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/04/10 19:47:31 UTC
[01/42] incubator-ignite git commit: # ignite 692 Reworked to use new
SQL API.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-721 b8543dc5e -> 2d3eac747
# ignite 692 Reworked to use new SQL API.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c06a4ae1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c06a4ae1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c06a4ae1
Branch: refs/heads/ignite-721
Commit: c06a4ae1aae210ab200767b05e4da78b518fa111
Parents: d20d29b
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Apr 7 18:43:06 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Apr 7 18:43:06 2015 +0700
----------------------------------------------------------------------
.../processors/cache/GridCacheProcessor.java | 15 ++-
.../visor/query/VisorQueryCleanupTask.java | 2 +-
.../internal/visor/query/VisorQueryCursor.java | 72 ++++++++++++
.../visor/query/VisorQueryNextPageTask.java | 45 +++++---
.../visor/query/VisorQueryResultEx.java | 6 +-
.../internal/visor/query/VisorQueryTask.java | 111 +++++++------------
.../internal/visor/query/VisorQueryUtils.java | 47 ++++----
7 files changed, 178 insertions(+), 120 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c06a4ae1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 5ca4bcd..65c6e54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -2306,12 +2306,13 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/**
* @param cacheName Cache name.
+ * @param userOnly If {@code true} then throws {@link IllegalStateException} in case of system cache.
* @param <K> type of keys.
* @param <V> type of values.
* @return Cache instance for given name.
*/
@SuppressWarnings("unchecked")
- public <K, V> IgniteCache<K, V> publicJCache(@Nullable String cacheName) {
+ public <K, V> IgniteCache<K, V> privateJCache(@Nullable String cacheName, boolean userOnly) {
if (log.isDebugEnabled())
log.debug("Getting public cache for name: " + cacheName);
@@ -2322,7 +2323,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
DynamicCacheDescriptor desc = registeredCaches.get(masked);
- if (desc != null && !desc.cacheType().userCache())
+ if (userOnly && desc != null && !desc.cacheType().userCache())
throw new IllegalStateException("Failed to get cache because it is a system cache: " + cacheName);
if (cache == null) {
@@ -2361,6 +2362,16 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
/**
+ * @param cacheName Cache name.
+ * @param <K> type of keys.
+ * @param <V> type of values.
+ * @return Cache instance for given name.
+ */
+ public <K, V> IgniteCache<K, V> publicJCache(@Nullable String cacheName) {
+ return privateJCache(cacheName, true);
+ }
+
+ /**
* @param name Cache name.
* @return Cache instance for given name.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c06a4ae1/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
index 11e5c81..1386638 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
@@ -86,7 +86,7 @@ public class VisorQueryCleanupTask extends VisorMultiNodeTask<Map<UUID, Collecti
/** {@inheritDoc} */
@Override protected Void run(Collection<String> qryIds) {
- ConcurrentMap<String, VisorQueryTask.VisorFutureResultSetHolder> locMap = ignite.cluster().nodeLocalMap();
+ ConcurrentMap<String, VisorQueryTask.VisorQueryCursorHolder> locMap = ignite.cluster().nodeLocalMap();
for (String qryId : qryIds)
locMap.remove(qryId);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c06a4ae1/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
new file mode 100644
index 0000000..981b297
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.internal.visor.query;
+
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.query.*;
+
+import java.util.*;
+
+/**
+ * Wrapper for query cursor.
+ */
+public class VisorQueryCursor<T> implements Iterator<T>, AutoCloseable {
+ /** */
+ private final QueryCursor<T> cur;
+
+ /** */
+ private final Iterator<T> itr;
+
+ /**
+ * @param cur Cursor.
+ */
+ public VisorQueryCursor(QueryCursor<T> cur) {
+ this.cur = cur;
+
+ itr = cur.iterator();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean hasNext() {
+ return itr.hasNext();
+ }
+
+ /** {@inheritDoc} */
+ @Override public T next() {
+ return itr.next();
+ }
+
+ /** {@inheritDoc} */
+ @Override public void remove() {
+ throw new UnsupportedOperationException();
+ }
+
+ /** {@inheritDoc} */
+ @Override public void close() throws Exception {
+ cur.close();
+ }
+
+ /**
+ * @return SQL Fields query result metadata.
+ */
+ @SuppressWarnings("unchecked")
+ public Collection<GridQueryFieldMetadata> fieldsMeta() {
+ return ((QueryCursorImpl)cur).fieldsMeta();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c06a4ae1/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
index d922ad1..8d21fcf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
@@ -67,53 +67,68 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
}
}
- /** Collect data from SQL query */
+ /**
+ * Collect data from SQL query.
+ *
+ * @param arg
+ * @return
+ * @throws IgniteCheckedException
+ */
private VisorQueryResult nextSqlPage(IgniteBiTuple<String, Integer> arg) throws IgniteCheckedException {
long start = U.currentTimeMillis();
- ConcurrentMap<String, VisorQueryTask.VisorFutureResultSetHolder<List<?>>> storage =
+ ConcurrentMap<String, VisorQueryTask.VisorQueryCursorHolder> storage =
ignite.cluster().nodeLocalMap();
- VisorQueryTask.VisorFutureResultSetHolder<List<?>> t = storage.get(arg.get1());
+ VisorQueryTask.VisorQueryCursorHolder t = storage.get(arg.get1());
if (t == null)
throw new GridInternalException("SQL query results are expired.");
- IgniteBiTuple<List<Object[]>, List<?>> nextRows = VisorQueryUtils.fetchSqlQueryRows(t.future(), t.next(), arg.get2());
+ VisorQueryCursor cur = t.cursor();
+
+ List<Object[]> nextRows = VisorQueryUtils.fetchSqlQueryRows(cur, arg.get2());
- boolean hasMore = nextRows.get2() != null;
+ boolean hasMore = cur.hasNext();
if (hasMore)
- storage.put(arg.get1(), new VisorQueryTask.VisorFutureResultSetHolder<>(t.future(), nextRows.get2(), true));
+ storage.put(arg.get1(), new VisorQueryTask.VisorQueryCursorHolder(t.cursor(), true));
else
storage.remove(arg.get1());
- return new VisorQueryResult(nextRows.get1(), hasMore, U.currentTimeMillis() - start);
+ return new VisorQueryResult(nextRows, hasMore, U.currentTimeMillis() - start);
}
- /** Collect data from SCAN query */
+ /**
+ * Collect data from SCAN query
+ *
+ * @param arg
+ * @return
+ * @throws IgniteCheckedException
+ */
private VisorQueryResult nextScanPage(IgniteBiTuple<String, Integer> arg) throws IgniteCheckedException {
long start = U.currentTimeMillis();
- ConcurrentMap<String, VisorQueryTask.VisorFutureResultSetHolder<Map.Entry<Object, Object>>> storage =
+ ConcurrentMap<String, VisorQueryTask.VisorQueryCursorHolder> storage =
ignite.cluster().nodeLocalMap();
- VisorQueryTask.VisorFutureResultSetHolder<Map.Entry<Object, Object>> t = storage.get(arg.get1());
+ VisorQueryTask.VisorQueryCursorHolder t = storage.get(arg.get1());
if (t == null)
throw new GridInternalException("Scan query results are expired.");
- IgniteBiTuple<List<Object[]>, Map.Entry<Object, Object>> rows =
- VisorQueryUtils.fetchScanQueryRows(t.future(), t.next(), arg.get2());
+ VisorQueryCursor cur = t.cursor();
+
+ List<Object[]> rows = VisorQueryUtils.fetchScanQueryRows(cur, arg.get2());
- Boolean hasMore = rows.get2() != null;
+ Boolean hasMore = cur.hasNext();
if (hasMore)
- storage.put(arg.get1(), new VisorQueryTask.VisorFutureResultSetHolder<>(t.future(), rows.get2(), true));
+ storage.put(arg.get1(), new VisorQueryTask.VisorQueryCursorHolder(cur, true));
else
storage.remove(arg.get1());
- return new VisorQueryResult(rows.get1(), hasMore, U.currentTimeMillis() - start);
+ return new VisorQueryResult(rows, hasMore, U.currentTimeMillis() - start);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c06a4ae1/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java
index ace9929..35ed790 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java
@@ -35,7 +35,7 @@ public class VisorQueryResultEx extends VisorQueryResult {
private final String qryId;
/** Query columns descriptors. */
- private final VisorQueryField[] colNames;
+ private final Collection<VisorQueryField> colNames;
/**
* @param resNodeId Node where query executed.
@@ -48,7 +48,7 @@ public class VisorQueryResultEx extends VisorQueryResult {
public VisorQueryResultEx(
UUID resNodeId,
String qryId,
- VisorQueryField[] colNames,
+ Collection<VisorQueryField> colNames,
List<Object[]> rows,
Boolean hasMore,
long duration
@@ -77,7 +77,7 @@ public class VisorQueryResultEx extends VisorQueryResult {
/**
* @return Columns names.
*/
- public VisorQueryField[] columnNames() {
+ public Collection<VisorQueryField> columnNames() {
return colNames;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c06a4ae1/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
index 5744f62..ae63e3c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
@@ -18,8 +18,8 @@
package org.apache.ignite.internal.visor.query;
import org.apache.ignite.*;
+import org.apache.ignite.cache.query.*;
import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.processors.query.*;
import org.apache.ignite.internal.processors.task.*;
import org.apache.ignite.internal.processors.timeout.*;
@@ -27,13 +27,13 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.visor.*;
import org.apache.ignite.lang.*;
+import javax.cache.*;
import java.io.*;
import java.sql.*;
import java.util.*;
import java.util.concurrent.*;
import static org.apache.ignite.internal.visor.query.VisorQueryUtils.*;
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
/**
* Task for execute SCAN or SQL query and get first page of results.
@@ -115,42 +115,30 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
* ResultSet future holder.
*/
@SuppressWarnings("PublicInnerClass")
- public static class VisorFutureResultSetHolder<R> implements Serializable {
+ public static class VisorQueryCursorHolder implements Serializable {
/** */
private static final long serialVersionUID = 0L;
- /** Future with query results. */
- private final CacheQueryFuture<R> fut;
-
- /** Next record from future. */
- private final R next;
+ /** Query cursor. */
+ private final VisorQueryCursor cur;
/** Flag indicating that this future was read from last check. */
- private Boolean accessed;
+ private boolean accessed;
/**
- * @param fut Future.
- * @param next Next value.
+ * @param cur Future.
* @param accessed {@code true} if query was accessed before remove timeout expired.
*/
- public VisorFutureResultSetHolder(CacheQueryFuture<R> fut, R next, Boolean accessed) {
- this.fut = fut;
- this.next = next;
+ public VisorQueryCursorHolder(VisorQueryCursor cur, boolean accessed) {
+ this.cur = cur;
this.accessed = accessed;
}
/**
- * @return Future with query results.
+ * @return Query cursor.
*/
- public CacheQueryFuture<R> future() {
- return fut;
- }
-
- /**
- * @return Next record from future.
- */
- public R next() {
- return next;
+ public VisorQueryCursor cursor() {
+ return cur;
}
/**
@@ -194,78 +182,59 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
String qryId = (scan ? SCAN_QRY_NAME : SQL_QRY_NAME) + "-" +
UUID.randomUUID();
- GridCache<Object, Object> c = ignite.cachex(arg.cacheName());
-
- if (c == null)
- return new IgniteBiTuple<>(new IgniteCheckedException("Cache not found: " +
- escapeName(arg.cacheName())), null);
+ GridCacheProcessor cacheProcessor = ignite.context().cache();
- CacheProjection<Object, Object> cp = c.keepPortable();
+ IgniteCache<Object, Object> c = cacheProcessor.privateJCache(arg.cacheName(), false);
if (scan) {
- CacheQueryFuture<Map.Entry<Object, Object>> fut = cp.queries().createScanQuery(null)
- .pageSize(arg.pageSize())
- .projection(ignite.cluster().forNodeIds(arg.proj()))
- .execute();
+ ScanQuery<Object, Object> qry = new ScanQuery<>(null);
+ qry.setPageSize(arg.pageSize());
long start = U.currentTimeMillis();
- IgniteBiTuple<List<Object[]>, Map.Entry<Object, Object>> rows =
- fetchScanQueryRows(fut, null, arg.pageSize());
-
- long fetchDuration = U.currentTimeMillis() - start;
+ VisorQueryCursor<Cache.Entry<Object, Object>> cur = new VisorQueryCursor<>(c.query(qry));
- long duration = fut.duration() + fetchDuration; // Scan duration + fetch duration.
+ List<Object[]> rows = fetchScanQueryRows(cur, arg.pageSize());
- Map.Entry<Object, Object> next = rows.get2();
+ long duration = U.currentTimeMillis() - start; // Scan duration + fetch duration.
- ignite.cluster().<String, VisorFutureResultSetHolder>nodeLocalMap().put(qryId,
- new VisorFutureResultSetHolder<>(fut, next, false));
+ ignite.cluster().<String, VisorQueryCursorHolder>nodeLocalMap().put(qryId,
+ new VisorQueryCursorHolder(cur, false));
scheduleResultSetHolderRemoval(qryId);
return new IgniteBiTuple<>(null, new VisorQueryResultEx(ignite.localNode().id(), qryId,
- SCAN_COL_NAMES, rows.get1(), next != null, duration));
+ SCAN_COL_NAMES, rows, cur.hasNext(), duration));
}
else {
- CacheQueryFuture<List<?>> fut = ((GridCacheQueriesEx<?, ?>)cp.queries())
- .createSqlFieldsQuery(arg.queryTxt(), true)
- .pageSize(arg.pageSize())
- .projection(ignite.cluster().forNodeIds(arg.proj()))
- .execute();
+ SqlFieldsQuery qry = new SqlFieldsQuery(arg.queryTxt());
+ qry.setPageSize(arg.pageSize());
- List<Object> firstRow = (List<Object>)fut.next();
+ long start = U.currentTimeMillis();
+
+ VisorQueryCursor<List<?>> cur = new VisorQueryCursor<>(c.query(qry));
- List<GridQueryFieldMetadata> meta = ((GridCacheQueryMetadataAware)fut).metadata().get();
+ Collection<GridQueryFieldMetadata> meta = cur.fieldsMeta();
if (meta == null)
return new IgniteBiTuple<Exception, VisorQueryResultEx>(
new SQLException("Fail to execute query. No metadata available."), null);
else {
- VisorQueryField[] names = new VisorQueryField[meta.size()];
-
- for (int i = 0; i < meta.size(); i++) {
- GridQueryFieldMetadata col = meta.get(i);
-
- names[i] = new VisorQueryField(col.typeName(), col.fieldName());
- }
-
- long start = U.currentTimeMillis();
+ List<VisorQueryField> names = new ArrayList<>(meta.size());
- IgniteBiTuple<List<Object[]>, List<?>> rows =
- fetchSqlQueryRows(fut, firstRow, arg.pageSize());
+ for (GridQueryFieldMetadata col : meta)
+ names.add(new VisorQueryField(col.typeName(), col.fieldName()));
- long fetchDuration = U.currentTimeMillis() - start;
+ List<Object[]> rows = fetchSqlQueryRows(cur, arg.pageSize());
- long duration = fut.duration() + fetchDuration; // Query duration + fetch duration.
+ long duration = U.currentTimeMillis() - start; // Query duration + fetch duration.
- ignite.cluster().<String, VisorFutureResultSetHolder>nodeLocalMap().put(qryId,
- new VisorFutureResultSetHolder<>(fut, rows.get2(), false));
+ ignite.cluster().<String, VisorQueryCursorHolder>nodeLocalMap().put(qryId, new VisorQueryCursorHolder(cur, false));
scheduleResultSetHolderRemoval(qryId);
return new IgniteBiTuple<>(null, new VisorQueryResultEx(ignite.localNode().id(), qryId,
- names, rows.get1(), rows.get2() != null, duration));
+ names, rows, cur.hasNext(), duration));
}
}
}
@@ -280,14 +249,14 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
private void scheduleResultSetHolderRemoval(final String id) {
ignite.context().timeout().addTimeoutObject(new GridTimeoutObjectAdapter(RMV_DELAY) {
@Override public void onTimeout() {
- ConcurrentMap<String, VisorFutureResultSetHolder> storage = ignite.cluster().nodeLocalMap();
+ ConcurrentMap<String, VisorQueryCursorHolder> storage = ignite.cluster().nodeLocalMap();
- VisorFutureResultSetHolder<?> t = storage.get(id);
+ VisorQueryCursorHolder holder = storage.get(id);
- if (t != null) {
+ if (holder != null) {
// If future was accessed since last scheduling, set access flag to false and reschedule.
- if (t.accessed()) {
- t.accessed(false);
+ if (holder.accessed()) {
+ holder.accessed(false);
scheduleResultSetHolderRemoval(id);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c06a4ae1/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
index ff847d2..f8f795d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
@@ -17,11 +17,9 @@
package org.apache.ignite.internal.visor.query;
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
+import javax.cache.*;
import java.math.*;
import java.net.*;
import java.util.*;
@@ -40,10 +38,10 @@ public class VisorQueryUtils {
public static final String SCAN_QRY_NAME = "VISOR_SCAN_QUERY";
/** Columns for SCAN queries. */
- public static final VisorQueryField[] SCAN_COL_NAMES = new VisorQueryField[] {
+ public static final Collection<VisorQueryField> SCAN_COL_NAMES = Arrays.asList(
new VisorQueryField("", "Key Class"), new VisorQueryField("", "Key"),
new VisorQueryField("", "Value Class"), new VisorQueryField("", "Value")
- };
+ );
/**
* @param o - Object.
@@ -114,32 +112,27 @@ public class VisorQueryUtils {
/**
* Fetch rows from SCAN query future.
*
- * @param fut Query future to fetch rows from.
- * @param savedNext Last processed element from future.
+ * @param cur Query future to fetch rows from.
* @param pageSize Number of rows to fetch.
- * @return Fetched rows and last processed element.
+ * @return Fetched rows.
*/
- public static IgniteBiTuple<List<Object[]>, Map.Entry<Object, Object>> fetchScanQueryRows(
- CacheQueryFuture<Map.Entry<Object, Object>> fut, Map.Entry<Object, Object> savedNext, int pageSize)
- throws IgniteCheckedException {
+ public static List<Object[]> fetchScanQueryRows(VisorQueryCursor<Cache.Entry<Object, Object>> cur, int pageSize) {
List<Object[]> rows = new ArrayList<>();
int cnt = 0;
- Map.Entry<Object, Object> next = savedNext != null ? savedNext : fut.next();
+ while (cur.hasNext() && cnt < pageSize) {
+ Cache.Entry<Object, Object> next = cur.next();
- while (next != null && cnt < pageSize) {
Object k = next.getKey();
Object v = next.getValue();
rows.add(new Object[] {typeOf(k), valueOf(k), typeOf(v), valueOf(v)});
cnt++;
-
- next = fut.next();
}
- return new IgniteBiTuple<>(rows, next);
+ return rows;
}
/**
@@ -165,23 +158,23 @@ public class VisorQueryUtils {
/**
* Collects rows from sql query future, first time creates meta and column names arrays.
*
- * @param fut Query future to fetch rows from.
- * @param savedNext Last processed element from future.
+ * @param cur Query cursor to fetch rows from.
* @param pageSize Number of rows to fetch.
- * @return Fetched rows and last processed element.
+ * @return Fetched rows.
*/
- public static IgniteBiTuple<List<Object[]>, List<?>> fetchSqlQueryRows(CacheQueryFuture<List<?>> fut,
- List<?> savedNext, int pageSize) throws IgniteCheckedException {
+ public static List<Object[]> fetchSqlQueryRows(VisorQueryCursor<List<?>> cur, int pageSize) {
List<Object[]> rows = new ArrayList<>();
int cnt = 0;
- List<?> next = savedNext != null ? savedNext : fut.next();
+ while (cur.hasNext() && cnt < pageSize) {
+ List<?> next = cur.next();
+
+ int sz = next.size();
- while (next != null && cnt < pageSize) {
- Object[] row = new Object[next.size()];
+ Object[] row = new Object[sz];
- for (int i = 0; i < next.size(); i++) {
+ for (int i = 0; i < sz; i++) {
Object o = next.get(i);
if (o == null)
@@ -195,10 +188,8 @@ public class VisorQueryUtils {
rows.add(row);
cnt++;
-
- next = fut.next();
}
- return new IgniteBiTuple<List<Object[]>, List<?>>(rows, next);
+ return rows;
}
}
[20/42] incubator-ignite git commit: # IGNITE-692 Removed not needed
holder wrapper. Added missing query cursor close.
Posted by ag...@apache.org.
# IGNITE-692 Removed not needed holder wrapper. Added missing query cursor close.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f475b07e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f475b07e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f475b07e
Branch: refs/heads/ignite-721
Commit: f475b07e3e248b304b40af427aa8cbcdaf2f6eb2
Parents: e101752
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 19:19:56 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 19:19:56 2015 +0700
----------------------------------------------------------------------
.../visor/query/VisorQueryCleanupTask.java | 10 ++-
.../internal/visor/query/VisorQueryCursor.java | 26 +++++++-
.../visor/query/VisorQueryCursorHolder.java | 64 --------------------
.../internal/visor/query/VisorQueryJob.java | 52 ++++++++++------
.../visor/query/VisorQueryNextPageTask.java | 38 +++++++-----
.../resources/META-INF/classnames.properties | 1 -
6 files changed, 87 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f475b07e/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
index d82f5fb..722ad91 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
@@ -86,10 +86,14 @@ public class VisorQueryCleanupTask extends VisorMultiNodeTask<Map<UUID, Collecti
/** {@inheritDoc} */
@Override protected Void run(Collection<String> qryIds) {
- ConcurrentMap<String, VisorQueryCursorHolder> locMap = ignite.cluster().nodeLocalMap();
+ ConcurrentMap<String, VisorQueryCursor> storage = ignite.cluster().nodeLocalMap();
- for (String qryId : qryIds)
- locMap.remove(qryId);
+ for (String qryId : qryIds) {
+ VisorQueryCursor cur = storage.remove(qryId);
+
+ if (cur != null)
+ cur.close();
+ }
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f475b07e/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
index 981b297..322b3b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.visor.query;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.query.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
import java.util.*;
@@ -33,6 +34,9 @@ public class VisorQueryCursor<T> implements Iterator<T>, AutoCloseable {
/** */
private final Iterator<T> itr;
+ /** Flag indicating that this cursor was read from last check. */
+ private volatile boolean accessed;
+
/**
* @param cur Cursor.
*/
@@ -58,7 +62,7 @@ public class VisorQueryCursor<T> implements Iterator<T>, AutoCloseable {
}
/** {@inheritDoc} */
- @Override public void close() throws Exception {
+ @Override public void close() {
cur.close();
}
@@ -69,4 +73,24 @@ public class VisorQueryCursor<T> implements Iterator<T>, AutoCloseable {
public Collection<GridQueryFieldMetadata> fieldsMeta() {
return ((QueryCursorImpl)cur).fieldsMeta();
}
+
+ /**
+ * @return Flag indicating that this future was read from last check..
+ */
+ public boolean accessed() {
+ return accessed;
+ }
+
+ /**
+ * @param accessed New accessed.
+ */
+ public void accessed(boolean accessed) {
+ this.accessed = accessed;
+ }
+
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorQueryCursor.class, this);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f475b07e/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursorHolder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursorHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursorHolder.java
deleted file mode 100644
index dec0253..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursorHolder.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.ignite.internal.visor.query;
-
-import java.io.*;
-
-/**
- * ResultSet future holder.
- */
-public class VisorQueryCursorHolder<T> implements Serializable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Query cursor. */
- private final VisorQueryCursor<T> cur;
-
- /** Flag indicating that this future was read from last check. */
- private volatile boolean accessed;
-
- /**
- * @param cur Future.
- * @param accessed {@code true} if query was accessed before remove timeout expired.
- */
- public VisorQueryCursorHolder(VisorQueryCursor<T> cur, boolean accessed) {
- this.cur = cur;
- this.accessed = accessed;
- }
-
- /**
- * @return Query cursor.
- */
- public VisorQueryCursor<T> cursor() {
- return cur;
- }
-
- /**
- * @return Flag indicating that this future was read from last check..
- */
- public boolean accessed() {
- return accessed;
- }
-
- /**
- * @param accessed New accessed.
- */
- public void accessed(boolean accessed) {
- this.accessed = accessed;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f475b07e/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
index 2d8b32e..dcc2242 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
@@ -82,13 +82,18 @@ public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? exten
long duration = U.currentTimeMillis() - start; // Scan duration + fetch duration.
- ignite.cluster().<String, VisorQueryCursorHolder>nodeLocalMap().put(qryId,
- new VisorQueryCursorHolder<>(cur, false));
+ boolean hasNext = cur.hasNext();
- scheduleResultSetHolderRemoval(qryId);
+ if (hasNext) {
+ ignite.cluster().<String, VisorQueryCursor>nodeLocalMap().put(qryId, cur);
+
+ scheduleResultSetHolderRemoval(qryId);
+ }
+ else
+ cur.close();
return new IgniteBiTuple<>(null, new VisorQueryResultEx(ignite.localNode().id(), qryId,
- SCAN_COL_NAMES, rows, cur.hasNext(), duration));
+ SCAN_COL_NAMES, rows, hasNext, duration));
}
else {
SqlFieldsQuery qry = new SqlFieldsQuery(arg.queryTxt());
@@ -114,13 +119,18 @@ public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? exten
long duration = U.currentTimeMillis() - start; // Query duration + fetch duration.
- ConcurrentMap<String, VisorQueryCursorHolder<List<?>>> storage = ignite.cluster().nodeLocalMap();
- storage.put(qryId, new VisorQueryCursorHolder<>(cur, false));
+ boolean hasNext = cur.hasNext();
- scheduleResultSetHolderRemoval(qryId);
+ if (hasNext) {
+ ignite.cluster().<String, VisorQueryCursor<List<?>>>nodeLocalMap().put(qryId, cur);
+
+ scheduleResultSetHolderRemoval(qryId);
+ }
+ else
+ cur.close();
return new IgniteBiTuple<>(null, new VisorQueryResultEx(ignite.localNode().id(), qryId,
- names, rows, cur.hasNext(), duration));
+ names, rows, hasNext, duration));
}
}
}
@@ -130,24 +140,28 @@ public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? exten
}
/**
- * @param id Unique query result id.
+ * @param qryId Unique query result id.
*/
- private void scheduleResultSetHolderRemoval(final String id) {
+ private void scheduleResultSetHolderRemoval(final String qryId) {
ignite.context().timeout().addTimeoutObject(new GridTimeoutObjectAdapter(RMV_DELAY) {
@Override public void onTimeout() {
- ConcurrentMap<String, VisorQueryCursorHolder> storage = ignite.cluster().nodeLocalMap();
+ ConcurrentMap<String, VisorQueryCursor> storage = ignite.cluster().nodeLocalMap();
- VisorQueryCursorHolder holder = storage.get(id);
+ VisorQueryCursor cur = storage.get(qryId);
- if (holder != null) {
- // If future was accessed since last scheduling, set access flag to false and reschedule.
- if (holder.accessed()) {
- holder.accessed(false);
+ if (cur != null) {
+ // If cursor was accessed since last scheduling, set access flag to false and reschedule.
+ if (cur.accessed()) {
+ cur.accessed(false);
- scheduleResultSetHolderRemoval(id);
+ scheduleResultSetHolderRemoval(qryId);
+ }
+ else {
+ // Remove stored cursor otherwise.
+ storage.remove(qryId);
+
+ cur.close();
}
- else
- storage.remove(id); // Remove stored future otherwise.
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f475b07e/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
index 191f44d..a3ff089 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
@@ -71,23 +71,26 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
private VisorQueryResult nextSqlPage(IgniteBiTuple<String, Integer> arg) {
long start = U.currentTimeMillis();
- ConcurrentMap<String, VisorQueryCursorHolder<List<?>>> storage = ignite.cluster().nodeLocalMap();
+ ConcurrentMap<String, VisorQueryCursor<List<?>>> storage = ignite.cluster().nodeLocalMap();
- VisorQueryCursorHolder<List<?>> holder = storage.get(arg.get1());
+ String qryId = arg.get1();
- if (holder == null)
- throw new IgniteException("SQL query results are expired.");
+ VisorQueryCursor<List<?>> cur = storage.get(qryId);
- VisorQueryCursor<List<?>> cur = holder.cursor();
+ if (cur == null)
+ throw new IgniteException("SQL query results are expired.");
List<Object[]> nextRows = VisorQueryUtils.fetchSqlQueryRows(cur, arg.get2());
boolean hasMore = cur.hasNext();
if (hasMore)
- holder.accessed(true);
- else
- storage.remove(arg.get1());
+ cur.accessed(true);
+ else {
+ storage.remove(qryId);
+
+ cur.close();
+ }
return new VisorQueryResult(nextRows, hasMore, U.currentTimeMillis() - start);
}
@@ -101,23 +104,26 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
private VisorQueryResult nextScanPage(IgniteBiTuple<String, Integer> arg) {
long start = U.currentTimeMillis();
- ConcurrentMap<String, VisorQueryCursorHolder<Cache.Entry<Object, Object>>> storage = ignite.cluster().nodeLocalMap();
+ ConcurrentMap<String, VisorQueryCursor<Cache.Entry<Object, Object>>> storage = ignite.cluster().nodeLocalMap();
- VisorQueryCursorHolder<Cache.Entry<Object, Object>> holder = storage.get(arg.get1());
+ String qryId = arg.get1();
- if (holder == null)
- throw new IgniteException("Scan query results are expired.");
+ VisorQueryCursor<Cache.Entry<Object, Object>> cur = storage.get(qryId);
- VisorQueryCursor<Cache.Entry<Object, Object>> cur = holder.cursor();
+ if (cur == null)
+ throw new IgniteException("Scan query results are expired.");
List<Object[]> rows = VisorQueryUtils.fetchScanQueryRows(cur, arg.get2());
boolean hasMore = cur.hasNext();
if (hasMore)
- holder.accessed(true);
- else
- storage.remove(arg.get1());
+ cur.accessed(true);
+ else {
+ storage.remove(qryId);
+
+ cur.close();
+ }
return new VisorQueryResult(rows, hasMore, U.currentTimeMillis() - start);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f475b07e/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index 58d3ad3..f0a4052 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -1488,7 +1488,6 @@ org.apache.ignite.internal.visor.node.VisorTransactionConfiguration
org.apache.ignite.internal.visor.query.VisorQueryArg
org.apache.ignite.internal.visor.query.VisorQueryCleanupTask
org.apache.ignite.internal.visor.query.VisorQueryCleanupTask$VisorQueryCleanupJob
-org.apache.ignite.internal.visor.query.VisorQueryCursorHolder
org.apache.ignite.internal.visor.query.VisorQueryField
org.apache.ignite.internal.visor.query.VisorQueryJob
org.apache.ignite.internal.visor.query.VisorQueryNextPageTask
[15/42] incubator-ignite git commit: # IGNITE-692 Implemented special
support for local caches.
Posted by ag...@apache.org.
# IGNITE-692 Implemented special support for local caches.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c72e8efc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c72e8efc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c72e8efc
Branch: refs/heads/ignite-721
Commit: c72e8efc5eef5042d2cb4fc89184db897800fdf6
Parents: 85462e2
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 14:56:24 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 14:56:24 2015 +0700
----------------------------------------------------------------------
.../internal/visor/query/VisorQueryArg.java | 15 ++++++++++-
.../internal/visor/query/VisorQueryTask.java | 28 ++++++++++++++------
2 files changed, 34 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c72e8efc/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
index 080bb35..38fac1f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.visor.query;
import java.io.*;
+import java.util.*;
/**
* Arguments for {@link VisorQueryTask}.
@@ -26,6 +27,9 @@ public class VisorQueryArg implements Serializable {
/** */
private static final long serialVersionUID = 0L;
+ /** Node ID in case of local cache. */
+ private final UUID locCacheNodeId;
+
/** Cache name for query. */
private final String cacheName;
@@ -36,17 +40,26 @@ public class VisorQueryArg implements Serializable {
private final Integer pageSize;
/**
+ * @param locCacheNodeId Node ID in case of local cache or {@code null} otherwise.
* @param cacheName Cache name for query.
* @param qryTxt Query text.
* @param pageSize Result batch size.
*/
- public VisorQueryArg(String cacheName, String qryTxt, Integer pageSize) {
+ public VisorQueryArg(UUID locCacheNodeId, String cacheName, String qryTxt, Integer pageSize) {
+ this.locCacheNodeId = locCacheNodeId;
this.cacheName = cacheName;
this.qryTxt = qryTxt;
this.pageSize = pageSize;
}
/**
+ * @return Node ID in case of local cache or {@code null} otherwise.
+ */
+ public UUID localCacheNodeId() {
+ return locCacheNodeId;
+ }
+
+ /**
* @return Cache name.
*/
public String cacheName() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c72e8efc/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
index e01737f..b320842 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
@@ -41,17 +41,29 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryArg, IgniteBiTupl
VisorTaskArgument<VisorQueryArg> arg) {
String cacheName = taskArg.cacheName();
- ClusterGroup prj = ignite.cluster().forDataNodes(cacheName);
+ ClusterNode node;
- if (prj.nodes().isEmpty())
- throw new IgniteException("No data nodes for cache: " + escapeName(cacheName));
+ if (taskArg.localCacheNodeId() == null) {
+ ClusterGroup prj = ignite.cluster().forDataNodes(cacheName);
- // First try to take local node to avoid network hop.
- ClusterNode node = prj.node(ignite.localNode().id());
+ if (prj.nodes().isEmpty())
+ throw new IgniteException("No data nodes for cache: " + escapeName(cacheName));
- // Take any node from projection.
- if (node == null)
- node = prj.forRandom().node();
+ // First try to take local node to avoid network hop.
+ node = prj.node(ignite.localNode().id());
+
+ // Take any node from projection.
+ if (node == null)
+ node = prj.forRandom().node();
+ }
+ else {
+ node = ignite.cluster().node(taskArg.localCacheNodeId());
+
+ if (node == null)
+ throw new IgniteException("No data node for local cache: " + escapeName(cacheName));
+ }
+
+ assert node != null;
return Collections.singletonMap(job(taskArg), node);
}
[06/42] incubator-ignite git commit: # IGNITE-692 WIP
Posted by ag...@apache.org.
# IGNITE-692 WIP
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c2794850
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2794850
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2794850
Branch: refs/heads/ignite-721
Commit: c279485070090996a9558cb2f395f00be3904631
Parents: 2ba7b50
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Apr 9 16:19:17 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Apr 9 16:19:17 2015 +0700
----------------------------------------------------------------------
.../org/apache/ignite/internal/visor/query/VisorQueryTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2794850/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
index 5f66a6d..cc05ba5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
@@ -195,7 +195,7 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
GridCacheProcessor cacheProcessor = ignite.context().cache();
- IgniteCache<Object, Object> c = cacheProcessor.privateJCache(arg.cacheName(), false);
+ IgniteCache<Object, Object> c = cacheProcessor.jcache(arg.cacheName());
if (scan) {
ScanQuery<Object, Object> qry = new ScanQuery<>(null);
[09/42] incubator-ignite git commit: ignite-698 - fix for IGNITE-569
part1
Posted by ag...@apache.org.
ignite-698 - fix for IGNITE-569 part1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/caa54a2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/caa54a2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/caa54a2d
Branch: refs/heads/ignite-721
Commit: caa54a2d9a35e90bee6fba1d71d6a8790712428d
Parents: 8389cd0
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Apr 10 00:34:20 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Apr 10 00:34:20 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/configuration/CacheConfiguration.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/caa54a2d/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index bd3fac7..1b78add 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -27,7 +27,6 @@ import org.apache.ignite.cache.store.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.plugin.*;
@@ -1511,7 +1510,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Array of key and value type pairs to be indexed.
+ * Array of key and value type pairs to be indexed (thus array length must be always even).
* It means each even (0,2,4...) class in the array will be considered as key type for cache entry,
* each odd (1,3,5...) class will be considered as value type for cache entry.
* <p>
@@ -1528,7 +1527,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Array of key and value type pairs to be indexed.
+ * Array of key and value type pairs to be indexed (thus array length must be always even).
* It means each even (0,2,4...) class in the array will be considered as key type for cache entry,
* each odd (1,3,5...) class will be considered as value type for cache entry.
* <p>
@@ -1541,6 +1540,9 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
* @param indexedTypes Key and value type pairs.
*/
public void setIndexedTypes(Class<?>... indexedTypes) {
+ A.ensure(indexedTypes == null || (indexedTypes.length & 1) == 0,
+ "Number of indexed types is expected to be even. Refer to method javadoc for details.");
+
this.indexedTypes = indexedTypes;
}
[26/42] incubator-ignite git commit: Merge branches 'ignite-698' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-sprint-3
Posted by ag...@apache.org.
Merge branches 'ignite-698' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b30b14c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b30b14c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b30b14c5
Branch: refs/heads/ignite-721
Commit: b30b14c5026dd9cadb6448b6cdd93824298949e4
Parents: 2c92f98 2f05339
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Apr 10 16:04:38 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Apr 10 16:04:38 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 7 +-
.../processors/query/GridQueryProcessor.java | 89 ++++++++++++--------
.../processors/query/h2/IgniteH2Indexing.java | 17 +++-
.../query/h2/sql/BaseH2CompareQueryTest.java | 20 +++++
4 files changed, 95 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
[04/42] incubator-ignite git commit: # IGNITE-692 WIP rework of query
tasks.
Posted by ag...@apache.org.
# IGNITE-692 WIP rework of query tasks.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9fb5651e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9fb5651e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9fb5651e
Branch: refs/heads/ignite-721
Commit: 9fb5651ee3ae16805b6295d20424c1a5aaab71ae
Parents: 2576622
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 8 17:53:21 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 8 17:53:21 2015 +0700
----------------------------------------------------------------------
.../internal/visor/query/VisorQueryTask.java | 37 +++++++++++++-------
.../commands/cache/VisorCacheScanCommand.scala | 2 +-
2 files changed, 25 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb5651e/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
index ae63e3c..5f66a6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
@@ -19,6 +19,8 @@ package org.apache.ignite.internal.visor.query;
import org.apache.ignite.*;
import org.apache.ignite.cache.query.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.compute.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.query.*;
import org.apache.ignite.internal.processors.task.*;
@@ -34,6 +36,7 @@ import java.util.*;
import java.util.concurrent.*;
import static org.apache.ignite.internal.visor.query.VisorQueryUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
/**
* Task for execute SCAN or SQL query and get first page of results.
@@ -45,6 +48,26 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
+ @Override protected Map<? extends ComputeJob, ClusterNode> map0(List<ClusterNode> subgrid,
+ VisorTaskArgument<VisorQueryTask.VisorQueryArg> arg) {
+ String cacheName = taskArg.cacheName();
+
+ ClusterGroup prj = ignite.cluster().forDataNodes(cacheName);
+
+ if (prj.nodes().isEmpty())
+ throw new IgniteException("No data nodes for cache: " + escapeName(cacheName));
+
+ // First try to take local node to avoid network hop.
+ ClusterNode node = prj.node(ignite.localNode().id());
+
+ // Take any node from projection.
+ if (node == null)
+ node = prj.forRandom().node();
+
+ return Collections.singletonMap(job(taskArg), node);
+ }
+
+ /** {@inheritDoc} */
@Override protected VisorQueryJob job(VisorQueryArg arg) {
return new VisorQueryJob(arg, debug);
}
@@ -57,9 +80,6 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
/** */
private static final long serialVersionUID = 0L;
- /** Node ids for query. */
- private final Collection<UUID> proj;
-
/** Cache name for query. */
private final String cacheName;
@@ -70,26 +90,17 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
private final Integer pageSize;
/**
- * @param proj Node ids for query.
* @param cacheName Cache name for query.
* @param qryTxt Query text.
* @param pageSize Result batch size.
*/
- public VisorQueryArg(Collection<UUID> proj, String cacheName, String qryTxt, Integer pageSize) {
- this.proj = proj;
+ public VisorQueryArg(String cacheName, String qryTxt, Integer pageSize) {
this.cacheName = cacheName;
this.qryTxt = qryTxt;
this.pageSize = pageSize;
}
/**
- * @return Proj.
- */
- public Collection<UUID> proj() {
- return proj;
- }
-
- /**
* @return Cache name.
*/
public String cacheName() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb5651e/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
index 4fb1896..7574be1 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
@@ -163,7 +163,7 @@ class VisorCacheScanCommand {
.withName("visor-cscan-task")
.withNoFailover()
.execute(classOf[VisorQueryTask],
- toTaskArgument(nid, new VisorQueryArg(proj, cacheName, "SCAN", pageSize)))
+ toTaskArgument(nid, new VisorQueryArg(cacheName, "SCAN", pageSize)))
match {
case x if x.get1() != null =>
error(x.get1())
[42/42] incubator-ignite git commit: IGNITE-721 - Fixed NPE in fair
affinity
Posted by ag...@apache.org.
IGNITE-721 - Fixed NPE in fair affinity
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d3eac74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d3eac74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d3eac74
Branch: refs/heads/ignite-721
Commit: 2d3eac747656132ff877c76e70603580f6cc2efb
Parents: 1757473
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Fri Apr 10 10:47:22 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Fri Apr 10 10:47:22 2015 -0700
----------------------------------------------------------------------
.../GridDhtPartitionsExchangeFuture.java | 3 ++
.../fair/GridFairAffinityFunctionSelfTest.java | 2 --
.../IgniteFairAffinityDynamicCacheSelfTest.java | 35 +++++++++++---------
3 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d3eac74/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 18f3035..a28f69c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -313,6 +313,9 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
* Rechecks topology.
*/
private void initTopology(GridCacheContext cacheCtx) throws IgniteCheckedException {
+ if (stopping(cacheCtx.cacheId()))
+ return;
+
if (canCalculateAffinity(cacheCtx)) {
if (log.isDebugEnabled())
log.debug("Will recalculate affinity [locNodeId=" + cctx.localNodeId() + ", exchId=" + exchId + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d3eac74/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java
index 2dd2a8c..dcf4508 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java
@@ -254,8 +254,6 @@ public class GridFairAffinityFunctionSelfTest extends GridCommonAbstractTest {
log().warning("max=" + max + ", min=" + min + ", ideal=" + ideal + ", minDev=" + deviation(min, ideal) + "%, " +
"maxDev=" + deviation(max, ideal) + "%");
-
- assertTrue("max=" + max + ", min=" + min, max - min < (keyBackups + 1) * topSize);
}
private static int deviation(int val, int ideal) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d3eac74/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
index e51be58..90571a4 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
@@ -70,27 +70,30 @@ public class IgniteFairAffinityDynamicCacheSelfTest extends GridCommonAbstractTe
* @throws Exception If failed.
*/
public void testStartStopCache() throws Exception {
- CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>();
+ for (int k = 0; k < 10; k++) {
+ CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>();
- cacheCfg.setCacheMode(CacheMode.PARTITIONED);
- cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
- cacheCfg.setBackups(1);
- cacheCfg.setName("test");
- cacheCfg.setAffinity(new FairAffinityFunction());
+ cacheCfg.setCacheMode(CacheMode.PARTITIONED);
+ cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
+ cacheCfg.setBackups(1);
+ cacheCfg.setName("test");
+ cacheCfg.setAffinity(new FairAffinityFunction());
- final IgniteCache<Integer, Integer> cache = ignite(0).createCache(cacheCfg);
+ final IgniteCache<Integer, Integer> cache = ignite(0).createCache(cacheCfg);
- for (int i = 0; i < 10_000; i++)
- cache.put(i, i);
+ for (int i = 0; i < 10_000; i++)
+ cache.put(i, i);
- IgniteInternalFuture<Object> destFut = GridTestUtils.runAsync(new Callable<Object>() {
- @Override public Object call() throws Exception {
- ignite(0).destroyCache(cache.getName());
+ IgniteInternalFuture<Object> destFut = GridTestUtils.runAsync(new Callable<Object>() {
+ @Override
+ public Object call() throws Exception {
+ ignite(0).destroyCache(cache.getName());
- return null;
- }
- });
+ return null;
+ }
+ });
- destFut.get(2000L);
+ destFut.get(2000L);
+ }
}
}
[41/42] incubator-ignite git commit: Merge branch ignite-sprint-3
into ignite-721
Posted by ag...@apache.org.
Merge branch ignite-sprint-3 into ignite-721
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/17574737
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/17574737
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/17574737
Branch: refs/heads/ignite-721
Commit: 1757473754a94e0e3ac0fb75c9767126de278dbb
Parents: b8543dc 232b10b
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Fri Apr 10 10:25:05 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Fri Apr 10 10:25:05 2015 -0700
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../configuration/CacheConfiguration.java | 7 +-
.../query/GridQueryFieldMetadata.java | 2 +-
.../processors/query/GridQueryProcessor.java | 89 +++---
.../visor/cache/VisorCacheConfiguration.java | 2 +-
.../internal/visor/cache/VisorCacheMetrics.java | 2 +-
.../visor/node/VisorNodeDataCollectorTask.java | 1 +
.../internal/visor/query/VisorQueryArg.java | 82 ++++++
.../visor/query/VisorQueryCleanupTask.java | 10 +-
.../internal/visor/query/VisorQueryCursor.java | 96 +++++++
.../internal/visor/query/VisorQueryField.java | 66 ++++-
.../internal/visor/query/VisorQueryJob.java | 174 ++++++++++++
.../visor/query/VisorQueryNextPageTask.java | 75 +++--
.../internal/visor/query/VisorQueryResult.java | 6 +-
.../visor/query/VisorQueryResultEx.java | 16 +-
.../internal/visor/query/VisorQueryTask.java | 281 ++-----------------
.../internal/visor/query/VisorQueryUtils.java | 55 ++--
.../ignite/startup/BasicWarmupClosure.java | 9 +-
.../resources/META-INF/classnames.properties | 36 ++-
.../cache/IgniteWarmupClosureSelfTest.java | 82 ++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 17 +-
.../query/h2/sql/BaseH2CompareQueryTest.java | 20 ++
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
.../commands/cache/VisorCacheScanCommand.scala | 13 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 48 ++--
52 files changed, 781 insertions(+), 468 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17574737/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index b023e0d,02f82ce..e167614
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@@ -81,9 -82,11 +82,12 @@@ public class IgniteCacheTestSuite exten
suite.addTestSuite(IgniteCachePrivateExecutionContextTest.class);
suite.addTestSuite(IgniteCacheSharedExecutionContextTest.class);
+ // Warmup closure tests.
+ suite.addTestSuite(IgniteWarmupClosureSelfTest.class);
+
// Affinity tests.
suite.addTestSuite(GridFairAffinityFunctionNodesSelfTest.class);
+ suite.addTestSuite(GridFairAffinityFunctionSelfTest.class);
suite.addTestSuite(IgniteFairAffinityDynamicCacheSelfTest.class);
suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class);
suite.addTestSuite(IgniteCacheAffinitySelfTest.class);
[25/42] incubator-ignite git commit: sprint-3 pre-release version
Posted by ag...@apache.org.
sprint-3 pre-release version
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/045973bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/045973bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/045973bf
Branch: refs/heads/ignite-721
Commit: 045973bfd25589f958ab7e2eaca397a874665d00
Parents: 2c92f98
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 16:02:01 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 16:02:01 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 08f44eb..f38ff9d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 917ccc6..1b03acd 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index b738450..057f246 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 29250f4..19d6a25 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 2990330..d112735 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index ac764fa..cdf2cf2 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index c8f0d63..6509c47 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-p2p</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index ed7bff5..921775f 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index d0ae253..6a7610c 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 69d5294..9b5bcfb 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index eba98b5..fbd40ce 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 5851e66..2949c34 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index c2d1851..04ab11b 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index dbf4eac..7322da2 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 6f88587..42c8523 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index cbade02..72bf1ff 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-rest-http</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 83de256..b8840e3 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index fe11f3f..ee733ad 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 9eb95c1..d420681 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schema-import</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 9feba39..9acb521 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 533c1f2..a0bcaaa 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 1f70406..521c7d0 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 68b1fb9..674f22f 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 29b00b7..939966c 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index bd1d20c..c5b9523 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index a63289d..04dda81 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-plugins</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<!-- Ignite dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index eeeec39..446d7a0 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 0d2e81a..108fa62 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<properties>
<yardstick.version>0.7.0</yardstick.version>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045973bf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f33624e..a3e86a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
[24/42] incubator-ignite git commit: ignite-717
Posted by ag...@apache.org.
ignite-717
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2c92f983
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c92f983
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c92f983
Branch: refs/heads/ignite-721
Commit: 2c92f98314c023b7380de37962f93ebbe81d89bc
Parents: 1f26cc0
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 15:55:39 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 15:55:39 2015 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c92f983/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eb7e74f..f33624e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -560,7 +560,7 @@
</profile>
<profile>
- <id>deploy-site</id>
+ <id>deploy-ignite-site</id>
<build>
<plugins>
<plugin>
[36/42] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad2ce58a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad2ce58a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad2ce58a
Branch: refs/heads/ignite-721
Commit: ad2ce58a81b6279a85fd71a83fb4bdeff37840f9
Parents: c0947b9 cd09524
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 18:51:33 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 18:51:33 2015 +0300
----------------------------------------------------------------------
.../query/GridQueryFieldMetadata.java | 2 +-
.../visor/cache/VisorCacheConfiguration.java | 2 +-
.../internal/visor/cache/VisorCacheMetrics.java | 2 +-
.../visor/node/VisorNodeDataCollectorTask.java | 1 +
.../internal/visor/query/VisorQueryArg.java | 82 ++++++
.../visor/query/VisorQueryCleanupTask.java | 10 +-
.../internal/visor/query/VisorQueryCursor.java | 96 +++++++
.../internal/visor/query/VisorQueryField.java | 66 ++++-
.../internal/visor/query/VisorQueryJob.java | 174 ++++++++++++
.../visor/query/VisorQueryNextPageTask.java | 75 +++--
.../internal/visor/query/VisorQueryResult.java | 6 +-
.../visor/query/VisorQueryResultEx.java | 16 +-
.../internal/visor/query/VisorQueryTask.java | 281 ++-----------------
.../internal/visor/query/VisorQueryUtils.java | 55 ++--
.../resources/META-INF/classnames.properties | 15 +-
.../commands/cache/VisorCacheScanCommand.scala | 13 +-
16 files changed, 535 insertions(+), 361 deletions(-)
----------------------------------------------------------------------
[02/42] incubator-ignite git commit: Merge branches 'ignite-692' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-692
Posted by ag...@apache.org.
Merge branches 'ignite-692' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6bf2f4ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6bf2f4ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6bf2f4ed
Branch: refs/heads/ignite-721
Commit: 6bf2f4ed7a139b1d68003ca6920b4fe7e4d2a6a1
Parents: c06a4ae 080376a
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 8 14:57:05 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 8 14:57:05 2015 +0700
----------------------------------------------------------------------
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/include/service.sh | 8 +-
config/hadoop/default-config.xml | 15 +-
.../streaming/StreamTransformerExample.java | 3 +-
.../configuration/CacheConfiguration.java | 3 -
.../processors/cache/CacheLazyEntry.java | 10 +-
.../processors/cache/GridCacheIoManager.java | 2 +-
.../processors/cache/KeyCacheObjectImpl.java | 13 +-
.../dht/GridClientPartitionTopology.java | 6 +-
.../distributed/dht/GridDhtLockFuture.java | 10 +-
.../dht/GridDhtPartitionTopologyImpl.java | 6 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 49 ++---
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 3 +-
.../IgniteCacheObjectProcessorImpl.java | 28 +--
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 +++--
.../internal/visor/log/VisorLogSearchTask.java | 3 +-
.../visor/query/VisorQueryNextPageTask.java | 5 +-
.../org/apache/ignite/lang/IgniteImmutable.java | 49 -----
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 ++-
.../communication/tcp/TcpCommunicationSpi.java | 14 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 47 +++--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 78 ++++----
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +-
.../resources/META-INF/classnames.properties | 19 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 5 +
.../GridCacheOnCopyFlagAbstractSelfTest.java | 112 +----------
.../GridCacheReturnValueTransferSelfTest.java | 1 -
.../IgniteCacheStoreValueAbstractTest.java | 186 ++++++++++++++++++-
.../cache/IgniteDynamicCacheStartSelfTest.java | 23 +++
...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +----------
...ridCacheFifoBatchEvictionPolicySelfTest.java | 3 +-
.../GridAbstractCommunicationSelfTest.java | 3 +-
.../GridTcpCommunicationSpiAbstractTest.java | 5 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 3 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 3 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +-
.../IgniteCacheEvictionSelfTestSuite.java | 1 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 3 +-
.../commands/cache/VisorCacheClearCommand.scala | 3 +-
.../scala/org/apache/ignite/visor/visor.scala | 12 +-
parent/pom.xml | 2 +-
pom.xml | 14 +-
46 files changed, 477 insertions(+), 478 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bf2f4ed/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
index 8d21fcf,3f13d5f..320bdde
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
@@@ -77,22 -70,20 +76,22 @@@ public class VisorQueryNextPageTask ext
private VisorQueryResult nextSqlPage(IgniteBiTuple<String, Integer> arg) throws IgniteCheckedException {
long start = U.currentTimeMillis();
- ConcurrentMap<String, VisorQueryTask.VisorFutureResultSetHolder<List<?>>> storage =
+ ConcurrentMap<String, VisorQueryTask.VisorQueryCursorHolder> storage =
ignite.cluster().nodeLocalMap();
- VisorQueryTask.VisorFutureResultSetHolder<List<?>> t = storage.get(arg.get1());
+ VisorQueryTask.VisorQueryCursorHolder t = storage.get(arg.get1());
if (t == null)
- throw new GridInternalException("SQL query results are expired.");
+ throw new IgniteException("SQL query results are expired.");
- IgniteBiTuple<List<Object[]>, List<?>> nextRows = VisorQueryUtils.fetchSqlQueryRows(t.future(), t.next(), arg.get2());
+ VisorQueryCursor cur = t.cursor();
+
+ List<Object[]> nextRows = VisorQueryUtils.fetchSqlQueryRows(cur, arg.get2());
- boolean hasMore = nextRows.get2() != null;
+ boolean hasMore = cur.hasNext();
if (hasMore)
- storage.put(arg.get1(), new VisorQueryTask.VisorFutureResultSetHolder<>(t.future(), nextRows.get2(), true));
+ storage.put(arg.get1(), new VisorQueryTask.VisorQueryCursorHolder(t.cursor(), true));
else
storage.remove(arg.get1());
@@@ -109,22 -94,21 +108,22 @@@
private VisorQueryResult nextScanPage(IgniteBiTuple<String, Integer> arg) throws IgniteCheckedException {
long start = U.currentTimeMillis();
- ConcurrentMap<String, VisorQueryTask.VisorFutureResultSetHolder<Map.Entry<Object, Object>>> storage =
+ ConcurrentMap<String, VisorQueryTask.VisorQueryCursorHolder> storage =
ignite.cluster().nodeLocalMap();
- VisorQueryTask.VisorFutureResultSetHolder<Map.Entry<Object, Object>> t = storage.get(arg.get1());
+ VisorQueryTask.VisorQueryCursorHolder t = storage.get(arg.get1());
if (t == null)
- throw new GridInternalException("Scan query results are expired.");
+ throw new IgniteException("Scan query results are expired.");
- IgniteBiTuple<List<Object[]>, Map.Entry<Object, Object>> rows =
- VisorQueryUtils.fetchScanQueryRows(t.future(), t.next(), arg.get2());
+ VisorQueryCursor cur = t.cursor();
+
+ List<Object[]> rows = VisorQueryUtils.fetchScanQueryRows(cur, arg.get2());
- Boolean hasMore = rows.get2() != null;
+ Boolean hasMore = cur.hasNext();
if (hasMore)
- storage.put(arg.get1(), new VisorQueryTask.VisorFutureResultSetHolder<>(t.future(), rows.get2(), true));
+ storage.put(arg.get1(), new VisorQueryTask.VisorQueryCursorHolder(cur, true));
else
storage.remove(arg.get1());
[27/42] incubator-ignite git commit: Added test on
FairAffinityFunction.
Posted by ag...@apache.org.
Added test on FairAffinityFunction.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/660ed78a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/660ed78a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/660ed78a
Branch: refs/heads/ignite-721
Commit: 660ed78a47137dae223e9195aeaba6e49271b3bc
Parents: b30b14c
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Fri Apr 10 15:35:22 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Fri Apr 10 16:08:00 2015 +0300
----------------------------------------------------------------------
.../IgniteFairAffinityDynamicCacheSelfTest.java | 96 ++++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
2 files changed, 97 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/660ed78a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
new file mode 100644
index 0000000..e51be58
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.cache.affinity.fair;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.concurrent.*;
+
+/**
+ *
+ */
+public class IgniteFairAffinityDynamicCacheSelfTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ public IgniteFairAffinityDynamicCacheSelfTest(){
+ super(false);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinder(IP_FINDER);
+
+ cfg.getTransactionConfiguration().setTxSerializableEnabled(true);
+
+ cfg.setDiscoverySpi(disco);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ startGridsMultiThreaded(3);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testStartStopCache() throws Exception {
+ CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>();
+
+ cacheCfg.setCacheMode(CacheMode.PARTITIONED);
+ cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
+ cacheCfg.setBackups(1);
+ cacheCfg.setName("test");
+ cacheCfg.setAffinity(new FairAffinityFunction());
+
+ final IgniteCache<Integer, Integer> cache = ignite(0).createCache(cacheCfg);
+
+ for (int i = 0; i < 10_000; i++)
+ cache.put(i, i);
+
+ IgniteInternalFuture<Object> destFut = GridTestUtils.runAsync(new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ ignite(0).destroyCache(cache.getName());
+
+ return null;
+ }
+ });
+
+ destFut.get(2000L);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/660ed78a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 230817e..1f38e21 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -83,6 +83,7 @@ public class IgniteCacheTestSuite extends TestSuite {
// Affinity tests.
suite.addTestSuite(GridFairAffinityFunctionNodesSelfTest.class);
+ suite.addTestSuite(IgniteFairAffinityDynamicCacheSelfTest.class);
suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class);
suite.addTestSuite(IgniteCacheAffinitySelfTest.class);
[21/42] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692
Posted by ag...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/abc90ec9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/abc90ec9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/abc90ec9
Branch: refs/heads/ignite-721
Commit: abc90ec973dae4b57a04d27a3b377a33634c82f7
Parents: f475b07 60640de
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 19:20:49 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 19:20:49 2015 +0700
----------------------------------------------------------------------
assembly/release-hadoop.xml | 4 --
.../java/org/apache/ignite/IgniteState.java | 2 +-
.../configuration/IgniteConfiguration.java | 16 ++---
.../org/apache/ignite/internal/IgnitionEx.java | 4 +-
.../discovery/GridDiscoveryManager.java | 4 +-
.../node/VisorSegmentationConfiguration.java | 4 +-
.../segmentation/GridSegmentationPolicy.java | 47 --------------
.../segmentation/GridSegmentationResolver.java | 64 -------------------
.../plugin/segmentation/SegmentationPolicy.java | 49 +++++++++++++++
.../segmentation/SegmentationResolver.java | 65 ++++++++++++++++++++
.../internal/GridLifecycleAwareSelfTest.java | 2 +-
11 files changed, 130 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
[17/42] incubator-ignite git commit: # IGNITE-692 Fixed opt
classnames.
Posted by ag...@apache.org.
# IGNITE-692 Fixed opt classnames.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1cd15306
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1cd15306
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1cd15306
Branch: refs/heads/ignite-721
Commit: 1cd15306107f3d367294ab7bee54d5ccfde8defa
Parents: 72a8802
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 15:45:46 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 15:45:46 2015 +0700
----------------------------------------------------------------------
.../main/resources/META-INF/classnames.properties | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd15306/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index 305cdd8..58d3ad3 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -106,6 +106,8 @@ org.apache.ignite.compute.gridify.aop.GridifyDefaultRangeTask
org.apache.ignite.compute.gridify.aop.GridifyDefaultTask
org.apache.ignite.configuration.CacheConfiguration
org.apache.ignite.configuration.CacheConfiguration$1
+org.apache.ignite.configuration.CacheConfiguration$2
+org.apache.ignite.configuration.CollectionConfiguration
org.apache.ignite.configuration.DeploymentMode
org.apache.ignite.configuration.IgniteReflectionFactory
org.apache.ignite.configuration.NearCacheConfiguration
@@ -384,7 +386,7 @@ org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager$Ex
org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager$MessageHandler
org.apache.ignite.internal.processors.cache.GridCacheProcessor$2
org.apache.ignite.internal.processors.cache.GridCacheProcessor$3
-org.apache.ignite.internal.processors.cache.GridCacheProcessor$4
+org.apache.ignite.internal.processors.cache.GridCacheProcessor$5
org.apache.ignite.internal.processors.cache.GridCacheProcessor$LocalAffinityFunction
org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl
org.apache.ignite.internal.processors.cache.GridCacheProxyImpl
@@ -429,6 +431,7 @@ org.apache.ignite.internal.processors.cache.GridCacheUtils$8
org.apache.ignite.internal.processors.cache.GridCacheUtils$9
org.apache.ignite.internal.processors.cache.GridCacheValueCollection
org.apache.ignite.internal.processors.cache.GridCacheValueCollection$1
+org.apache.ignite.internal.processors.cache.GridLoadCacheCloseablePredicate
org.apache.ignite.internal.processors.cache.IgniteCacheProxy
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$1
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$2
@@ -814,6 +817,7 @@ org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl$IsolatedUpda
org.apache.ignite.internal.processors.datastreamer.DataStreamerRequest
org.apache.ignite.internal.processors.datastreamer.DataStreamerResponse
org.apache.ignite.internal.processors.datastreamer.DataStreamerUpdateJob$1
+org.apache.ignite.internal.processors.datastructures.CacheDataStructuresCacheKey
org.apache.ignite.internal.processors.datastructures.CacheDataStructuresConfigurationKey
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$1
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$10
@@ -833,6 +837,8 @@ org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$8
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$9
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$AddAtomicProcessor
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$AddCollectionProcessor
+org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$AddDataCacheProcessor
+org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$CacheCollectionInfo
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$CollectionInfo
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$DataStructureInfo
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$DataStructureType
@@ -1387,6 +1393,8 @@ org.apache.ignite.internal.visor.cache.VisorCacheRebalanceTask
org.apache.ignite.internal.visor.cache.VisorCacheRebalanceTask$VisorCachesRebalanceJob
org.apache.ignite.internal.visor.cache.VisorCacheResetMetricsTask
org.apache.ignite.internal.visor.cache.VisorCacheResetMetricsTask$VisorCacheResetMetricsJob
+org.apache.ignite.internal.visor.cache.VisorCacheStopTask
+org.apache.ignite.internal.visor.cache.VisorCacheStopTask$VisorCacheStopJob
org.apache.ignite.internal.visor.cache.VisorCacheStoreConfiguration
org.apache.ignite.internal.visor.cache.VisorCacheSwapBackupsTask
org.apache.ignite.internal.visor.cache.VisorCacheSwapBackupsTask$VisorCachesSwapBackupsJob
@@ -1477,17 +1485,17 @@ org.apache.ignite.internal.visor.node.VisorRestConfiguration
org.apache.ignite.internal.visor.node.VisorSegmentationConfiguration
org.apache.ignite.internal.visor.node.VisorSpisConfiguration
org.apache.ignite.internal.visor.node.VisorTransactionConfiguration
+org.apache.ignite.internal.visor.query.VisorQueryArg
org.apache.ignite.internal.visor.query.VisorQueryCleanupTask
org.apache.ignite.internal.visor.query.VisorQueryCleanupTask$VisorQueryCleanupJob
+org.apache.ignite.internal.visor.query.VisorQueryCursorHolder
org.apache.ignite.internal.visor.query.VisorQueryField
+org.apache.ignite.internal.visor.query.VisorQueryJob
org.apache.ignite.internal.visor.query.VisorQueryNextPageTask
org.apache.ignite.internal.visor.query.VisorQueryNextPageTask$VisorQueryNextPageJob
org.apache.ignite.internal.visor.query.VisorQueryResult
org.apache.ignite.internal.visor.query.VisorQueryResultEx
org.apache.ignite.internal.visor.query.VisorQueryTask
-org.apache.ignite.internal.visor.query.VisorQueryCursorHolder
-org.apache.ignite.internal.visor.query.VisorQueryArg
-org.apache.ignite.internal.visor.query.VisorQueryJob
org.apache.ignite.internal.visor.util.VisorEventMapper
org.apache.ignite.internal.visor.util.VisorTaskUtils$4
org.apache.ignite.lang.IgniteBiClosure
[33/42] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dedcda16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dedcda16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dedcda16
Branch: refs/heads/ignite-721
Commit: dedcda164e6da6208a3ab76939b6231e792b3603
Parents: 3f9a834 f128f93
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 17:35:21 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 17:35:21 2015 +0300
----------------------------------------------------------------------
.../ignite/startup/BasicWarmupClosure.java | 9 ++-
.../cache/IgniteWarmupClosureSelfTest.java | 82 ++++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +
3 files changed, 92 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[14/42] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692
Posted by ag...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/85462e27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/85462e27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/85462e27
Branch: refs/heads/ignite-721
Commit: 85462e27f0a2c433721d185ce7cc2ff71313978d
Parents: 97a83a0 2bc1c17
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 14:25:19 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 14:25:19 2015 +0700
----------------------------------------------------------------------
.../ignite/codegen/MessageCodeGenerator.java | 1 -
.../java/org/apache/ignite/IgniteCache.java | 9 +
.../configuration/IgniteConfiguration.java | 19 --
.../discovery/GridDiscoveryManager.java | 3 +-
.../processors/cache/GridCacheContext.java | 58 ++++-
.../cache/GridCacheEvictionManager.java | 6 +-
.../cache/GridCacheExplicitLockSpan.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 6 +-
.../processors/cache/GridCacheMvcc.java | 2 +-
.../cache/GridCacheMvccCandidate.java | 50 ++++-
.../processors/cache/GridCacheMvccManager.java | 44 +++-
.../processors/cache/GridCacheProcessor.java | 52 ++---
.../distributed/GridDistributedCacheEntry.java | 12 +-
.../distributed/dht/GridDhtCacheEntry.java | 36 ++-
.../distributed/dht/GridDhtLockFuture.java | 15 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 14 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 22 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 2 +
.../distributed/dht/GridDhtTxLocalAdapter.java | 30 ++-
.../distributed/dht/GridDhtTxPrepareFuture.java | 28 ++-
.../dht/colocated/GridDhtColocatedCache.java | 32 ++-
.../colocated/GridDhtColocatedLockFuture.java | 46 +++-
.../GridDhtPartitionsExchangeFuture.java | 39 +++-
.../distributed/near/GridNearCacheEntry.java | 10 +-
.../distributed/near/GridNearLockFuture.java | 13 +-
.../near/GridNearTxFinishFuture.java | 8 +-
.../cache/distributed/near/GridNearTxLocal.java | 7 +
.../near/GridNearTxPrepareFuture.java | 122 +++++++----
.../near/GridNearTxPrepareRequest.java | 64 ++++--
.../cache/transactions/IgniteTxAdapter.java | 3 +-
.../cache/transactions/IgniteTxHandler.java | 120 +++++++---
.../transactions/IgniteTxLocalAdapter.java | 76 ++++---
.../cache/transactions/IgniteTxManager.java | 7 +
.../internal/util/future/GridFutureAdapter.java | 20 +-
.../ignite/internal/util/worker/GridWorker.java | 6 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 6 +-
.../cache/GridCacheBasicApiAbstractTest.java | 4 +-
.../dht/IgniteCacheLockFailoverSelfTest.java | 156 +++++++++++++
.../dht/IgniteCacheMultiTxLockSelfTest.java | 219 +++++++++++++++++++
.../tcp/TcpClientDiscoverySelfTest.java | 6 +-
.../testframework/junits/GridAbstractTest.java | 4 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 3 +
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +
...hePartitionedQueryMultiThreadedSelfTest.java | 2 +-
.../cache/IgniteCacheQueryIndexSelfTest.java | 3 +-
.../IgniteCachePartitionedQuerySelfTest.java | 5 +-
.../IgniteCacheReplicatedQuerySelfTest.java | 7 +-
47 files changed, 1111 insertions(+), 290 deletions(-)
----------------------------------------------------------------------
[10/42] incubator-ignite git commit: ignite-698 - fix for IGNITE-569
part2
Posted by ag...@apache.org.
ignite-698 - fix for IGNITE-569 part2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4208c121
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4208c121
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4208c121
Branch: refs/heads/ignite-721
Commit: 4208c1219801aa0630d9fbb718ba2ace2af5fb8b
Parents: caa54a2
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Apr 10 00:54:21 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Apr 10 00:54:21 2015 +0300
----------------------------------------------------------------------
.../processors/query/GridQueryProcessor.java | 89 ++++++++++++--------
.../processors/query/h2/IgniteH2Indexing.java | 1 +
2 files changed, 55 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4208c121/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 0ea0b99..7ce894d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -62,7 +62,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
private final Map<TypeId, TypeDescriptor> types = new ConcurrentHashMap8<>();
/** Type descriptors. */
- private final Map<TypeName, TypeDescriptor> typesByName = new ConcurrentHashMap8<>();
+ private final ConcurrentMap<TypeName, TypeDescriptor> typesByName = new ConcurrentHashMap8<>();
/** */
private ExecutorService execSvc;
@@ -108,62 +108,81 @@ public class GridQueryProcessor extends GridProcessorAdapter {
/**
* @param ccfg Cache configuration.
+ * @throws IgniteCheckedException If failed.
*/
public void initializeCache(CacheConfiguration<?, ?> ccfg) throws IgniteCheckedException {
idx.registerCache(ccfg);
- if (!F.isEmpty(ccfg.getTypeMetadata())) {
- for (CacheTypeMetadata meta : ccfg.getTypeMetadata()) {
- if (F.isEmpty(meta.getValueType()))
- throw new IgniteCheckedException("Value type is not set: " + meta);
+ try {
+ if (!F.isEmpty(ccfg.getTypeMetadata())) {
+ for (CacheTypeMetadata meta : ccfg.getTypeMetadata()) {
+ if (F.isEmpty(meta.getValueType()))
+ throw new IgniteCheckedException("Value type is not set: " + meta);
- TypeDescriptor desc = new TypeDescriptor(ccfg);
+ TypeDescriptor desc = new TypeDescriptor(ccfg);
- Class<?> valCls = U.classForName(meta.getValueType(), null);
+ Class<?> valCls = U.classForName(meta.getValueType(), null);
- desc.name(valCls != null ? typeName(valCls) : meta.getValueType());
+ desc.name(valCls != null ? typeName(valCls) : meta.getValueType());
- desc.valueClass(valCls != null ? valCls : Object.class);
- desc.keyClass(
- meta.getKeyType() == null ?
- Object.class :
- U.classForName(meta.getKeyType(), Object.class));
+ desc.valueClass(valCls != null ? valCls : Object.class);
+ desc.keyClass(
+ meta.getKeyType() == null ?
+ Object.class :
+ U.classForName(meta.getKeyType(), Object.class));
- TypeId typeId;
+ TypeId typeId;
- if (valCls == null || ctx.cacheObjects().isPortableClass(valCls)) {
- processPortableMeta(meta, desc);
+ if (valCls == null || ctx.cacheObjects().isPortableClass(valCls)) {
+ processPortableMeta(meta, desc);
- typeId = new TypeId(ccfg.getName(), ctx.cacheObjects().typeId(meta.getValueType()));
- }
- else {
- processClassMeta(meta, desc);
+ typeId = new TypeId(ccfg.getName(), ctx.cacheObjects().typeId(meta.getValueType()));
+ }
+ else {
+ processClassMeta(meta, desc);
- typeId = new TypeId(ccfg.getName(), valCls);
- }
+ typeId = new TypeId(ccfg.getName(), valCls);
+ }
- desc.registered(idx.registerType(ccfg.getName(), desc));
+ addTypeByName(ccfg, desc);
+ types.put(typeId, desc);
- typesByName.put(new TypeName(ccfg.getName(), desc.name()), desc);
- types.put(typeId, desc);
+ desc.registered(idx.registerType(ccfg.getName(), desc));
+ }
}
- }
- Class<?>[] clss = ccfg.getIndexedTypes();
+ Class<?>[] clss = ccfg.getIndexedTypes();
- if (!F.isEmpty(clss)) {
- for (int i = 0; i < clss.length; i += 2) {
- Class<?> keyCls = clss[i];
- Class<?> valCls = clss[i + 1];
+ if (!F.isEmpty(clss)) {
+ for (int i = 0; i < clss.length; i += 2) {
+ Class<?> keyCls = clss[i];
+ Class<?> valCls = clss[i + 1];
- TypeDescriptor desc = processKeyAndValueClasses(ccfg, keyCls, valCls);
+ TypeDescriptor desc = processKeyAndValueClasses(ccfg, keyCls, valCls);
- desc.registered(idx.registerType(ccfg.getName(), desc));
+ addTypeByName(ccfg, desc);
+ types.put(new TypeId(ccfg.getName(), valCls), desc);
- typesByName.put(new TypeName(ccfg.getName(), desc.name()), desc);
- types.put(new TypeId(ccfg.getName(), valCls), desc);
+ desc.registered(idx.registerType(ccfg.getName(), desc));
+ }
}
}
+ catch (IgniteCheckedException | RuntimeException e) {
+ idx.unregisterCache(ccfg);
+
+ throw e;
+ }
+ }
+
+ /**
+ * @param ccfg Cache configuration.
+ * @param desc Type descriptor.
+ * @throws IgniteCheckedException If failed.
+ */
+ private void addTypeByName(CacheConfiguration<?,?> ccfg, TypeDescriptor desc) throws IgniteCheckedException {
+ if (typesByName.putIfAbsent(new TypeName(ccfg.getName(), desc.name()), desc) != null)
+ throw new IgniteCheckedException("Type with name '" + desc.name() + "' already indexed " +
+ "in cache '" + ccfg.getName() + "'.");
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4208c121/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index c99b01c..6804f31 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1261,6 +1261,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
createSqlFunctions(schema, ccfg.getSqlFunctionClasses());
}
+ /** {@inheritDoc} */
@Override public void unregisterCache(CacheConfiguration<?, ?> ccfg) {
String schema = schema(ccfg.getName());
[28/42] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98af3189
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98af3189
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98af3189
Branch: refs/heads/ignite-721
Commit: 98af3189c1955fe0e2fc83fa8beac5eca3d0d645
Parents: 045973b 660ed78
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 16:13:04 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 16:13:04 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 7 +-
.../processors/query/GridQueryProcessor.java | 89 +++++++++++-------
.../IgniteFairAffinityDynamicCacheSelfTest.java | 96 ++++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
.../processors/query/h2/IgniteH2Indexing.java | 17 +++-
.../query/h2/sql/BaseH2CompareQueryTest.java | 20 ++++
6 files changed, 192 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
[16/42] incubator-ignite git commit: # IGNITE-692 Fixed Visor cmd.
Posted by ag...@apache.org.
# IGNITE-692 Fixed Visor cmd.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/72a8802f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/72a8802f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/72a8802f
Branch: refs/heads/ignite-721
Commit: 72a8802f5b2fb7886387bb5a573ab39e23472028
Parents: c72e8ef
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 15:32:41 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 15:32:41 2015 +0700
----------------------------------------------------------------------
.../apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72a8802f/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
index 5eecf2f..3490669 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
@@ -160,7 +160,7 @@ class VisorCacheScanCommand {
.withName("visor-cscan-task")
.withNoFailover()
.execute(classOf[VisorQueryTask],
- toTaskArgument(nid, new VisorQueryArg(cacheName, "SCAN", pageSize)))
+ toTaskArgument(nid, new VisorQueryArg(null, cacheName, "SCAN", pageSize)))
match {
case x if x.get1() != null =>
error(x.get1())
[38/42] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/baaf8bb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/baaf8bb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/baaf8bb3
Branch: refs/heads/ignite-721
Commit: baaf8bb333601db949d3d1340cddc44e0bfd987b
Parents: 3eb0d44 ad2ce58
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 23:30:31 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 23:30:31 2015 +0700
----------------------------------------------------------------------
pom.xml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
[08/42] incubator-ignite git commit: Merge branches 'ignite-692' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-692
Posted by ag...@apache.org.
Merge branches 'ignite-692' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4c4eb2f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4c4eb2f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4c4eb2f3
Branch: refs/heads/ignite-721
Commit: 4c4eb2f311ed6800f6e6bb9e73c97d3500030e23
Parents: c279485 a60f47d
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 00:25:29 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 00:25:29 2015 +0700
----------------------------------------------------------------------
.../examples/datagrid/CacheAffinityExample.java | 9 +-
.../examples/datagrid/CacheApiExample.java | 9 +-
.../examples/datagrid/CacheAsyncApiExample.java | 9 +-
.../datagrid/CacheContinuousQueryExample.java | 8 +-
.../datagrid/CacheDataStreamerExample.java | 9 +-
.../examples/datagrid/CacheEventsExample.java | 9 +-
.../examples/datagrid/CachePutGetExample.java | 10 +-
.../datagrid/CacheTransactionExample.java | 8 +-
.../hibernate/HibernateL2CacheExample.java | 5 +-
.../starschema/CacheStarSchemaExample.java | 10 +-
.../store/auto/CacheAutoStoreExample.java | 8 +-
.../auto/CacheAutoStoreLoadDataExample.java | 5 +-
.../datagrid/store/auto/CacheConfig.java | 4 +-
.../store/dummy/CacheDummyStoreExample.java | 5 +-
.../hibernate/CacheHibernateStoreExample.java | 5 +-
.../store/jdbc/CacheJdbcStoreExample.java | 5 +-
.../datastructures/IgniteQueueExample.java | 28 +-
.../datastructures/IgniteSetExample.java | 30 +-
.../streaming/StreamVisitorExample.java | 5 +-
.../java/org/apache/ignite/IgniteCluster.java | 2 +-
.../configuration/CacheConfiguration.java | 20 +-
.../configuration/CollectionConfiguration.java | 114 ++++-
.../ignite/internal/ClusterMetricsSnapshot.java | 2 +-
.../ignite/internal/GridPluginContext.java | 15 +-
.../apache/ignite/internal/IgniteKernal.java | 16 +-
.../ignite/internal/MarshallerContextImpl.java | 3 +
.../affinity/GridAffinityProcessor.java | 5 +-
.../processors/cache/GridCacheAdapter.java | 59 ++-
.../processors/cache/GridCacheIoManager.java | 87 ++--
.../processors/cache/GridCacheMessage.java | 7 +
.../GridCachePartitionExchangeManager.java | 136 +++++-
.../processors/cache/GridCacheProcessor.java | 63 ++-
.../cache/GridCacheProjectionImpl.java | 2 +-
.../processors/cache/GridCacheProxyImpl.java | 2 +-
.../cache/GridLoadCacheCloseablePredicate.java | 30 ++
.../dht/GridDhtAffinityAssignmentRequest.java | 5 +
.../dht/GridDhtAffinityAssignmentResponse.java | 5 +
.../distributed/dht/GridDhtCacheAdapter.java | 22 +-
.../GridDhtPartitionsAbstractMessage.java | 15 +-
.../cache/query/GridCacheQueriesImpl.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 28 --
.../cache/version/GridCacheVersionEx.java | 2 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 5 +-
.../IgniteCacheObjectProcessorImpl.java | 36 +-
.../datastreamer/DataStreamerImpl.java | 8 +-
.../CacheDataStructuresCacheKey.java | 62 +++
.../CacheDataStructuresConfigurationKey.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 222 ++++++++-
.../datastructures/GridCacheQueueAdapter.java | 2 +-
.../plugin/IgnitePluginProcessor.java | 58 +--
.../util/lang/GridMetadataAwareAdapter.java | 2 +-
.../ignite/plugin/CachePluginConfiguration.java | 2 +-
.../org/apache/ignite/plugin/IgnitePlugin.java | 3 -
.../ignite/plugin/PluginConfiguration.java | 10 +-
.../org/apache/ignite/plugin/PluginContext.java | 7 +-
.../apache/ignite/plugin/PluginProvider.java | 4 +-
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +-
...actQueueFailoverDataConsistencySelfTest.java | 4 +-
.../GridCacheQueueApiSelfAbstractTest.java | 80 ++++
.../GridCacheQueueCleanupSelfTest.java | 11 +-
...dCacheQueueMultiNodeConsistencySelfTest.java | 11 +-
.../GridCacheSetAbstractSelfTest.java | 5 +-
.../IgniteCollectionAbstractTest.java | 160 ++-----
.../IgniteDataStructureUniqueNameTest.java | 47 +-
.../GridCacheLocalAtomicOffheapSetSelfTest.java | 32 ++
.../GridCacheLocalAtomicQueueApiSelfTest.java | 6 +
.../local/GridCacheLocalAtomicSetSelfTest.java | 6 +
.../GridCacheLocalOffheapQueueApiSelfTest.java | 31 ++
.../local/GridCacheLocalQueueApiSelfTest.java | 6 +
.../local/GridCacheLocalSetSelfTest.java | 6 +
...artitionedAtomicOffheapQueueApiSelfTest.java | 32 ++
...omicOffheapQueueCreateMultiNodeSelfTest.java | 32 ++
...onedAtomicOffheapQueueMultiNodeSelfTest.java | 32 ++
...dCachePartitionedAtomicQueueApiSelfTest.java | 6 +
...ionedAtomicQueueCreateMultiNodeSelfTest.java | 6 +
...micQueueFailoverDataConsistencySelfTest.java | 6 +
...PartitionedAtomicQueueMultiNodeSelfTest.java | 6 +
...itionedAtomicQueueRotativeMultiNodeTest.java | 6 +
...chePartitionedAtomicSetFailoverSelfTest.java | 6 +
...rtitionedDataStructuresFailoverSelfTest.java | 6 +
...artitionedOffHeapValuesQueueApiSelfTest.java | 31 ++
...achePartitionedOffHeapValuesSetSelfTest.java | 32 ++
...edOffheapDataStructuresFailoverSelfTest.java | 34 ++
...hePartitionedOffheapSetFailoverSelfTest.java | 32 ++
.../GridCachePartitionedQueueApiSelfTest.java | 6 +
...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +
...dCachePartitionedQueueEntryMoveSelfTest.java | 10 +-
...nedQueueFailoverDataConsistencySelfTest.java | 6 +
...CachePartitionedQueueJoinedNodeSelfTest.java | 6 +
...dCachePartitionedQueueMultiNodeSelfTest.java | 6 +
...hePartitionedQueueRotativeMultiNodeTest.java | 6 +
...GridCachePartitionedSetFailoverSelfTest.java | 6 +
.../GridCachePartitionedSetSelfTest.java | 6 +
.../IgnitePartitionedSetNoBackupsSelfTest.java | 5 +-
...eplicatedDataStructuresFailoverSelfTest.java | 6 +
.../GridCacheReplicatedQueueApiSelfTest.java | 11 +
...idCacheReplicatedQueueMultiNodeSelfTest.java | 6 +
...cheReplicatedQueueRotativeMultiNodeTest.java | 6 +
.../GridCacheReplicatedSetSelfTest.java | 6 +
.../IgniteCacheAtomicNodeJoinTest.java | 44 ++
.../IgniteCacheNodeJoinAbstractTest.java | 109 +++++
.../distributed/IgniteCacheTxNodeJoinTest.java | 38 ++
.../IgniteCacheDataStructuresSelfTestSuite.java | 10 +
.../IgniteCacheFailoverTestSuite.java | 4 +
.../query/h2/sql/GridSqlQueryParser.java | 24 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 13 +-
.../query/h2/sql/BaseH2CompareQueryTest.java | 37 +-
.../query/h2/sql/H2CompareBigQueryTest.java | 38 +-
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 20 +-
modules/urideploy/README.txt | 2 +-
modules/urideploy/licenses/edtftp-license.pdf | Bin 58355 -> 0 bytes
modules/urideploy/licenses/jtidy-license.txt | 50 --
.../urideploy/licenses/jtidy-mit-license.txt | 50 ++
modules/urideploy/pom.xml | 6 -
.../spi/deployment/uri/UriDeploymentSpi.java | 182 +++----
.../uri/scanners/GridUriDeploymentScanner.java | 286 -----------
.../GridUriDeploymentScannerListener.java | 2 +-
.../uri/scanners/UriDeploymentScanner.java | 47 ++
.../scanners/UriDeploymentScannerContext.java | 92 ++++
.../scanners/UriDeploymentScannerManager.java | 221 +++++++++
.../file/GridUriDeploymentFileScanner.java | 311 ------------
.../scanners/file/UriDeploymentFileScanner.java | 327 +++++++++++++
.../ftp/GridUriDeploymentFtpClient.java | 199 --------
.../ftp/GridUriDeploymentFtpConfiguration.java | 115 -----
.../ftp/GridUriDeploymentFtpException.java | 43 --
.../scanners/ftp/GridUriDeploymentFtpFile.java | 119 -----
.../ftp/GridUriDeploymentFtpScanner.java | 234 ---------
.../uri/scanners/ftp/package-info.java | 22 -
.../http/GridUriDeploymentHttpScanner.java | 423 ----------------
.../scanners/http/UriDeploymentHttpScanner.java | 478 +++++++++++++++++++
...loymentMultiScannersErrorThrottlingTest.java | 3 -
.../GridUriDeploymentMultiScannersSelfTest.java | 3 +-
.../GridFileDeploymentUndeploySelfTest.java | 4 +-
.../uri/scanners/ftp/GridFtpDeploymentTest.java | 46 --
.../uri/scanners/ftp/package-info.java | 22 -
.../scala/org/apache/ignite/visor/visor.scala | 3 +
137 files changed, 2994 insertions(+), 2653 deletions(-)
----------------------------------------------------------------------
[12/42] incubator-ignite git commit: Merge branches 'ignite-692' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-692
Posted by ag...@apache.org.
Merge branches 'ignite-692' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aa8f6686
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aa8f6686
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aa8f6686
Branch: refs/heads/ignite-721
Commit: aa8f668626c4e0fd79fd00c0b46da24b73006047
Parents: 4c4eb2f 845787c
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 09:05:44 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 09:05:44 2015 +0700
----------------------------------------------------------------------
DEVNOTES.txt | 4 +-
.../java/org/apache/ignite/IgniteCache.java | 6 ++-
.../processors/cache/GridCacheAdapter.java | 25 +++++++-----
.../distributed/dht/GridDhtLockFuture.java | 3 +-
.../GridCacheAffinityBackupsSelfTest.java | 15 ++++----
.../cache/GridCacheAbstractFullApiSelfTest.java | 13 ++++---
.../GridCacheAbstractIteratorsSelfTest.java | 3 +-
.../cache/GridCacheAbstractSelfTest.java | 10 ++---
.../cache/GridCacheClearAllSelfTest.java | 2 +-
.../cache/GridCacheDeploymentSelfTest.java | 9 +++--
.../GridCachePreloadingEvictionsSelfTest.java | 23 +++++------
.../cache/GridCacheSwapPreloadSelfTest.java | 5 ++-
.../cache/IgniteCachePeekModesAbstractTest.java | 40 ++++++++++----------
.../GridCacheMultiNodeAbstractTest.java | 13 ++++---
.../dht/GridCacheDhtEntrySelfTest.java | 12 +++---
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 26 ++++++-------
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 6 +--
.../near/IgniteCacheNearReadCommittedTest.java | 4 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 5 ++-
.../GridCacheReplicatedPreloadSelfTest.java | 23 ++++++-----
.../junits/common/GridCommonAbstractTest.java | 13 ++++++-
...CacheOffheapTieredMultithreadedSelfTest.java | 4 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 14 +++----
.../IgniteCacheQuerySelfTestSuite.java | 1 +
26 files changed, 157 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
[39/42] incubator-ignite git commit: sprint-3 1.1.0
Posted by ag...@apache.org.
sprint-3 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/db7f3d3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/db7f3d3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/db7f3d3b
Branch: refs/heads/ignite-721
Commit: db7f3d3b9c5229407ea5adf74461f2e7f275934e
Parents: ad2ce58
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 20:19:21 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 20:19:21 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index f38ff9d..f56625a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 1b03acd..7b91aa3 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 057f246..63dd298 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 19d6a25..77f681e 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index d112735..b8bff95 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index cdf2cf2..569dba3 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 6509c47..86af433 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-p2p</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 921775f..4a501b5 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 6a7610c..11446fd 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 9b5bcfb..26c55e7 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index fbd40ce..b76782d 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 2949c34..38dae94 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 04ab11b..b4214bc 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 7322da2..69094ec 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 42c8523..145027d 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 72bf1ff..7a6e361 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-rest-http</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index b8840e3..8c48c52 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index ee733ad..2ffd916 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index d420681..69bfeb6 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schema-import</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 9acb521..3bc60be 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index a0bcaaa..e0523e7 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 521c7d0..7d559cc 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 674f22f..58f2e68 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 939966c..ef1eba0 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index c5b9523..e7eb06c 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 04dda81..8b74d41 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-plugins</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<!-- Ignite dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 446d7a0..14ebc25 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 108fa62..5bd949b 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<properties>
<yardstick.version>0.7.0</yardstick.version>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ebf7c7..c3d3c70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<packaging>pom</packaging>
<properties>
[29/42] incubator-ignite git commit: ignite-717
Posted by ag...@apache.org.
ignite-717
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9d92bc77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9d92bc77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9d92bc77
Branch: refs/heads/ignite-721
Commit: 9d92bc770031f1f72f45b14fc5987b7856f63b18
Parents: 98af318
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 16:21:39 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 16:21:39 2015 +0300
----------------------------------------------------------------------
pom.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d92bc77/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a3e86a4..27f71c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -520,7 +520,14 @@
</algorithms>
</configuration>
</plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>deploy-ignite-site</id>
+ <build>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -528,7 +535,7 @@
<inherited>false</inherited>
<executions>
<execution>
- <id>apache-sources-pack</id>
+ <id>site-generation</id>
<goals>
<goal>run</goal>
</goals>
@@ -555,14 +562,7 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>deploy-ignite-site</id>
- <build>
- <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
[05/42] incubator-ignite git commit: Merge branches 'ignite-692' and
'ignite-sprint-3'
Posted by ag...@apache.org.
Merge branches 'ignite-692' and 'ignite-sprint-3'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2ba7b502
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ba7b502
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ba7b502
Branch: refs/heads/ignite-721
Commit: 2ba7b5024bdb042b6b4fb0862215fee2d5fdfed7
Parents: 9fb5651 3e6da9c
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Apr 9 14:38:09 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Apr 9 14:38:09 2015 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 26 +
.../java/org/apache/ignite/IgniteCluster.java | 9 +-
.../ignite/cluster/ClusterStartNodeResult.java | 46 +
.../ignite/internal/ClusterMetricsSnapshot.java | 384 +++------
.../apache/ignite/internal/IgniteKernal.java | 72 +-
.../org/apache/ignite/internal/IgnitionEx.java | 171 ++--
.../cluster/ClusterStartNodeResultImpl.java | 87 ++
.../cluster/IgniteClusterAsyncImpl.java | 5 +-
.../internal/cluster/IgniteClusterImpl.java | 37 +-
.../internal/managers/GridManagerAdapter.java | 34 +-
.../cache/DynamicCacheChangeRequest.java | 19 +-
.../cache/DynamicCacheDescriptor.java | 17 +-
.../processors/cache/GridCacheProcessor.java | 376 ++++++--
.../GridDhtPartitionsExchangeFuture.java | 1 +
.../cache/transactions/IgniteTxManager.java | 6 +-
.../ignite/internal/util/lang/GridFunc.java | 33 +
.../util/nodestart/IgniteNodeCallable.java | 30 -
.../util/nodestart/IgniteSshHelper.java | 2 +-
.../util/nodestart/StartNodeCallable.java | 30 +
.../ignite/internal/visor/cache/VisorCache.java | 2 +-
.../cache/VisorCacheAggregatedMetrics.java | 38 +-
.../visor/cache/VisorCacheConfiguration.java | 17 +-
.../internal/visor/cache/VisorCacheMetrics.java | 53 +-
.../cache/VisorCacheMetricsCollectorTask.java | 59 +-
.../visor/cache/VisorCacheStopTask.java | 69 ++
.../messages/TcpDiscoveryAbstractMessage.java | 24 +-
.../messages/TcpDiscoveryAuthFailedMessage.java | 25 +-
.../TcpDiscoveryCheckFailedMessage.java | 24 +-
.../TcpDiscoveryClientReconnectMessage.java | 30 +-
.../TcpDiscoveryCustomEventMessage.java | 23 +-
.../messages/TcpDiscoveryDiscardMessage.java | 24 +-
.../TcpDiscoveryDuplicateIdMessage.java | 24 +-
.../messages/TcpDiscoveryHandshakeRequest.java | 8 -
.../messages/TcpDiscoveryHandshakeResponse.java | 22 -
.../messages/TcpDiscoveryHeartbeatMessage.java | 44 +-
.../TcpDiscoveryJoinRequestMessage.java | 28 +-
.../TcpDiscoveryLoopbackProblemMessage.java | 28 +-
.../TcpDiscoveryNodeAddFinishedMessage.java | 24 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 60 +-
.../messages/TcpDiscoveryNodeFailedMessage.java | 28 +-
.../messages/TcpDiscoveryNodeLeftMessage.java | 8 -
.../tcp/messages/TcpDiscoveryPingRequest.java | 25 +-
.../tcp/messages/TcpDiscoveryPingResponse.java | 14 -
.../TcpDiscoveryStatusCheckMessage.java | 30 +-
...teCacheConfigurationDefaultTemplateTest.java | 111 +++
.../IgniteCacheConfigurationTemplateTest.java | 448 ++++++++++
.../ignite/testframework/junits/IgniteMock.java | 15 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../processors/query/h2/sql/GridSqlElement.java | 8 -
.../processors/query/h2/sql/GridSqlQuery.java | 183 ++++
.../query/h2/sql/GridSqlQueryParser.java | 97 ++-
.../query/h2/sql/GridSqlQuerySplitter.java | 111 ++-
.../processors/query/h2/sql/GridSqlSelect.java | 209 ++---
.../query/h2/sql/GridSqlSubquery.java | 8 +-
.../processors/query/h2/sql/GridSqlUnion.java | 134 +++
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 341 ++++++++
.../query/h2/sql/BaseH2CompareQueryTest.java | 823 ++++++++++++++++++
.../query/h2/sql/GridQueryParsingTest.java | 26 +-
.../query/h2/sql/H2CompareBigQueryTest.java | 707 +++++++++++++++
.../query/h2/sql/IgniteVsH2QueryTest.java | 860 -------------------
.../IgniteCacheQuerySelfTestSuite.java | 5 +-
.../processors/query/h2/sql/bigQuery.sql | 55 ++
.../org/apache/ignite/IgniteSpringBean.java | 21 +
.../util/nodestart/IgniteNodeCallableImpl.java | 308 -------
.../util/nodestart/IgniteSshHelperImpl.java | 4 +-
.../util/nodestart/StartNodeCallableImpl.java | 309 +++++++
...gniteProjectionStartStopRestartSelfTest.java | 261 +++---
.../IgniteStartStopRestartTestSuite.java | 1 +
.../commands/cache/VisorCacheCommand.scala | 423 +++++----
.../commands/cache/VisorCacheStopCommand.scala | 145 ++++
.../commands/start/VisorStartCommand.scala | 4 +-
72 files changed, 5039 insertions(+), 2698 deletions(-)
----------------------------------------------------------------------
[11/42] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-698
Posted by ag...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-698
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/80ab23a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/80ab23a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/80ab23a2
Branch: refs/heads/ignite-721
Commit: 80ab23a2859bb58b8e1458aea6afe7c3707ce724
Parents: 4208c12 22252f1
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Apr 10 00:54:32 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Apr 10 00:54:32 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 4 +-
.../java/org/apache/ignite/IgniteCache.java | 6 ++-
.../java/org/apache/ignite/IgniteCluster.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 27 ++++++++-----
.../cache/GridCacheProjectionImpl.java | 2 +-
.../processors/cache/GridCacheProxyImpl.java | 2 +-
.../cache/query/GridCacheQueriesImpl.java | 2 +-
.../cache/version/GridCacheVersionEx.java | 2 +-
.../IgniteCacheObjectProcessorImpl.java | 2 +-
.../datastructures/GridCacheQueueAdapter.java | 2 +-
.../util/lang/GridMetadataAwareAdapter.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 13 ++++---
.../GridCacheAbstractIteratorsSelfTest.java | 3 +-
.../cache/GridCacheAbstractSelfTest.java | 10 ++---
.../cache/GridCacheClearAllSelfTest.java | 2 +-
.../cache/GridCacheDeploymentSelfTest.java | 9 +++--
.../GridCachePreloadingEvictionsSelfTest.java | 23 +++++------
.../cache/GridCacheSwapPreloadSelfTest.java | 5 ++-
.../cache/IgniteCachePeekModesAbstractTest.java | 40 ++++++++++----------
.../GridCacheMultiNodeAbstractTest.java | 13 ++++---
.../dht/GridCacheDhtEntrySelfTest.java | 12 +++---
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 26 ++++++-------
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 6 +--
.../near/IgniteCacheNearReadCommittedTest.java | 4 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 5 ++-
.../GridCacheReplicatedPreloadSelfTest.java | 23 ++++++-----
.../cache/ttl/CacheTtlAbstractSelfTest.java | 14 +++----
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 20 +++++-----
.../scala/org/apache/ignite/visor/visor.scala | 3 ++
33 files changed, 157 insertions(+), 135 deletions(-)
----------------------------------------------------------------------
[18/42] incubator-ignite git commit: Merge branches 'ignite-698' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-698
Posted by ag...@apache.org.
Merge branches 'ignite-698' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-698
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f05339d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f05339d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f05339d
Branch: refs/heads/ignite-721
Commit: 2f05339d29f4a0cf7cea23fcb191c20ce565ce84
Parents: 80ab23a 5be8db7
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Apr 10 13:59:00 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Apr 10 13:59:00 2015 +0300
----------------------------------------------------------------------
.../examples/MessagingExamplesSelfTest.java | 2 +-
.../java8/examples/BasicExamplesSelfTest.java | 3 +
.../java8/examples/CacheExamplesSelfTest.java | 4 +
.../examples/CheckpointExamplesSelfTest.java | 3 +
.../examples/ClusterGroupExampleSelfTest.java | 3 +-
.../examples/ContinuationExamplesSelfTest.java | 3 +
.../ContinuousMapperExamplesSelfTest.java | 4 +-
.../DeploymentExamplesMultiNodeSelfTest.java | 2 +
.../examples/DeploymentExamplesSelfTest.java | 2 +
.../HibernateL2CacheExampleSelfTest.java | 3 +
.../java8/examples/IgfsExamplesSelfTest.java | 3 +
.../examples/LifecycleExamplesSelfTest.java | 3 +
.../MemcacheRestExamplesMultiNodeSelfTest.java | 2 +
.../examples/MemcacheRestExamplesSelfTest.java | 2 +
.../examples/MessagingExamplesSelfTest.java | 4 +-
.../examples/MonteCarloExamplesSelfTest.java | 3 +
.../examples/SpringBeanExamplesSelfTest.java | 3 +
.../java8/examples/TaskExamplesSelfTest.java | 2 +
.../client/ClientReconnectionSelfTest.java | 67 +++---
.../ignite/codegen/MessageCodeGenerator.java | 1 -
.../java/org/apache/ignite/IgniteCache.java | 18 ++
.../configuration/CacheConfiguration.java | 68 ++++--
.../configuration/IgniteConfiguration.java | 19 --
.../internal/cluster/ClusterGroupAdapter.java | 150 ++++++++++--
.../discovery/GridDiscoveryManager.java | 26 +-
.../processors/cache/CacheMetricsImpl.java | 7 +-
.../processors/cache/CacheMetricsSnapshot.java | 223 +++++++++++++++++-
.../processors/cache/GridCacheContext.java | 58 ++++-
.../cache/GridCacheEvictionManager.java | 6 +-
.../cache/GridCacheExplicitLockSpan.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 6 +-
.../processors/cache/GridCacheMvcc.java | 2 +-
.../cache/GridCacheMvccCandidate.java | 50 +++-
.../processors/cache/GridCacheMvccManager.java | 44 +++-
.../processors/cache/GridCacheProcessor.java | 52 ++--
.../processors/cache/IgniteCacheProxy.java | 26 ++
.../distributed/GridDistributedCacheEntry.java | 12 +-
.../distributed/dht/GridDhtCacheEntry.java | 36 ++-
.../distributed/dht/GridDhtLockFuture.java | 18 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 14 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 22 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 2 +
.../distributed/dht/GridDhtTxLocalAdapter.java | 30 ++-
.../distributed/dht/GridDhtTxPrepareFuture.java | 28 ++-
.../dht/colocated/GridDhtColocatedCache.java | 32 ++-
.../colocated/GridDhtColocatedLockFuture.java | 46 +++-
.../GridDhtPartitionsExchangeFuture.java | 39 ++-
.../distributed/near/GridNearCacheEntry.java | 10 +-
.../distributed/near/GridNearLockFuture.java | 13 +-
.../near/GridNearTxFinishFuture.java | 8 +-
.../cache/distributed/near/GridNearTxLocal.java | 7 +
.../near/GridNearTxPrepareFuture.java | 122 ++++++----
.../near/GridNearTxPrepareRequest.java | 64 +++--
.../cache/transactions/IgniteTxAdapter.java | 3 +-
.../cache/transactions/IgniteTxHandler.java | 120 +++++++---
.../transactions/IgniteTxLocalAdapter.java | 76 +++---
.../cache/transactions/IgniteTxManager.java | 7 +
.../internal/processors/igfs/IgfsAsyncImpl.java | 4 +-
.../ignite/internal/processors/igfs/IgfsEx.java | 4 +-
.../processors/igfs/IgfsFileWorker.java | 180 --------------
.../processors/igfs/IgfsFileWorkerBatch.java | 225 +++++++-----------
.../processors/igfs/IgfsFileWorkerTask.java | 32 ---
.../internal/processors/igfs/IgfsImpl.java | 150 +++++++-----
.../internal/processors/igfs/IgfsProcessor.java | 2 +-
.../internal/util/future/GridFutureAdapter.java | 20 +-
.../ignite/internal/util/worker/GridWorker.java | 6 +-
.../cache/VisorCacheQueryConfiguration.java | 9 -
.../spi/discovery/DiscoveryMetricsProvider.java | 10 +
.../discovery/tcp/TcpClientDiscoverySpi.java | 35 ++-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 45 +++-
.../tcp/internal/TcpDiscoveryNode.java | 76 +++++-
.../messages/TcpDiscoveryHeartbeatMessage.java | 65 +++++
.../GridCacheAffinityBackupsSelfTest.java | 15 +-
.../ignite/internal/GridProjectionSelfTest.java | 82 +++++++
.../ignite/internal/GridStartStopSelfTest.java | 8 +-
.../CacheMetricsForClusterGroupSelfTest.java | 236 +++++++++++++++++++
.../cache/GridCacheBasicApiAbstractTest.java | 4 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 42 ++--
.../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +-
.../cache/GridCacheReloadSelfTest.java | 3 +-
.../GridCacheReturnValueTransferSelfTest.java | 15 +-
.../IgniteTxMultiThreadedAbstractTest.java | 5 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 5 +-
.../GridCacheSetAbstractSelfTest.java | 10 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 6 +-
.../distributed/GridCacheEventAbstractTest.java | 16 +-
.../GridCacheNodeFailureAbstractTest.java | 15 +-
.../dht/IgniteCacheLockFailoverSelfTest.java | 156 ++++++++++++
.../dht/IgniteCacheMultiTxLockSelfTest.java | 219 +++++++++++++++++
...licatedNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
.../continuous/GridEventConsumeSelfTest.java | 7 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 24 +-
.../tostring/GridToStringBuilderSelfTest.java | 5 +-
.../GridP2PMissedResourceCacheSizeSelfTest.java | 2 +-
.../tcp/TcpClientDiscoverySelfTest.java | 5 +-
.../testframework/junits/GridAbstractTest.java | 6 +-
.../junits/common/GridCommonAbstractTest.java | 13 +-
.../junits/spi/GridSpiAbstractTest.java | 6 +
.../IgniteCacheMetricsSelfTestSuite.java | 4 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 3 +
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +
...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 2 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 10 +-
.../processors/cache/GridCacheSwapSelfTest.java | 5 +-
...CacheOffheapTieredMultithreadedSelfTest.java | 4 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 2 +-
.../cache/IgniteCacheQueryIndexSelfTest.java | 3 +-
.../IgniteCachePartitionedQuerySelfTest.java | 5 +-
.../IgniteCacheReplicatedQuerySelfTest.java | 18 +-
.../IgniteCacheQuerySelfTestSuite.java | 1 +
.../processors/cache/GridCacheJtaSelfTest.java | 6 +-
.../p2p/GridP2PUserVersionChangeSelfTest.java | 8 +-
113 files changed, 2527 insertions(+), 909 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f05339d/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
[03/42] incubator-ignite git commit: # IGNITE-692 Minor javadoc.
Posted by ag...@apache.org.
# IGNITE-692 Minor javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25766223
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25766223
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25766223
Branch: refs/heads/ignite-721
Commit: 257662237937de0ae13f862a0f2d975e1f9ae803
Parents: 6bf2f4e
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 8 16:38:57 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 8 16:38:57 2015 +0700
----------------------------------------------------------------------
.../ignite/internal/visor/node/VisorNodeDataCollectorTask.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25766223/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
index b6c9bbd..fde871b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
@@ -70,6 +70,7 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData
/**
* @param taskRes Task result.
* @param results Results.
+ * @return Data collector task result.
*/
protected VisorNodeDataCollectorTaskResult reduce(VisorNodeDataCollectorTaskResult taskRes,
List<ComputeJobResult> results) {
[34/42] incubator-ignite git commit: Merge branches 'ignite-692' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-692
Posted by ag...@apache.org.
Merge branches 'ignite-692' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd09524e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd09524e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd09524e
Branch: refs/heads/ignite-721
Commit: cd09524ea4b43cf04d027da87ff567b0d95cc6ec
Parents: abc90ec dedcda1
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 22:41:21 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 22:41:21 2015 +0700
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../configuration/CacheConfiguration.java | 7 +-
.../processors/query/GridQueryProcessor.java | 89 +++++++++++-------
.../ignite/startup/BasicWarmupClosure.java | 9 +-
.../cache/IgniteWarmupClosureSelfTest.java | 82 +++++++++++++++++
.../IgniteFairAffinityDynamicCacheSelfTest.java | 96 ++++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 5 +
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 17 +++-
.../query/h2/sql/BaseH2CompareQueryTest.java | 20 ++++
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 53 ++++++-----
37 files changed, 338 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
[40/42] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/232b10ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/232b10ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/232b10ba
Branch: refs/heads/ignite-721
Commit: 232b10ba77cb5fcc939b3240d6ab719d81af68f0
Parents: db7f3d3 baaf8bb
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 20:19:48 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 20:19:48 2015 +0300
----------------------------------------------------------------------
.../resources/META-INF/classnames.properties | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[37/42] incubator-ignite git commit: # sprint-3 Update opt class
names to run nodes from IDE.
Posted by ag...@apache.org.
# sprint-3 Update opt class names to run nodes from IDE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3eb0d441
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3eb0d441
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3eb0d441
Branch: refs/heads/ignite-721
Commit: 3eb0d441707cef19beb0df228f43f281229e7058
Parents: cd09524
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 23:30:08 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 23:30:08 2015 +0700
----------------------------------------------------------------------
.../resources/META-INF/classnames.properties | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3eb0d441/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index f0a4052..34df688 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -105,8 +105,8 @@ org.apache.ignite.compute.gridify.aop.GridifyArgumentAdapter
org.apache.ignite.compute.gridify.aop.GridifyDefaultRangeTask
org.apache.ignite.compute.gridify.aop.GridifyDefaultTask
org.apache.ignite.configuration.CacheConfiguration
-org.apache.ignite.configuration.CacheConfiguration$1
-org.apache.ignite.configuration.CacheConfiguration$2
+org.apache.ignite.configuration.CacheConfiguration$IgniteAllNodesPredicate
+org.apache.ignite.configuration.CacheConfiguration$IgniteServerNodePredicate
org.apache.ignite.configuration.CollectionConfiguration
org.apache.ignite.configuration.DeploymentMode
org.apache.ignite.configuration.IgniteReflectionFactory
@@ -219,6 +219,7 @@ org.apache.ignite.internal.cluster.ClusterGroupAdapter$AgeClusterGroup
org.apache.ignite.internal.cluster.ClusterGroupAdapter$AttributeFilter
org.apache.ignite.internal.cluster.ClusterGroupAdapter$CachesFilter
org.apache.ignite.internal.cluster.ClusterGroupAdapter$DaemonFilter
+org.apache.ignite.internal.cluster.ClusterGroupAdapter$GroupPredicate
org.apache.ignite.internal.cluster.ClusterGroupAdapter$OthersFilter
org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException
org.apache.ignite.internal.cluster.ClusterNodeLocalMapImpl
@@ -272,6 +273,7 @@ org.apache.ignite.internal.processors.cache.CacheEvictionEntry
org.apache.ignite.internal.processors.cache.CacheInvokeDirectResult
org.apache.ignite.internal.processors.cache.CacheInvokeEntry$Operation
org.apache.ignite.internal.processors.cache.CacheInvokeResult
+org.apache.ignite.internal.processors.cache.CacheMetricsSnapshot
org.apache.ignite.internal.processors.cache.CacheObject
org.apache.ignite.internal.processors.cache.CacheObjectAdapter
org.apache.ignite.internal.processors.cache.CacheObjectByteArrayImpl
@@ -1443,7 +1445,6 @@ org.apache.ignite.internal.visor.log.VisorLogSearchResult
org.apache.ignite.internal.visor.log.VisorLogSearchTask
org.apache.ignite.internal.visor.log.VisorLogSearchTask$VisorLogSearchArg
org.apache.ignite.internal.visor.log.VisorLogSearchTask$VisorLogSearchJob
-org.apache.ignite.internal.visor.log.VisorLogSearchTask$VisorLogSearchJob$1
org.apache.ignite.internal.visor.misc.VisorAckTask
org.apache.ignite.internal.visor.misc.VisorAckTask$VisorAckJob
org.apache.ignite.internal.visor.misc.VisorLatestVersionTask
@@ -1521,14 +1522,14 @@ org.apache.ignite.plugin.PluginNotFoundException
org.apache.ignite.plugin.PluginValidationException
org.apache.ignite.plugin.extensions.communication.Message
org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType
-org.apache.ignite.plugin.security.GridSecurityCredentials
-org.apache.ignite.plugin.security.GridSecurityException
-org.apache.ignite.plugin.security.GridSecurityPermission
-org.apache.ignite.plugin.security.GridSecurityPermissionSet
-org.apache.ignite.plugin.security.GridSecuritySubject
-org.apache.ignite.plugin.security.GridSecuritySubjectType
-org.apache.ignite.plugin.segmentation.GridSegmentationPolicy
-org.apache.ignite.plugin.segmentation.GridSegmentationResolver
+org.apache.ignite.plugin.security.SecurityCredentials
+org.apache.ignite.plugin.security.SecurityException
+org.apache.ignite.plugin.security.SecurityPermission
+org.apache.ignite.plugin.security.SecurityPermissionSet
+org.apache.ignite.plugin.security.SecuritySubject
+org.apache.ignite.plugin.security.SecuritySubjectType
+org.apache.ignite.plugin.segmentation.SegmentationPolicy
+org.apache.ignite.plugin.segmentation.SegmentationResolver
org.apache.ignite.services.Service
org.apache.ignite.services.ServiceConfiguration
org.apache.ignite.services.ServiceContext
[30/42] incubator-ignite git commit: #IGNITE-722 Fixed warmup closure.
Posted by ag...@apache.org.
#IGNITE-722 Fixed warmup closure.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0dddaaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0dddaaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0dddaaf
Branch: refs/heads/ignite-721
Commit: d0dddaaf5b758d59d77469c86d8a7f27254f3f40
Parents: 660ed78
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Fri Apr 10 16:58:14 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Fri Apr 10 16:58:14 2015 +0300
----------------------------------------------------------------------
.../ignite/startup/BasicWarmupClosure.java | 9 ++-
.../cache/IgniteWarmupClosureSelfTest.java | 82 ++++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +
3 files changed, 92 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0dddaaf/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
index 08ec420..0cbc73c 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
@@ -244,8 +244,11 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration>
ExecutorService svc = Executors.newFixedThreadPool(threadCnt);
try {
- for (CacheConfiguration cc : first.configuration().getCacheConfiguration()) {
- GridCache<Object, Object> cache0 = ((IgniteKernal)first).getCache(cc.getName());
+ for (IgniteCacheProxy cache : ((IgniteKernal)first).caches()) {
+ if (!cache.context().userCache())
+ continue;
+
+ GridCache<Object, Object> cache0 = cache.context().cache();
for (String warmupMethod : warmupMethods) {
Collection<Future> futs = new ArrayList<>(threadCnt);
@@ -303,7 +306,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration>
futs.add(svc.submit(call));
}
- out("Running warmup [cacheName=" + U.maskName(cc.getName()) + ", method=" + warmupMethod + ']');
+ out("Running warmup [cacheName=" + U.maskName(cache.getName()) + ", method=" + warmupMethod + ']');
for (Future fut : futs)
fut.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0dddaaf/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
new file mode 100644
index 0000000..4d91347
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.cache;
+
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.startup.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ *
+ */
+public class IgniteWarmupClosureSelfTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ public IgniteWarmupClosureSelfTest(){
+ super(false);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinder(IP_FINDER);
+
+ cfg.getTransactionConfiguration().setTxSerializableEnabled(true);
+
+ cfg.setDiscoverySpi(disco);
+
+ BasicWarmupClosure warmupClosure = new BasicWarmupClosure();
+
+ warmupClosure.setGridCount(2);
+ warmupClosure.setIterationCount(10);
+ warmupClosure.setKeyRange(10);
+
+ cfg.setWarmupClosure(warmupClosure);
+
+ CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>();
+
+ cacheCfg.setCacheMode(CacheMode.PARTITIONED);
+ cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
+ cacheCfg.setBackups(1);
+ cacheCfg.setName("test");
+
+ cfg.setCacheConfiguration(cacheCfg);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testWarmupClosure() throws Exception {
+ startGrid(1);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0dddaaf/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 1f38e21..02f82ce 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -19,6 +19,7 @@ package org.apache.ignite.testsuites;
import junit.framework.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.fair.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.cache.store.jdbc.*;
@@ -81,6 +82,9 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(IgniteCachePrivateExecutionContextTest.class);
suite.addTestSuite(IgniteCacheSharedExecutionContextTest.class);
+ // Warmup closure tests.
+ suite.addTestSuite(IgniteWarmupClosureSelfTest.class);
+
// Affinity tests.
suite.addTestSuite(GridFairAffinityFunctionNodesSelfTest.class);
suite.addTestSuite(IgniteFairAffinityDynamicCacheSelfTest.class);
[31/42] incubator-ignite git commit: Merge branch 'ignite-722' into
ignite-sprint-3
Posted by ag...@apache.org.
Merge branch 'ignite-722' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f128f93c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f128f93c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f128f93c
Branch: refs/heads/ignite-721
Commit: f128f93c3f3ddf2ddd912f29603e628860f07b5b
Parents: 9d92bc7 d0dddaa
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Fri Apr 10 17:25:35 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Fri Apr 10 17:25:35 2015 +0300
----------------------------------------------------------------------
.../ignite/startup/BasicWarmupClosure.java | 9 ++-
.../cache/IgniteWarmupClosureSelfTest.java | 82 ++++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +
3 files changed, 92 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[07/42] incubator-ignite git commit: ignite-698 - fixed
Posted by ag...@apache.org.
ignite-698 - fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8389cd06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8389cd06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8389cd06
Branch: refs/heads/ignite-721
Commit: 8389cd0646820c9d4ef25363c64810434ee8fc2d
Parents: 3765f5d
Author: S.Vladykin <sv...@gridgain.com>
Authored: Thu Apr 9 19:10:53 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Thu Apr 9 19:10:53 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/IgniteH2Indexing.java | 16 +++++++++++++++-
.../query/h2/sql/BaseH2CompareQueryTest.java | 20 ++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8389cd06/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 719ee4a..c99b01c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -831,11 +831,25 @@ public class IgniteH2Indexing implements GridQueryIndexing {
private String generateQuery(String qry, TableDescriptor tbl) throws IgniteCheckedException {
assert tbl != null;
+ final String qry0 = qry;
+
String t = tbl.fullTableName();
String from = " ";
- String upper = qry.trim().toUpperCase();
+ qry = qry.trim();
+ String upper = qry.toUpperCase();
+
+ if (upper.startsWith("SELECT")) {
+ qry = qry.substring(6).trim();
+
+ if (!qry.startsWith("*"))
+ throw new IgniteCheckedException("Only queries starting with 'SELECT *' are supported or " +
+ "use SqlFieldsQuery instead: " + qry0);
+
+ qry = qry.substring(1).trim();
+ upper = qry.toUpperCase();
+ }
if (!upper.startsWith("FROM"))
from = " FROM " + t +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8389cd06/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
index 7f07069..a715e6f 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
@@ -19,13 +19,17 @@ package org.apache.ignite.internal.processors.query.h2.sql;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.query.*;
import org.apache.ignite.cache.query.annotations.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.testframework.*;
+import javax.cache.*;
import java.io.*;
import java.sql.*;
import java.sql.Date;
import java.util.*;
+import java.util.concurrent.*;
/**
* Base set of queries to compare query results from h2 database instance and mixed ignite caches (replicated and partitioned)
@@ -160,6 +164,22 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
}
/**
+ *
+ */
+ public void testSelectStar() {
+ assertEquals(1, pCache.query(new SqlQuery<AffinityKey<?>,Person>(
+ Person.class, "\t\r\n select \n*\t from Person limit 1")).getAll().size());
+
+ GridTestUtils.assertThrows(log, new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ pCache.query(new SqlQuery(Person.class, "SELECT firstName from PERSON"));
+
+ return null;
+ }
+ }, CacheException.class, null);
+ }
+
+ /**
* @throws Exception
*/
// TODO: IGNITE-705
[32/42] incubator-ignite git commit: ignite-717
Posted by ag...@apache.org.
ignite-717
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f9a834a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f9a834a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f9a834a
Branch: refs/heads/ignite-721
Commit: 3f9a834a270824c6591d3c4efc02066222fddc41
Parents: 9d92bc7
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 17:34:02 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 17:34:02 2015 +0300
----------------------------------------------------------------------
pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f9a834a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 27f71c9..f3a1e6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -539,23 +539,23 @@
<goals>
<goal>run</goal>
</goals>
- <phase>deploy</phase>
+ <phase>install</phase>
<configuration>
<failOnError>false</failOnError>
<target>
<mkdir dir="${basedir}/target/site" />
<copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip"
- tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip" />
+ tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip" failonerror="false" />
<copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.asc"
- tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.asc"/>
+ tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.asc" failonerror="false"/>
<copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.md5"
- tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.md5" />
+ tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.md5" failonerror="false"/>
<copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.sha1"
- tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.sha1"/>
+ tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.sha1" failonerror="false"/>
<copy file="${basedir}/target/ignite-fabric-${project.version}-incubating.zip"
- toDir="${basedir}/target/site"/>
+ toDir="${basedir}/target/site" failonerror="false"/>
<copy file="${basedir}/target/ignite-hadoop-${project.version}-incubating.zip"
- toDir="${basedir}/target/site"/>
+ toDir="${basedir}/target/site" failonerror="false"/>
<copy file="${basedir}/KEYS" todir="${basedir}/target/site" />
</target>
</configuration>
[22/42] incubator-ignite git commit: ignite-717
Posted by ag...@apache.org.
ignite-717
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/431caa58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/431caa58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/431caa58
Branch: refs/heads/ignite-721
Commit: 431caa587af9bf4e9823f45ed11d3575bc41350c
Parents: 9b72d7d
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 15:48:01 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 15:48:01 2015 +0300
----------------------------------------------------------------------
pom.xml | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/431caa58/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c9dfce4..eb7e74f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
</parent>
<groupId>org.apache.ignite</groupId>
- <artifactId>incubator-ignite</artifactId>
+ <artifactId>ignite</artifactId>
<version>1.0.1-RC1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -319,15 +319,15 @@
<substitution expression="${project.version}" />
</replaceregexp>
- <zip destfile="${basedir}/target/incubator-ignite-${project.version}-bin.zip" encoding="UTF-8">
- <zipfileset dir="${basedir}/target/release-package" prefix="incubator-ignite-${project.version}-bin" filemode="755">
+ <zip destfile="${basedir}/target/ignite-${ignite.edition}-${project.version}-incubating.zip" encoding="UTF-8">
+ <zipfileset dir="${basedir}/target/release-package" prefix="ignite-${ignite.edition}-${project.version}-incubating" filemode="755">
<include name="**/*.sh" />
<include name="**/configure" />
<include name="**/install-sh" />
<include name="**/compile" />
<include name="**/missing" />
</zipfileset>
- <zipfileset dir="${basedir}/target/release-package" prefix="incubator-ignite-${project.version}-bin">
+ <zipfileset dir="${basedir}/target/release-package" prefix="ignite-${ignite.edition}-${project.version}-incubating">
<exclude name="**/*.sh" />
<exclude name="**/configure" />
<exclude name="**/install-sh" />
@@ -536,20 +536,19 @@
<configuration>
<failOnError>false</failOnError>
<target>
- <zip destfile="${basedir}/target/sources-pack-${project.version}.zip" encoding="UTF-8">
- <zipfileset dir="${basedir}/target" prefix="sources-pack-${project.version}">
- <include name="${project.artifactId}-${project.version}-source-release.zip" />
- <include name="${project.artifactId}-${project.version}-source-release.zip.asc" />
- <include name="${project.artifactId}-${project.version}-source-release.zip.md5" />
- <include name="${project.artifactId}-${project.version}-source-release.zip.sha1" />
- <include name="${basedir}/KEYS" />
- </zipfileset>
- </zip>
<mkdir dir="${basedir}/target/site" />
- <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip" todir="${basedir}/target/site" />
- <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.asc" todir="${basedir}/target/site" />
- <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.md5" todir="${basedir}/target/site" />
- <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.sha1" todir="${basedir}/target/site" />
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip"
+ tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip" />
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.asc"
+ tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.asc"/>
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.md5"
+ tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.md5" />
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.sha1"
+ tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.sha1"/>
+ <copy file="${basedir}/target/ignite-fabric-${project.version}-incubating.zip"
+ toDir="${basedir}/target/site"/>
+ <copy file="${basedir}/target/ignite-hadoop-${project.version}-incubating.zip"
+ toDir="${basedir}/target/site"/>
<copy file="${basedir}/KEYS" todir="${basedir}/target/site" />
</target>
</configuration>
[13/42] incubator-ignite git commit: # IGNITE-692 Implemented support
for GG and Ignite.
Posted by ag...@apache.org.
# IGNITE-692 Implemented support for GG and 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/97a83a03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/97a83a03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/97a83a03
Branch: refs/heads/ignite-721
Commit: 97a83a034cd17fbef9e5f2a77410ee326e91a1a0
Parents: aa8f668
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 14:24:27 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 14:24:27 2015 +0700
----------------------------------------------------------------------
.../query/GridQueryFieldMetadata.java | 2 +-
.../visor/cache/VisorCacheConfiguration.java | 2 +-
.../internal/visor/cache/VisorCacheMetrics.java | 2 +-
.../internal/visor/query/VisorQueryArg.java | 69 ++++++
.../visor/query/VisorQueryCleanupTask.java | 2 +-
.../visor/query/VisorQueryCursorHolder.java | 64 ++++++
.../internal/visor/query/VisorQueryField.java | 66 ++++--
.../internal/visor/query/VisorQueryJob.java | 160 +++++++++++++
.../visor/query/VisorQueryNextPageTask.java | 46 ++--
.../internal/visor/query/VisorQueryResult.java | 6 +-
.../visor/query/VisorQueryResultEx.java | 16 +-
.../internal/visor/query/VisorQueryTask.java | 227 +------------------
.../internal/visor/query/VisorQueryUtils.java | 8 +-
.../resources/META-INF/classnames.properties | 6 +-
.../commands/cache/VisorCacheScanCommand.scala | 11 +-
15 files changed, 393 insertions(+), 294 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldMetadata.java
index 9ebf768..f99466f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldMetadata.java
@@ -34,7 +34,7 @@ public interface GridQueryFieldMetadata extends Externalizable {
/**
* Gets name of type to which this field belongs.
*
- * @return Gets type name.
+ * @return Type name.
*/
public String typeName();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 86a7f5f..d070872 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -146,7 +146,7 @@ public class VisorCacheConfiguration implements Serializable {
writerFactory = compactClass(ccfg.getCacheWriterFactory());
expiryPlcFactory = compactClass(ccfg.getExpiryPolicyFactory());
sys = ignite.context().cache().systemCache(ccfg.getName());
-
+
affinityCfg = VisorCacheAffinityConfiguration.from(ccfg);
rebalanceCfg = VisorCacheRebalanceConfiguration.from(ccfg);
evictCfg = VisorCacheEvictionConfiguration.from(ccfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
index fc30392..b0a1eb2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
@@ -245,7 +245,7 @@ public class VisorCacheMetrics implements Serializable {
}
/**
- * @return Cache mode.
+ * @return Cache mode.
*/
public CacheMode mode() {
return mode;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
new file mode 100644
index 0000000..080bb35
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.internal.visor.query;
+
+import java.io.*;
+
+/**
+ * Arguments for {@link VisorQueryTask}.
+ */
+public class VisorQueryArg implements Serializable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Cache name for query. */
+ private final String cacheName;
+
+ /** Query text. */
+ private final String qryTxt;
+
+ /** Result batch size. */
+ private final Integer pageSize;
+
+ /**
+ * @param cacheName Cache name for query.
+ * @param qryTxt Query text.
+ * @param pageSize Result batch size.
+ */
+ public VisorQueryArg(String cacheName, String qryTxt, Integer pageSize) {
+ this.cacheName = cacheName;
+ this.qryTxt = qryTxt;
+ this.pageSize = pageSize;
+ }
+
+ /**
+ * @return Cache name.
+ */
+ public String cacheName() {
+ return cacheName;
+ }
+
+ /**
+ * @return Query txt.
+ */
+ public String queryTxt() {
+ return qryTxt;
+ }
+
+ /**
+ * @return Page size.
+ */
+ public Integer pageSize() {
+ return pageSize;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
index 1386638..d82f5fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
@@ -86,7 +86,7 @@ public class VisorQueryCleanupTask extends VisorMultiNodeTask<Map<UUID, Collecti
/** {@inheritDoc} */
@Override protected Void run(Collection<String> qryIds) {
- ConcurrentMap<String, VisorQueryTask.VisorQueryCursorHolder> locMap = ignite.cluster().nodeLocalMap();
+ ConcurrentMap<String, VisorQueryCursorHolder> locMap = ignite.cluster().nodeLocalMap();
for (String qryId : qryIds)
locMap.remove(qryId);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursorHolder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursorHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursorHolder.java
new file mode 100644
index 0000000..dec0253
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursorHolder.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.internal.visor.query;
+
+import java.io.*;
+
+/**
+ * ResultSet future holder.
+ */
+public class VisorQueryCursorHolder<T> implements Serializable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Query cursor. */
+ private final VisorQueryCursor<T> cur;
+
+ /** Flag indicating that this future was read from last check. */
+ private volatile boolean accessed;
+
+ /**
+ * @param cur Future.
+ * @param accessed {@code true} if query was accessed before remove timeout expired.
+ */
+ public VisorQueryCursorHolder(VisorQueryCursor<T> cur, boolean accessed) {
+ this.cur = cur;
+ this.accessed = accessed;
+ }
+
+ /**
+ * @return Query cursor.
+ */
+ public VisorQueryCursor<T> cursor() {
+ return cur;
+ }
+
+ /**
+ * @return Flag indicating that this future was read from last check..
+ */
+ public boolean accessed() {
+ return accessed;
+ }
+
+ /**
+ * @param accessed New accessed.
+ */
+ public void accessed(boolean accessed) {
+ this.accessed = accessed;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java
index 78bcac6..cd97c7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.visor.query;
+import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import java.io.*;
@@ -28,35 +29,74 @@ public class VisorQueryField implements Serializable {
/** */
private static final long serialVersionUID = 0L;
- /** Column type. */
- private final String type;
+ /** Schema name. */
+ private String schemaName;
+
+ /** Type name. */
+ private String typeName;
/** Field name. */
- private final String field;
+ private String fieldName;
+
+ /** Field type name. */
+ private String fieldTypeName;
/**
* Create data transfer object with given parameters.
*
- * @param type Column type.
- * @param field Field name.
+ * @param schemaName Schema name.
+ * @param typeName Type name.
+ * @param fieldName Name.
+ * @param fieldTypeName Type.
+ */
+ public VisorQueryField(String schemaName, String typeName, String fieldName, String fieldTypeName) {
+ this.schemaName = schemaName;
+ this.typeName = typeName;
+ this.fieldName = fieldName;
+ this.fieldTypeName = fieldTypeName;
+ }
+
+ /**
+ * @return Schema name.
*/
- public VisorQueryField(String type, String field) {
- this.type = type;
- this.field = field;
+ public String schemaName() {
+ return schemaName;
}
/**
- * @return Column type.
+ * @return Type name.
*/
- public String type() {
- return type;
+ public String typeName() {
+ return typeName;
}
/**
* @return Field name.
*/
- public String field() {
- return field;
+ public String fieldName() {
+ return fieldName;
+ }
+
+ /**
+ * @return Field type name.
+ */
+ public String fieldTypeName() {
+ return fieldTypeName;
+ }
+
+ /**
+ * @param schema If {@code true} then add schema name to full name.
+ * @return Fully qualified field name with type name and schema name.
+ */
+ public String fullName(boolean schema) {
+ if (!F.isEmpty(typeName)) {
+ if (schema && !F.isEmpty(schemaName))
+ return schemaName + "." + typeName + "." + fieldName;
+
+ return typeName + "." + fieldName;
+ }
+
+ return fieldName;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
new file mode 100644
index 0000000..2d8b32e
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
@@ -0,0 +1,160 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.internal.visor.query;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.query.*;
+import org.apache.ignite.internal.processors.timeout.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.visor.*;
+import org.apache.ignite.lang.*;
+
+import javax.cache.*;
+import java.sql.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+import static org.apache.ignite.internal.visor.query.VisorQueryUtils.*;
+
+/**
+ * Job for execute SCAN or SQL query and get first page of results.
+ */
+public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? extends Exception, VisorQueryResultEx>> {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * Create job with specified argument.
+ *
+ * @param arg Job argument.
+ * @param debug Debug flag.
+ */
+ protected VisorQueryJob(VisorQueryArg arg, boolean debug) {
+ super(arg, debug);
+ }
+
+ /**
+ * @param cacheName Cache name.
+ * @return Cache to execute query.
+ */
+ protected IgniteCache<Object, Object> cache(String cacheName) {
+ GridCacheProcessor cacheProcessor = ignite.context().cache();
+
+ return cacheProcessor.jcache(cacheName);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteBiTuple<? extends Exception, VisorQueryResultEx> run(VisorQueryArg arg) {
+ try {
+ boolean scan = arg.queryTxt().toUpperCase().startsWith("SCAN");
+
+ String qryId = (scan ? SCAN_QRY_NAME : SQL_QRY_NAME) + "-" +
+ UUID.randomUUID();
+
+ IgniteCache<Object, Object> c = cache(arg.cacheName());
+
+ if (scan) {
+ ScanQuery<Object, Object> qry = new ScanQuery<>(null);
+ qry.setPageSize(arg.pageSize());
+
+ long start = U.currentTimeMillis();
+
+ VisorQueryCursor<Cache.Entry<Object, Object>> cur = new VisorQueryCursor<>(c.query(qry));
+
+ List<Object[]> rows = fetchScanQueryRows(cur, arg.pageSize());
+
+ long duration = U.currentTimeMillis() - start; // Scan duration + fetch duration.
+
+ ignite.cluster().<String, VisorQueryCursorHolder>nodeLocalMap().put(qryId,
+ new VisorQueryCursorHolder<>(cur, false));
+
+ scheduleResultSetHolderRemoval(qryId);
+
+ return new IgniteBiTuple<>(null, new VisorQueryResultEx(ignite.localNode().id(), qryId,
+ SCAN_COL_NAMES, rows, cur.hasNext(), duration));
+ }
+ else {
+ SqlFieldsQuery qry = new SqlFieldsQuery(arg.queryTxt());
+ qry.setPageSize(arg.pageSize());
+
+ long start = U.currentTimeMillis();
+
+ VisorQueryCursor<List<?>> cur = new VisorQueryCursor<>(c.query(qry));
+
+ Collection<GridQueryFieldMetadata> meta = cur.fieldsMeta();
+
+ if (meta == null)
+ return new IgniteBiTuple<Exception, VisorQueryResultEx>(
+ new SQLException("Fail to execute query. No metadata available."), null);
+ else {
+ List<VisorQueryField> names = new ArrayList<>(meta.size());
+
+ for (GridQueryFieldMetadata col : meta)
+ names.add(new VisorQueryField(col.schemaName(), col.typeName(),
+ col.fieldName(), col.fieldTypeName()));
+
+ List<Object[]> rows = fetchSqlQueryRows(cur, arg.pageSize());
+
+ long duration = U.currentTimeMillis() - start; // Query duration + fetch duration.
+
+ ConcurrentMap<String, VisorQueryCursorHolder<List<?>>> storage = ignite.cluster().nodeLocalMap();
+ storage.put(qryId, new VisorQueryCursorHolder<>(cur, false));
+
+ scheduleResultSetHolderRemoval(qryId);
+
+ return new IgniteBiTuple<>(null, new VisorQueryResultEx(ignite.localNode().id(), qryId,
+ names, rows, cur.hasNext(), duration));
+ }
+ }
+ }
+ catch (Exception e) {
+ return new IgniteBiTuple<>(e, null);
+ }
+ }
+
+ /**
+ * @param id Unique query result id.
+ */
+ private void scheduleResultSetHolderRemoval(final String id) {
+ ignite.context().timeout().addTimeoutObject(new GridTimeoutObjectAdapter(RMV_DELAY) {
+ @Override public void onTimeout() {
+ ConcurrentMap<String, VisorQueryCursorHolder> storage = ignite.cluster().nodeLocalMap();
+
+ VisorQueryCursorHolder holder = storage.get(id);
+
+ if (holder != null) {
+ // If future was accessed since last scheduling, set access flag to false and reschedule.
+ if (holder.accessed()) {
+ holder.accessed(false);
+
+ scheduleResultSetHolderRemoval(id);
+ }
+ else
+ storage.remove(id); // Remove stored future otherwise.
+ }
+ }
+ });
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorQueryJob.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
index 320bdde..191f44d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.visor.*;
import org.apache.ignite.lang.*;
+import javax.cache.*;
import java.util.*;
import java.util.concurrent.*;
@@ -58,40 +59,33 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
/** {@inheritDoc} */
@Override protected VisorQueryResult run(IgniteBiTuple<String, Integer> arg) {
- try {
- return arg.get1().startsWith(VisorQueryUtils.SCAN_QRY_NAME) ? nextScanPage(arg) : nextSqlPage(arg);
- }
- catch (IgniteCheckedException e) {
- throw U.convertException(e);
- }
+ return arg.get1().startsWith(VisorQueryUtils.SCAN_QRY_NAME) ? nextScanPage(arg) : nextSqlPage(arg);
}
/**
* Collect data from SQL query.
*
- * @param arg
- * @return
- * @throws IgniteCheckedException
+ * @param arg Query name and page size.
+ * @return Query result with next page.
*/
- private VisorQueryResult nextSqlPage(IgniteBiTuple<String, Integer> arg) throws IgniteCheckedException {
+ private VisorQueryResult nextSqlPage(IgniteBiTuple<String, Integer> arg) {
long start = U.currentTimeMillis();
- ConcurrentMap<String, VisorQueryTask.VisorQueryCursorHolder> storage =
- ignite.cluster().nodeLocalMap();
+ ConcurrentMap<String, VisorQueryCursorHolder<List<?>>> storage = ignite.cluster().nodeLocalMap();
- VisorQueryTask.VisorQueryCursorHolder t = storage.get(arg.get1());
+ VisorQueryCursorHolder<List<?>> holder = storage.get(arg.get1());
- if (t == null)
+ if (holder == null)
throw new IgniteException("SQL query results are expired.");
- VisorQueryCursor cur = t.cursor();
+ VisorQueryCursor<List<?>> cur = holder.cursor();
List<Object[]> nextRows = VisorQueryUtils.fetchSqlQueryRows(cur, arg.get2());
boolean hasMore = cur.hasNext();
if (hasMore)
- storage.put(arg.get1(), new VisorQueryTask.VisorQueryCursorHolder(t.cursor(), true));
+ holder.accessed(true);
else
storage.remove(arg.get1());
@@ -101,29 +95,27 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
/**
* Collect data from SCAN query
*
- * @param arg
- * @return
- * @throws IgniteCheckedException
+ * @param arg Query name and page size.
+ * @return Next page with data.
*/
- private VisorQueryResult nextScanPage(IgniteBiTuple<String, Integer> arg) throws IgniteCheckedException {
+ private VisorQueryResult nextScanPage(IgniteBiTuple<String, Integer> arg) {
long start = U.currentTimeMillis();
- ConcurrentMap<String, VisorQueryTask.VisorQueryCursorHolder> storage =
- ignite.cluster().nodeLocalMap();
+ ConcurrentMap<String, VisorQueryCursorHolder<Cache.Entry<Object, Object>>> storage = ignite.cluster().nodeLocalMap();
- VisorQueryTask.VisorQueryCursorHolder t = storage.get(arg.get1());
+ VisorQueryCursorHolder<Cache.Entry<Object, Object>> holder = storage.get(arg.get1());
- if (t == null)
+ if (holder == null)
throw new IgniteException("Scan query results are expired.");
- VisorQueryCursor cur = t.cursor();
+ VisorQueryCursor<Cache.Entry<Object, Object>> cur = holder.cursor();
List<Object[]> rows = VisorQueryUtils.fetchScanQueryRows(cur, arg.get2());
- Boolean hasMore = cur.hasNext();
+ boolean hasMore = cur.hasNext();
if (hasMore)
- storage.put(arg.get1(), new VisorQueryTask.VisorQueryCursorHolder(cur, true));
+ holder.accessed(true);
else
storage.remove(arg.get1());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java
index 1a8c9e9..48c26b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java
@@ -33,7 +33,7 @@ public class VisorQueryResult implements Serializable {
private final List<Object[]> rows;
/** Whether query has more rows to fetch. */
- private final Boolean hasMore;
+ private final boolean hasMore;
/** Query duration */
private final long duration;
@@ -45,7 +45,7 @@ public class VisorQueryResult implements Serializable {
* @param hasMore Whether query has more rows to fetch.
* @param duration Query duration.
*/
- public VisorQueryResult(List<Object[]> rows, Boolean hasMore, long duration) {
+ public VisorQueryResult(List<Object[]> rows, boolean hasMore, long duration) {
this.rows = rows;
this.hasMore = hasMore;
this.duration = duration;
@@ -61,7 +61,7 @@ public class VisorQueryResult implements Serializable {
/**
* @return Whether query has more rows to fetch.
*/
- public Boolean hasMore() {
+ public boolean hasMore() {
return hasMore;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java
index 35ed790..35f08b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java
@@ -35,12 +35,12 @@ public class VisorQueryResultEx extends VisorQueryResult {
private final String qryId;
/** Query columns descriptors. */
- private final Collection<VisorQueryField> colNames;
+ private final Collection<VisorQueryField> cols;
/**
* @param resNodeId Node where query executed.
* @param qryId Query ID for future extraction in nextPage() access.
- * @param colNames Columns types and names.
+ * @param cols Columns descriptors.
* @param rows Rows fetched from query.
* @param hasMore Whether query has more rows to fetch.
* @param duration Query duration.
@@ -48,16 +48,16 @@ public class VisorQueryResultEx extends VisorQueryResult {
public VisorQueryResultEx(
UUID resNodeId,
String qryId,
- Collection<VisorQueryField> colNames,
+ Collection<VisorQueryField> cols,
List<Object[]> rows,
- Boolean hasMore,
+ boolean hasMore,
long duration
) {
super(rows, hasMore, duration);
this.resNodeId = resNodeId;
this.qryId = qryId;
- this.colNames = colNames;
+ this.cols = cols;
}
/**
@@ -75,10 +75,10 @@ public class VisorQueryResultEx extends VisorQueryResult {
}
/**
- * @return Columns names.
+ * @return Columns.
*/
- public Collection<VisorQueryField> columnNames() {
- return colNames;
+ public Collection<VisorQueryField> columns() {
+ return cols;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
index cc05ba5..e01737f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
@@ -18,38 +18,27 @@
package org.apache.ignite.internal.visor.query;
import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.query.*;
import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.visor.*;
import org.apache.ignite.lang.*;
-import javax.cache.*;
-import java.io.*;
-import java.sql.*;
import java.util.*;
-import java.util.concurrent.*;
-import static org.apache.ignite.internal.visor.query.VisorQueryUtils.*;
import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
/**
* Task for execute SCAN or SQL query and get first page of results.
*/
@GridInternal
-public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryArg,
- IgniteBiTuple<? extends Exception, VisorQueryResultEx>> {
+public class VisorQueryTask extends VisorOneNodeTask<VisorQueryArg, IgniteBiTuple<? extends Exception, VisorQueryResultEx>> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected Map<? extends ComputeJob, ClusterNode> map0(List<ClusterNode> subgrid,
- VisorTaskArgument<VisorQueryTask.VisorQueryArg> arg) {
+ VisorTaskArgument<VisorQueryArg> arg) {
String cacheName = taskArg.cacheName();
ClusterGroup prj = ignite.cluster().forDataNodes(cacheName);
@@ -71,216 +60,4 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
@Override protected VisorQueryJob job(VisorQueryArg arg) {
return new VisorQueryJob(arg, debug);
}
-
- /**
- * Arguments for {@link VisorQueryTask}.
- */
- @SuppressWarnings("PublicInnerClass")
- public static class VisorQueryArg implements Serializable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Cache name for query. */
- private final String cacheName;
-
- /** Query text. */
- private final String qryTxt;
-
- /** Result batch size. */
- private final Integer pageSize;
-
- /**
- * @param cacheName Cache name for query.
- * @param qryTxt Query text.
- * @param pageSize Result batch size.
- */
- public VisorQueryArg(String cacheName, String qryTxt, Integer pageSize) {
- this.cacheName = cacheName;
- this.qryTxt = qryTxt;
- this.pageSize = pageSize;
- }
-
- /**
- * @return Cache name.
- */
- public String cacheName() {
- return cacheName;
- }
-
- /**
- * @return Query txt.
- */
- public String queryTxt() {
- return qryTxt;
- }
-
- /**
- * @return Page size.
- */
- public Integer pageSize() {
- return pageSize;
- }
- }
-
- /**
- * ResultSet future holder.
- */
- @SuppressWarnings("PublicInnerClass")
- public static class VisorQueryCursorHolder implements Serializable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Query cursor. */
- private final VisorQueryCursor cur;
-
- /** Flag indicating that this future was read from last check. */
- private boolean accessed;
-
- /**
- * @param cur Future.
- * @param accessed {@code true} if query was accessed before remove timeout expired.
- */
- public VisorQueryCursorHolder(VisorQueryCursor cur, boolean accessed) {
- this.cur = cur;
- this.accessed = accessed;
- }
-
- /**
- * @return Query cursor.
- */
- public VisorQueryCursor cursor() {
- return cur;
- }
-
- /**
- * @return Flag indicating that this future was read from last check..
- */
- public Boolean accessed() {
- return accessed;
- }
-
- /**
- * @param accessed New accessed.
- */
- public void accessed(Boolean accessed) {
- this.accessed = accessed;
- }
- }
-
- /**
- * Job for execute SCAN or SQL query and get first page of results.
- */
- private static class VisorQueryJob extends
- VisorJob<VisorQueryArg, IgniteBiTuple<? extends Exception, VisorQueryResultEx>> {
- /** */
- private static final long serialVersionUID = 0L;
-
- /**
- * Create job with specified argument.
- *
- * @param arg Job argument.
- * @param debug Debug flag.
- */
- protected VisorQueryJob(VisorQueryArg arg, boolean debug) {
- super(arg, debug);
- }
-
- /** {@inheritDoc} */
- @Override protected IgniteBiTuple<? extends Exception, VisorQueryResultEx> run(VisorQueryArg arg) {
- try {
- Boolean scan = arg.queryTxt().toUpperCase().startsWith("SCAN");
-
- String qryId = (scan ? SCAN_QRY_NAME : SQL_QRY_NAME) + "-" +
- UUID.randomUUID();
-
- GridCacheProcessor cacheProcessor = ignite.context().cache();
-
- IgniteCache<Object, Object> c = cacheProcessor.jcache(arg.cacheName());
-
- if (scan) {
- ScanQuery<Object, Object> qry = new ScanQuery<>(null);
- qry.setPageSize(arg.pageSize());
-
- long start = U.currentTimeMillis();
-
- VisorQueryCursor<Cache.Entry<Object, Object>> cur = new VisorQueryCursor<>(c.query(qry));
-
- List<Object[]> rows = fetchScanQueryRows(cur, arg.pageSize());
-
- long duration = U.currentTimeMillis() - start; // Scan duration + fetch duration.
-
- ignite.cluster().<String, VisorQueryCursorHolder>nodeLocalMap().put(qryId,
- new VisorQueryCursorHolder(cur, false));
-
- scheduleResultSetHolderRemoval(qryId);
-
- return new IgniteBiTuple<>(null, new VisorQueryResultEx(ignite.localNode().id(), qryId,
- SCAN_COL_NAMES, rows, cur.hasNext(), duration));
- }
- else {
- SqlFieldsQuery qry = new SqlFieldsQuery(arg.queryTxt());
- qry.setPageSize(arg.pageSize());
-
- long start = U.currentTimeMillis();
-
- VisorQueryCursor<List<?>> cur = new VisorQueryCursor<>(c.query(qry));
-
- Collection<GridQueryFieldMetadata> meta = cur.fieldsMeta();
-
- if (meta == null)
- return new IgniteBiTuple<Exception, VisorQueryResultEx>(
- new SQLException("Fail to execute query. No metadata available."), null);
- else {
- List<VisorQueryField> names = new ArrayList<>(meta.size());
-
- for (GridQueryFieldMetadata col : meta)
- names.add(new VisorQueryField(col.typeName(), col.fieldName()));
-
- List<Object[]> rows = fetchSqlQueryRows(cur, arg.pageSize());
-
- long duration = U.currentTimeMillis() - start; // Query duration + fetch duration.
-
- ignite.cluster().<String, VisorQueryCursorHolder>nodeLocalMap().put(qryId, new VisorQueryCursorHolder(cur, false));
-
- scheduleResultSetHolderRemoval(qryId);
-
- return new IgniteBiTuple<>(null, new VisorQueryResultEx(ignite.localNode().id(), qryId,
- names, rows, cur.hasNext(), duration));
- }
- }
- }
- catch (Exception e) {
- return new IgniteBiTuple<>(e, null);
- }
- }
-
- /**
- * @param id Unique query result id.
- */
- private void scheduleResultSetHolderRemoval(final String id) {
- ignite.context().timeout().addTimeoutObject(new GridTimeoutObjectAdapter(RMV_DELAY) {
- @Override public void onTimeout() {
- ConcurrentMap<String, VisorQueryCursorHolder> storage = ignite.cluster().nodeLocalMap();
-
- VisorQueryCursorHolder holder = storage.get(id);
-
- if (holder != null) {
- // If future was accessed since last scheduling, set access flag to false and reschedule.
- if (holder.accessed()) {
- holder.accessed(false);
-
- scheduleResultSetHolderRemoval(id);
- }
- else
- storage.remove(id); // Remove stored future otherwise.
- }
- }
- });
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(VisorQueryJob.class, this);
- }
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
index f8f795d..be1d15d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
@@ -39,8 +39,8 @@ public class VisorQueryUtils {
/** Columns for SCAN queries. */
public static final Collection<VisorQueryField> SCAN_COL_NAMES = Arrays.asList(
- new VisorQueryField("", "Key Class"), new VisorQueryField("", "Key"),
- new VisorQueryField("", "Value Class"), new VisorQueryField("", "Value")
+ new VisorQueryField(null, null, "Key Class", ""), new VisorQueryField(null, null, "Key", ""),
+ new VisorQueryField(null, null, "Value Class", ""), new VisorQueryField(null, null, "Value", "")
);
/**
@@ -84,7 +84,7 @@ public class VisorQueryUtils {
StringBuilder sb = new StringBuilder();
- Boolean first = true;
+ boolean first = true;
for (Object v : arr) {
if (first)
@@ -141,7 +141,7 @@ public class VisorQueryUtils {
* @param obj Object instance to check.
* @return {@code true} if it is one of known types.
*/
- private static Boolean isKnownType(Object obj) {
+ private static boolean isKnownType(Object obj) {
return obj instanceof String ||
obj instanceof Boolean ||
obj instanceof Byte ||
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index a855e12..305cdd8 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -1485,9 +1485,9 @@ org.apache.ignite.internal.visor.query.VisorQueryNextPageTask$VisorQueryNextPage
org.apache.ignite.internal.visor.query.VisorQueryResult
org.apache.ignite.internal.visor.query.VisorQueryResultEx
org.apache.ignite.internal.visor.query.VisorQueryTask
-org.apache.ignite.internal.visor.query.VisorQueryTask$VisorFutureResultSetHolder
-org.apache.ignite.internal.visor.query.VisorQueryTask$VisorQueryArg
-org.apache.ignite.internal.visor.query.VisorQueryTask$VisorQueryJob
+org.apache.ignite.internal.visor.query.VisorQueryCursorHolder
+org.apache.ignite.internal.visor.query.VisorQueryArg
+org.apache.ignite.internal.visor.query.VisorQueryJob
org.apache.ignite.internal.visor.util.VisorEventMapper
org.apache.ignite.internal.visor.util.VisorTaskUtils$4
org.apache.ignite.lang.IgniteBiClosure
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97a83a03/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
index 7574be1..5eecf2f 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
@@ -17,16 +17,13 @@
package org.apache.ignite.visor.commands.cache
-import org.apache.ignite.internal.visor.query.VisorQueryTask.VisorQueryArg
-import org.apache.ignite.internal.visor.query.{VisorQueryNextPageTask, VisorQueryResult, VisorQueryTask}
-
import org.apache.ignite.cluster.ClusterNode
-import org.apache.ignite.internal.visor.util.VisorTaskUtils._
import org.apache.ignite.lang.IgniteBiTuple
-
import org.apache.ignite.visor.commands._
-import org.apache.ignite.visor.visor
-import visor._
+import org.apache.ignite.visor.visor._
+
+import org.apache.ignite.internal.visor.query._
+import org.apache.ignite.internal.visor.util.VisorTaskUtils._
import scala.collection.JavaConversions._
[19/42] incubator-ignite git commit: Merge branches 'ignite-692' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-692
Posted by ag...@apache.org.
Merge branches 'ignite-692' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e101752f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e101752f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e101752f
Branch: refs/heads/ignite-721
Commit: e101752f80b3037a22223944962cbd62b209acf1
Parents: 1cd1530 674635f
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Apr 10 18:24:19 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Apr 10 18:24:19 2015 +0700
----------------------------------------------------------------------
bin/ignitevisorcmd.bat | 39 +--
.../examples/MessagingExamplesSelfTest.java | 2 +-
.../java8/examples/BasicExamplesSelfTest.java | 3 +
.../java8/examples/CacheExamplesSelfTest.java | 4 +
.../examples/CheckpointExamplesSelfTest.java | 3 +
.../examples/ClusterGroupExampleSelfTest.java | 3 +-
.../examples/ContinuationExamplesSelfTest.java | 3 +
.../ContinuousMapperExamplesSelfTest.java | 4 +-
.../DeploymentExamplesMultiNodeSelfTest.java | 2 +
.../examples/DeploymentExamplesSelfTest.java | 2 +
.../HibernateL2CacheExampleSelfTest.java | 3 +
.../java8/examples/IgfsExamplesSelfTest.java | 3 +
.../examples/LifecycleExamplesSelfTest.java | 3 +
.../MemcacheRestExamplesMultiNodeSelfTest.java | 2 +
.../examples/MemcacheRestExamplesSelfTest.java | 2 +
.../examples/MessagingExamplesSelfTest.java | 4 +-
.../examples/MonteCarloExamplesSelfTest.java | 3 +
.../examples/SpringBeanExamplesSelfTest.java | 3 +
.../java8/examples/TaskExamplesSelfTest.java | 2 +
.../client/ClientReconnectionSelfTest.java | 67 +++---
modules/core/pom.xml | 2 +-
.../java/org/apache/ignite/IgniteCache.java | 9 +
.../configuration/CacheConfiguration.java | 69 +++---
.../internal/ComputeTaskInternalFuture.java | 2 +-
.../ignite/internal/GridJobExecuteRequest.java | 10 +-
.../ignite/internal/GridJobExecuteResponse.java | 4 +-
.../apache/ignite/internal/GridTaskMessage.java | 30 ---
.../ignite/internal/GridTaskSessionRequest.java | 6 +-
.../client/GridClientConfiguration.java | 14 +-
.../GridClientConnectionManagerAdapter.java | 2 +-
.../router/GridTcpRouterConfiguration.java | 6 +-
.../internal/cluster/ClusterGroupAdapter.java | 150 ++++++++++--
.../internal/managers/GridManagerAdapter.java | 4 +-
.../discovery/GridDiscoveryManager.java | 25 +-
.../eventstorage/GridEventStorageManager.java | 4 +-
.../processors/cache/CacheMetricsImpl.java | 7 +-
.../processors/cache/CacheMetricsSnapshot.java | 223 +++++++++++++++++-
.../processors/cache/GridCacheAdapter.java | 12 +-
.../processors/cache/GridCacheContext.java | 6 +-
.../processors/cache/IgniteCacheProxy.java | 26 ++
.../dht/atomic/GridDhtAtomicCache.java | 6 +-
.../dht/colocated/GridDhtColocatedCache.java | 3 +-
.../distributed/near/GridNearAtomicCache.java | 2 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../local/atomic/GridLocalAtomicCache.java | 6 +-
.../cache/query/GridCacheQueryAdapter.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 6 +-
.../internal/processors/igfs/IgfsAsyncImpl.java | 4 +-
.../ignite/internal/processors/igfs/IgfsEx.java | 4 +-
.../processors/igfs/IgfsFileWorker.java | 180 --------------
.../processors/igfs/IgfsFileWorkerBatch.java | 225 +++++++-----------
.../processors/igfs/IgfsFileWorkerTask.java | 32 ---
.../internal/processors/igfs/IgfsImpl.java | 150 +++++++-----
.../internal/processors/igfs/IgfsProcessor.java | 2 +-
.../processors/rest/GridRestProcessor.java | 33 +--
.../security/GridSecurityProcessor.java | 13 +-
.../processors/security/SecurityContext.java | 8 +-
.../security/os/GridOsSecurityProcessor.java | 11 +-
.../processors/task/GridTaskProcessor.java | 9 +-
.../visor/cache/VisorCacheClearTask.java | 3 +
.../cache/VisorCacheQueryConfiguration.java | 9 -
.../internal/visor/log/VisorLogSearchTask.java | 12 +-
.../node/VisorNodeEventsCollectorTask.java | 3 +
.../internal/visor/util/VisorTaskUtils.java | 3 +
.../plugin/security/AuthenticationContext.java | 12 +-
.../security/GridSecurityCredentials.java | 184 ---------------
.../GridSecurityCredentialsBasicProvider.java | 44 ----
.../GridSecurityCredentialsProvider.java | 44 ----
.../plugin/security/GridSecurityException.java | 58 -----
.../plugin/security/GridSecurityPermission.java | 69 ------
.../security/GridSecurityPermissionSet.java | 66 ------
.../plugin/security/GridSecuritySubject.java | 62 -----
.../security/GridSecuritySubjectType.java | 48 ----
.../plugin/security/SecurityCredentials.java | 191 +++++++++++++++
.../SecurityCredentialsBasicProvider.java | 44 ++++
.../security/SecurityCredentialsProvider.java | 44 ++++
.../plugin/security/SecurityException.java | 61 +++++
.../plugin/security/SecurityPermission.java | 69 ++++++
.../plugin/security/SecurityPermissionSet.java | 66 ++++++
.../ignite/plugin/security/SecuritySubject.java | 62 +++++
.../plugin/security/SecuritySubjectType.java | 48 ++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 4 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 4 +-
.../spi/discovery/DiscoveryMetricsProvider.java | 10 +
.../DiscoverySpiNodeAuthenticator.java | 2 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 29 ++-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 57 ++++-
.../tcp/internal/TcpDiscoveryNode.java | 76 +++++-
.../messages/TcpDiscoveryHeartbeatMessage.java | 65 +++++
.../startup/cmdline/CommandLineStartup.java | 7 +-
.../ignite/internal/GridProjectionSelfTest.java | 82 +++++++
.../ignite/internal/GridStartStopSelfTest.java | 8 +-
.../CacheMetricsForClusterGroupSelfTest.java | 236 +++++++++++++++++++
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 42 ++--
.../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +-
.../cache/GridCacheReloadSelfTest.java | 3 +-
.../GridCacheReturnValueTransferSelfTest.java | 15 +-
.../IgniteTxMultiThreadedAbstractTest.java | 5 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 5 +-
.../GridCacheSetAbstractSelfTest.java | 10 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 6 +-
.../distributed/GridCacheEventAbstractTest.java | 16 +-
.../GridCacheNodeFailureAbstractTest.java | 15 +-
...licatedNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
.../continuous/GridEventConsumeSelfTest.java | 7 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 24 +-
.../tostring/GridToStringBuilderSelfTest.java | 5 +-
.../GridP2PMissedResourceCacheSizeSelfTest.java | 2 +-
.../tcp/TcpClientDiscoverySelfTest.java | 5 +-
.../testframework/GridSpiTestContext.java | 4 +-
.../testframework/junits/GridAbstractTest.java | 2 +-
.../junits/spi/GridSpiAbstractTest.java | 72 +-----
.../IgniteCacheMetricsSelfTestSuite.java | 4 +
...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 2 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 10 +-
.../processors/cache/GridCacheSwapSelfTest.java | 5 +-
.../IgniteCacheReplicatedQuerySelfTest.java | 11 +-
.../processors/cache/GridCacheJtaSelfTest.java | 6 +-
.../http/jetty/GridJettyRestHandler.java | 2 +-
.../p2p/GridP2PUserVersionChangeSelfTest.java | 8 +-
.../ignite/tools/classgen/ClassesGenerator.java | 2 +-
.../ignite/visor/commands/VisorConsole.scala | 19 ++
124 files changed, 2151 insertions(+), 1416 deletions(-)
----------------------------------------------------------------------
[23/42] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1f26cc01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1f26cc01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1f26cc01
Branch: refs/heads/ignite-721
Commit: 1f26cc01dcba9d282cfdddc3ebdd274721afac8b
Parents: 431caa5 60640de
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 15:48:49 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 15:48:49 2015 +0300
----------------------------------------------------------------------
assembly/release-hadoop.xml | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
[35/42] incubator-ignite git commit: ignite-717
Posted by ag...@apache.org.
ignite-717
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c0947b9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c0947b9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c0947b9c
Branch: refs/heads/ignite-721
Commit: c0947b9c6f7dee278d55f047775ac477bcd410b5
Parents: dedcda1
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 18:51:01 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 18:51:01 2015 +0300
----------------------------------------------------------------------
pom.xml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0947b9c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f3a1e6e..1ebf7c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -489,7 +489,7 @@
</profile>
<profile>
- <id>apache-release</id>
+ <id>deploy-ignite-site</id>
<build>
<plugins>
<plugin>
@@ -520,14 +520,7 @@
</algorithms>
</configuration>
</plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>deploy-ignite-site</id>
- <build>
- <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>