You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/08 15:44:34 UTC
[01/50] incubator-ignite git commit: IGNITE-477 - Fixed locking issue.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-437-sqltests-p2 88bbece4d -> 04ff84a59
IGNITE-477 - Fixed locking issue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/92a7aad4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92a7aad4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92a7aad4
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 92a7aad4ccf673d0161ce0f6d4d6b7025f67dd08
Parents: 580f051
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Fri Apr 3 17:30:20 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Fri Apr 3 17:30:20 2015 -0700
----------------------------------------------------------------------
.../distributed/dht/GridDhtLockFuture.java | 10 +++-
.../distributed/dht/GridDhtTxLocalAdapter.java | 49 +++++++++++---------
.../ignite/testsuites/IgniteCacheTestSuite.java | 3 +-
3 files changed, 38 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92a7aad4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 7e93946..2c31a13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -862,10 +862,18 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
invalidateRdr,
cctx);
- if (needVal)
+ if (needVal) {
// Mark last added key as needed to be preloaded.
req.markLastKeyForPreload();
+ if (tx != null) {
+ IgniteTxEntry txEntry = tx.entry(e.txKey());
+
+ // NOOP entries will be sent to backups on prepare step.
+ txEntry.op(GridCacheOperation.NOOP);
+ }
+ }
+
it.set(addOwned(req, e));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92a7aad4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
index 5e37d96..54ceb36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
@@ -444,46 +444,53 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter {
GridDhtCacheAdapter dhtCache = cacheCtx.isNear() ? cacheCtx.near().dht() : cacheCtx.dht();
try {
- IgniteTxEntry entry = txMap.get(e.txKey());
-
- if (entry != null) {
- entry.op(e.op()); // Absolutely must set operation, as default is DELETE.
- entry.value(e.value(), e.hasWriteValue(), e.hasReadValue());
- entry.entryProcessors(e.entryProcessors());
- entry.ttl(e.ttl());
- entry.filters(e.filters());
- entry.expiry(e.expiry());
-
- entry.conflictExpireTime(e.conflictExpireTime());
- entry.conflictVersion(e.conflictVersion());
+ IgniteTxEntry existing = txMap.get(e.txKey());
+
+ if (existing != null) {
+ // Must keep NOOP operation if received READ because it means that the lock was sent to a backup node.
+ if (e.op() == READ) {
+ if (existing.op() != NOOP)
+ existing.op(e.op());
+ }
+ else
+ existing.op(e.op()); // Absolutely must set operation, as default is DELETE.
+
+ existing.value(e.value(), e.hasWriteValue(), e.hasReadValue());
+ existing.entryProcessors(e.entryProcessors());
+ existing.ttl(e.ttl());
+ existing.filters(e.filters());
+ existing.expiry(e.expiry());
+
+ existing.conflictExpireTime(e.conflictExpireTime());
+ existing.conflictVersion(e.conflictVersion());
}
else {
- entry = e;
+ existing = e;
addActiveCache(dhtCache.context());
- GridDhtCacheEntry cached = dhtCache.entryExx(entry.key(), topologyVersion());
+ GridDhtCacheEntry cached = dhtCache.entryExx(existing.key(), topologyVersion());
- entry.cached(cached);
+ existing.cached(cached);
- GridCacheVersion explicit = entry.explicitVersion();
+ GridCacheVersion explicit = existing.explicitVersion();
if (explicit != null) {
GridCacheVersion dhtVer = cctx.mvcc().mappedVersion(explicit);
if (dhtVer == null)
- throw new IgniteCheckedException("Failed to find dht mapping for explicit entry version: " + entry);
+ throw new IgniteCheckedException("Failed to find dht mapping for explicit entry version: " + existing);
- entry.explicitVersion(dhtVer);
+ existing.explicitVersion(dhtVer);
}
- txMap.put(entry.txKey(), entry);
+ txMap.put(existing.txKey(), existing);
if (log.isDebugEnabled())
- log.debug("Added entry to transaction: " + entry);
+ log.debug("Added entry to transaction: " + existing);
}
- return addReader(msgId, dhtCache.entryExx(entry.key()), entry, topologyVersion());
+ return addReader(msgId, dhtCache.entryExx(existing.key()), existing, topologyVersion());
}
catch (GridDhtInvalidPartitionException ex) {
addInvalidPartition(cacheCtx, ex.partition());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92a7aad4/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 d5ae2e6..f90ab72 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
@@ -406,8 +406,7 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(IgniteCacheAtomicCopyOnReadDisabledTest.class);
suite.addTestSuite(IgniteCacheTxCopyOnReadDisabledTest.class);
- // TODO: IGNITE-477.
- // suite.addTestSuite(IgniteCacheTxPreloadNoWriteTest.class);
+ suite.addTestSuite(IgniteCacheTxPreloadNoWriteTest.class);
suite.addTestSuite(IgniteDynamicCacheStartSelfTest.class);
suite.addTestSuite(IgniteCacheDynamicStopSelfTest.class);
[21/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-680
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-680
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/68a99f11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/68a99f11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/68a99f11
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 68a99f116dfc760a51016cc30390a363077fd8b0
Parents: 3cdf666 5f2d8c2
Author: sboikov <sb...@gridgain.com>
Authored: Tue Apr 7 13:30:10 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Apr 7 13:30:10 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 3 -
.../processors/cache/CacheLazyEntry.java | 10 +-
.../processors/cache/KeyCacheObjectImpl.java | 13 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 3 +-
.../IgniteCacheObjectProcessorImpl.java | 28 +--
.../internal/visor/log/VisorLogSearchTask.java | 3 +-
.../visor/query/VisorQueryNextPageTask.java | 5 +-
.../org/apache/ignite/lang/IgniteImmutable.java | 49 -----
.../ignite/IgniteCacheAffinitySelfTest.java | 5 +
.../GridCacheOnCopyFlagAbstractSelfTest.java | 112 +----------
.../GridCacheReturnValueTransferSelfTest.java | 1 -
.../IgniteCacheStoreValueAbstractTest.java | 186 ++++++++++++++++++-
pom.xml | 12 +-
13 files changed, 215 insertions(+), 215 deletions(-)
----------------------------------------------------------------------
[27/50] incubator-ignite git commit: ignite-624 - fix
Posted by sb...@apache.org.
ignite-624 - fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cf1cf9d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cf1cf9d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cf1cf9d0
Branch: refs/heads/ignite-437-sqltests-p2
Commit: cf1cf9d00788482abe89feeb39746f24035fc53b
Parents: 3daa0b6
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 01:20:07 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 01:20:07 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/util/lang/GridFunc.java | 14 ++++
.../processors/query/h2/sql/GridSqlElement.java | 8 ---
.../processors/query/h2/sql/GridSqlQuery.java | 26 +++++--
.../query/h2/sql/GridSqlQueryParser.java | 7 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 25 ++++---
.../processors/query/h2/sql/GridSqlSelect.java | 73 +++++++++++++-------
.../processors/query/h2/sql/GridSqlUnion.java | 10 +++
.../query/h2/sql/GridQueryParsingTest.java | 6 +-
.../query/h2/sql/IgniteVsH2QueryTest.java | 17 ++++-
9 files changed, 131 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index edd66d7..773b9ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -5429,6 +5429,20 @@ public class GridFunc {
}
/**
+ * @param c Target collection.
+ * @param it Iterator to fetch.
+ * @return Modified target collection.
+ */
+ public static <T, C extends Collection<T>> C addAll(C c, Iterator<? extends T> it) {
+ if (it != null) {
+ while (it.hasNext())
+ c.add(it.next());
+ }
+
+ return c;
+ }
+
+ /**
* Gets the value with given key. If that value does not exist, calls given
* closure to get the default value, puts it into the map and returns it. If
* closure is {@code null} return {@code null}.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
index 7ebdba1..a1c91ff 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
@@ -51,14 +51,6 @@ public abstract class GridSqlElement implements Cloneable, Iterable<GridSqlEleme
public abstract String getSQL();
/**
- * Clears all children.
- */
- public void clearChildren() {
- if (size() != 0)
- children = new ArrayList<>();
- }
-
- /**
* @param expr Expr.
* @return {@code this}.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
index 5953d5e..c40632f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.query.h2.sql;
-import org.apache.ignite.*;
import org.h2.util.*;
import java.util.*;
@@ -107,12 +106,25 @@ public abstract class GridSqlQuery implements Cloneable {
}
/**
+ * @return Number of visible columns.
+ */
+ protected abstract int visibleColumns();
+
+ /**
+ * @param col Column index.
+ * @return Expression for column index.
+ */
+ protected abstract GridSqlElement expression(int col);
+
+ /**
* @param buff Statement builder.
*/
protected void getSortLimitSQL(StatementBuilder buff) {
if (!sort.isEmpty()) {
buff.append("\nORDER BY ");
+ int visibleCols = visibleColumns();
+
boolean first = true;
for (GridSqlSortColumn col : sort) {
@@ -123,11 +135,17 @@ public abstract class GridSqlQuery implements Cloneable {
int idx = col.column();
- if (idx >= 0)
+ assert idx >= 0 : idx;
+
+ if (idx < visibleCols)
buff.append(idx + 1);
else {
- throw new IgniteException("Failed to generate query: " + buff);
-// buff.append('=').append(StringUtils.unEnclose(entry.getKey().getSQL()));
+ GridSqlElement expr = expression(idx);
+
+ if (expr == null) // For plain select should never be null, for union H2 itself can't parse query.
+ throw new IllegalStateException("Failed to build query: " + buff.toString());
+
+ buff.append('=').append(StringUtils.unEnclose(expr.getSQL()));
}
if (!col.asc())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index ea3628f..b174d71 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
@@ -270,8 +270,8 @@ public class GridSqlQueryParser {
ArrayList<Expression> expressions = select.getExpressions();
- for (Expression exp : expressions)
- res.addExpression(parseExpression(exp));
+ for (int i = 0; i < expressions.size(); i++)
+ res.addSelectExpression(parseExpression(expressions.get(i)), i < select.getColumnCount());
int[] grpIdx = GROUP_INDEXES.get(select);
@@ -290,9 +290,6 @@ public class GridSqlQueryParser {
res.having(parseExpression(expressions.get(havingIdx)));
}
- for (int i = 0; i < select.getColumnCount(); i++)
- res.addSelectExpression(parseExpression(expressions.get(i)));
-
processSortOrder(select.getSortOrder(), res);
res.limit(parseExpression(select.getLimit()));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 05928c2..b84084b 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.query.h2.sql;
import org.apache.ignite.*;
import org.apache.ignite.internal.processors.cache.query.*;
+import org.apache.ignite.internal.util.typedef.*;
import org.h2.jdbc.*;
import org.h2.value.*;
import org.jetbrains.annotations.*;
@@ -89,7 +90,7 @@ public class GridSqlQuerySplitter {
int c = 0;
- for (GridSqlElement expr : left.select()) {
+ for (GridSqlElement expr : left.select(true)) {
String colName;
if (expr instanceof GridSqlAlias)
@@ -102,11 +103,12 @@ public class GridSqlQuerySplitter {
expr = alias(colName, expr);
// Set generated alias to the expression.
- left.select().set(c, expr);
- left.allExpressions().set(c, expr);
+ left.setSelectExpression(c, expr);
}
- srcQry.addSelectExpression(column(colName));
+ GridSqlColumn col = column(colName);
+
+ srcQry.addSelectExpression(col, true);
qry0.sort();
@@ -126,8 +128,8 @@ public class GridSqlQuerySplitter {
GridSqlSelect rdcQry = new GridSqlSelect().from(new GridSqlFunction("PUBLIC", TABLE_FUNC_NAME)); // table(mergeTable)); TODO
// Split all select expressions into map-reduce parts.
- List<GridSqlElement> mapExps = new ArrayList<>(srcQry.allExpressions());
- GridSqlElement[] rdcExps = new GridSqlElement[srcQry.select().size()];
+ List<GridSqlElement> mapExps = F.addAll(new ArrayList<GridSqlElement>(), srcQry.select(false).iterator());
+ GridSqlElement[] rdcExps = new GridSqlElement[srcQry.visibleColumns()];
Set<String> colNames = new HashSet<>();
@@ -140,13 +142,13 @@ public class GridSqlQuerySplitter {
mapQry.clearSelect();
for (GridSqlElement exp : mapExps)
- mapQry.addSelectExpression(exp);
+ mapQry.addSelectExpression(exp, true);
for (GridSqlElement rdcExp : rdcExps)
- rdcQry.addSelectExpression(rdcExp);
+ rdcQry.addSelectExpression(rdcExp, true);
// -- GROUP BY
- if (!srcQry.groups().isEmpty()) {
+ if (srcQry.hasGroupBy()) {
mapQry.clearGroups();
for (int col : srcQry.groupColumns())
@@ -219,6 +221,9 @@ public class GridSqlQuerySplitter {
findParams(union.left(), params, target);
findParams(union.right(), params, target);
+ findParams(qry.limit(), params, target);
+ findParams(qry.offset(), params, target);
+
return target;
}
@@ -232,7 +237,7 @@ public class GridSqlQuerySplitter {
if (params.length == 0)
return target;
- for (GridSqlElement el : qry.allExpressions())
+ for (GridSqlElement el : qry.select(false))
findParams(el, params, target);
findParams(qry.from(), params, target);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
index 154659b..398ae10 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -26,7 +26,7 @@ import java.util.*;
*/
public class GridSqlSelect extends GridSqlQuery {
/** */
- private List<GridSqlElement> allExprs;
+ private List<GridSqlElement> allExprs = new ArrayList<>();
/** */
private List<GridSqlElement> select = new ArrayList<>();
@@ -50,6 +50,16 @@ public class GridSqlSelect extends GridSqlQuery {
private int havingCol = -1;
/** {@inheritDoc} */
+ @Override public int visibleColumns() {
+ return select.size();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected GridSqlElement expression(int col) {
+ return allExprs.get(col);
+ }
+
+ /** {@inheritDoc} */
@Override public String getSQL() {
StatementBuilder buff = new StatementBuilder("SELECT");
@@ -91,27 +101,11 @@ public class GridSqlSelect extends GridSqlQuery {
}
/**
- * @param expression Expression.
- */
- public void addExpression(GridSqlElement expression) {
- if (allExprs == null)
- allExprs = new ArrayList<>();
-
- allExprs.add(expression);
- }
-
- /**
- * @return All expressions in select, group by, order by.
- */
- public List<GridSqlElement> allExpressions() {
- return allExprs;
- }
-
- /**
- * @return Expressions.
+ * @param visibleOnly If only visible expressions needed.
+ * @return Select phrase expressions.
*/
- public List<GridSqlElement> select() {
- return select;
+ public Iterable<GridSqlElement> select(boolean visibleOnly) {
+ return visibleOnly ? select : allExprs;
}
/**
@@ -119,26 +113,55 @@ public class GridSqlSelect extends GridSqlQuery {
*/
public void clearSelect() {
select = new ArrayList<>();
+ allExprs = new ArrayList<>();
}
/**
* @param expression Expression.
+ * @param visible Expression is visible in select phrase.
*/
- public void addSelectExpression(GridSqlElement expression) {
+ public void addSelectExpression(GridSqlElement expression, boolean visible) {
if (expression == null)
throw new NullPointerException();
- select.add(expression);
+ if (visible) {
+ if (select.size() != allExprs.size())
+ throw new IllegalStateException("Already started adding invisible columns.");
+
+ select.add(expression);
+ }
+ else if (select.isEmpty())
+ throw new IllegalStateException("No visible columns.");
+
+ allExprs.add(expression);
+ }
+
+ /**
+ * @param colIdx Column index.
+ * @param expression Expression.
+ */
+ public void setSelectExpression(int colIdx, GridSqlElement expression) {
+ if (colIdx < select.size()) // Assuming that all the needed expressions were already added.
+ select.set(colIdx, expression);
+
+ allExprs.set(colIdx, expression);
}
/**
* @return Expressions.
*/
- public List<GridSqlElement> groups() {
+ public Iterable<GridSqlElement> groups() {
return groups;
}
/**
+ * @return {@code true} If the select has group by expression.
+ */
+ public boolean hasGroupBy() {
+ return !groups.isEmpty();
+ }
+
+ /**
*
*/
public void clearGroups() {
@@ -252,7 +275,7 @@ public class GridSqlSelect extends GridSqlQuery {
res.groups = new ArrayList<>(groups);
res.grpCols = grpCols == null ? null : grpCols.clone();
res.select = new ArrayList<>(select);
- res.allExprs = null;
+ res.allExprs = new ArrayList<>(allExprs);
return res;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
index 6fe3f19..90d9e41 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
@@ -36,6 +36,16 @@ public class GridSqlUnion extends GridSqlQuery {
private GridSqlQuery left;
/** {@inheritDoc} */
+ @Override protected int visibleColumns() {
+ return left.visibleColumns();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected GridSqlElement expression(int col) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
@Override public String getSQL() {
StatementBuilder buff = new StatementBuilder();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index 83162f0..66ba6ac 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -208,6 +208,8 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("select name from Person UNION select street from Address limit ?");
checkQuery("select name from Person UNION select street from Address limit ? offset ?");
checkQuery("(select name from Person limit 4) UNION (select street from Address limit 1) limit ? offset ?");
+ checkQuery("(select 2 a) union all (select 1) order by 1");
+ checkQuery("(select 2 a) union all (select 1) order by a desc nulls first limit ? offset ?");
}
/**
@@ -282,9 +284,9 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
else
throw new UnsupportedOperationException();
- assertSqlEquals(prepared.getPlanSQL(), res);
-
System.out.println(normalizeSql(res));
+
+ assertSqlEquals(prepared.getPlanSQL(), res);
}
@QuerySqlFunction
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
index 1f4771a..5da72b4 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
@@ -526,7 +526,7 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testSimpleReplSelect() throws Exception {
+ public void _testSimpleReplSelect() throws Exception {
compareQueryRes0("select id, name, price from \"repl\".Product");
}
@@ -555,6 +555,21 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
}
/**
+ *
+ */
+ public void testUnion() throws SQLException {
+ String base = "select _val v from \"part\".Person";
+
+ compareQueryRes0(base + " union all " + base);
+ compareQueryRes0(base + " union " + base);
+
+ base = "select firstName||lastName name, salary from \"part\".Person";
+
+ assertEquals(10, compareOrderedQueryRes0(base + " union all " + base + " order by salary desc").size());
+ assertEquals(5, compareOrderedQueryRes0(base + " union " + base + " order by salary desc").size());
+ }
+
+ /**
* @throws Exception If failed.
*/
public void testEmptyResult() throws Exception {
[15/50] incubator-ignite git commit: Merge branches 'ignite-639' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-639
Posted by sb...@apache.org.
Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f600e7e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f600e7e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f600e7e8
Branch: refs/heads/ignite-437-sqltests-p2
Commit: f600e7e833055e9965209dcd8cdfc933b9cfe01a
Parents: f1eaf29 e144a68
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Apr 7 11:29:54 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Apr 7 11:29:54 2015 +0700
----------------------------------------------------------------------
.../ignite/internal/visor/cache/VisorCache.java | 17 ++++-
.../VisorCacheConfigurationCollectorJob.java | 76 ++++++++++++++++++++
.../VisorCacheConfigurationCollectorTask.java | 39 ++++++++++
.../VisorIgfsProfilerUniformityCounters.java | 6 +-
.../visor/node/VisorGridConfiguration.java | 38 ----------
.../visor/node/VisorIgfsConfiguration.java | 2 +-
.../visor/node/VisorRestConfiguration.java | 1 +
.../internal/visor/util/VisorTaskUtils.java | 3 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../commands/cache/VisorCacheCommand.scala | 20 +++---
.../config/VisorConfigurationCommand.scala | 15 ++--
.../visor/commands/gc/VisorGcCommand.scala | 15 ++--
.../scala/org/apache/ignite/visor/visor.scala | 34 +++++++--
13 files changed, 191 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f600e7e8/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f600e7e8/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --cc modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 4d35b35,91317c9..055931b
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@@ -214,229 -200,202 +214,229 @@@ class VisorCacheCommand
* @param args Command arguments.
*/
def cache(args: String) {
- breakable {
- if (!isConnected)
- adviseToConnect()
- else {
- var argLst = parseArgs(args)
-
- if (hasArgFlag("i", argLst)) {
- askForNode("Select node from:") match {
- case Some(nid) => ask("Detailed statistics (y/n) [n]: ", "n") match {
- case "n" | "N" => nl(); cache("-id=" + nid).^^
- case "y" | "Y" => nl(); cache("-a -id=" + nid).^^
- case x => nl(); warn("Invalid answer: " + x).^^
- }
- case None => break()
+ if (!isConnected)
+ adviseToConnect()
+ else {
+ var argLst = parseArgs(args)
+
+ if (hasArgFlag("i", argLst)) {
+ askForNode("Select node from:") match {
+ case Some(nid) => ask("Detailed statistics (y/n) [n]: ", "n") match {
+ case "n" | "N" => nl(); cache("-id=" + nid).^^
+ case "y" | "Y" => nl(); cache("-a -id=" + nid).^^
+ case x => nl(); warn("Invalid answer: " + x).^^
}
-
- break()
+ case None => return
}
- val node = parseNode(argLst) match {
- case Left(msg) =>
- scold(msg)
-
- break()
-
- case Right(n) => n
- }
+ return
+ }
- val cacheName = argValue("c", argLst) match {
- case Some(dfltName) if dfltName == DFLT_CACHE_KEY || dfltName == DFLT_CACHE_NAME =>
- argLst = argLst.filter(_._1 != "c") ++ Seq("c" -> null)
+ val node = parseNode(argLst) match {
+ case Left(msg) =>
+ scold(msg)
- Some(null)
+ return
- case cn => cn
- }
+ case Right(n) => n
+ }
- if (Seq("clear", "swap", "scan").exists(hasArgFlag(_, argLst))) {
- if (cacheName.isEmpty)
- askForCache("Select cache from:", node) match {
- case Some(name) => argLst = argLst ++ Seq("c" -> name)
- case None => break()
- }
+ val showSystem = hasArgFlag("system", argLst)
- if (hasArgFlag("clear", argLst))
- VisorCacheClearCommand().clear(argLst, node)
- else if (hasArgFlag("swap", argLst))
- VisorCacheSwapCommand().swap(argLst, node)
- else if (hasArgFlag("scan", argLst))
- VisorCacheScanCommand().scan(argLst, node)
+ var cacheName = argValue("c", argLst) match {
+ case Some(dfltName) if dfltName == DFLT_CACHE_KEY || dfltName == DFLT_CACHE_NAME =>
+ argLst = argLst.filter(_._1 != "c") ++ Seq("c" -> null)
- break()
- }
+ Some(null)
- val all = hasArgFlag("a", argLst)
-
- val sortType = argValue("s", argLst)
- val reversed = hasArgName("r", argLst)
+ case cn => cn
+ }
- if (sortType.isDefined && !isValidSortType(sortType.get))
- scold("Invalid '-s' argument in: " + args).^^
+ /** Check that argument list has flag from list. */
+ def hasArgFlagIn(flags: String *) = {
+ flags.exists(hasArgFlag(_, argLst))
+ }
- // Get cache stats data from all nodes.
- val aggrData = cacheData(node, cacheName)
+ // Get cache stats data from all nodes.
+ val aggrData = cacheData(node, cacheName, showSystem)
- if (aggrData.isEmpty)
- scold("No caches found.").^^
+ if (hasArgFlagIn("clear", "swap", "scan", "stop")) {
+ if (cacheName.isEmpty)
+ askForCache("Select cache from:", node, showSystem && !hasArgFlagIn("clear", "swap", "stop"),
+ aggrData) match {
+ case Some(name) =>
+ argLst = argLst ++ Seq("c" -> name)
- println("Time of the snapshot: " + formatDateTime(System.currentTimeMillis))
+ cacheName = Some(name)
- val sumT = VisorTextTable()
+ case None => return
+ }
- sumT #= ("Name(@)", "Nodes", "Entries", "Hits", "Misses", "Reads", "Writes")
+ cacheName.foreach(name => {
+ if (hasArgFlag("scan", argLst))
+ VisorCacheScanCommand().scan(argLst, node)
+ else {
+ if (!aggrData.exists(cache => safeEquals(cache.name(), name) && cache.system())) {
+ if (hasArgFlag("clear", argLst))
+ VisorCacheClearCommand().clear(argLst, node)
+ else if (hasArgFlag("swap", argLst))
+ VisorCacheSwapCommand().swap(argLst, node)
+ else if (hasArgFlag("stop", argLst))
+ VisorCacheStopCommand().scan(argLst, node)
+ }
+ else {
+ if (hasArgFlag("clear", argLst))
+ warn("Clearing of system cache is not allowed: " + name)
+ else if (hasArgFlag("swap", argLst))
+ warn("Backup swapping of system cache is not allowed: " + name)
+ else if (hasArgFlag("stop", argLst))
+ warn("Stopping of system cache is not allowed: " + name)
+ }
+ }
+ })
- sortAggregatedData(aggrData, sortType.getOrElse("cn"), reversed).foreach(
- ad => {
- // Add cache host as visor variable.
- registerCacheName(ad.cacheName)
+ return
+ }
- sumT += (
- mkCacheName(ad.cacheName),
- ad.nodes,
- (
- "min: " + ad.minimumSize,
- "avg: " + formatDouble(ad.averageSize),
- "max: " + ad.maximumSize
- ),
- (
- "min: " + ad.minimumHits,
- "avg: " + formatDouble(ad.averageHits),
- "max: " + ad.maximumHits
- ),
- (
- "min: " + ad.minimumMisses,
- "avg: " + formatDouble(ad.averageMisses),
- "max: " + ad.maximumMisses
- ),
- (
- "min: " + ad.minimumReads,
- "avg: " + formatDouble(ad.averageReads),
- "max: " + ad.maximumReads
- ),
- (
- "min: " + ad.minimumWrites,
- "avg: " + formatDouble(ad.averageWrites),
- "max: " + ad.maximumWrites
- )
+ val all = hasArgFlag("a", argLst)
+
+ val sortType = argValue("s", argLst)
+ val reversed = hasArgName("r", argLst)
+
+ if (sortType.isDefined && !isValidSortType(sortType.get))
+ scold("Invalid '-s' argument in: " + args).^^
+
+ if (aggrData.isEmpty)
+ scold("No caches found.").^^
+
+ println("Time of the snapshot: " + formatDateTime(System.currentTimeMillis))
+
+ val sumT = VisorTextTable()
+
+ sumT #= ("Name(@)", "Mode", "Nodes", "Entries", "Hits", "Misses", "Reads", "Writes")
+
+ sortAggregatedData(aggrData, sortType.getOrElse("cn"), reversed).foreach(
+ ad => {
+ // Add cache host as visor variable.
+ registerCacheName(ad.name())
+
+ sumT += (
+ mkCacheName(ad.name()),
+ ad.mode(),
+ ad.nodes,
+ (
+ "min: " + ad.minimumSize,
+ "avg: " + formatDouble(ad.averageSize),
+ "max: " + ad.maximumSize
+ ),
+ (
+ "min: " + ad.minimumHits,
+ "avg: " + formatDouble(ad.averageHits),
+ "max: " + ad.maximumHits
+ ),
+ (
+ "min: " + ad.minimumMisses,
+ "avg: " + formatDouble(ad.averageMisses),
+ "max: " + ad.maximumMisses
+ ),
+ (
+ "min: " + ad.minimumReads,
+ "avg: " + formatDouble(ad.averageReads),
+ "max: " + ad.maximumReads
+ ),
+ (
+ "min: " + ad.minimumWrites,
+ "avg: " + formatDouble(ad.averageWrites),
+ "max: " + ad.maximumWrites
)
- }
- )
+ )
+ }
+ )
- sumT.render()
+ sumT.render()
- if (all) {
- val sorted = aggrData.sortWith((k1, k2) => {
- if (k1.cacheName == null)
- true
- else if (k2.cacheName == null)
- false
- else k1.cacheName.compareTo(k2.cacheName) < 0
- })
+ if (all) {
+ val sorted = aggrData.sortWith((k1, k2) => {
+ if (k1.name() == null)
+ true
+ else if (k2.name() == null)
+ false
+ else k1.name().compareTo(k2.name()) < 0
+ })
- val gCfg = node.map(config).collect {
- case cfg if cfg != null => cfg
- }
+ val gCfg = node.map(config).collect {
+ case cfg if cfg != null => cfg
+ }
- sorted.foreach(ad => {
- val cacheNameVar = mkCacheName(ad.cacheName)
+ sorted.foreach(ad => {
+ val cacheNameVar = mkCacheName(ad.name())
- println("\nCache '" + cacheNameVar + "':")
+ println("\nCache '" + cacheNameVar + "':")
- val m = ad.metrics()
+ val m = ad.metrics()
- val csT = VisorTextTable()
+ val csT = VisorTextTable()
- csT += ("Name(@)", cacheNameVar)
- csT += ("Nodes", m.size())
- csT += ("Size Min/Avg/Max", ad.minimumSize + " / " + formatDouble(ad.averageSize) + " / " + ad.maximumSize)
+ csT += ("Name(@)", cacheNameVar)
+ csT += ("Nodes", m.size())
+ csT += ("Size Min/Avg/Max", ad.minimumSize + " / " + formatDouble(ad.averageSize) + " / " + ad.maximumSize)
- val ciT = VisorTextTable()
+ val ciT = VisorTextTable()
- ciT #= ("Node ID8(@), IP", "CPUs", "Heap Used", "CPU Load", "Up Time", "Size", "Hi/Mi/Rd/Wr")
+ ciT #= ("Node ID8(@), IP", "CPUs", "Heap Used", "CPU Load", "Up Time", "Size", "Hi/Mi/Rd/Wr")
- sortData(m.toMap, sortType.getOrElse("hi"), reversed).foreach { case (nid, cm) =>
- val nm = ignite.cluster.node(nid).metrics()
+ sortData(m.toMap, sortType.getOrElse("hi"), reversed).foreach { case (nid, cm) =>
+ val nm = ignite.cluster.node(nid).metrics()
- ciT += (
- nodeId8Addr(nid),
- nm.getTotalCpus,
- formatDouble(100d * nm.getHeapMemoryUsed / nm.getHeapMemoryMaximum) + " %",
+ ciT += (
+ nodeId8Addr(nid),
+ nm.getTotalCpus,
+ formatDouble(100d * nm.getHeapMemoryUsed / nm.getHeapMemoryMaximum) + " %",
- formatDouble(nm.getCurrentCpuLoad * 100d) + " %",
- X.timeSpan2HMSM(nm.getUpTime),
- cm.keySize(),
- (
- "Hi: " + cm.hits(),
- "Mi: " + cm.misses(),
- "Rd: " + cm.reads(),
- "Wr: " + cm.writes()
- )
+ formatDouble(nm.getCurrentCpuLoad * 100d) + " %",
+ X.timeSpan2HMSM(nm.getUpTime),
+ cm.keySize(),
+ (
+ "Hi: " + cm.hits(),
+ "Mi: " + cm.misses(),
+ "Rd: " + cm.reads(),
+ "Wr: " + cm.writes()
)
- }
+ )
+ }
- csT.render()
+ csT.render()
- nl()
- println("Nodes for: " + cacheNameVar)
+ nl()
+ println("Nodes for: " + cacheNameVar)
- ciT.render()
+ ciT.render()
- // Print footnote.
- println("'Hi' - Number of cache hits.")
- println("'Mi' - Number of cache misses.")
- println("'Rd' - number of cache reads.")
- println("'Wr' - Number of cache writes.")
+ // Print footnote.
+ println("'Hi' - Number of cache hits.")
+ println("'Mi' - Number of cache misses.")
+ println("'Rd' - number of cache reads.")
+ println("'Wr' - Number of cache writes.")
- // Print metrics.
- nl()
- println("Aggregated queries metrics:")
- println(" Minimum execution time: " + X.timeSpan2HMSM(ad.minimumQueryTime()))
- println(" Maximum execution time: " + X.timeSpan2HMSM(ad.maximumQueryTime))
- println(" Average execution time: " + X.timeSpan2HMSM(ad.averageQueryTime.toLong))
- println(" Total number of executions: " + ad.execsQuery)
- println(" Total number of failures: " + ad.failsQuery)
+ // Print metrics.
+ nl()
+ println("Aggregated queries metrics:")
+ println(" Minimum execution time: " + X.timeSpan2HMSM(ad.minimumQueryTime()))
+ println(" Maximum execution time: " + X.timeSpan2HMSM(ad.maximumQueryTime))
+ println(" Average execution time: " + X.timeSpan2HMSM(ad.averageQueryTime.toLong))
+ println(" Total number of executions: " + ad.execsQuery)
+ println(" Total number of failures: " + ad.failsQuery)
- gCfg.foreach(_.caches().find(_.name() == ad.name()).foreach(cfg => {
- nl()
- gCfg.foreach(ccfgs => ccfgs.find(ccfg => safeEquals(ccfg.name(), ad.cacheName()))
- .foreach(ccfg => {
- nl()
++ gCfg.foreach(ccfgs => ccfgs.find(ccfg => safeEquals(ccfg.name(), ad.name()))
++ .foreach(ccfg => {
++ nl()
- showCacheConfiguration("Cache configuration:", cfg)
- showCacheConfiguration("Cache configuration:", ccfg)
- }))
- })
- }
- else
- println("\nUse \"-a\" flag to see detailed statistics.")
++ showCacheConfiguration("Cache configuration:", ccfg)
+ }))
+ })
-
}
+ else
+ println("\nUse \"-a\" flag to see detailed statistics.")
}
}
@@@ -506,15 -459,15 +506,15 @@@
}
/**
- * Gets configuration of grid from specified node for callecting of node cache's configuration.
+ * Gets configuration of grid from specified node for collecting of node cache's configuration.
*
* @param node Specified node.
- * @return Grid configuration for specified node.
+ * @return Cache configurations for specified node.
*/
- private def config(node: ClusterNode): VisorGridConfiguration = {
- try
- ignite.compute(ignite.cluster.forNode(node)).withNoFailover()
- .execute(classOf[VisorNodeConfigurationCollectorTask], emptyTaskArgument(node.id()))
+ private def config(node: ClusterNode): JavaCollection[VisorCacheConfiguration] = {
+ try {
+ cacheConfigurations(node.id())
+ }
catch {
case e: IgniteException =>
scold(e.getMessage)
[44/50] incubator-ignite git commit: # IGNITE-685 NPE on node start
if client discovery is used.
Posted by sb...@apache.org.
# IGNITE-685 NPE on node start if client discovery is used.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/654b4e98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/654b4e98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/654b4e98
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 654b4e98f2f618e4ffffad6486d13f883a1a5d7d
Parents: 0cf79e4
Author: sevdokimov <se...@gridgain.com>
Authored: Wed Apr 8 13:03:01 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed Apr 8 13:29:06 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgnitionEx.java | 172 +++++++------------
1 file changed, 65 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/654b4e98/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index fe81006..a4aea66 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1675,23 +1675,32 @@ public class IgnitionEx {
*/
@SuppressWarnings("unchecked")
public void initializeDefaultCacheConfiguration(IgniteConfiguration cfg) throws IgniteCheckedException {
- CacheConfiguration[] cacheCfgs = cfg.getCacheConfiguration();
+ List<CacheConfiguration> cacheCfgs = new ArrayList<>();
- final boolean hasHadoop = IgniteComponentType.HADOOP.inClassPath();
+ boolean clientDisco = cfg.getDiscoverySpi() instanceof TcpClientDiscoverySpi;
- final boolean hasAtomics = cfg.getAtomicConfiguration() != null;
+ // Add marshaller and utility caches.
+ if (!clientDisco) {
+ cacheCfgs.add(marshallerSystemCache());
- final boolean clientDisco = cfg.getDiscoverySpi() instanceof TcpClientDiscoverySpi;
+ cacheCfgs.add(utilitySystemCache());
+ }
+
+ if (IgniteComponentType.HADOOP.inClassPath())
+ cacheCfgs.add(CU.hadoopSystemCache());
- CacheConfiguration[] copies;
+ if (cfg.getAtomicConfiguration() != null && !clientDisco)
+ cacheCfgs.add(atomicsSystemCache(cfg.getAtomicConfiguration()));
- if (cacheCfgs != null && cacheCfgs.length > 0) {
+ CacheConfiguration[] userCaches = cfg.getCacheConfiguration();
+
+ if (userCaches != null && userCaches.length > 0) {
if (!U.discoOrdered(cfg.getDiscoverySpi()) && !U.relaxDiscoveryOrdered())
throw new IgniteCheckedException("Discovery SPI implementation does not support node ordering and " +
"cannot be used with cache (use SPI with @GridDiscoverySpiOrderSupport annotation, " +
"like GridTcpDiscoverySpi)");
- for (CacheConfiguration ccfg : cacheCfgs) {
+ for (CacheConfiguration ccfg : userCaches) {
if (CU.isHadoopSystemCache(ccfg.getName()))
throw new IgniteCheckedException("Cache name cannot be \"" + CU.SYS_CACHE_HADOOP_MR +
"\" because it is reserved for internal purposes.");
@@ -1709,52 +1718,15 @@ public class IgnitionEx {
"\" because it is reserved for internal purposes.");
}
- int addCacheCnt = 2; // Always add marshaller and utility caches.
-
- if (hasHadoop)
- addCacheCnt++;
-
- if (hasAtomics)
- addCacheCnt++;
-
- copies = new CacheConfiguration[cacheCfgs.length + addCacheCnt];
-
- int cloneIdx = 2;
-
- if (hasHadoop)
- copies[cloneIdx++] = CU.hadoopSystemCache();
-
- if (hasAtomics)
- copies[cloneIdx++] = atomicsSystemCache(cfg.getAtomicConfiguration(), clientDisco);
-
- for (CacheConfiguration ccfg : cacheCfgs)
- copies[cloneIdx++] = new CacheConfiguration(ccfg);
- }
- else {
- int cacheCnt = 2; // Always add marshaller and utility caches.
-
- if (hasHadoop)
- cacheCnt++;
-
- if (hasAtomics)
- cacheCnt++;
+ for (CacheConfiguration ccfg : userCaches) {
+ if (ccfg == null)
+ throw new NullPointerException("Cache configuration list must not contains null element");
- copies = new CacheConfiguration[cacheCnt];
-
- int cacheIdx = 2;
-
- if (hasHadoop)
- copies[cacheIdx++] = CU.hadoopSystemCache();
-
- if (hasAtomics)
- copies[cacheIdx] = atomicsSystemCache(cfg.getAtomicConfiguration(), clientDisco);
+ cacheCfgs.add(ccfg);
+ }
}
- // Always add marshaller and utility caches.
- copies[0] = marshallerSystemCache(clientDisco);
- copies[1] = utilitySystemCache(clientDisco);
-
- cfg.setCacheConfiguration(copies);
+ cfg.setCacheConfiguration(cacheCfgs.toArray(new CacheConfiguration[cacheCfgs.size()]));
}
/**
@@ -1899,78 +1871,64 @@ public class IgnitionEx {
*
* @return Marshaller system cache configuration.
*/
- private static CacheConfiguration marshallerSystemCache(boolean client) {
- if (!client) {
- CacheConfiguration cache = new CacheConfiguration();
-
- cache.setName(CU.MARSH_CACHE_NAME);
- cache.setCacheMode(REPLICATED);
- cache.setAtomicityMode(ATOMIC);
- cache.setSwapEnabled(false);
- cache.setRebalanceMode(SYNC);
- cache.setWriteSynchronizationMode(FULL_SYNC);
- cache.setAffinity(new RendezvousAffinityFunction(false, 20));
- cache.setNodeFilter(CacheConfiguration.ALL_NODES);
- cache.setStartSize(300);
-
- return cache;
- }
-
- return null;
+ private static CacheConfiguration marshallerSystemCache() {
+ CacheConfiguration cache = new CacheConfiguration();
+
+ cache.setName(CU.MARSH_CACHE_NAME);
+ cache.setCacheMode(REPLICATED);
+ cache.setAtomicityMode(ATOMIC);
+ cache.setSwapEnabled(false);
+ cache.setRebalanceMode(SYNC);
+ cache.setWriteSynchronizationMode(FULL_SYNC);
+ cache.setAffinity(new RendezvousAffinityFunction(false, 20));
+ cache.setNodeFilter(CacheConfiguration.ALL_NODES);
+ cache.setStartSize(300);
+
+ return cache;
}
/**
* Creates utility system cache configuration.
*
- * @param client If {@code true} creates client-only cache configuration.
* @return Utility system cache configuration.
*/
- private static CacheConfiguration utilitySystemCache(boolean client) {
- if (!client) {
- CacheConfiguration cache = new CacheConfiguration();
-
- cache.setName(CU.UTILITY_CACHE_NAME);
- cache.setCacheMode(REPLICATED);
- cache.setAtomicityMode(TRANSACTIONAL);
- cache.setSwapEnabled(false);
- cache.setRebalanceMode(SYNC);
- cache.setWriteSynchronizationMode(FULL_SYNC);
- cache.setAffinity(new RendezvousAffinityFunction(false, 100));
- cache.setNodeFilter(CacheConfiguration.ALL_NODES);
-
- return cache;
- }
-
- return null;
+ private static CacheConfiguration utilitySystemCache() {
+ CacheConfiguration cache = new CacheConfiguration();
+
+ cache.setName(CU.UTILITY_CACHE_NAME);
+ cache.setCacheMode(REPLICATED);
+ cache.setAtomicityMode(TRANSACTIONAL);
+ cache.setSwapEnabled(false);
+ cache.setRebalanceMode(SYNC);
+ cache.setWriteSynchronizationMode(FULL_SYNC);
+ cache.setAffinity(new RendezvousAffinityFunction(false, 100));
+ cache.setNodeFilter(CacheConfiguration.ALL_NODES);
+
+ return cache;
}
/**
* Creates cache configuration for atomic data structures.
*
* @param cfg Atomic configuration.
- * @param client If {@code true} creates client-only cache configuration.
* @return Cache configuration for atomic data structures.
*/
- private static CacheConfiguration atomicsSystemCache(AtomicConfiguration cfg, boolean client) {
- if (!client) {
- CacheConfiguration ccfg = new CacheConfiguration();
-
- ccfg.setName(CU.ATOMICS_CACHE_NAME);
- ccfg.setAtomicityMode(TRANSACTIONAL);
- ccfg.setSwapEnabled(false);
- ccfg.setRebalanceMode(SYNC);
- ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setCacheMode(cfg.getCacheMode());
- ccfg.setNodeFilter(CacheConfiguration.ALL_NODES);
- ccfg.setNearConfiguration(new NearCacheConfiguration());
-
- if (cfg.getCacheMode() == PARTITIONED)
- ccfg.setBackups(cfg.getBackups());
-
- return ccfg;
- }
-
- return null;
+ private static CacheConfiguration atomicsSystemCache(AtomicConfiguration cfg) {
+ CacheConfiguration ccfg = new CacheConfiguration();
+
+ ccfg.setName(CU.ATOMICS_CACHE_NAME);
+ ccfg.setAtomicityMode(TRANSACTIONAL);
+ ccfg.setSwapEnabled(false);
+ ccfg.setRebalanceMode(SYNC);
+ ccfg.setWriteSynchronizationMode(FULL_SYNC);
+ ccfg.setCacheMode(cfg.getCacheMode());
+ ccfg.setNodeFilter(CacheConfiguration.ALL_NODES);
+ ccfg.setNearConfiguration(new NearCacheConfiguration());
+
+ if (cfg.getCacheMode() == PARTITIONED)
+ ccfg.setBackups(cfg.getBackups());
+
+ return ccfg;
}
/**
[36/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@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/080376af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/080376af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/080376af
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 080376afa04e2c4be07371518d44e5b02c87d088
Parents: 76f8049 3f6beb3
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 8 14:38:27 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 8 14:38:27 2015 +0700
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheIoManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[06/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-477
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-477
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae4dda19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae4dda19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae4dda19
Branch: refs/heads/ignite-437-sqltests-p2
Commit: ae4dda19f3f1c91ef41b4e6e6d3512a01f401ba1
Parents: 92a7aad e6a6b64
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Mon Apr 6 11:02:12 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Mon Apr 6 11:02:12 2015 -0700
----------------------------------------------------------------------
assembly/release-fabric.xml | 5 -
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
modules/clients/readme.md | 2 -
.../apache/ignite/internal/GridComponent.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../ignite/internal/GridPluginComponent.java | 4 +-
.../org/apache/ignite/internal/IgniteEx.java | 7 -
.../apache/ignite/internal/IgniteKernal.java | 27 +---
.../ignite/internal/IgniteNodeAttributes.java | 3 -
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../internal/managers/GridManagerAdapter.java | 6 +-
.../processors/GridProcessorAdapter.java | 2 +-
.../processors/cache/CacheDistributionMode.java | 67 --------
.../internal/processors/cache/CacheType.java | 77 +++++++++
.../cache/DynamicCacheChangeRequest.java | 17 ++
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 ++-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 139 ++++++++++------
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 ++-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../DiscoveryNodeValidationProcessor.java | 27 ++++
.../OsDiscoveryNodeValidationProcessor.java | 72 +++++++++
.../processors/query/GridQueryProcessor.java | 8 +-
.../processors/task/GridTaskProcessor.java | 24 ++-
.../ignite/internal/util/IgniteUtils.java | 46 +++++-
.../internal/visor/util/VisorTaskUtils.java | 18 ++-
.../ignite/spi/IgniteNodeValidationResult.java | 66 ++++++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 2 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 --------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 106 +------------
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++---
.../cache/IgniteInternalCacheTypesTest.java | 159 +++++++++++++++++++
.../IgniteCollectionAbstractTest.java | 23 ---
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +-
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 --------------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/messaging/GridMessagingSelfTest.java | 50 ++++++
.../testframework/GridSpiTestContext.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../HadoopDefaultMapReducePlannerSelfTest.java | 5 -
.../query/h2/sql/GridSqlQuerySplitter.java | 22 ++-
.../h2/twostep/GridReduceQueryExecutor.java | 13 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
.../query/h2/sql/GridQueryParsingTest.java | 1 +
.../query/h2/sql/IgniteVsH2QueryTest.java | 7 +
modules/schedule/pom.xml | 20 +++
modules/yardstick/README.md | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 ++-
.../org/apache/ignite/yardstick/IgniteNode.java | 11 +-
parent/pom.xml | 49 +++---
pom.xml | 143 ++++++++++++++++-
70 files changed, 1177 insertions(+), 625 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae4dda19/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
[41/50] incubator-ignite git commit: ignite-624 - fix for reduce
invisible columns
Posted by sb...@apache.org.
ignite-624 - fix for reduce invisible columns
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d9e2a648
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d9e2a648
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d9e2a648
Branch: refs/heads/ignite-437-sqltests-p2
Commit: d9e2a648136b00cb688789a8216f0ae02c73bc93
Parents: bef34cd
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 13:12:23 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 13:12:23 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/util/lang/GridFunc.java | 9 +++++++++
.../query/h2/sql/GridSqlQuerySplitter.java | 15 +++++++++++----
.../processors/query/h2/sql/GridSqlSelect.java | 9 ++++++++-
.../processors/query/h2/sql/GridSqlUnion.java | 2 +-
4 files changed, 29 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9e2a648/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 773b9ee..fee53ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -5430,6 +5430,15 @@ public class GridFunc {
/**
* @param c Target collection.
+ * @param it Iterable to fetch.
+ * @return Modified target collection.
+ */
+ public static <T, C extends Collection<T>> C addAll(C c, Iterable<? extends T> it) {
+ return it == null ? c : addAll(c, it.iterator());
+ }
+
+ /**
+ * @param c Target collection.
* @param it Iterator to fetch.
* @return Modified target collection.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9e2a648/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index b84084b..79c73f0 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -83,7 +83,7 @@ public class GridSqlQuerySplitter {
if (qry0 instanceof GridSqlSelect)
srcQry = (GridSqlSelect)qry0;
- else {
+ else { // Handle UNION.
srcQry = new GridSqlSelect().from(new GridSqlSubquery(qry0));
GridSqlSelect left = leftest(qry0);
@@ -124,11 +124,15 @@ public class GridSqlQuerySplitter {
final String mergeTable = TABLE_FUNC_NAME + "()"; // table(0); TODO
+ // Create map and reduce queries.
GridSqlSelect mapQry = srcQry.clone();
GridSqlSelect rdcQry = new GridSqlSelect().from(new GridSqlFunction("PUBLIC", TABLE_FUNC_NAME)); // table(mergeTable)); TODO
// Split all select expressions into map-reduce parts.
- List<GridSqlElement> mapExps = F.addAll(new ArrayList<GridSqlElement>(), srcQry.select(false).iterator());
+ List<GridSqlElement> mapExps = F.addAll(
+ new ArrayList<GridSqlElement>(srcQry.allColumns()),
+ srcQry.select(false));
+
GridSqlElement[] rdcExps = new GridSqlElement[srcQry.visibleColumns()];
Set<String> colNames = new HashSet<>();
@@ -141,12 +145,15 @@ public class GridSqlQuerySplitter {
// Fill select expressions.
mapQry.clearSelect();
- for (GridSqlElement exp : mapExps)
+ for (GridSqlElement exp : mapExps) // Add all map expressions as visible.
mapQry.addSelectExpression(exp, true);
- for (GridSqlElement rdcExp : rdcExps)
+ for (GridSqlElement rdcExp : rdcExps) // Add corresponding visible reduce columns.
rdcQry.addSelectExpression(rdcExp, true);
+ for (int i = rdcExps.length; i < mapExps.size(); i++) // Add all extra map columns as invisible reduce columns.
+ rdcQry.addSelectExpression(column(((GridSqlAlias)mapExps.get(i)).alias()), false);
+
// -- GROUP BY
if (srcQry.hasGroupBy()) {
mapQry.clearGroups();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9e2a648/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
index 398ae10..dadba7c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -22,7 +22,7 @@ import org.h2.util.*;
import java.util.*;
/**
- *
+ * Plain SELECT query.
*/
public class GridSqlSelect extends GridSqlQuery {
/** */
@@ -54,6 +54,13 @@ public class GridSqlSelect extends GridSqlQuery {
return select.size();
}
+ /**
+ * @return Number of columns is select including invisible ones.
+ */
+ public int allColumns() {
+ return allExprs.size();
+ }
+
/** {@inheritDoc} */
@Override protected GridSqlElement expression(int col) {
return allExprs.get(col);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9e2a648/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
index 90d9e41..dcc2c84 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
@@ -23,7 +23,7 @@ import org.h2.util.*;
import javax.cache.*;
/**
- *
+ * Select query with UNION.
*/
public class GridSqlUnion extends GridSqlQuery {
/** */
[43/50] incubator-ignite git commit: # IGNITE-685 Fix issue found on
the review.
Posted by sb...@apache.org.
# IGNITE-685 Fix issue found on the review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa552bc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa552bc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa552bc0
Branch: refs/heads/ignite-437-sqltests-p2
Commit: fa552bc08f2835eaa9d7f91ef88e1ac43201a363
Parents: 654b4e9
Author: sevdokimov <se...@gridgain.com>
Authored: Wed Apr 8 13:26:16 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed Apr 8 13:29:06 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa552bc0/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index a4aea66..c7dfd19 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1716,11 +1716,6 @@ public class IgnitionEx {
if (CU.isMarshallerCache(ccfg.getName()))
throw new IgniteCheckedException("Cache name cannot be \"" + CU.MARSH_CACHE_NAME +
"\" because it is reserved for internal purposes.");
- }
-
- for (CacheConfiguration ccfg : userCaches) {
- if (ccfg == null)
- throw new NullPointerException("Cache configuration list must not contains null element");
cacheCfgs.add(ccfg);
}
[49/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/71439bc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71439bc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71439bc0
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 71439bc0e5040b9df0b3e27e5632133049bc4432
Parents: c2c4da4 5e9addb
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 14:37:41 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 14:37:41 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 7 +-
.../org/apache/ignite/internal/IgnitionEx.java | 171 +++-----
.../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 +++
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../commands/cache/VisorCacheCommand.scala | 423 +++++++++++--------
.../commands/cache/VisorCacheStopCommand.scala | 145 +++++++
11 files changed, 653 insertions(+), 333 deletions(-)
----------------------------------------------------------------------
[37/50] incubator-ignite git commit: # ignite-680 added test
Posted by sb...@apache.org.
# ignite-680 added test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e9f22ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e9f22ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e9f22ed
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 7e9f22ed4c80ecd3850accf0451c354e3ee687e8
Parents: b05c14f
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 8 11:32:03 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 8 11:32:03 2015 +0300
----------------------------------------------------------------------
.../IgniteCacheConfigurationTemplateTest.java | 53 ++++++++++++++++++++
1 file changed, 53 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9f22ed/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
index 9dfa913..d0ffab2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
@@ -19,6 +19,8 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.events.*;
+import org.apache.ignite.lang.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -79,6 +81,8 @@ public class IgniteCacheConfigurationTemplateTest extends GridCommonAbstractTest
cfg.setClientMode(clientMode);
+ cfg.setIncludeEventTypes(EventType.EVT_CACHE_REBALANCE_STARTED, EventType.EVT_CACHE_REBALANCE_STOPPED);
+
return cfg;
}
@@ -253,6 +257,55 @@ public class IgniteCacheConfigurationTemplateTest extends GridCommonAbstractTest
}
/**
+ * @throws Exception If failed.
+ */
+ public void testNoPartitionExchangeForTemplate() throws Exception{
+ final int GRID_CNT = 3;
+
+ startGridsMultiThreaded(GRID_CNT);
+
+ final CountDownLatch evtLatch = new CountDownLatch(1);
+
+ log.info("Add templates.");
+
+ for (int i = 0; i < GRID_CNT; i++) {
+ Ignite ignite = ignite(i);
+
+ ignite.events().localListen(new IgnitePredicate<Event>() {
+ @Override public boolean apply(Event evt) {
+ log.info("Event: " + evt);
+
+ evtLatch.countDown();
+
+ return true;
+ }
+ }, EventType.EVT_CACHE_REBALANCE_STARTED, EventType.EVT_CACHE_REBALANCE_STOPPED);
+ }
+
+ for (int i = 0; i < GRID_CNT; i++) {
+ Ignite ignite = ignite(i);
+
+ CacheConfiguration ccfg = new CacheConfiguration();
+
+ ccfg.setName("cfg-" + i);
+
+ ignite.addCacheConfiguration(ccfg);
+ }
+
+ boolean evt = evtLatch.await(3000, TimeUnit.MILLISECONDS);
+
+ assertFalse(evt);
+
+ log.info("Start cache.");
+
+ checkGetOrCreate(ignite(0), "cfg-0", 0);
+
+ evt = evtLatch.await(3000, TimeUnit.MILLISECONDS);
+
+ assertTrue(evt);
+ }
+
+ /**
* @param ignite Ignite.
* @param name Cache name.
* @param expBackups Expected number of backups.
[05/50] incubator-ignite git commit: # ignite-680
Posted by sb...@apache.org.
# ignite-680
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bf7fdb21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bf7fdb21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bf7fdb21
Branch: refs/heads/ignite-437-sqltests-p2
Commit: bf7fdb2110cb75a7fcbb48ee006c2b082fda4164
Parents: a815911
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 17:56:58 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 17:56:58 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheProcessor.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf7fdb21/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 a7777de..7deb9fb 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
@@ -2712,6 +2712,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
private class AddCacheTemplateProcessor implements
CacheEntryProcessor<CacheTemplateConfigurationKey, TemplateConfigurations, Void> {
/** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
private Collection<CacheConfiguration> cfgs;
/**
[39/50] incubator-ignite git commit: # IGNITE-700: Done.
Posted by sb...@apache.org.
# IGNITE-700: Done.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/21c8e893
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/21c8e893
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/21c8e893
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 21c8e893e2170ae7ab11761676ddb4f2dce912f9
Parents: 080376a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Apr 8 12:59:17 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Apr 8 12:59:17 2015 +0300
----------------------------------------------------------------------
.../processors/cache/transactions/IgniteTxManager.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/21c8e893/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index 12f57b4..13db6c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -1263,7 +1263,8 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
// 15. Update metrics.
if (!tx.dht() && tx.local()) {
- cctx.txMetrics().onTxCommit();
+ if (!tx.system())
+ cctx.txMetrics().onTxCommit();
for (int cacheId : tx.activeCacheIds()) {
GridCacheContext cacheCtx = cctx.cacheContext(cacheId);
@@ -1337,7 +1338,8 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
// 11. Update metrics.
if (!tx.dht() && tx.local()) {
- cctx.txMetrics().onTxRollback();
+ if (!tx.system())
+ cctx.txMetrics().onTxRollback();
for (int cacheId : tx.activeCacheIds()) {
GridCacheContext cacheCtx = cctx.cacheContext(cacheId);
[19/50] incubator-ignite git commit: # ignite-680
Posted by sb...@apache.org.
# ignite-680
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5832b3a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5832b3a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5832b3a9
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 5832b3a99f61ef298f2d8c75ae0d208a2f58be72
Parents: 414882c
Author: sboikov <sb...@gridgain.com>
Authored: Tue Apr 7 11:50:45 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Apr 7 12:02:23 2015 +0300
----------------------------------------------------------------------
.../cache/CacheTemplateConfigurationKey.java | 53 --
.../cache/DynamicCacheChangeRequest.java | 17 +
.../cache/DynamicCacheDescriptor.java | 17 +-
.../processors/cache/GridCacheProcessor.java | 478 ++++++++-----------
.../GridDhtPartitionsExchangeFuture.java | 1 +
.../IgniteCacheConfigurationTemplateTest.java | 61 +++
6 files changed, 303 insertions(+), 324 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5832b3a9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheTemplateConfigurationKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheTemplateConfigurationKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheTemplateConfigurationKey.java
deleted file mode 100644
index 310fa74..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheTemplateConfigurationKey.java
+++ /dev/null
@@ -1,53 +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.processors.cache;
-
-import java.io.*;
-
-/**
- *
- */
-public class CacheTemplateConfigurationKey implements GridCacheInternal, Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- return getClass().getName().hashCode();
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object obj) {
- return obj == this || (obj instanceof CacheTemplateConfigurationKey);
- }
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return "CacheTemplateConfigurationKey []";
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5832b3a9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
index f7c8769..bd53cdb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
@@ -60,6 +60,9 @@ public class DynamicCacheChangeRequest implements Serializable {
/** Fail if exists flag. */
private boolean failIfExists;
+ /** Template configuration flag. */
+ private boolean template;
+
/**
* Constructor creates cache stop request.
*
@@ -85,6 +88,20 @@ public class DynamicCacheChangeRequest implements Serializable {
}
/**
+ * @param template {@code True} if this is request for adding template configuration.
+ */
+ public void template(boolean template) {
+ this.template = template;
+ }
+
+ /**
+ * @return {@code True} if this is template configuration.
+ */
+ public boolean template() {
+ return template;
+ }
+
+ /**
* @return Deployment ID.
*/
public IgniteUuid deploymentId() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5832b3a9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
index 4f07658..d8da9ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
@@ -53,18 +53,33 @@ public class DynamicCacheDescriptor {
/** */
private volatile Map<UUID, CacheConfiguration> rmtCfgs;
+ /** Template configuration flag. */
+ private boolean template;
+
/**
* @param cacheCfg Cache configuration.
* @param cacheType Cache type.
+ * @param template {@code True} if this is template configuration.
* @param deploymentId Deployment ID.
*/
- public DynamicCacheDescriptor(CacheConfiguration cacheCfg, CacheType cacheType, IgniteUuid deploymentId) {
+ public DynamicCacheDescriptor(CacheConfiguration cacheCfg,
+ CacheType cacheType,
+ boolean template,
+ IgniteUuid deploymentId) {
this.cacheCfg = cacheCfg;
this.cacheType = cacheType;
+ this.template = template;
this.deploymentId = deploymentId;
}
/**
+ * @return {@code True} if this is template configuration.
+ */
+ public boolean template() {
+ return template;
+ }
+
+ /**
* @return Cache type.
*/
public CacheType cacheType() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5832b3a9/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 eb98b89..fcf65b9 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
@@ -110,9 +110,15 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/** Pending cache starts. */
private ConcurrentMap<String, IgniteInternalFuture> pendingFuts = new ConcurrentHashMap<>();
+ /** Template configuration add futures. */
+ private ConcurrentMap<String, IgniteInternalFuture> pendingTemplateFuts = new ConcurrentHashMap<>();
+
/** Dynamic caches. */
private ConcurrentMap<String, DynamicCacheDescriptor> registeredCaches = new ConcurrentHashMap<>();
+ /** Cache templates. */
+ private ConcurrentMap<String, DynamicCacheDescriptor> registeredTemplates = new ConcurrentHashMap<>();
+
/** */
private IdentityHashMap<CacheStore, ThreadLocal> sesHolders = new IdentityHashMap<>();
@@ -438,7 +444,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (ctx.config().getCacheMode() == LOCAL || !isNearEnabled(ctx))
return Collections.emptyList();
else
- return F.asList((GridCacheManager)ctx.queries(), ctx.continuousQueries(), ctx.store());
+ return F.asList(ctx.queries(), ctx.continuousQueries(), ctx.store());
}
/**
@@ -576,9 +582,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
cfgs[i] = cfg; // Replace original configuration value.
- if (cfg.getName() != null && cfg.getName().endsWith("*")) // Skip template configurations.
- continue;
-
String masked = maskNull(cfg.getName());
if (registeredCaches.containsKey(masked)) {
@@ -603,23 +606,43 @@ public class GridCacheProcessor extends GridProcessorAdapter {
else
cacheType = CacheType.USER;
- DynamicCacheDescriptor desc = new DynamicCacheDescriptor(cfg, cacheType, IgniteUuid.randomUuid());
+ boolean template = cfg.getName() != null && cfg.getName().endsWith("*");
+
+ DynamicCacheDescriptor desc = new DynamicCacheDescriptor(cfg, cacheType, template, IgniteUuid.randomUuid());
desc.locallyConfigured(true);
desc.staticallyConfigured(true);
- registeredCaches.put(masked, desc);
+ if (!template) {
+ registeredCaches.put(masked, desc);
- ctx.discovery().setCacheFilter(
- cfg.getName(),
- cfg.getNodeFilter(),
- cfg.getNearConfiguration() != null,
- cfg.getCacheMode() == LOCAL);
+ ctx.discovery().setCacheFilter(
+ cfg.getName(),
+ cfg.getNodeFilter(),
+ cfg.getNearConfiguration() != null,
+ cfg.getCacheMode() == LOCAL);
- if (!cacheType.userCache())
- stopSeq.addLast(cfg.getName());
- else
- stopSeq.addFirst(cfg.getName());
+ if (!cacheType.userCache())
+ stopSeq.addLast(cfg.getName());
+ else
+ stopSeq.addFirst(cfg.getName());
+ }
+ else {
+ if (log.isDebugEnabled())
+ log.debug("Use cache configuration as template: " + cfg);
+
+ registeredTemplates.put(masked, desc);
+ }
+
+ if (cfg.getName() == null) { // Use cache configuration with null name as template.
+ DynamicCacheDescriptor desc0 =
+ new DynamicCacheDescriptor(cfg, cacheType, true, IgniteUuid.randomUuid());
+
+ desc0.locallyConfigured(true);
+ desc0.staticallyConfigured(true);
+
+ registeredTemplates.put(masked, desc0);
+ }
}
// Start shared managers.
@@ -770,20 +793,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
ctx.cacheObjects().onCacheProcessorStarted();
-
- List<CacheConfiguration> templateCfgs = null;
-
- for (CacheConfiguration cfg : ctx.config().getCacheConfiguration()) {
- if (cfg.getName() == null || cfg.getName().endsWith("*")) {
- if (templateCfgs == null)
- templateCfgs = new ArrayList<>();
-
- templateCfgs.add(cfg);
- }
- }
-
- if (templateCfgs != null)
- addCacheConfigurations(templateCfgs);
}
/** {@inheritDoc} */
@@ -942,7 +951,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
ctx.kernalContext().continuous().onCacheStop(ctx);
U.stopLifecycleAware(log, lifecycleAwares(cache.configuration(), ctx.jta().tmLookup(),
- ctx.store().configuredStore()));
+ ctx.store().configuredStore()));
if (log.isInfoEnabled())
log.info("Stopped cache: " + cache.name());
@@ -1295,7 +1304,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
/**
- * Gets a collection of currentlty started caches.
+ * Gets a collection of currently started caches.
*
* @return Collection of started cache names.
*/
@@ -1581,7 +1590,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/** {@inheritDoc} */
@Nullable @Override public Object collectDiscoveryData(UUID nodeId) {
// Collect dynamically started caches to a single object.
- Collection<DynamicCacheChangeRequest> reqs = new ArrayList<>(registeredCaches.size());
+ Collection<DynamicCacheChangeRequest> reqs =
+ new ArrayList<>(registeredCaches.size() + registeredTemplates.size());
for (DynamicCacheDescriptor desc : registeredCaches.values()) {
if (!desc.cancelled()) {
@@ -1597,6 +1607,18 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
}
+ for (DynamicCacheDescriptor desc : registeredTemplates.values()) {
+ DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(desc.cacheConfiguration().getName(), null);
+
+ req.startCacheConfiguration(desc.cacheConfiguration());
+
+ req.template(true);
+
+ req.deploymentId(desc.deploymentId());
+
+ reqs.add(req);
+ }
+
DynamicCacheChangeBatch req = new DynamicCacheChangeBatch(reqs);
req.clientNodes(ctx.discovery().clientNodesMap());
@@ -1610,6 +1632,26 @@ public class GridCacheProcessor extends GridProcessorAdapter {
DynamicCacheChangeBatch batch = (DynamicCacheChangeBatch)data;
for (DynamicCacheChangeRequest req : batch.requests()) {
+ if (req.template()) {
+ CacheConfiguration ccfg = req.startCacheConfiguration();
+
+ assert ccfg != null : req;
+
+ DynamicCacheDescriptor existing = registeredTemplates.get(maskNull(req.cacheName()));
+
+ if (existing == null) {
+ DynamicCacheDescriptor desc = new DynamicCacheDescriptor(
+ ccfg,
+ req.cacheType(),
+ true,
+ req.deploymentId());
+
+ registeredTemplates.put(maskNull(req.cacheName()), desc);
+ }
+
+ continue;
+ }
+
DynamicCacheDescriptor existing = registeredCaches.get(maskNull(req.cacheName()));
if (req.start() && !req.clientStartOnly()) {
@@ -1634,6 +1676,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
DynamicCacheDescriptor desc = new DynamicCacheDescriptor(
ccfg,
req.cacheType(),
+ false,
req.deploymentId());
// Received statically configured cache.
@@ -1673,12 +1716,62 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (publicJCache(cacheName, false) != null) // Cache with given name already started.
return new GridFinishedFuture<>();
- GridCacheAdapter<CacheTemplateConfigurationKey, TemplateConfigurations> utilityCache = utilityCache();
+ CacheConfiguration cfgTemplate = null;
+
+ CacheConfiguration dfltCacheCfg = null;
+
+ List<CacheConfiguration> wildcardNameCfgs = null;
+
+ for (DynamicCacheDescriptor desc : registeredTemplates.values()) {
+ assert desc.template();
+
+ CacheConfiguration cfg = desc.cacheConfiguration();
+
+ assert cfg != null;
+
+ if (F.eq(cacheName, cfg.getName())) {
+ cfgTemplate = cfg;
+
+ break;
+ }
+
+ if (cfg.getName() != null ) {
+ if (cfg.getName().endsWith("*")) {
+ if (cfg.getName().length() > 1) {
+ if (wildcardNameCfgs == null)
+ wildcardNameCfgs = new ArrayList<>();
+
+ wildcardNameCfgs.add(cfg);
+ }
+ else
+ dfltCacheCfg = cfg; // Template with name '*'.
+ }
+ }
+ else if (dfltCacheCfg == null)
+ dfltCacheCfg = cfg;
+ }
+
+ if (cfgTemplate == null && cacheName != null && wildcardNameCfgs != null) {
+ Collections.sort(wildcardNameCfgs, new Comparator<CacheConfiguration>() {
+ @Override public int compare(CacheConfiguration cfg1, CacheConfiguration cfg2) {
+ Integer len1 = cfg1.getName() != null ? cfg1.getName().length() : 0;
+ Integer len2 = cfg2.getName() != null ? cfg2.getName().length() : 0;
+
+ return len2.compareTo(len1);
+ }
+ });
- TemplateConfigurations cfgs =
- utilityCache.localPeek(new CacheTemplateConfigurationKey(), CachePeekModes.ONHEAP_ONLY, null);
+ for (CacheConfiguration cfg : wildcardNameCfgs) {
+ if (cacheName.startsWith(cfg.getName().substring(0, cfg.getName().length() - 1))) {
+ cfgTemplate = cfg;
- CacheConfiguration cfgTemplate = cfgs != null ? cfgs.configuration(cacheName) : null;
+ break;
+ }
+ }
+ }
+
+ if (cfgTemplate == null)
+ cfgTemplate = dfltCacheCfg;
if (cfgTemplate == null)
throw new IllegalArgumentException("Failed to start cache " +
@@ -1880,6 +1973,32 @@ public class GridCacheProcessor extends GridProcessorAdapter {
*/
private void onCacheChangeRequested(DynamicCacheChangeBatch batch) {
for (DynamicCacheChangeRequest req : batch.requests()) {
+ if (req.template()) {
+ CacheConfiguration ccfg = req.startCacheConfiguration();
+
+ assert ccfg != null : req;
+
+ DynamicCacheDescriptor desc = registeredTemplates.get(maskNull(req.cacheName()));
+
+ if (desc == null) {
+ DynamicCacheDescriptor templateDesc =
+ new DynamicCacheDescriptor(ccfg, req.cacheType(), true, req.deploymentId());
+
+ DynamicCacheDescriptor old = registeredTemplates.put(maskNull(ccfg.getName()), templateDesc);
+
+ assert old == null :
+ "Dynamic cache map was concurrently modified [new=" + templateDesc + ", old=" + old + ']';
+ }
+
+ TemplateConfigurationFuture fut =
+ (TemplateConfigurationFuture)pendingTemplateFuts.get(maskNull(ccfg.getName()));
+
+ if (fut != null && fut.deploymentId().equals(req.deploymentId()))
+ fut.onDone();
+
+ continue;
+ }
+
DynamicCacheDescriptor desc = registeredCaches.get(maskNull(req.cacheName()));
if (req.start()) {
@@ -1917,7 +2036,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
assert req.cacheType() != null : req;
DynamicCacheDescriptor startDesc =
- new DynamicCacheDescriptor(ccfg, req.cacheType(), req.deploymentId());
+ new DynamicCacheDescriptor(ccfg, req.cacheType(), false, req.deploymentId());
DynamicCacheDescriptor old = registeredCaches.put(maskNull(ccfg.getName()), startDesc);
@@ -2432,44 +2551,34 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @throws IgniteCheckedException If failed.
*/
public void addCacheConfiguration(CacheConfiguration cacheCfg) throws IgniteCheckedException {
- addCacheConfigurations(Collections.singleton(cacheCfg));
- }
+ String masked = maskNull(cacheCfg.getName());
- /**
- * @param cfgs Cache configurations.
- * @throws IgniteCheckedException If failed.
- */
- private void addCacheConfigurations(Collection<CacheConfiguration> cfgs) throws IgniteCheckedException {
- GridCacheAdapter<CacheTemplateConfigurationKey, TemplateConfigurations> utilityCache = utilityCache();
+ DynamicCacheDescriptor desc = registeredTemplates.get(masked);
- TemplateConfigurations templates =
- utilityCache.localPeek(new CacheTemplateConfigurationKey(), CachePeekModes.ONHEAP_ONLY, null);
+ if (desc != null)
+ return;
- if (templates != null) {
- cfgs = templates.needAdd(cfgs);
+ DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(cacheCfg.getName(), ctx.localNodeId());
- if (cfgs == null)
- return;
- }
+ CacheConfiguration cfg = new CacheConfiguration(cacheCfg);
- final int RETRY_CNT = 5;
+ req.template(true);
- for (int i = 0; i < RETRY_CNT; i++) {
- try {
- utilityCache.invoke(
- new CacheTemplateConfigurationKey(), new AddCacheTemplateProcessor(cfgs));
+ req.startCacheConfiguration(cfg);
- break;
- }
- catch (IgniteCheckedException e) {
- if (i < RETRY_CNT - 1) {
- if (log.isDebugEnabled())
- log.debug("Failed to save cache template configuration, will retry: " + e);
- }
- else
- throw e;
- }
- }
+ req.deploymentId(IgniteUuid.randomUuid());
+
+ TemplateConfigurationFuture fut = new TemplateConfigurationFuture(req.cacheName(), req.deploymentId());
+
+ TemplateConfigurationFuture old =
+ (TemplateConfigurationFuture)pendingTemplateFuts.putIfAbsent(maskNull(cacheCfg.getName()), fut);
+
+ if (old != null)
+ fut = old;
+
+ ctx.discovery().sendCustomEvent(new DynamicCacheChangeBatch(Collections.singleton(req)));
+
+ fut.get();
}
/**
@@ -2719,213 +2828,55 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/**
*
*/
- private class AddCacheTemplateProcessor implements
- CacheEntryProcessor<CacheTemplateConfigurationKey, TemplateConfigurations, Void> {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** */
- private Collection<CacheConfiguration> cfgs;
-
- /**
- * @param cfgs Cache configuration templates.
- */
- public AddCacheTemplateProcessor(Collection<CacheConfiguration> cfgs) {
- assert !F.isEmpty(cfgs);
-
- this.cfgs = cfgs;
- }
-
- /** {@inheritDoc} */
- @Override public Void process(MutableEntry<CacheTemplateConfigurationKey, TemplateConfigurations> entry,
- Object... args)
- {
- TemplateConfigurations cfgs0 = entry.getValue();
-
- if (cfgs0 == null)
- cfgs0 = new TemplateConfigurations();
-
- cfgs0.add(cfgs);
-
- entry.setValue(cfgs0);
-
- return null;
- }
- }
-
- /**
- *
- */
- private static class TemplateConfigurations implements Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** */
+ @SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
+ private class DynamicCacheStartFuture extends GridFutureAdapter<Object> {
+ /** Start ID. */
@GridToStringInclude
- private List<CacheConfiguration> exactNameCfgs;
+ private IgniteUuid deploymentId;
- /** */
- @GridToStringInclude
- private List<CacheConfiguration> wildcardNameCfgs;
+ /** Cache name. */
+ private String cacheName;
- /**
- *
- */
- public TemplateConfigurations() {
- // No-op.
- }
+ /** Change request. */
+ @GridToStringInclude
+ private DynamicCacheChangeRequest req;
/**
- * Checks if need to add new templates.
- *
- * @param cfgs Templates to add.
- * @return Templates which should be added.
+ * @param cacheName Cache name.
+ * @param deploymentId Deployment ID.
+ * @param req Cache start request.
*/
- @Nullable Collection<CacheConfiguration> needAdd(Collection<CacheConfiguration> cfgs) {
- Collection<CacheConfiguration> res = null;
-
- for (CacheConfiguration cfg : cfgs) {
- boolean found = false;
-
- if (cfg.getName() != null && cfg.getName().endsWith("*")) {
- String name0 = cfg.getName().substring(0, cfg.getName().length() - 1);
-
- if (wildcardNameCfgs != null) {
- for (CacheConfiguration cfg0 : wildcardNameCfgs) {
- if (F.eq(cfg0.getName(), name0)) {
- found = true;
-
- break;
- }
- }
- }
- }
- else {
- if (exactNameCfgs != null) {
- for (CacheConfiguration cfg0 : exactNameCfgs) {
- if (F.eq(cfg0.getName(), cfg.getName())) {
- found = true;
-
- break;
- }
- }
- }
- }
-
- if (!found) {
- if (res == null)
- res = new ArrayList<>();
-
- System.out.println(Thread.currentThread().getName() + " need add: " + cfg + " " + exactNameCfgs);
-
-
- res.add(cfg);
- }
- }
-
- return res;
+ private DynamicCacheStartFuture(String cacheName, IgniteUuid deploymentId, DynamicCacheChangeRequest req) {
+ this.deploymentId = deploymentId;
+ this.cacheName = cacheName;
+ this.req = req;
}
/**
- * @param cfgs Configurations to add.
+ * @return Start ID.
*/
- void add(Collection<CacheConfiguration> cfgs) {
- for (CacheConfiguration cfg : cfgs) {
- CacheConfiguration template = new CacheConfiguration(cfg);
-
- if (cfg.getName() != null && cfg.getName().endsWith("*")) {
- template.setName(cfg.getName().substring(0, cfg.getName().length() - 1));
-
- boolean found = false;
-
- if (wildcardNameCfgs != null) {
- for (CacheConfiguration cfg0 : wildcardNameCfgs) {
- if (F.eq(cfg0.getName(), template.getName())) {
- found = true;
-
- break;
- }
- }
- }
- else
- wildcardNameCfgs = new ArrayList<>(cfgs.size());
-
- if (!found)
- wildcardNameCfgs.add(template);
- }
- else {
- boolean found = false;
-
- if (exactNameCfgs != null) {
- for (CacheConfiguration cfg0 : exactNameCfgs) {
- if (F.eq(cfg0.getName(), template.getName())) {
- found = true;
-
- break;
- }
- }
- }
- else
- exactNameCfgs = new ArrayList<>(cfgs.size());
-
- if (!found)
- exactNameCfgs.add(template);
- }
- }
-
- if (wildcardNameCfgs != null) {
- Collections.sort(wildcardNameCfgs, new Comparator<CacheConfiguration>() {
- @Override public int compare(CacheConfiguration cfg1, CacheConfiguration cfg2) {
- Integer len1 = cfg1.getName() != null ? cfg1.getName().length() : 0;
- Integer len2 = cfg2.getName() != null ? cfg2.getName().length() : 0;
-
- return len2.compareTo(len1);
- }
- });
- }
+ public IgniteUuid deploymentId() {
+ return deploymentId;
}
/**
- * @param name Cache name.
- * @return Cache configuration for given name or {@code null} if template not found.
+ * @return Request.
*/
- @Nullable CacheConfiguration configuration(String name) {
- CacheConfiguration dfltCfg = null;
-
- if (exactNameCfgs != null) {
- for (CacheConfiguration cfg : exactNameCfgs) {
- if (F.eq(name, cfg.getName()))
- return cfg;
- else if (cfg.getName() == null)
- dfltCfg = cfg;
- }
- }
-
- if (wildcardNameCfgs != null && name != null) {
- for (CacheConfiguration cfg : wildcardNameCfgs) {
- if (name.startsWith(cfg.getName()))
- return cfg;
- }
- }
-
- return dfltCfg;
+ public DynamicCacheChangeRequest request() {
+ return req;
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeCollection(out, exactNameCfgs);
- U.writeCollection(out, wildcardNameCfgs);
- }
+ @Override public boolean onDone(@Nullable Object res, @Nullable Throwable err) {
+ // Make sure to remove future before completion.
+ pendingFuts.remove(maskNull(cacheName), this);
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- exactNameCfgs = U.readList(in);
- wildcardNameCfgs = U.readList(in);
+ return super.onDone(res, err);
}
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(TemplateConfigurations.class, this);
+ return S.toString(DynamicCacheStartFuture.class, this);
}
}
@@ -2933,7 +2884,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
*
*/
@SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
- private class DynamicCacheStartFuture extends GridFutureAdapter<Object> {
+ private class TemplateConfigurationFuture extends GridFutureAdapter<Object> {
/** Start ID. */
@GridToStringInclude
private IgniteUuid deploymentId;
@@ -2941,19 +2892,13 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/** Cache name. */
private String cacheName;
- /** Change request. */
- @GridToStringInclude
- private DynamicCacheChangeRequest req;
-
/**
* @param cacheName Cache name.
* @param deploymentId Deployment ID.
- * @param req Cache start request.
*/
- private DynamicCacheStartFuture(String cacheName, IgniteUuid deploymentId, DynamicCacheChangeRequest req) {
+ private TemplateConfigurationFuture(String cacheName, IgniteUuid deploymentId) {
this.deploymentId = deploymentId;
this.cacheName = cacheName;
- this.req = req;
}
/**
@@ -2963,24 +2908,17 @@ public class GridCacheProcessor extends GridProcessorAdapter {
return deploymentId;
}
- /**
- * @return Request.
- */
- public DynamicCacheChangeRequest request() {
- return req;
- }
-
/** {@inheritDoc} */
@Override public boolean onDone(@Nullable Object res, @Nullable Throwable err) {
// Make sure to remove future before completion.
- pendingFuts.remove(maskNull(cacheName), this);
+ pendingTemplateFuts.remove(maskNull(cacheName), this);
return super.onDone(res, err);
}
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(DynamicCacheStartFuture.class, this);
+ return S.toString(TemplateConfigurationFuture.class, this);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5832b3a9/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 ddf0df1..f6a0763 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
@@ -679,6 +679,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
/**
* Starts dynamic caches.
+ * @throws IgniteCheckedException If failed.
*/
private void startCaches() throws IgniteCheckedException {
cctx.cache().prepareCachesStart(F.view(reqs, new IgnitePredicate<DynamicCacheChangeRequest>() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5832b3a9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
index c32d54b..9dfa913 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.testframework.*;
import org.apache.ignite.testframework.junits.common.*;
import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
@@ -163,6 +164,19 @@ public class IgniteCacheConfigurationTemplateTest extends GridCommonAbstractTest
checkGetOrCreate(ignite1, "org.apache.ignite", 6);
checkGetOrCreate(ignite2, "org.apache.ignite", 6);
checkGetOrCreate(ignite3, "org.apache.ignite", 6);
+
+ // Test name '*'.
+ CacheConfiguration template3 = new CacheConfiguration();
+
+ template3.setName("*");
+ template3.setBackups(7);
+
+ ignite1.addCacheConfiguration(template3);
+
+ checkGetOrCreate(ignite0, "x", 7);
+ checkGetOrCreate(ignite1, "x", 7);
+ checkGetOrCreate(ignite2, "x", 7);
+ checkGetOrCreate(ignite3, "x", 7);
}
/**
@@ -192,6 +206,53 @@ public class IgniteCacheConfigurationTemplateTest extends GridCommonAbstractTest
}
/**
+ * @throws Exception If failed.
+ */
+ public void testAddCacheConfigurationMultinode() throws Exception {
+ addTemplate = true;
+
+ final int GRID_CNT = 3;
+
+ startGridsMultiThreaded(GRID_CNT);
+
+ for (int i = 0; i < 10; i++) {
+ log.info("Iteration: " + i);
+
+ final AtomicInteger idx = new AtomicInteger();
+
+ final int iter = i;
+
+ GridTestUtils.runMultiThreaded(new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ int node = idx.getAndIncrement() % GRID_CNT;
+
+ Ignite ignite = grid(node);
+
+ log.info("Add configuration using node: " + ignite.name());
+
+ CacheConfiguration cfg = new CacheConfiguration();
+
+ cfg.setName("org.apache.ignite" + iter + "*");
+
+ cfg.setBackups(iter);
+
+ for (int i = 0; i < 100; i++)
+ ignite.addCacheConfiguration(cfg);
+
+ return null;
+ }
+ }, 15, "add-configuration");
+
+ for (int grid = 0; grid < GRID_CNT; grid++)
+ checkGetOrCreate(grid(grid), "org.apache.ignite" + iter, iter);
+ }
+
+ Ignite ignite = startGrid(GRID_CNT);
+
+ checkGetOrCreate(ignite, "org.apache.ignite3", 3);
+ }
+
+ /**
* @param ignite Ignite.
* @param name Cache name.
* @param expBackups Expected number of backups.
[04/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Conflicts:
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e7f8a4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e7f8a4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e7f8a4b
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 9e7f8a4b81174ed1f048d3f19be37d9b5e4f81c6
Parents: 0e89dde 7e6d193
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Apr 6 17:52:26 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Apr 6 17:52:26 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
assembly/release-fabric.xml | 5 -
examples/schema-import/bin/db-init.sql | 17 ++
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
modules/clients/readme.md | 2 -
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../apache/ignite/internal/GridComponent.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../ignite/internal/GridPluginComponent.java | 4 +-
.../org/apache/ignite/internal/IgniteEx.java | 7 -
.../apache/ignite/internal/IgniteKernal.java | 27 +--
.../ignite/internal/IgniteNodeAttributes.java | 3 -
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../internal/managers/GridManagerAdapter.java | 6 +-
.../processors/GridProcessorAdapter.java | 2 +-
.../processors/cache/CacheDistributionMode.java | 67 -------
.../internal/processors/cache/CacheType.java | 77 ++++++++
.../cache/DynamicCacheChangeRequest.java | 17 ++
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 ++-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 195 +++++++++++++------
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../DiscoveryNodeValidationProcessor.java | 27 +++
.../OsDiscoveryNodeValidationProcessor.java | 72 +++++++
.../processors/plugin/CachePluginManager.java | 51 +++--
.../processors/query/GridQueryProcessor.java | 12 +-
.../processors/task/GridTaskProcessor.java | 24 ++-
.../internal/visor/util/VisorTaskUtils.java | 18 +-
.../ignite/plugin/CachePluginContext.java | 11 ++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../ignite/spi/IgniteNodeValidationResult.java | 66 +++++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 2 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 -------
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 113 +----------
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 ++---
.../cache/IgniteInternalCacheTypesTest.java | 159 +++++++++++++++
.../IgniteCollectionAbstractTest.java | 23 ---
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
.../near/GridCacheNearReadersSelfTest.java | 2 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +-
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 +++++++++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 -----------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/messaging/GridMessagingSelfTest.java | 50 +++++
.../testframework/GridSpiTestContext.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../HadoopDefaultMapReducePlannerSelfTest.java | 5 -
.../query/h2/sql/GridSqlQuerySplitter.java | 24 ++-
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../h2/twostep/GridReduceQueryExecutor.java | 13 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 14 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
.../query/h2/sql/GridQueryParsingTest.java | 1 +
.../query/h2/sql/IgniteVsH2QueryTest.java | 7 +
modules/yardstick/README.md | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 ++-
.../org/apache/ignite/yardstick/IgniteNode.java | 11 +-
parent/pom.xml | 50 ++---
pom.xml | 94 ++++++++-
scripts/git-apply-patch.sh | 94 +++++++++
scripts/git-format-patch.sh | 87 +++++++++
scripts/git-patch-functions.sh | 171 ++++++++++++++++
scripts/git-patch-prop.sh | 24 +++
90 files changed, 1613 insertions(+), 706 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e7f8a4b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index e98169c,b3deea3..f343b01
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@@ -115,20 -111,27 +117,27 @@@ public class GridSqlQuerySplitter
}
// -- ORDER BY
- if (!srcQry.sort().isEmpty()) {
+ if (!srcSelect.sort().isEmpty()) {
+ if (aggregateFound) // Ordering over aggregates does not make sense.
+ mapQry.clearSort(); // Otherwise map sort will be used by offset-limit.
+
- for (GridSqlSortColumn sortCol : srcQry.sort().values())
+ for (GridSqlSortColumn sortCol : srcSelect.sort().values())
rdcQry.addSort(column(((GridSqlAlias)mapExps.get(sortCol.column())).alias()), sortCol);
}
// -- LIMIT
- if (srcSelect.limit() != null)
- rdcQry.limit(srcSelect.limit());
+ if (srcQry.limit() != null) {
+ if (aggregateFound)
+ mapQry.limit(null);
+
+ rdcQry.limit(srcQry.limit());
+ }
// -- OFFSET
- if (srcQry.offset() != null) {
+ if (srcSelect.offset() != null) {
mapQry.offset(null);
- rdcQry.offset(srcQry.offset());
+ rdcQry.offset(srcSelect.offset());
}
// -- DISTINCT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e7f8a4b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
[13/50] incubator-ignite git commit: # IGNITE-639 Review.
Posted by sb...@apache.org.
# IGNITE-639 Review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/43fa7148
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/43fa7148
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/43fa7148
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 43fa7148b37bbd3cdd0c4b406075d98491072b8a
Parents: 349c200
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Apr 7 10:26:43 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Apr 7 10:26:43 2015 +0700
----------------------------------------------------------------------
.../ignite/internal/visor/cache/VisorCache.java | 6 +--
.../cache/VisorCacheAggregatedMetrics.java | 35 +++++++------
.../internal/visor/cache/VisorCacheMetrics.java | 53 ++++++++++++++++++--
.../cache/VisorCacheMetricsCollectorTask.java | 33 +++++-------
.../commands/cache/VisorCacheCommand.scala | 29 ++++++-----
5 files changed, 99 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43fa7148/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
index 98f602f..d57d19a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
@@ -97,9 +97,9 @@ public class VisorCache implements Serializable {
* @param cacheName Cache name.
* @param sample Sample size.
* @return Data transfer object for given cache.
- * @throws IgniteCheckedException
+ * @throws IgniteCheckedException If failed collect metrics.
*/
- public static VisorCache from(Ignite ignite, String cacheName, int sample) throws IgniteCheckedException {
+ public static VisorCache from(IgniteEx ignite, String cacheName, int sample) throws IgniteCheckedException {
assert ignite != null;
GridCacheAdapter ca = ((IgniteKernal)ignite).internalCache(cacheName);
@@ -226,7 +226,7 @@ public class VisorCache implements Serializable {
cache.partitions = ca.affinity().partitions();
cache.primaryPartitions = pps;
cache.backupPartitions = bps;
- cache.metrics = VisorCacheMetrics.from(ca);
+ cache.metrics = VisorCacheMetrics.from(ignite, ca);
cache.partitionsMap = partsMap;
return cache;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43fa7148/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
index c8d3a8d..af68e9f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
@@ -31,13 +31,13 @@ public class VisorCacheAggregatedMetrics implements Serializable {
private static final long serialVersionUID = 0L;
/** Cache name. */
- private final String cacheName;
+ private String name;
/** Cache mode. */
- private final CacheMode cacheMode;
+ private CacheMode mode;
/** Cache system state. */
- private final Boolean system;
+ private boolean sys;
/** Node IDs with cache metrics. */
private final Map<UUID, VisorCacheMetrics> metrics = new HashMap<>();
@@ -106,31 +106,36 @@ public class VisorCacheAggregatedMetrics implements Serializable {
private transient Integer failsQry;
/**
- * Create data transfer object with given parameters.
+ * Create data transfer object for aggregated cache metrics.
*
- * @param cacheName Cache name.
+ * @param cm Source cache metrics.
+ * @return Data transfer object for aggregated cache metrics.
*/
- public VisorCacheAggregatedMetrics(String cacheName, CacheMode cacheMode, Boolean system) {
- this.cacheName = cacheName;
- this.cacheMode = cacheMode;
- this.system = system;
+ public static VisorCacheAggregatedMetrics from(VisorCacheMetrics cm) {
+ VisorCacheAggregatedMetrics acm = new VisorCacheAggregatedMetrics();
+
+ acm.name = cm.name();
+ acm.mode = cm.mode();
+ acm.sys = cm.system();
+
+ return acm;
}
/**
* @return Cache name.
*/
- public String cacheName() {
- return cacheName;
+ public String name() {
+ return name;
}
/** @return Cache mode. */
- public CacheMode cacheMode() {
- return cacheMode;
+ public CacheMode mode() {
+ return mode;
}
/** @return Cache system state. */
- public Boolean system() {
- return system;
+ public boolean system() {
+ return sys;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43fa7148/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 77db2f4..fc30392 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
@@ -18,13 +18,14 @@
package org.apache.ignite.internal.visor.cache;
import org.apache.ignite.cache.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import java.io.*;
/**
- * Data transfer object for {@link org.apache.ignite.cache.CacheMetrics}.
+ * Data transfer object for {@link CacheMetrics}.
*/
public class VisorCacheMetrics implements Serializable {
/** */
@@ -33,6 +34,15 @@ public class VisorCacheMetrics implements Serializable {
/** */
private static final long serialVersionUID = 0L;
+ /** Cache name. */
+ private String name;
+
+ /** Cache mode. */
+ private CacheMode mode;
+
+ /** Cache system state. */
+ private boolean sys;
+
/** Number of non-{@code null} values in the cache. */
private int size;
@@ -147,7 +157,14 @@ public class VisorCacheMetrics implements Serializable {
/** Number of cached rolled back DHT transaction IDs. */
private int txDhtRolledbackVersionsSize;
- /** Calculate rate of metric per second. */
+ /**
+ * Calculate rate of metric per second.
+ *
+ * @param metric Metric value.
+ * @param time Metric finish time.
+ * @param createTime Metric start time.
+ * @return Metric per second.
+ */
private static int perSecond(int metric, long time, long createTime) {
long seconds = (time - createTime) / 1000;
@@ -155,14 +172,21 @@ public class VisorCacheMetrics implements Serializable {
}
/**
+ * @param ignite Ignite.
* @param c Cache.
* @return Data transfer object for given cache metrics.
*/
- public static VisorCacheMetrics from(GridCache c) {
+ public static VisorCacheMetrics from(IgniteEx ignite, GridCache c) {
VisorCacheMetrics cm = new VisorCacheMetrics();
CacheMetrics m = c.metrics();
+ GridCacheProcessor cacheProcessor = ignite.context().cache();
+
+ cm.name = c.name();
+ cm.mode = cacheProcessor.cacheMode(c.name());
+ cm.sys = cacheProcessor.systemCache(c.name());
+
cm.size = m.getSize();
cm.keySize = m.getKeySize();
@@ -214,6 +238,27 @@ public class VisorCacheMetrics implements Serializable {
}
/**
+ * @return Cache name.
+ */
+ public String name() {
+ return name;
+ }
+
+ /**
+ * @return Cache mode.
+ */
+ public CacheMode mode() {
+ return mode;
+ }
+
+ /**
+ * @return Cache system state.
+ */
+ public boolean system() {
+ return sys;
+ }
+
+ /**
* @return Total number of reads of the owning entity (either cache or entry).
*/
public long reads() {
@@ -396,7 +441,7 @@ public class VisorCacheMetrics implements Serializable {
}
/**
- * Committed transaction queue size.
+ * @return Committed transaction queue size.
*/
public int txCommitQueueSize() {
return txCommitQueueSize;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43fa7148/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index 99b29c0..b4b850b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -32,7 +32,7 @@ import java.util.*;
*/
@GridInternal
public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiTuple<Boolean, Collection<String>>,
- Iterable<VisorCacheAggregatedMetrics>, Map<String, IgniteBiTuple<Boolean, VisorCacheMetrics>>> {
+ Iterable<VisorCacheAggregatedMetrics>, Collection<VisorCacheMetrics>> {
/** */
private static final long serialVersionUID = 0L;
@@ -47,23 +47,18 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
for (ComputeJobResult res : results) {
if (res.getException() == null && res.getData() instanceof Map<?, ?>) {
- Map<String, IgniteBiTuple<Boolean, VisorCacheMetrics>> cms = res.getData();
+ Collection<VisorCacheMetrics> cms = res.getData();
- for (Map.Entry<String, IgniteBiTuple<Boolean, VisorCacheMetrics>> entry : cms.entrySet()) {
- VisorCacheAggregatedMetrics am = grpAggrMetrics.get(entry.getKey());
+ for (VisorCacheMetrics cm : cms) {
+ VisorCacheAggregatedMetrics am = grpAggrMetrics.get(cm.name());
if (am == null) {
- String cacheName = entry.getKey();
+ am = VisorCacheAggregatedMetrics.from(cm);
- GridCacheProcessor proc = ignite.context().cache();
-
- am = new VisorCacheAggregatedMetrics(cacheName, proc.cacheMode(cacheName),
- entry.getValue().get1());
-
- grpAggrMetrics.put(entry.getKey(), am);
+ grpAggrMetrics.put(cm.name(), am);
}
- am.metrics().put(res.getNode().id(), entry.getValue().get2());
+ am.metrics().put(res.getNode().id(), cm);
}
}
}
@@ -76,7 +71,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
* Job that collect cache metrics from node.
*/
private static class VisorCacheMetricsCollectorJob
- extends VisorJob<IgniteBiTuple<Boolean, Collection<String>>, Map<String, IgniteBiTuple<Boolean, VisorCacheMetrics>>> {
+ extends VisorJob<IgniteBiTuple<Boolean, Collection<String>>, Collection<VisorCacheMetrics>> {
/** */
private static final long serialVersionUID = 0L;
@@ -91,8 +86,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
}
/** {@inheritDoc} */
- @Override protected Map<String, IgniteBiTuple<Boolean, VisorCacheMetrics>> run(
- final IgniteBiTuple<Boolean, Collection<String>> arg) {
+ @Override protected Collection<VisorCacheMetrics> run(final IgniteBiTuple<Boolean, Collection<String>> arg) {
assert arg != null;
Boolean showSysCaches = arg.get1();
@@ -107,17 +101,16 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
Collection<GridCacheAdapter<?, ?>> caches = cacheProcessor.internalCaches();
- Map<String, IgniteBiTuple<Boolean, VisorCacheMetrics>> res = U.newHashMap(caches.size());
+ Collection<VisorCacheMetrics> res = new ArrayList<>(caches.size());
boolean allCaches = cacheNames.isEmpty();
for (GridCacheAdapter ca : caches) {
if (ca.context().started()) {
- String name = ca.name();
+ VisorCacheMetrics cm = VisorCacheMetrics.from(ignite, ca);
- if ((showSysCaches && cacheProcessor.systemCache(name)) || allCaches || cacheNames.contains(name))
- res.put(name, new IgniteBiTuple<Boolean, VisorCacheMetrics>(
- ignite.context().cache().systemCache(name), VisorCacheMetrics.from(ca)));
+ if ((showSysCaches && cm.system()) || allCaches || cacheNames.contains(ca.name()))
+ res.add(cm);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43fa7148/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 33a2a16..4d35b35 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -19,7 +19,6 @@ package org.apache.ignite.visor.commands.cache
import org.apache.ignite._
import org.apache.ignite.cluster.ClusterNode
-import org.apache.ignite.internal.processors.cache.{GridCacheUtils => CU}
import org.apache.ignite.internal.util.typedef._
import org.apache.ignite.lang.IgniteBiTuple
import org.apache.ignite.visor.VisorTag
@@ -277,7 +276,7 @@ class VisorCacheCommand {
if (hasArgFlag("scan", argLst))
VisorCacheScanCommand().scan(argLst, node)
else {
- if (!aggrData.exists(cache => cache.cacheName() == name && cache.system())) {
+ if (!aggrData.exists(cache => safeEquals(cache.name(), name) && cache.system())) {
if (hasArgFlag("clear", argLst))
VisorCacheClearCommand().clear(argLst, node)
else if (hasArgFlag("swap", argLst))
@@ -319,11 +318,11 @@ class VisorCacheCommand {
sortAggregatedData(aggrData, sortType.getOrElse("cn"), reversed).foreach(
ad => {
// Add cache host as visor variable.
- registerCacheName(ad.cacheName)
+ registerCacheName(ad.name())
sumT += (
- mkCacheName(ad.cacheName),
- ad.cacheMode(),
+ mkCacheName(ad.name()),
+ ad.mode(),
ad.nodes,
(
"min: " + ad.minimumSize,
@@ -358,11 +357,11 @@ class VisorCacheCommand {
if (all) {
val sorted = aggrData.sortWith((k1, k2) => {
- if (k1.cacheName == null)
+ if (k1.name() == null)
true
- else if (k2.cacheName == null)
+ else if (k2.name() == null)
false
- else k1.cacheName.compareTo(k2.cacheName) < 0
+ else k1.name().compareTo(k2.name()) < 0
})
val gCfg = node.map(config).collect {
@@ -370,7 +369,7 @@ class VisorCacheCommand {
}
sorted.foreach(ad => {
- val cacheNameVar = mkCacheName(ad.cacheName)
+ val cacheNameVar = mkCacheName(ad.name())
println("\nCache '" + cacheNameVar + "':")
@@ -428,7 +427,7 @@ class VisorCacheCommand {
println(" Total number of executions: " + ad.execsQuery)
println(" Total number of failures: " + ad.failsQuery)
- gCfg.foreach(_.caches().find(_.name() == ad.cacheName()).foreach(cfg => {
+ gCfg.foreach(_.caches().find(_.name() == ad.name()).foreach(cfg => {
nl()
showCacheConfiguration("Cache configuration:", cfg)
@@ -580,7 +579,7 @@ class VisorCacheCommand {
case "rd" => data.toList.sortBy(_.averageReads)
case "wr" => data.toList.sortBy(_.averageWrites)
case "cn" => data.toList.sortWith((x, y) =>
- x.cacheName == null || (y.cacheName != null && x.cacheName.toLowerCase < y.cacheName.toLowerCase))
+ x.name() == null || (y.name() != null && x.name().toLowerCase < y.name().toLowerCase))
case _ =>
assert(false, "Unknown sorting type: " + arg)
@@ -619,12 +618,12 @@ class VisorCacheCommand {
val ad = sortedAggrData(i)
// Add cache host as visor variable.
- registerCacheName(ad.cacheName)
+ registerCacheName(ad.name())
sumT += (
i,
- mkCacheName(ad.cacheName),
- ad.cacheMode(),
+ mkCacheName(ad.name()),
+ ad.mode(),
ad.nodes,
(
"min: " + ad.minimumSize,
@@ -641,7 +640,7 @@ class VisorCacheCommand {
None
else {
try
- Some(sortedAggrData(a.toInt).cacheName)
+ Some(sortedAggrData(a.toInt).name())
catch {
case e: Throwable =>
warn("Invalid selection: " + a)
[46/50] incubator-ignite git commit: # IGNITE-639 minor changes.
Posted by sb...@apache.org.
# IGNITE-639 minor changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5e9addb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5e9addb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5e9addb5
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 5e9addb568125d8ce5b375c64169178e8fc85137
Parents: 4d44e61
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 8 18:05:42 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 8 18:05:42 2015 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteEx.java | 2 +-
.../internal/visor/cache/VisorCacheMetricsCollectorTask.java | 8 +-------
2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e9addb5/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
index bea4ab5..867e26d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
@@ -117,7 +117,7 @@ public interface IgniteEx extends Ignite {
public Hadoop hadoop();
/** {@inheritDoc} */
- @Override public IgniteClusterEx cluster();
+ @Override IgniteClusterEx cluster();
/**
* Get latest version in string form.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e9addb5/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index ee0b962..8fd42a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -109,13 +109,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
if (ca.context().started()) {
VisorCacheMetrics cm = VisorCacheMetrics.from(ignite, ca);
- boolean addCache = allCaches || cacheNames.contains(ca.name());
-
- if (showSysCaches) {
- if (cm.system() && addCache)
- res.add(cm);
- }
- else if (!cm.system() && addCache)
+ if ((allCaches || cacheNames.contains(ca.name())) && (showSysCaches || !cm.system()))
res.add(cm);
}
}
[17/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-680
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-680
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/414882cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/414882cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/414882cf
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 414882cfd2e21b961c2d766c5b78a2665336e914
Parents: 86f23de e144a68
Author: sboikov <sb...@gridgain.com>
Authored: Tue Apr 7 09:10:03 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Apr 7 09:10:03 2015 +0300
----------------------------------------------------------------------
assembly/release-fabric.xml | 5 -
modules/clients/readme.md | 2 -
.../cache/eviction/fifo/FifoEvictionPolicy.java | 58 ++-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 16 +
.../store/jdbc/CacheAbstractJdbcStore.java | 104 +++--
.../apache/ignite/internal/GridComponent.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../ignite/internal/GridPluginComponent.java | 4 +-
.../org/apache/ignite/internal/IgniteEx.java | 7 -
.../apache/ignite/internal/IgniteKernal.java | 25 +-
.../ignite/internal/IgniteNodeAttributes.java | 3 -
.../internal/managers/GridManagerAdapter.java | 6 +-
.../processors/GridProcessorAdapter.java | 2 +-
.../processors/cache/CacheDistributionMode.java | 67 ----
.../processors/cache/GridCacheProcessor.java | 6 +-
.../DiscoveryNodeValidationProcessor.java | 27 ++
.../OsDiscoveryNodeValidationProcessor.java | 72 ++++
.../processors/query/GridQueryProcessor.java | 8 +-
.../ignite/internal/util/IgniteUtils.java | 46 ++-
.../ignite/internal/visor/cache/VisorCache.java | 19 +-
.../VisorCacheConfigurationCollectorJob.java | 76 ++++
.../VisorCacheConfigurationCollectorTask.java | 39 ++
.../VisorIgfsProfilerUniformityCounters.java | 6 +-
.../visor/node/VisorGridConfiguration.java | 38 --
.../visor/node/VisorIgfsConfiguration.java | 2 +-
.../visor/node/VisorRestConfiguration.java | 1 +
.../internal/visor/util/VisorTaskUtils.java | 21 +-
.../ignite/spi/IgniteNodeValidationResult.java | 66 ++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 2 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 ----
.../spi/discovery/tcp/TcpDiscoverySpi.java | 106 +----
.../org/apache/ignite/stream/StreamVisitor.java | 2 +-
.../IgniteCollectionAbstractTest.java | 23 --
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +-
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +-
.../eviction/GridCacheEvictionAbstractTest.java | 5 +-
...ridCacheFifoBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++++
.../testframework/GridSpiTestContext.java | 2 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 5 -
.../query/h2/sql/GridSqlQuerySplitter.java | 22 +-
.../h2/twostep/GridReduceQueryExecutor.java | 15 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
.../query/h2/sql/GridQueryParsingTest.java | 1 +
.../query/h2/sql/IgniteVsH2QueryTest.java | 7 +
modules/schedule/pom.xml | 20 +
.../commands/cache/VisorCacheCommand.scala | 26 +-
.../config/VisorConfigurationCommand.scala | 15 +-
.../visor/commands/gc/VisorGcCommand.scala | 15 +-
.../scala/org/apache/ignite/visor/visor.scala | 34 +-
modules/yardstick/README.md | 3 +-
.../yardstick/config/benchmark-store.properties | 5 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 +-
.../org/apache/ignite/yardstick/IgniteNode.java | 11 +-
parent/pom.xml | 49 +--
pom.xml | 143 ++++++-
61 files changed, 1238 insertions(+), 524 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414882cf/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414882cf/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414882cf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
[22/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5edf4d98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5edf4d98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5edf4d98
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 5edf4d9849ad5ba21a35fa10e309d3b1dbae899e
Parents: 25f900e 5f2d8c2
Author: S.Vladykin <sv...@gridgain.com>
Authored: Tue Apr 7 13:47:28 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Apr 7 13:47:28 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 2 +-
examples/README.txt | 11 +-
examples/config/example-ignite.xml | 2 +-
.../streaming/StreamTransformerExample.java | 101 +
.../streaming/StreamVisitorExample.java | 171 +
.../streaming/marketdata/CacheConfig.java | 44 -
.../streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 103 -
.../examples/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 78 -
.../streaming/wordcount/CacheConfig.java | 48 +
.../streaming/wordcount/QueryWords.java | 77 +
.../streaming/wordcount/StreamWords.java | 68 +
.../streaming/wordcount/alice-in-wonderland.txt | 3735 ++++++++++++++++++
.../streaming/wordcount/package-info.java | 22 +
.../streaming/StreamTransformerExample.java | 97 +
.../java8/streaming/StreamVisitorExample.java | 168 +
.../java8/streaming/marketdata/CacheConfig.java | 44 -
.../java8/streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 101 -
.../java8/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 74 -
.../ignite/cache/affinity/AffinityUuid.java | 50 +
.../store/jdbc/CacheAbstractJdbcStore.java | 104 +-
.../configuration/CacheConfiguration.java | 3 -
.../processors/cache/CacheLazyEntry.java | 10 +-
.../processors/cache/KeyCacheObjectImpl.java | 13 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 3 +-
.../IgniteCacheObjectProcessorImpl.java | 28 +-
.../ignite/internal/visor/cache/VisorCache.java | 19 +-
.../VisorCacheConfigurationCollectorJob.java | 76 +
.../VisorCacheConfigurationCollectorTask.java | 39 +
.../VisorIgfsProfilerUniformityCounters.java | 6 +-
.../internal/visor/log/VisorLogSearchTask.java | 3 +-
.../visor/node/VisorGridConfiguration.java | 38 -
.../visor/node/VisorIgfsConfiguration.java | 2 +-
.../visor/node/VisorRestConfiguration.java | 1 +
.../visor/query/VisorQueryNextPageTask.java | 5 +-
.../internal/visor/util/VisorTaskUtils.java | 3 +-
.../org/apache/ignite/lang/IgniteImmutable.java | 49 -
.../ignite/IgniteCacheAffinitySelfTest.java | 5 +
.../GridCacheOnCopyFlagAbstractSelfTest.java | 112 +-
.../GridCacheReturnValueTransferSelfTest.java | 1 -
.../IgniteCacheStoreValueAbstractTest.java | 186 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../commands/cache/VisorCacheCommand.scala | 26 +-
.../config/VisorConfigurationCommand.scala | 15 +-
.../visor/commands/gc/VisorGcCommand.scala | 15 +-
.../scala/org/apache/ignite/visor/visor.scala | 34 +-
.../yardstick/config/benchmark-store.properties | 5 +-
parent/pom.xml | 1 +
pom.xml | 12 +-
56 files changed, 5039 insertions(+), 1371 deletions(-)
----------------------------------------------------------------------
[50/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
into ignite-437-sqltests-p2
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' into ignite-437-sqltests-p2
Conflicts:
modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/04ff84a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/04ff84a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/04ff84a5
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 04ff84a59708a18574786af6c7b0fa265e7fc9df
Parents: 88bbece 71439bc
Author: Artem Shutak <as...@gridgain.com>
Authored: Wed Apr 8 16:43:57 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Wed Apr 8 16:43:57 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 15 +
.../apache/ignite/internal/IgniteKernal.java | 44 +-
.../org/apache/ignite/internal/IgnitionEx.java | 171 +++-----
.../internal/managers/GridManagerAdapter.java | 34 +-
.../cache/DynamicCacheChangeRequest.java | 17 +
.../cache/DynamicCacheDescriptor.java | 17 +-
.../processors/cache/GridCacheIoManager.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 349 +++++++++++++--
.../dht/GridClientPartitionTopology.java | 6 +-
.../distributed/dht/GridDhtLockFuture.java | 10 +-
.../dht/GridDhtPartitionTopologyImpl.java | 6 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 49 ++-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 1 +
.../cache/transactions/IgniteTxManager.java | 6 +-
.../ignite/internal/util/lang/GridFunc.java | 33 ++
.../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 +++
.../resources/META-INF/classnames.properties | 19 +-
...eCacheConfigurationTemplateNotFoundTest.java | 114 +++++
.../IgniteCacheConfigurationTemplateTest.java | 364 ++++++++++++++++
.../cache/IgniteDynamicCacheStartSelfTest.java | 23 +
...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +----
.../ignite/testframework/junits/IgniteMock.java | 10 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 5 +-
.../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 +-
.../query/h2/sql/BaseH2CompareQueryTest.java | 27 +-
.../query/h2/sql/GridQueryParsingTest.java | 29 +-
.../org/apache/ignite/IgniteSpringBean.java | 14 +
.../commands/cache/VisorCacheClearCommand.scala | 3 +-
.../commands/cache/VisorCacheCommand.scala | 423 +++++++++++--------
.../commands/cache/VisorCacheStopCommand.scala | 145 +++++++
.../scala/org/apache/ignite/visor/visor.scala | 12 +-
44 files changed, 2298 insertions(+), 752 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04ff84a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
index 2821425,0000000..8049b76
mode 100644,000000..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
@@@ -1,807 -1,0 +1,822 @@@
+/*
+ * 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.processors.query.h2.sql;
+
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.query.annotations.*;
+import org.apache.ignite.configuration.*;
+
+import java.io.*;
+import java.sql.*;
+import java.sql.Date;
+import java.util.*;
+
+/**
+ * Base set of queries to compare query results from h2 database instance and mixed ignite caches (replicated and partitioned)
+ * which have the same data models and data content.
+ */
+public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
+ /** Org count. */
+ public static final int ORG_CNT = 3;
+
+ /** Address count. */
+ public static final int ADDR_CNT = 10;
+
+ /** Person count. */
+ public static final int PERS_CNT = 5;
+
+ /** Product count. */
+ public static final int PROD_CNT = 10;
+
+ /** Purchase count. */
+ public static final int PURCH_CNT = PROD_CNT * 2;
+
+ /** {@inheritDoc} */
+ @Override protected void setIndexedTypes(CacheConfiguration<?, ?> cc, CacheMode mode) {
+ if (mode == CacheMode.PARTITIONED)
+ cc.setIndexedTypes(
+ Integer.class, Organization.class,
+ AffinityKey.class, Person.class,
+ AffinityKey.class, Purchase.class
+ );
+ else if (mode == CacheMode.REPLICATED)
+ cc.setIndexedTypes(
+ Integer.class, Product.class,
+ Integer.class, Address.class
+ );
+ else
+ throw new IllegalStateException("mode: " + mode);
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
+ @Override protected void initCacheAndDbData() throws SQLException {
+ int idGen = 0;
+
+ // Organizations.
+ List<Organization> organizations = new ArrayList<>();
+
+ for (int i = 0; i < ORG_CNT; i++) {
+ int id = idGen++;
+
+ Organization org = new Organization(id, "Org" + id);
+
+ organizations.add(org);
+
+ pCache.put(org.id, org);
+
+ insertInDb(org);
+ }
+
+ // Adresses.
+ List<Address> addreses = new ArrayList<>();
+
+ for (int i = 0; i < ADDR_CNT; i++) {
+ int id = idGen++;
+
+ Address addr = new Address(id, "Addr" + id);
+
+ addreses.add(addr);
+
+ rCache.put(addr.id, addr);
+
+ insertInDb(addr);
+ }
+
+ // Persons.
+ List<Person> persons = new ArrayList<>();
+
+ for (int i = 0; i < PERS_CNT; i++) {
+ int id = idGen++;
+
+ Person person = new Person(id, organizations.get(i % organizations.size()),
+ "name" + id, "lastName" + id, id * 100.0, addreses.get(i % addreses.size()));
+
+ // Add a Person without lastname.
+ if (id == organizations.size() + 1)
+ person.lastName = null;
+
+ persons.add(person);
+
+ pCache.put(person.key(), person);
+
+ insertInDb(person);
+ }
+
+ // Products.
+ List<Product> products = new ArrayList<>();
+
+ for (int i = 0; i < PROD_CNT; i++) {
+ int id = idGen++;
+
+ Product product = new Product(id, "Product" + id, id*1000);
+
+ products.add(product);
+
+ rCache.put(product.id, product);
+
+ insertInDb(product);
+ }
+
+ // Purchases.
+ for (int i = 0; i < PURCH_CNT; i++) {
+ int id = idGen++;
+
+ Purchase purchase = new Purchase(id, products.get(i % products.size()), persons.get(i % persons.size()));
+
+ pCache.put(purchase.key(), purchase);
+
+ insertInDb(purchase);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void checkAllDataEquals() throws Exception {
+ compareQueryRes0("select _key, _val, id, name from \"part\".Organization");
+
+ compareQueryRes0("select _key, _val, id, firstName, lastName, orgId, salary from \"part\".Person");
+
+ compareQueryRes0("select _key, _val, id, personId, productId from \"part\".Purchase");
+
+ compareQueryRes0(rCache, "select _key, _val, id, name, price from \"repl\".Product");
+ }
+
+ /**
+ * *
+ * @throws Exception
+ */
+ public void testAllExamples() throws Exception {
+// compareQueryRes0("select ? limit ? offset ?");
+
+// compareQueryRes0("select cool1()");
+// compareQueryRes0("select cool1() z");
+//
+// compareQueryRes0("select b,a from table0('aaa', 100)");
+// compareQueryRes0("select * from table0('aaa', 100)");
+// compareQueryRes0("select * from table0('aaa', 100) t0");
+// compareQueryRes0("select x.a, y.b from table0('aaa', 100) x natural join table0('bbb', 100) y");
+// compareQueryRes0("select * from table0('aaa', 100) x join table0('bbb', 100) y on x.a=y.a and x.b = 'bbb'");
+// compareQueryRes0("select * from table0('aaa', 100) x left join table0('bbb', 100) y on x.a=y.a and x.b = 'bbb'");
+// compareQueryRes0("select * from table0('aaa', 100) x left join table0('bbb', 100) y on x.a=y.a where x.b = 'bbb'");
+// compareQueryRes0("select * from table0('aaa', 100) x left join table0('bbb', 100) y where x.b = 'bbb'");
+
+ final String addStreet = "Addr" + ORG_CNT + 1;
+
+ List<List<?>> res = compareQueryRes0("select avg(old) from \"part\".Person left join \"repl\".Address " +
+ " on Person.addrId = Address.id where lower(Address.street) = lower(?)", addStreet);
+
+ assertNotSame(0, res);
+
+ compareQueryRes0("select avg(old) from \"part\".Person join \"repl\".Address on Person.addrId = Address.id " +
+ "where lower(Address.street) = lower(?)", addStreet);
+
+ compareQueryRes0("select avg(old) from \"part\".Person left join \"repl\".Address where Person.addrId = Address.id " +
+ "and lower(Address.street) = lower(?)", addStreet);
+
+ compareQueryRes0("select avg(old) from \"part\".Person, \"repl\".Address where Person.addrId = Address.id " +
+ "and lower(Address.street) = lower(?)", addStreet);
+
+ compareQueryRes0("select firstName, date from \"part\".Person");
+ compareQueryRes0("select distinct firstName, date from \"part\".Person");
+
+ final String star = " _key, _val, id, firstName, lastName, orgId, salary, addrId, old, date ";
+
+ compareQueryRes0("select " + star + " from \"part\".Person p");
+ compareQueryRes0("select " + star + " from \"part\".Person");
+ compareQueryRes0("select distinct " + star + " from \"part\".Person");
+ compareQueryRes0("select p.firstName, date from \"part\".Person p");
+
+ compareQueryRes0("select p._key, p._val, p.id, p.firstName, p.lastName, p.orgId, p.salary, p.addrId, p.old, " +
+ " p.date, a._key, a._val, a.id, a.street" +
+ " from \"part\".Person p, \"repl\".Address a");
+// compareQueryRes0("select p.* from \"part\".Person p, \"repl\".Address a");
+// compareQueryRes0("select person.* from \"part\".Person, \"repl\".Address a");
+// compareQueryRes0("select p.*, street from \"part\".Person p, \"repl\".Address a");
+ compareQueryRes0("select p.firstName, a.street from \"part\".Person p, \"repl\".Address a");
+ compareQueryRes0("select distinct p.firstName, a.street from \"part\".Person p, \"repl\".Address a");
+ compareQueryRes0("select distinct firstName, street from \"part\".Person, \"repl\".Address group by firstName, street ");
+ compareQueryRes0("select distinct firstName, street from \"part\".Person, \"repl\".Address");
+ // TODO uncomment and investigate (Rows count has to be equal.: Expected :2500, Actual :900)
+// compareQueryRes0("select p1.firstName, a2.street from \"part\".Person p1, \"repl\".Address a1, \"part\".Person p2, \"repl\".Address a2");
+
+ //TODO look at it (org.h2.jdbc.JdbcSQLException: Feature not supported: "VARCHAR +" // at H2)
+// compareQueryRes0("select p.firstName n, a.street s from \"part\".Person p, \"repl\".Address a");
+ compareQueryRes0("select p.firstName, 1 as i, 'aaa' s from \"part\".Person p");
+
+// compareQueryRes0("select p.firstName + 'a', 1 * 3 as i, 'aaa' s, -p.old, -p.old as old from \"part\".Person p");
+// compareQueryRes0("select p.firstName || 'a' + p.firstName, (p.old * 3) % p.old - p.old / p.old, p.firstName = 'aaa', " +
+// " p.firstName is p.firstName, p.old > 0, p.old >= 0, p.old < 0, p.old <= 0, p.old <> 0, p.old is not p.old, " +
+// " p.old is null, p.old is not null " +
+// " from \"part\".Person p");
+
+ compareQueryRes0("select p.firstName from \"part\".Person p where firstName <> 'ivan'");
+ compareQueryRes0("select p.firstName from \"part\".Person p where firstName like 'i%'");
+ compareQueryRes0("select p.firstName from \"part\".Person p where firstName regexp 'i%'");
+ compareQueryRes0("select p.firstName from \"part\".Person p, \"repl\".Address a where p.firstName <> 'ivan' and a.id > 10 or not (a.id = 100)");
+
+ compareQueryRes0("select case p.firstName when 'a' then 1 when 'a' then 2 end as a from \"part\".Person p");
+ compareQueryRes0("select case p.firstName when 'a' then 1 when 'a' then 2 else -1 end as a from \"part\".Person p");
+
+ compareQueryRes0("select abs(p.old) from \"part\".Person p");
+ compareQueryRes0("select cast(p.old as numeric(10, 2)) from \"part\".Person p");
+ compareQueryRes0("select cast(p.old as numeric(10, 2)) z from \"part\".Person p");
+ compareQueryRes0("select cast(p.old as numeric(10, 2)) as z from \"part\".Person p");
+
+ compareQueryRes0("select " + star + " from \"part\".Person p where p.firstName in ('a', 'b', '_' + RAND())"); // test ConditionIn
+ compareQueryRes0("select " + star + " from \"part\".Person p where p.firstName in ('a', 'b', 'c')"); // test ConditionInConstantSet
+ compareQueryRes0("select " + star + " from \"part\".Person p where p.firstName in (select a.street from \"repl\".Address a)"); // test ConditionInConstantSet
+
+ compareQueryRes0("select (select a.street from \"repl\".Address a where a.id = p.addrId) from \"part\".Person p"); // test ConditionInConstantSet
+
+ compareQueryRes0("select p.firstName, ? from \"part\".Person p where firstName regexp ? and p.old < ?");
+
+ compareQueryRes0("select count(*) as a from \"part\".Person");
+ compareQueryRes0("select count(*) as a, count(p.*), count(p.firstName) from \"part\".Person p");
+ compareQueryRes0("select count(distinct p.firstName) from \"part\".Person p");
+
+ compareQueryRes0("select p.firstName, avg(p.old), max(p.old) from \"part\".Person p group by p.firstName");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by n");
+
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.addrId, p.firstName");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName, p.addrId");
+ compareQueryRes0("select p.firstName n, max(p.old) + min(p.old) / count(distinct p.old) from \"part\".Person p group by p.firstName");
+ compareQueryRes0("select p.firstName n, max(p.old) maxOld, min(p.old) minOld from \"part\".Person p group by p.firstName having maxOld > 10 and min(p.old) < 1");
+
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by n");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName, m");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName, max(p.old) desc");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName nulls first");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName nulls last");
+ compareQueryRes0("select p.firstName n from \"part\".Person p order by p.old + 10");
+ compareQueryRes0("select p.firstName n from \"part\".Person p order by p.old + 10, p.firstName");
+ compareQueryRes0("select p.firstName n from \"part\".Person p order by p.old + 10, p.firstName desc");
+
+ compareQueryRes0("select p.firstName n from \"part\".Person p, (select a.street from \"repl\".Address a where a.street is not null) ");
+ compareQueryRes0("select street from \"part\".Person p, (select a.street from \"repl\".Address a where a.street is not null) ");
+ compareQueryRes0("select addr.street from \"part\".Person p, (select a.street from \"repl\".Address a where a.street is not null) addr");
+
+ compareQueryRes0("select p.firstName n from \"part\".Person p order by p.old + 10");
+
+ compareQueryRes0("select 'foo' as bar union select 'foo' as bar");
+ compareQueryRes0("select 'foo' as bar union all select 'foo' as bar");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
- public void testSimpleReplSelect() throws Exception {
++ public void _testSimpleReplSelect() throws Exception {
+ compareQueryRes0("select id, name, price from \"repl\".Product");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testParamSubstitution() throws Exception {
+ compareQueryRes0("select ? from \"part\".Person", "Some arg");
+ }
+
+ /**
+ * @throws SQLException If failed.
+ */
+ public void testAggregateOrderBy() throws SQLException {
+ compareOrderedQueryRes0("select firstName name, count(*) cnt from \"part\".Person group by name order by cnt desc");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testNullParamSubstitution() throws Exception {
+ List<List<?>> rs1 = compareQueryRes0("select id from \"part\".Person where lastname is ?", null);
+
+ // Ensure we find something.
+ assertNotSame(0, rs1.size());
+ }
+
+ /**
++ *
++ */
++ public void testUnion() throws SQLException {
++ String base = "select _val v from \"part\".Person";
++
++ compareQueryRes0(base + " union all " + base);
++ compareQueryRes0(base + " union " + base);
++
++ base = "select firstName||lastName name, salary from \"part\".Person";
++
++ assertEquals(10, compareOrderedQueryRes0(base + " union all " + base + " order by salary desc").size());
++ assertEquals(5, compareOrderedQueryRes0(base + " union " + base + " order by salary desc").size());
++ }
++
++ /**
+ * @throws Exception If failed.
+ */
+ public void testEmptyResult() throws Exception {
+ compareQueryRes0("select id from \"part\".Person where 0 = 1");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSqlQueryWithAggregation() throws Exception {
+ compareQueryRes0("select avg(salary) from \"part\".Person, \"part\".Organization where Person.orgId = Organization.id and "
+ + "lower(Organization.name) = lower(?)", "Org1");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSqlFieldsQuery() throws Exception {
+ compareQueryRes0("select concat(firstName, ' ', lastName) from \"part\".Person");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSqlFieldsQueryWithJoin() throws Exception {
+ compareQueryRes0("select concat(firstName, ' ', lastName), "
+ + "Organization.name from \"part\".Person, \"part\".Organization where "
+ + "Person.orgId = Organization.id");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testOrdered() throws Exception {
+ compareOrderedQueryRes0("select firstName, lastName" +
+ " from \"part\".Person" +
+ " order by lastName, firstName"
+ );
+ }
+
+ /**
+ * //TODO Investigate.
+ *
+ * @throws Exception If failed.
+ */
- public void testSimpleJoin() throws Exception {
++ public void _testSimpleJoin() throws Exception {
+ // Have expected results.
+ compareQueryRes0("select id, firstName, lastName" +
+ " from \"part\".Person" +
+ " where Person.id = ?", 3);
+
+ // Ignite cache return 0 results...
- compareQueryRes0("select Person.firstName" +
- " from \"part\".Person, \"part\".Purchase" +
- " where Person.id = ?", 3);
++ compareQueryRes0("select pe.firstName" +
++ " from \"part\".Person pe join \"part\".Purchase pu on pe.id = pu.personId " +
++ " where pe.id = ?", 3);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSimpleReplicatedSelect() throws Exception {
+ compareQueryRes0(rCache, "select id, name from \"repl\".Product");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
- public void testCrossCache() throws Exception {
++ public void _testCrossCache() throws Exception {
+ //TODO Investigate (should be 20 results instead of 0).
+ compareQueryRes0("select firstName, lastName" +
+ " from \"part\".Person, \"part\".Purchase" +
+ " where Person.id = Purchase.personId");
+
+ //TODO Investigate.
+ compareQueryRes0("select concat(firstName, ' ', lastName), Product.name " +
+ " from \"part\".Person, \"part\".Purchase, \"repl\".Product " +
+ " where Person.id = Purchase.personId and Purchase.productId = Product.id" +
+ " group by Product.id");
+
+ //TODO Investigate.
+ compareQueryRes0("select concat(firstName, ' ', lastName), count (Product.id) " +
+ " from \"part\".Person, \"part\".Purchase, \"repl\".Product " +
+ " where Person.id = Purchase.personId and Purchase.productId = Product.id" +
+ " group by Product.id");
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void initializeH2Schema() throws SQLException {
+ Statement st = conn.createStatement();
+
+ st.execute("CREATE SCHEMA \"part\"");
+ st.execute("CREATE SCHEMA \"repl\"");
+
+ st.execute("create table \"part\".ORGANIZATION" +
+ " (_key int not null," +
+ " _val other not null," +
+ " id int unique," +
+ " name varchar(255))");
+
+ st.execute("create table \"part\".PERSON" +
+ " (_key other not null ," +
+ " _val other not null ," +
+ " id int unique, " +
+ " firstName varchar(255), " +
+ " lastName varchar(255)," +
+ " orgId int not null," +
+ " salary double," +
+ " addrId int," +
+ " old int," +
+ " date Date )");
+
+ st.execute("create table \"repl\".PRODUCT" +
+ " (_key int not null ," +
+ " _val other not null ," +
+ " id int unique, " +
+ " name varchar(255), " +
+ " price int)");
+
+ st.execute("create table \"part\".PURCHASE" +
+ " (_key other not null ," +
+ " _val other not null ," +
+ " id int unique, " +
+ " personId int, " +
+ " productId int)");
+
+ st.execute("create table \"repl\".ADDRESS" +
+ " (_key int not null ," +
+ " _val other not null ," +
+ " id int unique, " +
+ " street varchar(255))");
+
+ conn.commit();
+ }
+
+ /**
+ * Insert {@link Organization} at h2 database.
+ *
+ * @param org Organization.
+ * @throws SQLException If exception.
+ */
+ private void insertInDb(Organization org) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"part\".ORGANIZATION (_key, _val, id, name) values(?, ?, ?, ?)")) {
+ st.setObject(1, org.id);
+ st.setObject(2, org);
+ st.setObject(3, org.id);
+ st.setObject(4, org.name);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Insert {@link Person} at h2 database.
+ *
+ * @param p Person.
+ * @throws SQLException If exception.
+ */
+ private void insertInDb(Person p) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement("insert into \"part\".PERSON " +
+ "(_key, _val, id, firstName, lastName, orgId, salary, addrId, old, date) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")) {
+ st.setObject(1, p.key());
+ st.setObject(2, p);
+ st.setObject(3, p.id);
+ st.setObject(4, p.firstName);
+ st.setObject(5, p.lastName);
+ st.setObject(6, p.orgId);
+ st.setObject(7, p.salary);
+ st.setObject(8, p.addrId);
+ st.setObject(9, p.old);
+ st.setObject(10, p.date);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Insert {@link Product} at h2 database.
+ *
+ * @param p Product.
+ * @throws SQLException If exception.
+ */
+ private void insertInDb(Product p) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"repl\".PRODUCT (_key, _val, id, name, price) values(?, ?, ?, ?, ?)")) {
+ st.setObject(1, p.id);
+ st.setObject(2, p);
+ st.setObject(3, p.id);
+ st.setObject(4, p.name);
+ st.setObject(5, p.price);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Insert {@link Purchase} at h2 database.
+ *
+ * @param p Purchase.
+ * @throws SQLException If exception.
+ */
+ private void insertInDb(Purchase p) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"part\".PURCHASE (_key, _val, id, personId, productId) values(?, ?, ?, ?, ?)")) {
+ st.setObject(1, p.key());
+ st.setObject(2, p);
+ st.setObject(3, p.id);
+ st.setObject(4, p.personId);
+ st.setObject(5, p.productId);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Insert {@link Address} at h2 database.
+ *
+ * @param a Address.
+ * @throws SQLException If exception.
+ */
+ private void insertInDb(Address a) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"repl\".ADDRESS (_key, _val, id, street) values(?, ?, ?, ?)")) {
+ st.setObject(1, a.id);
+ st.setObject(2, a);
+ st.setObject(3, a.id);
+ st.setObject(4, a.street);
+
+ st.executeUpdate();
+ }
+ }
+
+ @QuerySqlFunction
+ public static int cool1() {
+ return 1;
+ }
+
+ @QuerySqlFunction
+ public static ResultSet table0(Connection c, String a, int b) throws SQLException {
+ return c.createStatement().executeQuery("select '" + a + "' as a, " + b + " as b");
+ }
+
+ /**
+ * Person class. Stored at partitioned cache.
+ */
+ private static class Person implements Serializable {
+ /** Person ID (indexed). */
+ @QuerySqlField(index = true)
+ private int id;
+
+ /** Organization ID (indexed). */
+ @QuerySqlField(index = true)
+ private int orgId;
+
+ /** First name (not-indexed). */
+ @QuerySqlField
+ private String firstName;
+
+ /** Last name (not indexed). */
+ @QuerySqlField
+ private String lastName;
+
+ /** Salary (indexed). */
+ @QuerySqlField(index = true)
+ private double salary;
+
+ /** Address Id (indexed). */
+ @QuerySqlField(index = true)
+ private int addrId;
+
+ /** Date. */
+ @QuerySqlField(index = true)
+ public Date date = new Date(System.currentTimeMillis());
+
+ /** Old. */
+ @QuerySqlField(index = true)
+ public int old = 17;
+
+
+ /**
+ * Constructs person record.
+ *
+ * @param org Organization.
+ * @param firstName First name.
+ * @param lastName Last name.
+ * @param salary Salary.
+ */
+ Person(int id, Organization org, String firstName, String lastName, double salary, Address addr) {
+ this.id = id;
+ this.firstName = firstName;
+ this.lastName = lastName;
+ this.salary = salary;
+ orgId = org.id;
+ addrId = addr.id;
+ }
+
+ /**
+ * @return Custom affinity key to guarantee that person is always collocated with organization.
+ */
+ public AffinityKey<Integer> key() {
+ return new AffinityKey<>(id, orgId);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof Person && id == ((Person)o).id;
+
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Person [firstName=" + firstName +
+ ", lastName=" + lastName +
+ ", id=" + id +
+ ", orgId=" + orgId +
+ ", salary=" + salary +
+ ", addrId=" + addrId + ']';
+ }
+ }
+
+ /**
+ * Organization class. Stored at partitioned cache.
+ */
+ private static class Organization implements Serializable {
+ /** Organization ID (indexed). */
+ @QuerySqlField(index = true)
+ private int id;
+
+ /** Organization name (indexed). */
+ @QuerySqlField(index = true)
+ private String name;
+
+ /**
+ * Create Organization.
+ *
+ * @param id Organization ID.
+ * @param name Organization name.
+ */
+ Organization(int id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof Organization && id == ((Organization)o).id;
+
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Organization [id=" + id + ", name=" + name + ']';
+ }
+ }
+
+ /**
+ * Product class. Stored at replicated cache.
+ */
+ private static class Product implements Serializable {
+ /** Primary key. */
+ @QuerySqlField(index = true)
+ private int id;
+
+ /** Product name. */
+ @QuerySqlField
+ private String name;
+
+ /** Product price */
+ @QuerySqlField
+ private int price;
+
+ /**
+ * Create Product.
+ *
+ * @param id Product ID.
+ * @param name Product name.
+ * @param price Product price.
+ */
+ Product(int id, String name, int price) {
+ this.id = id;
+ this.name = name;
+ this.price = price;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof Product && id == ((Product)o).id;
+
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Product [id=" + id + ", name=" + name + ", price=" + price + ']';
+ }
+ }
+
+ /**
+ * Purchase class. Stored at partitioned cache.
+ */
+ private static class Purchase implements Serializable {
+ /** Primary key. */
+ @QuerySqlField(index = true)
+ private int id;
+
+ /** Product ID. */
+ @QuerySqlField
+ private int productId;
+
+ /** Person ID. */
+ @QuerySqlField
+ private int personId;
+
+ /**
+ * Create Purchase.
+ *
+ * @param id Purchase ID.
+ * @param product Purchase product.
+ * @param person Purchase person.
+ */
+ Purchase(int id, Product product, Person person) {
+ this.id = id;
+ productId = product.id;
+ personId = person.id;
+ }
+
+ /**
+ * @return Custom affinity key to guarantee that purchase is always collocated with person.
+ */
+ public AffinityKey<Integer> key() {
+ return new AffinityKey<>(id, personId);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof Purchase && id == ((Purchase)o).id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Purchase [id=" + id + ", productId=" + productId + ", personId=" + personId + ']';
+ }
+ }
+
+ /**
+ * Address class. Stored at replicated cache.
+ */
+ private static class Address implements Serializable {
+ @QuerySqlField(index = true)
+ private int id;
+
+ @QuerySqlField(index = true)
+ private String street;
+
+ Address(int id, String street) {
+ this.id = id;
+ this.street = street;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof Address && id == ((Address)o).id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Address [id=" + id + ", street=" + street + ']';
+ }
+ }
+}
[34/50] incubator-ignite git commit: # ignite-sprint-3 more info in
error message
Posted by sb...@apache.org.
# ignite-sprint-3 more info in error message
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f6beb36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f6beb36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f6beb36
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 3f6beb36e207c76244dee7a6696d9414a65e7a24
Parents: cbab850
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 8 10:16:10 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 8 10:16:10 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheIoManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f6beb36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 7bd6726..d0cceab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -302,7 +302,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
log.debug("Finished processing cache communication message [nodeId=" + nodeId + ", msg=" + msg + ']');
}
catch (Throwable e) {
- U.error(log, "Failed processing message [senderId=" + nodeId + ']', e);
+ U.error(log, "Failed processing message [senderId=" + nodeId + ", msg=" + msg + ']', e);
}
finally {
// Reset thread local context.
[38/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-680' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-680' 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/682dcd14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/682dcd14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/682dcd14
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 682dcd143da345cbba7eeab8e2068fbe04cc4900
Parents: 080376a 7e9f22e
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 8 11:32:55 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 8 11:32:55 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 15 +
.../apache/ignite/internal/IgniteKernal.java | 37 ++
.../internal/managers/GridManagerAdapter.java | 34 +-
.../cache/DynamicCacheChangeRequest.java | 17 +
.../cache/DynamicCacheDescriptor.java | 17 +-
.../processors/cache/GridCacheProcessor.java | 349 +++++++++++++++---
.../GridDhtPartitionsExchangeFuture.java | 1 +
...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++
.../IgniteCacheConfigurationTemplateTest.java | 364 +++++++++++++++++++
.../ignite/testframework/junits/IgniteMock.java | 10 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../org/apache/ignite/IgniteSpringBean.java | 14 +
12 files changed, 920 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
[20/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-680
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-680
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3cdf666f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3cdf666f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3cdf666f
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 3cdf666f57b32e1eab5ff3ad00a91ed142c95163
Parents: 5832b3a d20d29b
Author: sboikov <sb...@gridgain.com>
Authored: Tue Apr 7 12:07:47 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Apr 7 12:07:47 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 2 +-
examples/README.txt | 11 +-
examples/config/example-ignite.xml | 2 +-
.../streaming/StreamTransformerExample.java | 101 +
.../streaming/StreamVisitorExample.java | 171 +
.../streaming/marketdata/CacheConfig.java | 44 -
.../streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 103 -
.../examples/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 78 -
.../streaming/wordcount/CacheConfig.java | 48 +
.../streaming/wordcount/QueryWords.java | 77 +
.../streaming/wordcount/StreamWords.java | 68 +
.../streaming/wordcount/alice-in-wonderland.txt | 3735 ++++++++++++++++++
.../streaming/wordcount/package-info.java | 22 +
.../streaming/StreamTransformerExample.java | 97 +
.../java8/streaming/StreamVisitorExample.java | 168 +
.../java8/streaming/marketdata/CacheConfig.java | 44 -
.../java8/streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 101 -
.../java8/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 74 -
.../ignite/cache/affinity/AffinityUuid.java | 50 +
parent/pom.xml | 1 +
28 files changed, 4549 insertions(+), 1046 deletions(-)
----------------------------------------------------------------------
[42/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e0d88d3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e0d88d3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e0d88d3a
Branch: refs/heads/ignite-437-sqltests-p2
Commit: e0d88d3a0dc0f07316d9f48910203a8dd1428346
Parents: d9e2a64 0cf79e4
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 13:12:36 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 13:12:36 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 15 +
.../apache/ignite/internal/IgniteKernal.java | 37 ++
.../internal/managers/GridManagerAdapter.java | 34 +-
.../cache/DynamicCacheChangeRequest.java | 17 +
.../cache/DynamicCacheDescriptor.java | 17 +-
.../processors/cache/GridCacheIoManager.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 349 +++++++++++++++---
.../dht/GridClientPartitionTopology.java | 6 +-
.../distributed/dht/GridDhtLockFuture.java | 10 +-
.../dht/GridDhtPartitionTopologyImpl.java | 6 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 49 +--
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 1 +
.../cache/transactions/IgniteTxManager.java | 6 +-
.../resources/META-INF/classnames.properties | 19 +-
...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++
.../IgniteCacheConfigurationTemplateTest.java | 364 +++++++++++++++++++
.../cache/IgniteDynamicCacheStartSelfTest.java | 23 ++
.../ignite/testframework/junits/IgniteMock.java | 10 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 5 +-
.../org/apache/ignite/IgniteSpringBean.java | 14 +
.../commands/cache/VisorCacheClearCommand.scala | 3 +-
.../scala/org/apache/ignite/visor/visor.scala | 12 +-
23 files changed, 1011 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
[26/50] incubator-ignite git commit: # ignite-sprint-3 fixed test
Posted by sb...@apache.org.
# ignite-sprint-3 fixed test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/beedb178
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/beedb178
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/beedb178
Branch: refs/heads/ignite-437-sqltests-p2
Commit: beedb1789c6636f5823b445cb219ffa9ae28d6d0
Parents: f11e357
Author: sboikov <se...@inria.fr>
Authored: Tue Apr 7 22:23:23 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Tue Apr 7 22:23:23 2015 +0300
----------------------------------------------------------------------
...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 ++-----------------
1 file changed, 10 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/beedb178/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
index 05eab37..b362431 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
@@ -126,22 +126,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
public void testPutFromPrimary() throws Exception {
IgniteCache<Integer, String> cache = jcache(0);
- int key = 0;
-
- while (true) {
- boolean found = false;
-
- for (ClusterNode n : grid(0).cluster().nodes()) {
- if (grid(0).affinity(null).isPrimary(n, key)) {
- found = true;
-
- break;
- }
- }
-
- if (found)
- break;
- }
+ int key = primaryKey(cache);
assertNull(cache.getAndPut(key, "val"));
@@ -154,26 +139,11 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
public void testPutFromBackup() throws Exception {
IgniteCache<Integer, String> cache = jcache(0);
- int key = 0;
-
- while (true) {
- boolean found = false;
-
- for (ClusterNode n : grid(0).cluster().nodes()) {
- if (grid(0).affinity(null).isBackup(n, key)) {
- found = true;
-
- break;
- }
- }
-
- if (found)
- break;
- }
+ int key = backupKey(cache);
assertNull(cache.getAndPut(key, "val"));
- checkStoreUsage(1, 1, 0, 1);
+ checkStoreUsage(1, 1, 0, nearCacheConfiguration() == null ? 2 : 1);
}
/**
@@ -182,26 +152,11 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
public void testPutFromNear() throws Exception {
IgniteCache<Integer, String> cache = jcache(0);
- int key = 0;
-
- while (true) {
- boolean found = false;
-
- for (ClusterNode n : grid(0).cluster().nodes()) {
- if (!grid(0).affinity(null).isPrimaryOrBackup(n, key)) {
- found = true;
-
- break;
- }
- }
-
- if (found)
- break;
- }
+ int key = nearKey(cache);
assertNull(cache.getAndPut(key, "val"));
- checkStoreUsage(1, 1, 0, 1);
+ checkStoreUsage(1, 1, 0, nearCacheConfiguration() == null ? 2 : 1);
}
/**
@@ -210,22 +165,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
public void testPutIfAbsentFromPrimary() throws Exception {
IgniteCache<Integer, String> cache = jcache(0);
- int key = 0;
-
- while (true) {
- boolean found = false;
-
- for (ClusterNode n : grid(0).cluster().nodes()) {
- if (grid(0).affinity(null).isPrimary(n, key)) {
- found = true;
-
- break;
- }
- }
-
- if (found)
- break;
- }
+ int key = primaryKey(cache);
assertTrue(cache.putIfAbsent(key, "val"));
@@ -238,26 +178,11 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
public void testPutIfAbsentFromBackup() throws Exception {
IgniteCache<Integer, String> cache = jcache(0);
- int key = 0;
-
- while (true) {
- boolean found = false;
-
- for (ClusterNode n : grid(0).cluster().nodes()) {
- if (grid(0).affinity(null).isBackup(n, key)) {
- found = true;
-
- break;
- }
- }
-
- if (found)
- break;
- }
+ int key = backupKey(cache);
assertTrue(cache.putIfAbsent(key, "val"));
- checkStoreUsage(1, 1, 0, 1);
+ checkStoreUsage(1, 1, 0, nearCacheConfiguration() == null ? 2 : 1);
}
/**
@@ -266,26 +191,11 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
public void testPutIfAbsentFromNear() throws Exception {
IgniteCache<Integer, String> cache = jcache(0);
- int key = 0;
-
- while (true) {
- boolean found = false;
-
- for (ClusterNode n : grid(0).cluster().nodes()) {
- if (!grid(0).affinity(null).isPrimaryOrBackup(n, key)) {
- found = true;
-
- break;
- }
- }
-
- if (found)
- break;
- }
+ int key = nearKey(cache);
assertTrue(cache.putIfAbsent(key, "val"));
- checkStoreUsage(1, 1, 0, 1);
+ checkStoreUsage(1, 1, 0, nearCacheConfiguration() == null ? 2 : 1);
}
/**
[30/50] incubator-ignite git commit: IGNITE-180 - Fixed
awaitPartitionMap for dynamically started cache.
Posted by sb...@apache.org.
IGNITE-180 - Fixed awaitPartitionMap for dynamically started cache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fd011e28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fd011e28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fd011e28
Branch: refs/heads/ignite-437-sqltests-p2
Commit: fd011e282fd818ff3cab1bda94fd236207bb8779
Parents: beedb17
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Tue Apr 7 17:09:51 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Tue Apr 7 17:09:51 2015 -0700
----------------------------------------------------------------------
.../dht/GridClientPartitionTopology.java | 6 ++---
.../dht/GridDhtPartitionTopologyImpl.java | 6 ++---
.../cache/IgniteDynamicCacheStartSelfTest.java | 23 ++++++++++++++++++++
3 files changed, 29 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd011e28/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
index 4640192..331de4e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
@@ -220,21 +220,21 @@ public class GridClientPartitionTopology implements GridDhtPartitionTopology {
// If this is the oldest node.
if (oldest.id().equals(loc.id()) || exchFut.isCacheAdded(cacheId)) {
if (node2part == null) {
- node2part = new GridDhtPartitionFullMap(loc.id(), loc.order(), updateSeq);
+ node2part = new GridDhtPartitionFullMap(oldest.id(), oldest.order(), updateSeq);
if (log.isDebugEnabled())
log.debug("Created brand new full topology map on oldest node [exchId=" +
exchId + ", fullMap=" + fullMapString() + ']');
}
else if (!node2part.valid()) {
- node2part = new GridDhtPartitionFullMap(loc.id(), loc.order(), updateSeq, node2part, false);
+ node2part = new GridDhtPartitionFullMap(oldest.id(), oldest.order(), updateSeq, node2part, false);
if (log.isDebugEnabled())
log.debug("Created new full topology map on oldest node [exchId=" + exchId + ", fullMap=" +
node2part + ']');
}
else if (!node2part.nodeId().equals(loc.id())) {
- node2part = new GridDhtPartitionFullMap(loc.id(), loc.order(), updateSeq, node2part, false);
+ node2part = new GridDhtPartitionFullMap(oldest.id(), oldest.order(), updateSeq, node2part, false);
if (log.isDebugEnabled())
log.debug("Copied old map into new map on oldest node (previous oldest node left) [exchId=" +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd011e28/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 30b4c80..073e0e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -249,21 +249,21 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology {
// If this is the oldest node.
if (oldest.id().equals(loc.id()) || exchFut.isCacheAdded(cctx.cacheId())) {
if (node2part == null) {
- node2part = new GridDhtPartitionFullMap(loc.id(), loc.order(), updateSeq);
+ node2part = new GridDhtPartitionFullMap(oldest.id(), oldest.order(), updateSeq);
if (log.isDebugEnabled())
log.debug("Created brand new full topology map on oldest node [exchId=" +
exchId + ", fullMap=" + fullMapString() + ']');
}
else if (!node2part.valid()) {
- node2part = new GridDhtPartitionFullMap(loc.id(), loc.order(), updateSeq, node2part, false);
+ node2part = new GridDhtPartitionFullMap(oldest.id(), oldest.order(), updateSeq, node2part, false);
if (log.isDebugEnabled())
log.debug("Created new full topology map on oldest node [exchId=" + exchId + ", fullMap=" +
node2part + ']');
}
else if (!node2part.nodeId().equals(loc.id())) {
- node2part = new GridDhtPartitionFullMap(loc.id(), loc.order(), updateSeq, node2part, false);
+ node2part = new GridDhtPartitionFullMap(oldest.id(), oldest.order(), updateSeq, node2part, false);
if (log.isDebugEnabled())
log.debug("Copied old map into new map on oldest node (previous oldest node left) [exchId=" +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd011e28/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
index b83924b25..32809e6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
@@ -997,4 +997,27 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
daemon = false;
}
}
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testAwaitPartitionMapExchange() throws Exception {
+ try (IgniteCache ignored = grid(0).getOrCreateCache(new CacheConfiguration(DYNAMIC_CACHE_NAME))) {
+ awaitPartitionMapExchange();
+
+ startGrid(nodeCount());
+
+ awaitPartitionMapExchange();
+
+ startGrid(nodeCount() + 1);
+
+ awaitPartitionMapExchange();
+
+ stopGrid(nodeCount() + 1);
+
+ awaitPartitionMapExchange();
+
+ stopGrid(nodeCount());
+ }
+ }
}
[33/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-680
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-680
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b05c14fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b05c14fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b05c14fa
Branch: refs/heads/ignite-437-sqltests-p2
Commit: b05c14fa8630062863b48c893c21a2aeb542c985
Parents: 68a99f1 cbab850
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 8 09:22:50 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 8 09:22:50 2015 +0300
----------------------------------------------------------------------
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/include/service.sh | 8 +-
config/hadoop/default-config.xml | 15 ++-
.../streaming/StreamTransformerExample.java | 3 +-
.../dht/GridClientPartitionTopology.java | 6 +-
.../distributed/dht/GridDhtLockFuture.java | 10 +-
.../dht/GridDhtPartitionTopologyImpl.java | 6 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 49 +++++----
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 +++++---
.../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 ++--
.../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 +-
parent/pom.xml | 2 +-
pom.xml | 2 +
31 files changed, 254 insertions(+), 254 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b05c14fa/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
[40/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@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/0cf79e46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0cf79e46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0cf79e46
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 0cf79e467ab532e21ccac9ee6d36f57145c457de
Parents: 21c8e89 682dcd1
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Apr 8 13:00:10 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Apr 8 13:00:10 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 15 +
.../apache/ignite/internal/IgniteKernal.java | 37 ++
.../internal/managers/GridManagerAdapter.java | 34 +-
.../cache/DynamicCacheChangeRequest.java | 17 +
.../cache/DynamicCacheDescriptor.java | 17 +-
.../processors/cache/GridCacheProcessor.java | 349 +++++++++++++++---
.../GridDhtPartitionsExchangeFuture.java | 1 +
...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++
.../IgniteCacheConfigurationTemplateTest.java | 364 +++++++++++++++++++
.../ignite/testframework/junits/IgniteMock.java | 10 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../org/apache/ignite/IgniteSpringBean.java | 14 +
12 files changed, 920 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
[16/50] incubator-ignite git commit: Merge branches 'ignite-639' and
'ignite-sprint-3'
Posted by sb...@apache.org.
Merge branches 'ignite-639' 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/0c836dbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c836dbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c836dbe
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 0c836dbeb4c02e834ec7e26f5757cb631f569011
Parents: f600e7e
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Apr 7 11:30:32 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Apr 7 11:30:32 2015 +0700
----------------------------------------------------------------------
.../processors/query/h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../ignite/visor/commands/cache/VisorCacheCommand.scala | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c836dbe/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 984e2c0..02c7c55 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -47,7 +47,7 @@ import org.h2.value.*;
import org.jsr166.*;
import javax.cache.*;
-import java.lang.reflect.Constructor;
+import java.lang.reflect.*;
import java.sql.*;
import java.util.*;
import java.util.concurrent.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c836dbe/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 055931b..df3007c 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -32,7 +32,6 @@ import java.lang.{Boolean => JavaBoolean}
import java.util.{ArrayList => JavaList, Collection => JavaCollection, UUID}
import org.apache.ignite.internal.visor.cache._
-import org.apache.ignite.internal.visor.node.{VisorGridConfiguration, VisorNodeConfigurationCollectorTask}
import org.apache.ignite.internal.visor.util.VisorTaskUtils._
import scala.collection.JavaConversions._
@@ -494,11 +493,11 @@ class VisorCacheCommand {
val nids = prj.nodes().map(_.id())
- val caches = new JavaList[String](1)
+ val caches: JavaCollection[String] = new JavaList[String](1)
name.foreach(caches.add)
ignite.compute(prj).execute(classOf[VisorCacheMetricsCollectorTask], toTaskArgument(nids,
- new IgniteBiTuple(JavaBoolean.valueOf(systemCaches), caches.asInstanceOf[JavaCollection[String]]))).toList
+ new IgniteBiTuple(JavaBoolean.valueOf(systemCaches), caches))).toList
}
catch {
case e: IgniteException => Nil
@@ -519,7 +518,7 @@ class VisorCacheCommand {
case e: IgniteException =>
scold(e.getMessage)
- Collections.emptyList()
+ null
}
}
[02/50] incubator-ignite git commit: Merge branches 'ignite-639' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-639
Posted by sb...@apache.org.
Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fdf56a5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fdf56a5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fdf56a5d
Branch: refs/heads/ignite-437-sqltests-p2
Commit: fdf56a5db66f4e7f24033f83f9d566a2eae177d2
Parents: 5dd8ff1 5b806d8
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Apr 6 09:57:55 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Apr 6 09:57:55 2015 +0700
----------------------------------------------------------------------
examples/schema-import/bin/db-init.sql | 17 +++++++
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 ++---
.../ignite/events/CacheQueryReadEvent.java | 11 ++---
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../cache/query/GridCacheQueryManager.java | 18 +++----
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../processors/query/GridQueryProcessor.java | 4 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../ignite/messaging/GridMessagingSelfTest.java | 50 +++++++++++++++++++
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +--
parent/pom.xml | 1 -
scripts/git-apply-patch.sh | 34 +++++++------
scripts/git-format-patch.sh | 35 ++++++++------
scripts/git-patch-functions.sh | 51 +++++++++++++++++---
scripts/git-patch-prop.sh | 10 ++--
18 files changed, 189 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
[03/50] incubator-ignite git commit: # ignite-680
Posted by sb...@apache.org.
# ignite-680
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a815911d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a815911d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a815911d
Branch: refs/heads/ignite-437-sqltests-p2
Commit: a815911d2f5f6f4fa5de9baad9dce6febbd6e835
Parents: dd944bf
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 16:08:27 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 16:23:24 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 15 +
.../apache/ignite/internal/IgniteKernal.java | 37 +++
.../internal/managers/GridManagerAdapter.java | 34 +-
.../cache/CacheTemplateConfigurationKey.java | 53 ++++
.../processors/cache/GridCacheProcessor.java | 315 +++++++++++++++++--
...eCacheConfigurationTemplateNotFoundTest.java | 114 +++++++
.../IgniteCacheConfigurationTemplateTest.java | 250 +++++++++++++++
.../ignite/testframework/junits/IgniteMock.java | 10 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../org/apache/ignite/IgniteSpringBean.java | 14 +
10 files changed, 807 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a815911d/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index 13e072b..6b49add 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -225,6 +225,21 @@ public interface Ignite extends AutoCloseable {
public <K, V> IgniteCache<K, V> getOrCreateCache(CacheConfiguration<K, V> cacheCfg);
/**
+ * Gets existing cache with the given name or creates new one using template configuration.
+ *
+ * @param cacheName Cache name.
+ * @return Existing or newly created cache.
+ */
+ public <K, V> IgniteCache<K, V> getOrCreateCache(String cacheName);
+
+ /**
+ * Adds cache configuration template.
+ *
+ * @param cacheCfg Cache configuration template.
+ */
+ public <K, V> void addCacheConfiguration(CacheConfiguration<K, V> cacheCfg);
+
+ /**
* Dynamically starts new cache with the given cache configuration.
* <p>
* If local node is an affinity node, this method will return the instance of started cache.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a815911d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index a623cb9..08ec78f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2259,6 +2259,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
try {
return ctx.cache().publicJCache(name);
}
+ catch (IgniteCheckedException e) {
+ throw CU.convertToCacheException(e);
+ }
finally {
unguard();
}
@@ -2406,6 +2409,40 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
}
+ /** {@inheritDoc} */
+ @Override public <K, V> IgniteCache<K, V> getOrCreateCache(String cacheName) {
+ guard();
+
+ try {
+ ctx.cache().dynamicStartCache(cacheName).get();
+
+ return ctx.cache().publicJCache(cacheName);
+ }
+ catch (IgniteCheckedException e) {
+ throw CU.convertToCacheException(e);
+ }
+ finally {
+ unguard();
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public <K, V> void addCacheConfiguration(CacheConfiguration<K, V> cacheCfg) {
+ A.notNull(cacheCfg, "cacheCfg");
+
+ guard();
+
+ try {
+ ctx.cache().addCacheConfiguration(cacheCfg);
+ }
+ catch (IgniteCheckedException e) {
+ throw CU.convertToCacheException(e);
+ }
+ finally {
+ unguard();
+ }
+ }
+
/**
* @return Public caches.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a815911d/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index 982ca86..83d257e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -398,27 +398,37 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
}
@Nullable @Override public <K, V> V put(String cacheName, K key, V val, long ttl) {
- if (ttl > 0) {
- ExpiryPolicy plc = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl));
+ try {
+ if (ttl > 0) {
+ ExpiryPolicy plc = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl));
- IgniteCache<K, V> cache = ctx.cache().<K, V>publicJCache(cacheName).withExpiryPolicy(plc);
+ IgniteCache<K, V> cache = ctx.cache().<K, V>publicJCache(cacheName).withExpiryPolicy(plc);
- return cache.getAndPut(key, val);
+ return cache.getAndPut(key, val);
+ }
+ else
+ return ctx.cache().<K, V>jcache(cacheName).getAndPut(key, val);
+ }
+ catch (IgniteCheckedException e) {
+ throw CU.convertToCacheException(e);
}
- else
- return ctx.cache().<K, V>jcache(cacheName).getAndPut(key, val);
}
@Nullable @Override public <K, V> V putIfAbsent(String cacheName, K key, V val, long ttl) {
- if (ttl > 0) {
- ExpiryPolicy plc = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl));
+ try {
+ if (ttl > 0) {
+ ExpiryPolicy plc = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl));
- IgniteCache<K, V> cache = ctx.cache().<K, V>publicJCache(cacheName).withExpiryPolicy(plc);
+ IgniteCache<K, V> cache = ctx.cache().<K, V>publicJCache(cacheName).withExpiryPolicy(plc);
- return cache.getAndPutIfAbsent(key, val);
+ return cache.getAndPutIfAbsent(key, val);
+ }
+ else
+ return ctx.cache().<K, V>jcache(cacheName).getAndPutIfAbsent(key, val);
+ }
+ catch (IgniteCheckedException e) {
+ throw CU.convertToCacheException(e);
}
- else
- return ctx.cache().<K, V>jcache(cacheName).getAndPutIfAbsent(key, val);
}
@Nullable @Override public <K, V> V remove(String cacheName, K key) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a815911d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheTemplateConfigurationKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheTemplateConfigurationKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheTemplateConfigurationKey.java
new file mode 100644
index 0000000..310fa74
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheTemplateConfigurationKey.java
@@ -0,0 +1,53 @@
+/*
+ * 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.processors.cache;
+
+import java.io.*;
+
+/**
+ *
+ */
+public class CacheTemplateConfigurationKey implements GridCacheInternal, Externalizable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return getClass().getName().hashCode();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object obj) {
+ return obj == this || (obj instanceof CacheTemplateConfigurationKey);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeExternal(ObjectOutput out) throws IOException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "CacheTemplateConfigurationKey []";
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a815911d/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 482d816..a7777de 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
@@ -60,6 +60,7 @@ import org.jetbrains.annotations.*;
import javax.cache.configuration.*;
import javax.cache.integration.*;
+import javax.cache.processor.*;
import javax.management.*;
import java.io.*;
import java.util.*;
@@ -575,6 +576,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
cfgs[i] = cfg; // Replace original configuration value.
+ if (cfg.getName() != null && cfg.getName().endsWith("*")) // Skip template configurations.
+ continue;
+
String masked = maskNull(cfg.getName());
if (registeredCaches.containsKey(masked)) {
@@ -766,6 +770,20 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
ctx.cacheObjects().onCacheProcessorStarted();
+
+ List<CacheConfiguration> templateCfgs = null;
+
+ for (CacheConfiguration cfg : ctx.config().getCacheConfiguration()) {
+ if (cfg.getName() == null || cfg.getName().endsWith("*")) {
+ if (templateCfgs == null)
+ templateCfgs = new ArrayList<>();
+
+ templateCfgs.add(cfg);
+ }
+ }
+
+ if (templateCfgs != null)
+ addCacheConfigurations(templateCfgs);
}
/** {@inheritDoc} */
@@ -1475,6 +1493,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
*
* @param topVer Completed topology version.
* @param reqs Change requests.
+ * @param err Error.
*/
@SuppressWarnings("unchecked")
public void onExchangeDone(
@@ -1644,6 +1663,39 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
/**
+ * Dynamically starts cache using template configuration.
+ *
+ * @param cacheName Cache name.
+ * @return Future that will be completed when cache is deployed.
+ */
+ public IgniteInternalFuture<?> dynamicStartCache(String cacheName) {
+ try {
+ if (publicJCache(cacheName, false) != null) // Cache with given name already started.
+ return new GridFinishedFuture<>();
+
+ GridCacheAdapter<CacheTemplateConfigurationKey, TemplateConfigurations> utilityCache = utilityCache();
+
+ TemplateConfigurations cfgs =
+ utilityCache.localPeek(new CacheTemplateConfigurationKey(), CachePeekModes.ONHEAP_ONLY, null);
+
+ CacheConfiguration cfgTemplate = cfgs != null ? cfgs.configuration(cacheName) : null;
+
+ if (cfgTemplate == null)
+ throw new IllegalArgumentException("Failed to start cache " +
+ "(there is no matching template configuration) : " + cacheName);
+
+ CacheConfiguration cfg = new CacheConfiguration(cfgTemplate);
+
+ cfg.setName(cacheName);
+
+ return dynamicStartCache(cfg, cacheName, null, false);
+ }
+ catch (IgniteCheckedException e) {
+ return new GridFinishedFuture<>(e);
+ }
+ }
+
+ /**
* Dynamically starts cache.
*
* @param ccfg Cache configuration.
@@ -2309,54 +2361,104 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param <K> type of keys.
* @param <V> type of values.
* @return Cache instance for given name.
+ * @throws IgniteCheckedException If failed.
+ */
+ public <K, V> IgniteCache<K, V> publicJCache(@Nullable String cacheName) throws IgniteCheckedException {
+ return publicJCache(cacheName, true);
+ }
+
+ /**
+ * @param cacheName Cache name.
+ * @param failIfNotStarted If {@code true} throws {@link IllegalArgumentException} if cache is not started,
+ * otherwise returns {@code null} in this case.
+ * @param <K> type of keys.
+ * @param <V> type of values.
+ * @return Cache instance for given name.
+ * @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("unchecked")
- public <K, V> IgniteCache<K, V> publicJCache(@Nullable String cacheName) {
+ @Nullable private <K, V> IgniteCache<K, V> publicJCache(@Nullable String cacheName, boolean failIfNotStarted)
+ throws IgniteCheckedException
+ {
if (log.isDebugEnabled())
log.debug("Getting public cache for name: " + cacheName);
- try {
- String masked = maskNull(cacheName);
+ String masked = maskNull(cacheName);
- IgniteCache<K,V> cache = (IgniteCache<K, V>)jCacheProxies.get(masked);
+ IgniteCache<K,V> cache = (IgniteCache<K, V>)jCacheProxies.get(masked);
- DynamicCacheDescriptor desc = registeredCaches.get(masked);
+ DynamicCacheDescriptor desc = registeredCaches.get(masked);
- if (desc != null && !desc.cacheType().userCache())
- throw new IllegalStateException("Failed to get cache because it is a system cache: " + cacheName);
+ if (desc != null && !desc.cacheType().userCache())
+ throw new IllegalStateException("Failed to get cache because it is a system cache: " + cacheName);
- if (cache == null) {
- if (desc == null || desc.cancelled())
+ if (cache == null) {
+ if (desc == null || desc.cancelled()) {
+ if (failIfNotStarted)
throw new IllegalArgumentException("Cache is not started: " + cacheName);
- DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(cacheName, ctx.localNodeId());
+ return null;
+ }
- req.cacheName(cacheName);
+ DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(cacheName, ctx.localNodeId());
- req.deploymentId(desc.deploymentId());
+ req.cacheName(cacheName);
- CacheConfiguration cfg = new CacheConfiguration(desc.cacheConfiguration());
+ req.deploymentId(desc.deploymentId());
- cfg.setNearConfiguration(null);
+ CacheConfiguration cfg = new CacheConfiguration(desc.cacheConfiguration());
- req.startCacheConfiguration(cfg);
+ cfg.setNearConfiguration(null);
- req.cacheType(desc.cacheType());
+ req.startCacheConfiguration(cfg);
- req.clientStartOnly(true);
+ req.cacheType(desc.cacheType());
- F.first(initiateCacheChanges(F.asList(req))).get();
+ req.clientStartOnly(true);
- cache = (IgniteCache<K, V>)jCacheProxies.get(masked);
+ F.first(initiateCacheChanges(F.asList(req))).get();
- if (cache == null)
- throw new IllegalArgumentException("Cache is not started: " + cacheName);
- }
+ cache = (IgniteCache<K, V>)jCacheProxies.get(masked);
- return cache;
+ if (cache == null && failIfNotStarted)
+ throw new IllegalArgumentException("Cache is not started: " + cacheName);
}
- catch (IgniteCheckedException e) {
- throw CU.convertToCacheException(e);
+
+ return cache;
+ }
+
+ /**
+ * @param cacheCfg Cache configuration template.
+ * @throws IgniteCheckedException If failed.
+ */
+ public void addCacheConfiguration(CacheConfiguration cacheCfg) throws IgniteCheckedException {
+ addCacheConfigurations(Collections.singleton(cacheCfg));
+ }
+
+ /**
+ * @param cfgs Cache configurations.
+ * @throws IgniteCheckedException If failed.
+ */
+ private void addCacheConfigurations(Collection<CacheConfiguration> cfgs) throws IgniteCheckedException {
+ GridCacheAdapter<CacheTemplateConfigurationKey, TemplateConfigurations> utilityCache = utilityCache();
+
+ final int RETRY_CNT = 5;
+
+ for (int i = 0; i < RETRY_CNT; i++) {
+ try {
+ utilityCache.invoke(
+ new CacheTemplateConfigurationKey(), new AddCacheTemplateProcessor(cfgs));
+
+ break;
+ }
+ catch (IgniteCheckedException e) {
+ if (i < RETRY_CNT - 1) {
+ if (log.isDebugEnabled())
+ log.debug("Failed to save cache template configuration, will retry: " + e);
+ }
+ else
+ throw e;
+ }
}
}
@@ -2571,6 +2673,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/**
* @param val Object to check.
+ * @throws IgniteCheckedException If validation failed.
*/
private void checkSerializable(CacheConfiguration val) throws IgniteCheckedException {
if (val == null)
@@ -2606,6 +2709,165 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/**
*
*/
+ private class AddCacheTemplateProcessor implements
+ CacheEntryProcessor<CacheTemplateConfigurationKey, TemplateConfigurations, Void> {
+ /** */
+ private Collection<CacheConfiguration> cfgs;
+
+ /**
+ * @param cfgs Cache configuration templates.
+ */
+ public AddCacheTemplateProcessor(Collection<CacheConfiguration> cfgs) {
+ assert !F.isEmpty(cfgs);
+
+ this.cfgs = cfgs;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Void process(MutableEntry<CacheTemplateConfigurationKey, TemplateConfigurations> entry,
+ Object... args)
+ {
+ TemplateConfigurations cfgs0 = entry.getValue();
+
+ if (cfgs0 == null)
+ cfgs0 = new TemplateConfigurations();
+
+ cfgs0.add(cfgs);
+
+ entry.setValue(cfgs0);
+
+ return null;
+ }
+ }
+
+ /**
+ *
+ */
+ private static class TemplateConfigurations implements Externalizable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
+ @GridToStringInclude
+ private List<CacheConfiguration> exactNameCfgs;
+
+ /** */
+ @GridToStringInclude
+ private List<CacheConfiguration> wildcardNameCfgs;
+
+ /**
+ *
+ */
+ public TemplateConfigurations() {
+ // No-op.
+ }
+
+ /**
+ * @param cfgs Configurations to add.
+ */
+ void add(Collection<CacheConfiguration> cfgs) {
+ for (CacheConfiguration cfg : cfgs) {
+ CacheConfiguration template = new CacheConfiguration(cfg);
+
+ if (cfg.getName() != null && cfg.getName().endsWith("*")) {
+ template.setName(cfg.getName().substring(0, cfg.getName().length() - 1));
+
+ boolean found = false;
+
+ if (wildcardNameCfgs != null) {
+ for (CacheConfiguration cfg0 : wildcardNameCfgs) {
+ if (F.eq(cfg0.getName(), template.getName())) {
+ found = true;
+
+ break;
+ }
+ }
+ }
+ else
+ wildcardNameCfgs = new ArrayList<>(cfgs.size());
+
+ if (!found)
+ wildcardNameCfgs.add(template);
+ }
+ else {
+ boolean found = false;
+
+ if (exactNameCfgs != null) {
+ for (CacheConfiguration cfg0 : exactNameCfgs) {
+ if (F.eq(cfg0.getName(), template.getName())) {
+ found = true;
+
+ break;
+ }
+ }
+ }
+ else
+ exactNameCfgs = new ArrayList<>(cfgs.size());
+
+ if (!found)
+ exactNameCfgs.add(template);
+ }
+ }
+
+ if (wildcardNameCfgs != null) {
+ Collections.sort(wildcardNameCfgs, new Comparator<CacheConfiguration>() {
+ @Override public int compare(CacheConfiguration cfg1, CacheConfiguration cfg2) {
+ Integer len1 = cfg1.getName() != null ? cfg1.getName().length() : 0;
+ Integer len2 = cfg2.getName() != null ? cfg2.getName().length() : 0;
+
+ return len2.compareTo(len1);
+ }
+ });
+ }
+ }
+
+ /**
+ * @param name Cache name.
+ * @return Cache configuration for given name or {@code null} if template not found.
+ */
+ @Nullable CacheConfiguration configuration(String name) {
+ CacheConfiguration dfltCfg = null;
+
+ if (exactNameCfgs != null) {
+ for (CacheConfiguration cfg : exactNameCfgs) {
+ if (F.eq(name, cfg.getName()))
+ return cfg;
+ else if (cfg.getName() == null)
+ dfltCfg = cfg;
+ }
+ }
+
+ if (wildcardNameCfgs != null && name != null) {
+ for (CacheConfiguration cfg : wildcardNameCfgs) {
+ if (name.startsWith(cfg.getName()))
+ return cfg;
+ }
+ }
+
+ return dfltCfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeExternal(ObjectOutput out) throws IOException {
+ U.writeCollection(out, exactNameCfgs);
+ U.writeCollection(out, wildcardNameCfgs);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ exactNameCfgs = U.readList(in);
+ wildcardNameCfgs = U.readList(in);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(TemplateConfigurations.class, this);
+ }
+ }
+
+ /**
+ *
+ */
@SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
private class DynamicCacheStartFuture extends GridFutureAdapter<Object> {
/** Start ID. */
@@ -2620,6 +2882,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
private DynamicCacheChangeRequest req;
/**
+ * @param cacheName Cache name.
+ * @param deploymentId Deployment ID.
+ * @param req Cache start request.
*/
private DynamicCacheStartFuture(String cacheName, IgniteUuid deploymentId, DynamicCacheChangeRequest req) {
this.deploymentId = deploymentId;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a815911d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateNotFoundTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateNotFoundTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateNotFoundTest.java
new file mode 100644
index 0000000..53780da
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateNotFoundTest.java
@@ -0,0 +1,114 @@
+/*
+ * 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.processors.cache;
+
+import org.apache.ignite.*;
+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.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.concurrent.*;
+
+/**
+ *
+ */
+public class IgniteCacheConfigurationTemplateNotFoundTest extends GridCommonAbstractTest {
+ /** */
+ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+ CacheConfiguration templateCfg = new CacheConfiguration();
+
+ templateCfg.setName("org.apache.ignite.template*");
+ templateCfg.setBackups(3);
+
+ cfg.setCacheConfiguration(templateCfg);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testTemplateNotFound() throws Exception {
+ Ignite ignite = startGrid(0);
+
+ checkTemplateNotFound(ignite, "org.apache.ignite");
+
+ checkTemplateNotFound(ignite, "org.apache.ignite.templat");
+
+ checkTemplateNotFound(ignite, null);
+
+ checkGetOrCreate(ignite, "org.apache.ignite.template", 3);
+
+ CacheConfiguration templateCfg = new CacheConfiguration();
+
+ templateCfg.setBackups(4);
+
+ ignite.addCacheConfiguration(templateCfg);
+
+ checkGetOrCreate(ignite, "org.apache.ignite", 4);
+
+ checkGetOrCreate(ignite, null, 4);
+ }
+
+ /**
+ * @param ignite Ignite.
+ * @param cacheName Cache name.
+ */
+ private void checkTemplateNotFound(final Ignite ignite, final String cacheName) {
+ GridTestUtils.assertThrows(log, new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ ignite.getOrCreateCache(cacheName);
+
+ return null;
+ }
+ }, IllegalArgumentException.class, null);
+ }
+
+ /**
+ * @param ignite Ignite.
+ * @param name Cache name.
+ * @param expBackups Expected number of backups.
+ */
+ private void checkGetOrCreate(Ignite ignite, String name, int expBackups) {
+ IgniteCache cache = ignite.getOrCreateCache(name);
+
+ assertNotNull(cache);
+
+ CacheConfiguration cfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
+
+ assertEquals(name, cfg.getName());
+ assertEquals(expBackups, cfg.getBackups());
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a815911d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
new file mode 100644
index 0000000..c32d54b
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
@@ -0,0 +1,250 @@
+/*
+ * 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.processors.cache;
+
+import org.apache.ignite.*;
+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.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.concurrent.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+
+/**
+ *
+ */
+public class IgniteCacheConfigurationTemplateTest extends GridCommonAbstractTest {
+ /** */
+ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ private static final String TEMPLATE1 = "org.apache.ignite*";
+
+ /** */
+ private static final String TEMPLATE2 = "org.apache.ignite.test.*";
+
+ /** */
+ private static final String TEMPLATE3 = "org.apache.ignite.test2.*";
+
+ /** */
+ private boolean clientMode;
+
+ /** */
+ private boolean addTemplate;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+ if (addTemplate) {
+ CacheConfiguration dfltCfg = new CacheConfiguration();
+
+ dfltCfg.setAtomicityMode(TRANSACTIONAL);
+ dfltCfg.setBackups(2);
+
+ CacheConfiguration templateCfg1 = new CacheConfiguration();
+
+ templateCfg1.setName(TEMPLATE1);
+ templateCfg1.setBackups(3);
+
+ CacheConfiguration templateCfg2 = new CacheConfiguration();
+
+ templateCfg2.setName(TEMPLATE2);
+ templateCfg2.setBackups(4);
+
+ cfg.setCacheConfiguration(dfltCfg, templateCfg1, templateCfg2);
+ }
+
+ cfg.setClientMode(clientMode);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCreateFromTemplateConfiguration() throws Exception {
+ addTemplate = true;
+
+ Ignite ignite0 = startGrid(0);
+
+ checkNoTemplateCaches(1);
+
+ checkGetOrCreate(ignite0, "org.apache.ignite.test.cache1", 4);
+ checkGetOrCreate(ignite0, "org.apache.ignite.test.cache1", 4);
+
+ Ignite ignite1 = startGrid(1);
+
+ checkGetOrCreate(ignite1, "org.apache.ignite.test.cache1", 4);
+ checkGetOrCreate(ignite1, "org.apache.ignite.test.cache1", 4);
+
+ checkGetOrCreate(ignite1, "org.apache.ignite1", 3);
+ checkGetOrCreate(ignite1, "org.apache.ignite1", 3);
+
+ checkGetOrCreate(ignite0, "org.apache.ignite1", 3);
+ checkGetOrCreate(ignite0, "org.apache.ignite1", 3);
+
+ checkGetOrCreate(ignite0, "org.apache1", 2);
+ checkGetOrCreate(ignite1, "org.apache1", 2);
+
+ checkNoTemplateCaches(2);
+
+ addTemplate = false;
+ clientMode = true;
+
+ Ignite ignite2 = startGrid(2);
+
+ assertNotNull(ignite2.cache("org.apache.ignite.test.cache1"));
+ assertNotNull(ignite2.cache("org.apache.ignite1"));
+ assertNotNull(ignite2.cache("org.apache1"));
+
+ checkGetOrCreate(ignite2, "org.apache.ignite.test.cache1", 4);
+ checkGetOrCreate(ignite2, "org.apache.ignite1", 3);
+ checkGetOrCreate(ignite2, "org.apache1", 2);
+
+ checkGetOrCreate(ignite2, "org.apache.ignite.test.cache2", 4);
+ checkGetOrCreate(ignite2, "org.apache.ignite.cache2", 3);
+ checkGetOrCreate(ignite2, "org.apache2", 2);
+
+ CacheConfiguration template1 = new CacheConfiguration();
+
+ template1.setName(TEMPLATE3);
+ template1.setBackups(5);
+
+ ignite2.addCacheConfiguration(template1);
+
+ checkGetOrCreate(ignite0, "org.apache.ignite.test2.cache1", 5);
+ checkGetOrCreate(ignite1, "org.apache.ignite.test2.cache1", 5);
+ checkGetOrCreate(ignite2, "org.apache.ignite.test2.cache1", 5);
+
+ Ignite ignite3 = startGrid(3);
+
+ checkGetOrCreate(ignite3, "org.apache.ignite.test2.cache1", 5);
+
+ checkNoTemplateCaches(4);
+
+ // Template with non-wildcard name.
+ CacheConfiguration template2 = new CacheConfiguration();
+
+ template2.setName("org.apache.ignite");
+ template2.setBackups(6);
+
+ ignite0.addCacheConfiguration(template2);
+
+ checkGetOrCreate(ignite0, "org.apache.ignite", 6);
+ checkGetOrCreate(ignite1, "org.apache.ignite", 6);
+ checkGetOrCreate(ignite2, "org.apache.ignite", 6);
+ checkGetOrCreate(ignite3, "org.apache.ignite", 6);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testStartClientNodeFirst() throws Exception {
+ addTemplate = true;
+ clientMode = true;
+
+ Ignite ignite0 = startGrid(0);
+
+ checkNoTemplateCaches(0);
+
+ addTemplate = false;
+ clientMode = false;
+
+ Ignite ignite1 = startGrid(1);
+
+ checkGetOrCreate(ignite1, "org.apache.ignite.test.cache1", 4);
+ checkGetOrCreate(ignite1, "org.apache.ignite.test.cache1", 4);
+
+ checkGetOrCreate(ignite1, "org.apache.ignite1", 3);
+ checkGetOrCreate(ignite1, "org.apache.ignite1", 3);
+
+ checkGetOrCreate(ignite0, "org.apache.ignite1", 3);
+ checkGetOrCreate(ignite0, "org.apache.ignite1", 3);
+ }
+
+ /**
+ * @param ignite Ignite.
+ * @param name Cache name.
+ * @param expBackups Expected number of backups.
+ */
+ private void checkGetOrCreate(Ignite ignite, String name, int expBackups) {
+ IgniteCache cache = ignite.getOrCreateCache(name);
+
+ assertNotNull(cache);
+
+ CacheConfiguration cfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
+
+ assertEquals(name, cfg.getName());
+ assertEquals(expBackups, cfg.getBackups());
+ }
+
+ /**
+ * @param nodes Nodes number.
+ */
+ private void checkNoTemplateCaches(int nodes) {
+ for (int i = 0; i < nodes; i++) {
+ final Ignite ignite = grid(i);
+
+ GridTestUtils.assertThrows(log, new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ ignite.cache(GridCacheUtils.UTILITY_CACHE_NAME);
+
+ return null;
+ }
+ }, IllegalStateException.class, null);
+
+ GridTestUtils.assertThrows(log, new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ ignite.cache(TEMPLATE1);
+
+ return null;
+ }
+ }, IllegalArgumentException.class, null);
+
+ GridTestUtils.assertThrows(log, new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ ignite.cache(TEMPLATE2);
+
+ return null;
+ }
+ }, IllegalArgumentException.class, null);
+
+ GridTestUtils.assertThrows(log, new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ ignite.cache(TEMPLATE3);
+
+ return null;
+ }
+ }, IllegalArgumentException.class, null);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a815911d/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
index 71f36cd..b575544 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
@@ -197,6 +197,16 @@ public class IgniteMock implements Ignite {
}
/** {@inheritDoc} */
+ @Override public <K, V> IgniteCache<K, V> getOrCreateCache(String cacheName) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public <K, V> void addCacheConfiguration(CacheConfiguration<K, V> cacheCfg) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
@Override public void destroyCache(String cacheName) {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a815911d/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 00dfc76..18c76b4 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
@@ -411,6 +411,8 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(IgniteDynamicCacheStartSelfTest.class);
suite.addTestSuite(IgniteCacheDynamicStopSelfTest.class);
+ suite.addTestSuite(IgniteCacheConfigurationTemplateTest.class);
+ suite.addTestSuite(IgniteCacheConfigurationTemplateNotFoundTest.class);
suite.addTestSuite(GridCacheTxLoadFromStoreOnLockSelfTest.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a815911d/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
index eebde72..cd4fd73 100644
--- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
+++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
@@ -276,6 +276,20 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea
}
/** {@inheritDoc} */
+ @Override public <K, V> IgniteCache<K, V> getOrCreateCache(String cacheName) {
+ assert g != null;
+
+ return g.getOrCreateCache(cacheName);
+ }
+
+ /** {@inheritDoc} */
+ @Override public <K, V> void addCacheConfiguration(CacheConfiguration<K, V> cacheCfg) {
+ assert g != null;
+
+ g.addCacheConfiguration(cacheCfg);
+ }
+
+ /** {@inheritDoc} */
@Override public void destroyCache(String cacheName) {
assert g != null;
[35/50] incubator-ignite git commit: # Minor code cleanup.
Posted by sb...@apache.org.
# Minor code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/76f8049c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/76f8049c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/76f8049c
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 76f8049c2124b965d142f8dc781fad2ff20419d1
Parents: cbab850
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 8 14:38:10 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 8 14:38:10 2015 +0700
----------------------------------------------------------------------
.../visor/commands/cache/VisorCacheClearCommand.scala | 3 +--
.../src/main/scala/org/apache/ignite/visor/visor.scala | 12 ++++++------
2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76f8049c/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
index f012b19..379b566 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
@@ -93,8 +93,7 @@ class VisorCacheClearCommand {
case Some(s) if s.startsWith("@") =>
warn("Can't find cache variable with specified name: " + s,
- "Type 'cache' to see available cache variables."
- )
+ "Type 'cache' to see available cache variables.")
break()
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76f8049c/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index 5710458..33ba976 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -1820,23 +1820,23 @@ object visor extends VisorTag {
/**
* Guards against invalid percent readings.
*
- * @param v Value in '%' to guard. Any value below `0` and greater than `100`
- * will return `<n/a>` string.
+ * @param v Value in '%' to guard.
+ * @return Percent as string. Any value below `0` and greater than `100` will return `<n/a>` string.
*/
def safePercent(v: Double): String = if (v < 0 || v > 100) NA else formatDouble(v) + " %"
/** Convert to task argument. */
def emptyTaskArgument[A](nid: UUID): VisorTaskArgument[Void] = new VisorTaskArgument(nid, false)
- def emptyTaskArgument[A](nids: Iterable[UUID]): VisorTaskArgument[Void] = new VisorTaskArgument(new JavaHashSet(nids),
- false)
+ def emptyTaskArgument[A](nids: Iterable[UUID]): VisorTaskArgument[Void]
+ = new VisorTaskArgument(new JavaHashSet(nids), false)
/** Convert to task argument. */
def toTaskArgument[A](nid: UUID, arg: A): VisorTaskArgument[A] = new VisorTaskArgument(nid, arg, false)
/** Convert to task argument. */
- def toTaskArgument[A](nids: Iterable[UUID], arg: A): VisorTaskArgument[A] = new VisorTaskArgument(
- new JavaHashSet(nids), arg, false)
+ def toTaskArgument[A](nids: Iterable[UUID], arg: A): VisorTaskArgument[A]
+ = new VisorTaskArgument(new JavaHashSet(nids), arg, false)
def compute(nid: UUID): IgniteCompute = ignite.compute(ignite.cluster.forNodeId(nid)).withNoFailover()
[29/50] incubator-ignite git commit: ignite-624 - disabled failing
tests because of wrong colocation
Posted by sb...@apache.org.
ignite-624 - disabled failing tests because of wrong colocation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bef34cd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bef34cd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bef34cd8
Branch: refs/heads/ignite-437-sqltests-p2
Commit: bef34cd8e3fac1fe3b30301869a2ad42d5c7ea6e
Parents: 58f4913
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 01:54:34 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 01:54:34 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/sql/IgniteVsH2QueryTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bef34cd8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
index 5da72b4..5845a2e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
@@ -615,16 +615,16 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
*
* @throws Exception If failed.
*/
- public void testSimpleJoin() throws Exception {
+ public void _testSimpleJoin() throws Exception {
// Have expected results.
compareQueryRes0("select id, firstName, lastName" +
" from \"part\".Person" +
" where Person.id = ?", 3);
// Ignite cache return 0 results...
- compareQueryRes0("select Person.firstName" +
- " from \"part\".Person, \"part\".Purchase" +
- " where Person.id = ?", 3);
+ compareQueryRes0("select pe.firstName" +
+ " from \"part\".Person pe join \"part\".Purchase pu on pe.id = pu.personId " +
+ " where pe.id = ?", 3);
}
/**
@@ -637,7 +637,7 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testCrossCache() throws Exception {
+ public void _testCrossCache() throws Exception {
//TODO Investigate (should be 20 results instead of 0).
compareQueryRes0("select firstName, lastName" +
" from \"part\".Person, \"part\".Purchase" +
[07/50] incubator-ignite git commit: IGNITE-477 - Fixed TTL test.
Posted by sb...@apache.org.
IGNITE-477 - Fixed TTL test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ec2af0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ec2af0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ec2af0d
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 5ec2af0d9a01e0b4a0b71cb0d3250e59e8dedc44
Parents: ae4dda1
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Mon Apr 6 11:53:16 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Mon Apr 6 11:53:16 2015 -0700
----------------------------------------------------------------------
.../processors/cache/distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ec2af0d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index e0fc719..1f991c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -971,7 +971,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
ExpiryPolicy expiry = cacheCtx.expiryForTxEntry(entry);
- if (expiry != null && entry.op() == READ) {
+ if (expiry != null && (entry.op() == READ || entry.op() == NOOP)) {
entry.op(NOOP);
entry.ttl(CU.toTtl(expiry.getExpiryForAccess()));
[48/50] incubator-ignite git commit: ignite-624 - minor2
Posted by sb...@apache.org.
ignite-624 - minor2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c2c4da48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2c4da48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2c4da48
Branch: refs/heads/ignite-437-sqltests-p2
Commit: c2c4da48a9ebaf5d41e61bb006e9d590edcd5f8b
Parents: ab2fe77
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 14:33:23 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 14:33:23 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/query/h2/sql/GridSqlSelect.java | 3 +++
.../ignite/internal/processors/query/h2/sql/GridSqlUnion.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2c4da48/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
index dadba7c..0786eac 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -148,6 +148,9 @@ public class GridSqlSelect extends GridSqlQuery {
* @param expression Expression.
*/
public void setSelectExpression(int colIdx, GridSqlElement expression) {
+ if (expression == null)
+ throw new NullPointerException();
+
if (colIdx < select.size()) // Assuming that all the needed expressions were already added.
select.set(colIdx, expression);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2c4da48/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
index dcc2c84..23c18ed 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
@@ -42,7 +42,7 @@ public class GridSqlUnion extends GridSqlQuery {
/** {@inheritDoc} */
@Override protected GridSqlElement expression(int col) {
- return null;
+ throw new IllegalStateException();
}
/** {@inheritDoc} */
[45/50] incubator-ignite git commit: Merge branches 'ignite-639' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-639
Posted by sb...@apache.org.
Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d44e610
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d44e610
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d44e610
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 4d44e6106666c57870938b4c1699249c8d68beca
Parents: 36c330a fa552bc
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 8 17:55:20 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 8 17:55:20 2015 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 15 +
.../apache/ignite/internal/IgniteKernal.java | 37 ++
.../org/apache/ignite/internal/IgnitionEx.java | 171 ++++-----
.../internal/managers/GridManagerAdapter.java | 34 +-
.../cache/DynamicCacheChangeRequest.java | 17 +
.../cache/DynamicCacheDescriptor.java | 17 +-
.../processors/cache/GridCacheIoManager.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 349 +++++++++++++++---
.../dht/GridClientPartitionTopology.java | 6 +-
.../distributed/dht/GridDhtLockFuture.java | 10 +-
.../dht/GridDhtPartitionTopologyImpl.java | 6 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 49 +--
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 1 +
.../cache/transactions/IgniteTxManager.java | 6 +-
.../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 +-
...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++
.../IgniteCacheConfigurationTemplateTest.java | 364 +++++++++++++++++++
.../cache/IgniteDynamicCacheStartSelfTest.java | 23 ++
...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +-----
.../GridAbstractCommunicationSelfTest.java | 3 +-
.../GridTcpCommunicationSpiAbstractTest.java | 5 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 3 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 3 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +-
.../ignite/testframework/junits/IgniteMock.java | 10 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 5 +-
.../org/apache/ignite/IgniteSpringBean.java | 14 +
.../commands/cache/VisorCacheClearCommand.scala | 3 +-
.../scala/org/apache/ignite/visor/visor.scala | 12 +-
parent/pom.xml | 2 +-
pom.xml | 1 +
39 files changed, 1192 insertions(+), 401 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d44e610/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
[31/50] incubator-ignite git commit: Merge branch ignite-477 into
ignite-sprint-3
Posted by sb...@apache.org.
Merge branch ignite-477 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/21cfc8da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/21cfc8da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/21cfc8da
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 21cfc8da70bf745b1cd9a7ac7d26ff75e063f41d
Parents: fd011e2 dc8c4a9
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Tue Apr 7 19:11:45 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Tue Apr 7 19:11:45 2015 -0700
----------------------------------------------------------------------
.../distributed/dht/GridDhtLockFuture.java | 10 +++-
.../distributed/dht/GridDhtTxLocalAdapter.java | 49 +++++++++++---------
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 3 +-
4 files changed, 39 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
[32/50] incubator-ignite git commit: # Updated classnames.
Posted by sb...@apache.org.
# Updated 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/cbab8503
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cbab8503
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cbab8503
Branch: refs/heads/ignite-437-sqltests-p2
Commit: cbab850301e0ee9b72371624fd6756e58ac06724
Parents: 21cfc8d
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 8 10:51:51 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 8 10:51:51 2015 +0700
----------------------------------------------------------------------
.../resources/META-INF/classnames.properties | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cbab8503/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 3be2564..a855e12 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -45,6 +45,7 @@ org.apache.ignite.cache.affinity.AffinityKeyMapper
org.apache.ignite.cache.affinity.AffinityNodeAddressHashResolver
org.apache.ignite.cache.affinity.AffinityNodeHashResolver
org.apache.ignite.cache.affinity.AffinityNodeIdHashResolver
+org.apache.ignite.cache.affinity.AffinityUuid
org.apache.ignite.cache.affinity.fair.FairAffinityFunction
org.apache.ignite.cache.affinity.fair.FairAffinityFunction$PartitionSetComparator
org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction
@@ -258,7 +259,6 @@ org.apache.ignite.internal.processors.affinity.GridAffinityAssignment
org.apache.ignite.internal.processors.affinity.GridAffinityMessage
org.apache.ignite.internal.processors.affinity.GridAffinityUtils$AffinityJob
org.apache.ignite.internal.processors.cache.CacheAtomicUpdateTimeoutCheckedException
-org.apache.ignite.internal.processors.cache.CacheDistributionMode
org.apache.ignite.internal.processors.cache.CacheEntryInfoCollection
org.apache.ignite.internal.processors.cache.CacheEntryPredicate
org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapter
@@ -276,6 +276,7 @@ org.apache.ignite.internal.processors.cache.CacheObjectByteArrayImpl
org.apache.ignite.internal.processors.cache.CacheObjectImpl
org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException
org.apache.ignite.internal.processors.cache.CacheStorePartialUpdateException
+org.apache.ignite.internal.processors.cache.CacheType
org.apache.ignite.internal.processors.cache.CacheWeakQueryIteratorsHolder$WeakQueryFutureIterator
org.apache.ignite.internal.processors.cache.DynamicCacheChangeBatch
org.apache.ignite.internal.processors.cache.DynamicCacheChangeRequest
@@ -388,10 +389,6 @@ org.apache.ignite.internal.processors.cache.GridCacheProcessor$LocalAffinityFunc
org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl
org.apache.ignite.internal.processors.cache.GridCacheProxyImpl
org.apache.ignite.internal.processors.cache.GridCacheReturn
-org.apache.ignite.internal.processors.cache.store.GridCacheStoreManagerAdapter$1
-org.apache.ignite.internal.processors.cache.store.GridCacheStoreManagerAdapter$2
-org.apache.ignite.internal.processors.cache.store.GridCacheStoreManagerAdapter$3
-org.apache.ignite.internal.processors.cache.store.GridCacheStoreManagerAdapter$4
org.apache.ignite.internal.processors.cache.GridCacheSwapManager$10
org.apache.ignite.internal.processors.cache.GridCacheSwapManager$12
org.apache.ignite.internal.processors.cache.GridCacheSwapManager$14
@@ -432,9 +429,6 @@ 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.store.GridCacheWriteBehindStore$StatefulValue
-org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$StoreOperation
-org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$ValueStatus
org.apache.ignite.internal.processors.cache.IgniteCacheProxy
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$1
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$2
@@ -706,6 +700,13 @@ org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcTask$Jd
org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcTask$JdbcDriverJob$1
org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcValidationTask
org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcValidationTask$1
+org.apache.ignite.internal.processors.cache.store.GridCacheStoreManagerAdapter$1
+org.apache.ignite.internal.processors.cache.store.GridCacheStoreManagerAdapter$2
+org.apache.ignite.internal.processors.cache.store.GridCacheStoreManagerAdapter$3
+org.apache.ignite.internal.processors.cache.store.GridCacheStoreManagerAdapter$4
+org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$StatefulValue
+org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$StoreOperation
+org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$ValueStatus
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx$FinalizationStatus
org.apache.ignite.internal.processors.cache.transactions.IgniteTxAdapter
org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry
@@ -1367,6 +1368,8 @@ org.apache.ignite.internal.visor.cache.VisorCacheClearTask$VisorCacheClearJob
org.apache.ignite.internal.visor.cache.VisorCacheClearTask$VisorCacheClearJob$1
org.apache.ignite.internal.visor.cache.VisorCacheClearTask$VisorCacheSizeCallable
org.apache.ignite.internal.visor.cache.VisorCacheConfiguration
+org.apache.ignite.internal.visor.cache.VisorCacheConfigurationCollectorJob
+org.apache.ignite.internal.visor.cache.VisorCacheConfigurationCollectorTask
org.apache.ignite.internal.visor.cache.VisorCacheDefaultConfiguration
org.apache.ignite.internal.visor.cache.VisorCacheEvictionConfiguration
org.apache.ignite.internal.visor.cache.VisorCacheLoadTask
[10/50] incubator-ignite git commit: Merge branches 'ignite-639' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-639
Posted by sb...@apache.org.
Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b1898776
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b1898776
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b1898776
Branch: refs/heads/ignite-437-sqltests-p2
Commit: b1898776bac93ea164db6d06780f0eb84c6b1e2d
Parents: fdf56a5 5a2b46c
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Apr 7 09:15:09 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Apr 7 09:15:09 2015 +0700
----------------------------------------------------------------------
assembly/release-fabric.xml | 5 -
modules/clients/readme.md | 2 -
.../cache/eviction/fifo/FifoEvictionPolicy.java | 58 ++-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 16 +
.../apache/ignite/internal/GridComponent.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../ignite/internal/GridPluginComponent.java | 4 +-
.../org/apache/ignite/internal/IgniteEx.java | 7 -
.../apache/ignite/internal/IgniteKernal.java | 27 +-
.../ignite/internal/IgniteNodeAttributes.java | 3 -
.../internal/managers/GridManagerAdapter.java | 6 +-
.../processors/GridProcessorAdapter.java | 2 +-
.../processors/cache/CacheDistributionMode.java | 67 ----
.../internal/processors/cache/CacheType.java | 77 ++++
.../cache/DynamicCacheChangeRequest.java | 17 +
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 +-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 139 ++++---
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../DiscoveryNodeValidationProcessor.java | 27 ++
.../OsDiscoveryNodeValidationProcessor.java | 72 ++++
.../processors/query/GridQueryProcessor.java | 8 +-
.../processors/task/GridTaskProcessor.java | 24 +-
.../ignite/internal/util/IgniteUtils.java | 46 ++-
.../internal/visor/util/VisorTaskUtils.java | 18 +-
.../ignite/spi/IgniteNodeValidationResult.java | 66 ++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 2 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 ----
.../spi/discovery/tcp/TcpDiscoverySpi.java | 106 +----
.../org/apache/ignite/stream/StreamVisitor.java | 2 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +--
.../cache/IgniteInternalCacheTypesTest.java | 159 ++++++++
.../IgniteCollectionAbstractTest.java | 23 --
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +-
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +-
.../eviction/GridCacheEvictionAbstractTest.java | 5 +-
...ridCacheFifoBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++++
.../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 ------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../testframework/GridSpiTestContext.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../HadoopDefaultMapReducePlannerSelfTest.java | 5 -
.../query/h2/sql/GridSqlQuerySplitter.java | 22 +-
.../h2/twostep/GridReduceQueryExecutor.java | 13 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
.../query/h2/sql/GridQueryParsingTest.java | 1 +
.../query/h2/sql/IgniteVsH2QueryTest.java | 7 +
modules/schedule/pom.xml | 20 +
modules/yardstick/README.md | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 +-
.../org/apache/ignite/yardstick/IgniteNode.java | 11 +-
parent/pom.xml | 49 +--
pom.xml | 143 ++++++-
71 files changed, 1578 insertions(+), 633 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1898776/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1898776/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
[11/50] incubator-ignite git commit: Merge branches 'ignite-639' and
'ignite-sprint-3' of https://github.com/ggprivate/ggprivate into ignite-639
Posted by sb...@apache.org.
Merge branches 'ignite-639' and 'ignite-sprint-3' of https://github.com/ggprivate/ggprivate into ignite-639
Conflicts:
modules/visor-tester/src/main/scala/org/gridgain/visor/tester/VisorCmptbTesterLauncherBase.scala
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/349c200d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/349c200d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/349c200d
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 349c200d11e2c961a503b368a566e6bd5345590a
Parents: b189877
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Apr 7 09:17:16 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Apr 7 09:17:16 2015 +0700
----------------------------------------------------------------------
.../cache/VisorCacheAggregatedMetrics.java | 21 +++++++++++-
.../cache/VisorCacheMetricsCollectorTask.java | 25 +++++++++-----
.../commands/cache/VisorCacheCommand.scala | 26 +++++++-------
.../commands/cache/VisorCacheStopCommand.scala | 36 +++++++++++++-------
4 files changed, 72 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/349c200d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
index 076a19b..c8d3a8d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.visor.cache;
+import org.apache.ignite.cache.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import java.io.*;
@@ -32,6 +33,12 @@ public class VisorCacheAggregatedMetrics implements Serializable {
/** Cache name. */
private final String cacheName;
+ /** Cache mode. */
+ private final CacheMode cacheMode;
+
+ /** Cache system state. */
+ private final Boolean system;
+
/** Node IDs with cache metrics. */
private final Map<UUID, VisorCacheMetrics> metrics = new HashMap<>();
@@ -103,8 +110,10 @@ public class VisorCacheAggregatedMetrics implements Serializable {
*
* @param cacheName Cache name.
*/
- public VisorCacheAggregatedMetrics(String cacheName) {
+ public VisorCacheAggregatedMetrics(String cacheName, CacheMode cacheMode, Boolean system) {
this.cacheName = cacheName;
+ this.cacheMode = cacheMode;
+ this.system = system;
}
/**
@@ -114,6 +123,16 @@ public class VisorCacheAggregatedMetrics implements Serializable {
return cacheName;
}
+ /** @return Cache mode. */
+ public CacheMode cacheMode() {
+ return cacheMode;
+ }
+
+ /** @return Cache system state. */
+ public Boolean system() {
+ return system;
+ }
+
/**
* @return Nodes.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/349c200d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index 615935a..99b29c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -32,7 +32,7 @@ import java.util.*;
*/
@GridInternal
public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiTuple<Boolean, Collection<String>>,
- Iterable<VisorCacheAggregatedMetrics>, Map<String, VisorCacheMetrics>> {
+ Iterable<VisorCacheAggregatedMetrics>, Map<String, IgniteBiTuple<Boolean, VisorCacheMetrics>>> {
/** */
private static final long serialVersionUID = 0L;
@@ -47,18 +47,23 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
for (ComputeJobResult res : results) {
if (res.getException() == null && res.getData() instanceof Map<?, ?>) {
- Map<String, VisorCacheMetrics> cms = res.getData();
+ Map<String, IgniteBiTuple<Boolean, VisorCacheMetrics>> cms = res.getData();
- for (Map.Entry<String, VisorCacheMetrics> entry : cms.entrySet()) {
+ for (Map.Entry<String, IgniteBiTuple<Boolean, VisorCacheMetrics>> entry : cms.entrySet()) {
VisorCacheAggregatedMetrics am = grpAggrMetrics.get(entry.getKey());
if (am == null) {
- am = new VisorCacheAggregatedMetrics(entry.getKey());
+ String cacheName = entry.getKey();
+
+ GridCacheProcessor proc = ignite.context().cache();
+
+ am = new VisorCacheAggregatedMetrics(cacheName, proc.cacheMode(cacheName),
+ entry.getValue().get1());
grpAggrMetrics.put(entry.getKey(), am);
}
- am.metrics().put(res.getNode().id(), entry.getValue());
+ am.metrics().put(res.getNode().id(), entry.getValue().get2());
}
}
}
@@ -71,7 +76,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
* Job that collect cache metrics from node.
*/
private static class VisorCacheMetricsCollectorJob
- extends VisorJob<IgniteBiTuple<Boolean, Collection<String>>, Map<String, VisorCacheMetrics>> {
+ extends VisorJob<IgniteBiTuple<Boolean, Collection<String>>, Map<String, IgniteBiTuple<Boolean, VisorCacheMetrics>>> {
/** */
private static final long serialVersionUID = 0L;
@@ -86,7 +91,8 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
}
/** {@inheritDoc} */
- @Override protected Map<String, VisorCacheMetrics> run(final IgniteBiTuple<Boolean, Collection<String>> arg) {
+ @Override protected Map<String, IgniteBiTuple<Boolean, VisorCacheMetrics>> run(
+ final IgniteBiTuple<Boolean, Collection<String>> arg) {
assert arg != null;
Boolean showSysCaches = arg.get1();
@@ -101,7 +107,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
Collection<GridCacheAdapter<?, ?>> caches = cacheProcessor.internalCaches();
- Map<String, VisorCacheMetrics> res = U.newHashMap(caches.size());
+ Map<String, IgniteBiTuple<Boolean, VisorCacheMetrics>> res = U.newHashMap(caches.size());
boolean allCaches = cacheNames.isEmpty();
@@ -110,7 +116,8 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
String name = ca.name();
if ((showSysCaches && cacheProcessor.systemCache(name)) || allCaches || cacheNames.contains(name))
- res.put(name, VisorCacheMetrics.from(ca));
+ res.put(name, new IgniteBiTuple<Boolean, VisorCacheMetrics>(
+ ignite.context().cache().systemCache(name), VisorCacheMetrics.from(ca)));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/349c200d/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index bd0d251..33a2a16 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -30,8 +30,7 @@ import org.apache.ignite.visor.visor._
import org.jetbrains.annotations._
import java.lang.{Boolean => JavaBoolean}
-import java.util.{ArrayList => JavaList, Collection => JavaCollection}
-import java.util.UUID
+import java.util.{ArrayList => JavaList, Collection => JavaCollection, UUID}
import org.apache.ignite.internal.visor.cache._
import org.apache.ignite.internal.visor.node.{VisorGridConfiguration, VisorNodeConfigurationCollectorTask}
@@ -259,9 +258,13 @@ class VisorCacheCommand {
flags.exists(hasArgFlag(_, argLst))
}
+ // Get cache stats data from all nodes.
+ val aggrData = cacheData(node, cacheName, showSystem)
+
if (hasArgFlagIn("clear", "swap", "scan", "stop")) {
if (cacheName.isEmpty)
- askForCache("Select cache from:", node, showSystem && !hasArgFlagIn("clear", "swap", "stop")) match {
+ askForCache("Select cache from:", node, showSystem && !hasArgFlagIn("clear", "swap", "stop"),
+ aggrData) match {
case Some(name) =>
argLst = argLst ++ Seq("c" -> name)
@@ -274,7 +277,7 @@ class VisorCacheCommand {
if (hasArgFlag("scan", argLst))
VisorCacheScanCommand().scan(argLst, node)
else {
- if (!CU.isSystemCache(name)) {
+ if (!aggrData.exists(cache => cache.cacheName() == name && cache.system())) {
if (hasArgFlag("clear", argLst))
VisorCacheClearCommand().clear(argLst, node)
else if (hasArgFlag("swap", argLst))
@@ -304,9 +307,6 @@ class VisorCacheCommand {
if (sortType.isDefined && !isValidSortType(sortType.get))
scold("Invalid '-s' argument in: " + args).^^
- // Get cache stats data from all nodes.
- val aggrData = cacheData(node, cacheName, showSystem)
-
if (aggrData.isEmpty)
scold("No caches found.").^^
@@ -314,7 +314,7 @@ class VisorCacheCommand {
val sumT = VisorTextTable()
- sumT #= ("Name(@)", "Nodes", "Entries", "Hits", "Misses", "Reads", "Writes")
+ sumT #= ("Name(@)", "Mode", "Nodes", "Entries", "Hits", "Misses", "Reads", "Writes")
sortAggregatedData(aggrData, sortType.getOrElse("cn"), reversed).foreach(
ad => {
@@ -323,6 +323,7 @@ class VisorCacheCommand {
sumT += (
mkCacheName(ad.cacheName),
+ ad.cacheMode(),
ad.nodes,
(
"min: " + ad.minimumSize,
@@ -598,13 +599,11 @@ class VisorCacheCommand {
* @param showSystem Allow selection of system caches.
* @return `Option` for ID of selected cache.
*/
- def askForCache(title: String, node: Option[ClusterNode], showSystem: Boolean = false): Option[String] = {
+ def askForCache(title: String, node: Option[ClusterNode], showSystem: Boolean = false,
+ aggrData: Seq[VisorCacheAggregatedMetrics]): Option[String] = {
assert(title != null)
assert(visor.visor.isConnected)
- // Get cache stats data from all nodes.
- val aggrData = cacheData(node, None, showSystem)
-
if (aggrData.isEmpty)
scold("No caches found.").^^
@@ -614,7 +613,7 @@ class VisorCacheCommand {
val sumT = VisorTextTable()
- sumT #= ("#", "Name(@)", "Nodes", "Size")
+ sumT #= ("#", "Name(@)", "Mode", "Nodes", "Size")
(0 until sortedAggrData.size) foreach (i => {
val ad = sortedAggrData(i)
@@ -625,6 +624,7 @@ class VisorCacheCommand {
sumT += (
i,
mkCacheName(ad.cacheName),
+ ad.cacheMode(),
ad.nodes,
(
"min: " + ad.minimumSize,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/349c200d/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala
index 4c1aa10..cf344e6 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala
@@ -19,9 +19,9 @@ package org.apache.ignite.visor.commands.cache
import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.visor.visor._
-import org.apache.ignite.internal.visor.util.VisorTaskUtils._
import org.apache.ignite.internal.visor.cache.VisorCacheStopTask
+import org.apache.ignite.internal.visor.util.VisorTaskUtils._
/**
* ==Overview==
@@ -105,21 +105,31 @@ class VisorCacheStopCommand {
return
}
- val stopPrj = cachePrj.forRandom()
+ ask(s"Are you sure you want to stop cache: ${escapeName(cacheName)}? (y/n) [n]: ", "n") match {
+ case "y" | "Y" =>
+ val stopPrj = cachePrj.forRandom()
- val nid = stopPrj.node().id()
+ val nid = stopPrj.node().id()
- try {
- ignite.compute(stopPrj)
- .withName("visor-cstop-task")
- .withNoFailover()
- .execute(classOf[VisorCacheStopTask], toTaskArgument(nid, cacheName))
+ try {
+ ignite.compute(stopPrj)
+ .withName("visor-cstop-task")
+ .withNoFailover()
+ .execute(classOf[VisorCacheStopTask], toTaskArgument(nid, cacheName))
- println("Visor successfully stop cache: " + escapeName(cacheName))
- }
- catch {
- case e: Exception =>
- error(e)
+ println("Visor successfully stop cache: " + escapeName(cacheName))
+ }
+ catch {
+ case e: Exception =>
+ error(e)
+ }
+
+ case "n" | "N" =>
+
+ case x =>
+ nl()
+
+ warn("Invalid answer: " + x)
}
}
}
[24/50] incubator-ignite git commit: Merge branches 'ignite-639' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-639
Posted by sb...@apache.org.
Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6de5e1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6de5e1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6de5e1e
Branch: refs/heads/ignite-437-sqltests-p2
Commit: c6de5e1e0163f23fd551253d2950224ba7317b7c
Parents: 0c836db 2444811
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Apr 7 20:34:29 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Apr 7 20:34:29 2015 +0700
----------------------------------------------------------------------
DEVNOTES.txt | 2 +-
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/include/service.sh | 8 +-
config/hadoop/default-config.xml | 15 +-
examples/README.txt | 11 +-
examples/config/example-ignite.xml | 2 +-
.../streaming/StreamTransformerExample.java | 100 +
.../streaming/StreamVisitorExample.java | 171 +
.../streaming/marketdata/CacheConfig.java | 44 -
.../streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 103 -
.../examples/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 78 -
.../streaming/wordcount/CacheConfig.java | 48 +
.../streaming/wordcount/QueryWords.java | 77 +
.../streaming/wordcount/StreamWords.java | 68 +
.../streaming/wordcount/alice-in-wonderland.txt | 3735 ++++++++++++++++++
.../streaming/wordcount/package-info.java | 22 +
.../streaming/StreamTransformerExample.java | 97 +
.../java8/streaming/StreamVisitorExample.java | 168 +
.../java8/streaming/marketdata/CacheConfig.java | 44 -
.../java8/streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 101 -
.../java8/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 74 -
.../ignite/cache/affinity/AffinityUuid.java | 50 +
.../configuration/CacheConfiguration.java | 3 -
.../processors/cache/CacheLazyEntry.java | 10 +-
.../processors/cache/KeyCacheObjectImpl.java | 13 +-
.../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 -
.../ignite/IgniteCacheAffinitySelfTest.java | 5 +
.../GridCacheOnCopyFlagAbstractSelfTest.java | 112 +-
.../GridCacheReturnValueTransferSelfTest.java | 1 -
.../IgniteCacheStoreValueAbstractTest.java | 186 +-
...ridCacheFifoBatchEvictionPolicySelfTest.java | 3 +-
.../IgniteCacheEvictionSelfTestSuite.java | 1 +
parent/pom.xml | 1 +
pom.xml | 13 +-
48 files changed, 4818 insertions(+), 1286 deletions(-)
----------------------------------------------------------------------
[18/50] incubator-ignite git commit: ignite-624
Posted by sb...@apache.org.
ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25f900ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25f900ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25f900ed
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 25f900edac7d3a213ec30de673251777739848a5
Parents: 71fa3a2
Author: S.Vladykin <sv...@gridgain.com>
Authored: Tue Apr 7 09:54:56 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Apr 7 09:54:56 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/sql/GridSqlQuery.java | 103 +++++++++----------
.../query/h2/sql/GridSqlQueryParser.java | 41 +++++---
.../query/h2/sql/GridSqlQuerySplitter.java | 96 ++++++++++++-----
.../processors/query/h2/sql/GridSqlSelect.java | 72 ++++++++-----
.../processors/query/h2/sql/GridSqlUnion.java | 42 +-------
5 files changed, 192 insertions(+), 162 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f900ed/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
index db1dcbf..5953d5e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
@@ -17,6 +17,9 @@
package org.apache.ignite.internal.processors.query.h2.sql;
+import org.apache.ignite.*;
+import org.h2.util.*;
+
import java.util.*;
/**
@@ -27,13 +30,7 @@ public abstract class GridSqlQuery implements Cloneable {
protected boolean distinct;
/** */
- protected List<GridSqlElement> allExprs;
-
- /** */
- protected List<GridSqlElement> select = new ArrayList<>();
-
- /** */
- protected Map<GridSqlElement,GridSqlSortColumn> sort = new LinkedHashMap<>();
+ protected List<GridSqlSortColumn> sort = new ArrayList<>();
/** */
protected GridSqlElement offset;
@@ -89,66 +86,66 @@ public abstract class GridSqlQuery implements Cloneable {
public abstract String getSQL();
/**
- * @param expression Expression.
- */
- public void addExpression(GridSqlElement expression) {
- if (allExprs == null)
- allExprs = new ArrayList<>();
-
- allExprs.add(expression);
- }
-
- /**
- * @return All expressions in select, group by, order by.
+ * @return Sort.
*/
- public List<GridSqlElement> allExpressions() {
- return allExprs;
+ public List<GridSqlSortColumn> sort() {
+ return sort;
}
/**
- * @return Expressions.
+ *
*/
- public List<GridSqlElement> select() {
- return select;
+ public void clearSort() {
+ sort = new ArrayList<>();
}
/**
- * Clears select list.
+ * @param sortCol The sort column.
*/
- public void clearSelect() {
- select = new ArrayList<>();
+ public void addSort(GridSqlSortColumn sortCol) {
+ sort.add(sortCol);
}
/**
- * @param expression Expression.
+ * @param buff Statement builder.
*/
- public void addSelectExpression(GridSqlElement expression) {
- if (expression == null)
- throw new NullPointerException();
-
- select.add(expression);
- }
+ protected void getSortLimitSQL(StatementBuilder buff) {
+ if (!sort.isEmpty()) {
+ buff.append("\nORDER BY ");
+
+ boolean first = true;
+
+ for (GridSqlSortColumn col : sort) {
+ if (first)
+ first = false;
+ else
+ buff.append(", ");
+
+ int idx = col.column();
+
+ if (idx >= 0)
+ buff.append(idx + 1);
+ else {
+ throw new IgniteException("Failed to generate query: " + buff);
+// buff.append('=').append(StringUtils.unEnclose(entry.getKey().getSQL()));
+ }
+
+ if (!col.asc())
+ buff.append(" DESC");
+
+ if (col.nullsFirst())
+ buff.append(" NULLS FIRST");
+ else if (col.nullsLast())
+ buff.append(" NULLS LAST");
+ }
+ }
- /**
- * @return Sort.
- */
- public Map<GridSqlElement,GridSqlSortColumn> sort() {
- return sort;
- }
+ if (limit != null)
+ buff.append(" LIMIT ").append(StringUtils.unEnclose(limit.getSQL()));
- /**
- *
- */
- public void clearSort() {
- sort = new LinkedHashMap<>();
- }
+ if (offset != null)
+ buff.append(" OFFSET ").append(StringUtils.unEnclose(offset.getSQL()));
- /**
- * @param expression Expression.
- * @param sortType The sort type bit mask (SortOrder.DESCENDING, SortOrder.NULLS_FIRST, SortOrder.NULLS_LAST).
- */
- public void addSort(GridSqlElement expression, GridSqlSortColumn sortType) {
- sort.put(expression, sortType);
}
/** {@inheritDoc} */
@@ -157,9 +154,7 @@ public abstract class GridSqlQuery implements Cloneable {
try {
GridSqlQuery res = (GridSqlQuery)super.clone();
- res.select = new ArrayList<>(select);
- res.sort = new LinkedHashMap<>(sort);
- res.allExprs = null;
+ res.sort = new ArrayList<>(sort);
return res;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f900ed/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index fb341c1..ea3628f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
@@ -293,22 +293,7 @@ public class GridSqlQueryParser {
for (int i = 0; i < select.getColumnCount(); i++)
res.addSelectExpression(parseExpression(expressions.get(i)));
- SortOrder sortOrder = select.getSortOrder();
-
- if (sortOrder != null) {
- int[] indexes = sortOrder.getQueryColumnIndexes();
- int[] sortTypes = sortOrder.getSortTypes();
-
- for (int i = 0; i < indexes.length; i++) {
- int colIdx = indexes[i];
- int type = sortTypes[i];
-
- res.addSort(parseExpression(expressions.get(colIdx)), new GridSqlSortColumn(colIdx,
- (type & SortOrder.DESCENDING) == 0,
- (type & SortOrder.NULLS_FIRST) != 0,
- (type & SortOrder.NULLS_LAST) != 0));
- }
- }
+ processSortOrder(select.getSortOrder(), res);
res.limit(parseExpression(select.getLimit()));
res.offset(parseExpression(select.getOffset()));
@@ -317,6 +302,28 @@ public class GridSqlQueryParser {
}
/**
+ * @param sortOrder Sort order.
+ * @param qry Query.
+ */
+ private void processSortOrder(SortOrder sortOrder, GridSqlQuery qry) {
+ if (sortOrder == null)
+ return;
+
+ int[] indexes = sortOrder.getQueryColumnIndexes();
+ int[] sortTypes = sortOrder.getSortTypes();
+
+ for (int i = 0; i < indexes.length; i++) {
+ int colIdx = indexes[i];
+ int type = sortTypes[i];
+
+ qry.addSort(new GridSqlSortColumn(colIdx,
+ (type & SortOrder.DESCENDING) == 0,
+ (type & SortOrder.NULLS_FIRST) != 0,
+ (type & SortOrder.NULLS_LAST) != 0));
+ }
+ }
+
+ /**
* @param qry Select.
*/
public GridSqlQuery parse(Query qry) {
@@ -348,7 +355,7 @@ public class GridSqlQueryParser {
res.limit(parseExpression(union.getLimit()));
res.offset(parseExpression(union.getOffset()));
- assert UNION_SORT.get(union) == null; // todo IGNITE-624
+ processSortOrder(UNION_SORT.get(union), res);
h2ObjToGridObj.put(union, res);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f900ed/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index f343b01..05928c2 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -57,6 +57,17 @@ public class GridSqlQuerySplitter {
}
/**
+ * @param qry Query.
+ * @return Leftest simple query if this is UNION.
+ */
+ private static GridSqlSelect leftest(GridSqlQuery qry) {
+ if (qry instanceof GridSqlUnion)
+ return leftest(((GridSqlUnion)qry).left());
+
+ return (GridSqlSelect)qry;
+ }
+
+ /**
* @param stmt Prepared statement.
* @param params Parameters.
* @return Two step query.
@@ -65,21 +76,58 @@ public class GridSqlQuerySplitter {
if (params == null)
params = GridCacheSqlQuery.EMPTY_PARAMS;
- GridSqlQuery srcQry = GridSqlQueryParser.parse(stmt);
+ GridSqlQuery qry0 = GridSqlQueryParser.parse(stmt);
+
+ GridSqlSelect srcQry;
+
+ if (qry0 instanceof GridSqlSelect)
+ srcQry = (GridSqlSelect)qry0;
+ else {
+ srcQry = new GridSqlSelect().from(new GridSqlSubquery(qry0));
+
+ GridSqlSelect left = leftest(qry0);
+
+ int c = 0;
+
+ for (GridSqlElement expr : left.select()) {
+ String colName;
+
+ if (expr instanceof GridSqlAlias)
+ colName = ((GridSqlAlias)expr).alias();
+ else if (expr instanceof GridSqlColumn)
+ colName = ((GridSqlColumn)expr).columnName();
+ else {
+ colName = columnName(c);
- if (!(srcQry instanceof GridSqlSelect))
- throw new UnsupportedOperationException(); // todo IGNITE-624 Support UNION,
+ expr = alias(colName, expr);
- GridSqlSelect srcSelect = (GridSqlSelect)srcQry;
+ // Set generated alias to the expression.
+ left.select().set(c, expr);
+ left.allExpressions().set(c, expr);
+ }
+
+ srcQry.addSelectExpression(column(colName));
+
+ qry0.sort();
+
+ c++;
+ }
+
+ // ORDER BY
+ if (!qry0.sort().isEmpty()) {
+ for (GridSqlSortColumn col : qry0.sort())
+ srcQry.addSort(col);
+ }
+ }
final String mergeTable = TABLE_FUNC_NAME + "()"; // table(0); TODO
- GridSqlSelect mapQry = srcSelect.clone();
+ GridSqlSelect mapQry = srcQry.clone();
GridSqlSelect rdcQry = new GridSqlSelect().from(new GridSqlFunction("PUBLIC", TABLE_FUNC_NAME)); // table(mergeTable)); TODO
// Split all select expressions into map-reduce parts.
- List<GridSqlElement> mapExps = new ArrayList<>(srcSelect.allExpressions());
- GridSqlElement[] rdcExps = new GridSqlElement[srcSelect.select().size()];
+ List<GridSqlElement> mapExps = new ArrayList<>(srcQry.allExpressions());
+ GridSqlElement[] rdcExps = new GridSqlElement[srcQry.select().size()];
Set<String> colNames = new HashSet<>();
@@ -98,31 +146,31 @@ public class GridSqlQuerySplitter {
rdcQry.addSelectExpression(rdcExp);
// -- GROUP BY
- if (!srcSelect.groups().isEmpty()) {
+ if (!srcQry.groups().isEmpty()) {
mapQry.clearGroups();
- for (int col : srcSelect.groupColumns())
+ for (int col : srcQry.groupColumns())
mapQry.addGroupExpression(column(((GridSqlAlias)mapExps.get(col)).alias()));
- for (int col : srcSelect.groupColumns())
+ for (int col : srcQry.groupColumns())
rdcQry.addGroupExpression(column(((GridSqlAlias)mapExps.get(col)).alias()));
}
// -- HAVING
- if (srcSelect.having() != null) {
+ if (srcQry.having() != null) {
// TODO Find aggregate functions in HAVING clause.
- rdcQry.whereAnd(column(columnName(srcSelect.havingColumn())));
+ rdcQry.whereAnd(column(columnName(srcQry.havingColumn())));
mapQry.having(null);
}
// -- ORDER BY
- if (!srcSelect.sort().isEmpty()) {
+ if (!srcQry.sort().isEmpty()) {
if (aggregateFound) // Ordering over aggregates does not make sense.
mapQry.clearSort(); // Otherwise map sort will be used by offset-limit.
- for (GridSqlSortColumn sortCol : srcSelect.sort().values())
- rdcQry.addSort(column(((GridSqlAlias)mapExps.get(sortCol.column())).alias()), sortCol);
+ for (GridSqlSortColumn sortCol : srcQry.sort())
+ rdcQry.addSort(sortCol);
}
// -- LIMIT
@@ -134,14 +182,14 @@ public class GridSqlQuerySplitter {
}
// -- OFFSET
- if (srcSelect.offset() != null) {
+ if (srcQry.offset() != null) {
mapQry.offset(null);
- rdcQry.offset(srcSelect.offset());
+ rdcQry.offset(srcQry.offset());
}
// -- DISTINCT
- if (srcSelect.distinct()) {
+ if (srcQry.distinct()) {
mapQry.distinct(false);
rdcQry.distinct(true);
}
@@ -166,7 +214,12 @@ public class GridSqlQuerySplitter {
if (qry instanceof GridSqlSelect)
return findParams((GridSqlSelect)qry, params, target);
- throw new UnsupportedOperationException(); // todo IGNITE-624
+ GridSqlUnion union = (GridSqlUnion)qry;
+
+ findParams(union.left(), params, target);
+ findParams(union.right(), params, target);
+
+ return target;
}
/**
@@ -179,7 +232,7 @@ public class GridSqlQuerySplitter {
if (params.length == 0)
return target;
- for (GridSqlElement el : qry.select())
+ for (GridSqlElement el : qry.allExpressions())
findParams(el, params, target);
findParams(qry.from(), params, target);
@@ -190,9 +243,6 @@ public class GridSqlQuerySplitter {
findParams(qry.having(), params, target);
- for (GridSqlElement el : qry.sort().keySet())
- findParams(el, params, target);
-
findParams(qry.limit(), params, target);
findParams(qry.offset(), params, target);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f900ed/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
index 272f8b4..154659b 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -26,6 +26,12 @@ import java.util.*;
*/
public class GridSqlSelect extends GridSqlQuery {
/** */
+ private List<GridSqlElement> allExprs;
+
+ /** */
+ private List<GridSqlElement> select = new ArrayList<>();
+
+ /** */
private List<GridSqlElement> groups = new ArrayList<>();
/** */
@@ -79,42 +85,50 @@ public class GridSqlSelect extends GridSqlQuery {
if (having != null)
buff.append("\nHAVING ").append(StringUtils.unEnclose(having.getSQL()));
- if (!sort.isEmpty()) {
- buff.append("\nORDER BY ");
-
- buff.resetCount();
-
- for (Map.Entry<GridSqlElement,GridSqlSortColumn> entry : sort.entrySet()) {
- buff.appendExceptFirst(", ");
-
- GridSqlElement expression = entry.getKey();
+ getSortLimitSQL(buff);
- int idx = select.indexOf(expression);
+ return buff.toString();
+ }
- if (idx >= 0)
- buff.append(idx + 1);
- else
- buff.append('=').append(StringUtils.unEnclose(expression.getSQL()));
+ /**
+ * @param expression Expression.
+ */
+ public void addExpression(GridSqlElement expression) {
+ if (allExprs == null)
+ allExprs = new ArrayList<>();
- GridSqlSortColumn type = entry.getValue();
+ allExprs.add(expression);
+ }
- if (!type.asc())
- buff.append(" DESC");
+ /**
+ * @return All expressions in select, group by, order by.
+ */
+ public List<GridSqlElement> allExpressions() {
+ return allExprs;
+ }
- if (type.nullsFirst())
- buff.append(" NULLS FIRST");
- else if (type.nullsLast())
- buff.append(" NULLS LAST");
- }
- }
+ /**
+ * @return Expressions.
+ */
+ public List<GridSqlElement> select() {
+ return select;
+ }
- if (limit != null)
- buff.append(" LIMIT ").append(StringUtils.unEnclose(limit.getSQL()));
+ /**
+ * Clears select list.
+ */
+ public void clearSelect() {
+ select = new ArrayList<>();
+ }
- if (offset != null)
- buff.append(" OFFSET ").append(StringUtils.unEnclose(offset.getSQL()));
+ /**
+ * @param expression Expression.
+ */
+ public void addSelectExpression(GridSqlElement expression) {
+ if (expression == null)
+ throw new NullPointerException();
- return buff.toString();
+ select.add(expression);
}
/**
@@ -237,6 +251,8 @@ public class GridSqlSelect extends GridSqlQuery {
res.groups = new ArrayList<>(groups);
res.grpCols = grpCols == null ? null : grpCols.clone();
+ res.select = new ArrayList<>(select);
+ res.allExprs = null;
return res;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f900ed/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
index 1eae1ef..6fe3f19 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
@@ -18,11 +18,9 @@
package org.apache.ignite.internal.processors.query.h2.sql;
import org.h2.command.dml.*;
-import org.h2.message.*;
import org.h2.util.*;
import javax.cache.*;
-import java.util.*;
/**
*
@@ -39,7 +37,7 @@ public class GridSqlUnion extends GridSqlQuery {
/** {@inheritDoc} */
@Override public String getSQL() {
- StringBuilder buff = new StringBuilder();
+ StatementBuilder buff = new StatementBuilder();
buff.append('(').append(left.getSQL()).append(')');
@@ -66,43 +64,7 @@ public class GridSqlUnion extends GridSqlQuery {
buff.append('(').append(right.getSQL()).append(')');
- if (!sort.isEmpty()) {
- buff.append("\nORDER BY ");
-
- boolean first = true;
-
- for (Map.Entry<GridSqlElement, GridSqlSortColumn> entry : sort.entrySet()) {
- if (first)
- first = false;
- else
- buff.append(", ");
-
- GridSqlElement expression = entry.getKey();
-
- int idx = select.indexOf(expression);
-
- if (idx >= 0)
- buff.append(idx + 1);
- else
- buff.append('=').append(StringUtils.unEnclose(expression.getSQL()));
-
- GridSqlSortColumn type = entry.getValue();
-
- if (!type.asc())
- buff.append(" DESC");
-
- if (type.nullsFirst())
- buff.append(" NULLS FIRST");
- else if (type.nullsLast())
- buff.append(" NULLS LAST");
- }
- }
-
- if (limit != null)
- buff.append(" LIMIT ").append(StringUtils.unEnclose(limit.getSQL()));
-
- if (offset != null)
- buff.append(" OFFSET ").append(StringUtils.unEnclose(offset.getSQL()));
+ getSortLimitSQL(buff);
return buff.toString();
}
[25/50] incubator-ignite git commit: # Ignite-639 Fixed Visor console
cache command.
Posted by sb...@apache.org.
# Ignite-639 Fixed Visor console cache command.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/36c330a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36c330a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36c330a6
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 36c330a6ab0f8bff24ef05933dd079f11d76b63a
Parents: c6de5e1
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Apr 7 21:38:09 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Apr 7 21:38:09 2015 +0700
----------------------------------------------------------------------
.../cache/VisorCacheMetricsCollectorTask.java | 10 +++++--
.../commands/cache/VisorCacheCommand.scala | 29 +++++++++++++-------
2 files changed, 27 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/36c330a6/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index b4b850b..ee0b962 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -46,7 +46,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
Map<String, VisorCacheAggregatedMetrics> grpAggrMetrics = U.newHashMap(results.size());
for (ComputeJobResult res : results) {
- if (res.getException() == null && res.getData() instanceof Map<?, ?>) {
+ if (res.getException() == null) {
Collection<VisorCacheMetrics> cms = res.getData();
for (VisorCacheMetrics cm : cms) {
@@ -109,7 +109,13 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
if (ca.context().started()) {
VisorCacheMetrics cm = VisorCacheMetrics.from(ignite, ca);
- if ((showSysCaches && cm.system()) || allCaches || cacheNames.contains(ca.name()))
+ boolean addCache = allCaches || cacheNames.contains(ca.name());
+
+ if (showSysCaches) {
+ if (cm.system() && addCache)
+ res.add(cm);
+ }
+ else if (!cm.system() && addCache)
res.add(cm);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/36c330a6/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index df3007c..b8f2a35 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -221,9 +221,9 @@ class VisorCacheCommand {
if (hasArgFlag("i", argLst)) {
askForNode("Select node from:") match {
case Some(nid) => ask("Detailed statistics (y/n) [n]: ", "n") match {
- case "n" | "N" => nl(); cache("-id=" + nid).^^
- case "y" | "Y" => nl(); cache("-a -id=" + nid).^^
- case x => nl(); warn("Invalid answer: " + x).^^
+ case "n" | "N" => nl(); cache("-id=" + nid); return;
+ case "y" | "Y" => nl(); cache("-a -id=" + nid); return;
+ case x => nl(); warn("Invalid answer: " + x); return;
}
case None => return
}
@@ -302,11 +302,17 @@ class VisorCacheCommand {
val sortType = argValue("s", argLst)
val reversed = hasArgName("r", argLst)
- if (sortType.isDefined && !isValidSortType(sortType.get))
- scold("Invalid '-s' argument in: " + args).^^
+ if (sortType.isDefined && !isValidSortType(sortType.get)) {
+ scold("Invalid '-s' argument in: " + args)
- if (aggrData.isEmpty)
- scold("No caches found.").^^
+ return
+ }
+
+ if (aggrData.isEmpty) {
+ scold("No caches found.")
+
+ return
+ }
println("Time of the snapshot: " + formatDateTime(System.currentTimeMillis))
@@ -493,7 +499,7 @@ class VisorCacheCommand {
val nids = prj.nodes().map(_.id())
- val caches: JavaCollection[String] = new JavaList[String](1)
+ val caches: JavaCollection[String] = new JavaList[String]()
name.foreach(caches.add)
ignite.compute(prj).execute(classOf[VisorCacheMetricsCollectorTask], toTaskArgument(nids,
@@ -602,8 +608,11 @@ class VisorCacheCommand {
assert(title != null)
assert(visor.visor.isConnected)
- if (aggrData.isEmpty)
- scold("No caches found.").^^
+ if (aggrData.isEmpty) {
+ scold("No caches found.")
+
+ return None
+ }
val sortedAggrData = sortAggregatedData(aggrData, "cn", false)
[47/50] incubator-ignite git commit: ignite-624 - minor
Posted by sb...@apache.org.
ignite-624 - minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ab2fe776
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ab2fe776
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ab2fe776
Branch: refs/heads/ignite-437-sqltests-p2
Commit: ab2fe77642294b9cfb432ed43ad41bf320503839
Parents: e0d88d3
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 14:28:24 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 14:28:24 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/util/lang/GridFunc.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab2fe776/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index fee53ef..c7574f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -5433,8 +5433,18 @@ public class GridFunc {
* @param it Iterable to fetch.
* @return Modified target collection.
*/
+ @SuppressWarnings("unchecked")
public static <T, C extends Collection<T>> C addAll(C c, Iterable<? extends T> it) {
- return it == null ? c : addAll(c, it.iterator());
+ if (it == null)
+ return c;
+
+ if (it instanceof Collection<?>) {
+ c.addAll((Collection<? extends T>)it);
+
+ return c;
+ }
+
+ return addAll(c, it.iterator());
}
/**
[14/50] incubator-ignite git commit: Merge branches 'ignite-639' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-639
Posted by sb...@apache.org.
Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1eaf292
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1eaf292
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1eaf292
Branch: refs/heads/ignite-437-sqltests-p2
Commit: f1eaf292921650e4ce44f61640fe7992ee14babb
Parents: 43fa714 3629cee
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Apr 7 10:31:50 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Apr 7 10:31:50 2015 +0700
----------------------------------------------------------------------
.../store/jdbc/CacheAbstractJdbcStore.java | 104 ++++++++++++++-----
.../yardstick/config/benchmark-store.properties | 5 +-
2 files changed, 80 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
[28/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/58f49139
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/58f49139
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/58f49139
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 58f4913905c3dccc2fe87da2a58f73da5416955e
Parents: cf1cf9d beedb17
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 01:25:24 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 01:25:24 2015 +0300
----------------------------------------------------------------------
.../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 +-
...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 +
parent/pom.xml | 2 +-
pom.xml | 1 +
17 files changed, 121 insertions(+), 190 deletions(-)
----------------------------------------------------------------------
[08/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-477
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-477
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dc8c4a95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dc8c4a95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dc8c4a95
Branch: refs/heads/ignite-437-sqltests-p2
Commit: dc8c4a955ab501b3ee2f486202f268933ff71712
Parents: 5ec2af0 8242c15
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Mon Apr 6 11:53:30 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Mon Apr 6 11:53:30 2015 -0700
----------------------------------------------------------------------
.../cache/eviction/fifo/FifoEvictionPolicy.java | 58 ++-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 16 +
.../eviction/GridCacheEvictionAbstractTest.java | 5 +-
...ridCacheFifoBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++++
4 files changed, 454 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[09/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/71fa3a22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71fa3a22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71fa3a22
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 71fa3a224a9adf0bad255b2d36fef3124e948b80
Parents: 9e7f8a4 5a2b46c
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Apr 6 22:55:19 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Apr 6 22:55:19 2015 +0300
----------------------------------------------------------------------
.../cache/eviction/fifo/FifoEvictionPolicy.java | 58 ++-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 16 +
.../ignite/internal/util/IgniteUtils.java | 46 ++-
.../org/apache/ignite/stream/StreamVisitor.java | 2 +-
.../eviction/GridCacheEvictionAbstractTest.java | 5 +-
...ridCacheFifoBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++++
modules/schedule/pom.xml | 20 +
pom.xml | 61 ++-
8 files changed, 571 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[12/50] incubator-ignite git commit: # ignite-680
Posted by sb...@apache.org.
# ignite-680
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/86f23de5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/86f23de5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/86f23de5
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 86f23de5cf8b308c25072e46cd3efdc31e9eb545
Parents: bf7fdb2
Author: sboikov <se...@inria.fr>
Authored: Tue Apr 7 06:14:46 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Tue Apr 7 06:14:46 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheProcessor.java | 63 +++++++++++++++++++-
1 file changed, 62 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86f23de5/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 7deb9fb..ca3b896 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
@@ -942,7 +942,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
ctx.kernalContext().continuous().onCacheStop(ctx);
U.stopLifecycleAware(log, lifecycleAwares(cache.configuration(), ctx.jta().tmLookup(),
- ctx.store().configuredStore()));
+ ctx.store().configuredStore()));
if (log.isInfoEnabled())
log.info("Stopped cache: " + cache.name());
@@ -2442,6 +2442,16 @@ public class GridCacheProcessor extends GridProcessorAdapter {
private void addCacheConfigurations(Collection<CacheConfiguration> cfgs) throws IgniteCheckedException {
GridCacheAdapter<CacheTemplateConfigurationKey, TemplateConfigurations> utilityCache = utilityCache();
+ TemplateConfigurations templates =
+ utilityCache.localPeek(new CacheTemplateConfigurationKey(), CachePeekModes.ONHEAP_ONLY, null);
+
+ if (templates != null) {
+ cfgs = templates.needAdd(cfgs);
+
+ if (cfgs == null)
+ return;
+ }
+
final int RETRY_CNT = 5;
for (int i = 0; i < RETRY_CNT; i++) {
@@ -2766,6 +2776,57 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
/**
+ * Checks if need to add new templates.
+ *
+ * @param cfgs Templates to add.
+ * @return Templates which should be added.
+ */
+ @Nullable Collection<CacheConfiguration> needAdd(Collection<CacheConfiguration> cfgs) {
+ Collection<CacheConfiguration> res = null;
+
+ for (CacheConfiguration cfg : cfgs) {
+ boolean found = false;
+
+ if (cfg.getName() != null && cfg.getName().endsWith("*")) {
+ String name0 = cfg.getName().substring(0, cfg.getName().length() - 1);
+
+ if (wildcardNameCfgs != null) {
+ for (CacheConfiguration cfg0 : wildcardNameCfgs) {
+ if (F.eq(cfg0.getName(), name0)) {
+ found = true;
+
+ break;
+ }
+ }
+ }
+ }
+ else {
+ if (exactNameCfgs != null) {
+ for (CacheConfiguration cfg0 : exactNameCfgs) {
+ if (F.eq(cfg0.getName(), cfg.getName())) {
+ found = true;
+
+ break;
+ }
+ }
+ }
+ }
+
+ if (!found) {
+ if (res == null)
+ res = new ArrayList<>();
+
+ System.out.println(Thread.currentThread().getName() + " need add: " + cfg + " " + exactNameCfgs);
+
+
+ res.add(cfg);
+ }
+ }
+
+ return res;
+ }
+
+ /**
* @param cfgs Configurations to add.
*/
void add(Collection<CacheConfiguration> cfgs) {
[23/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3daa0b6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3daa0b6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3daa0b6b
Branch: refs/heads/ignite-437-sqltests-p2
Commit: 3daa0b6bbf501def9e88983194a2bb952709c97e
Parents: 5edf4d9 21e328d
Author: S.Vladykin <sv...@gridgain.com>
Authored: Tue Apr 7 15:40:25 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Apr 7 15:40:25 2015 +0300
----------------------------------------------------------------------
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/include/service.sh | 8 ++--
config/hadoop/default-config.xml | 15 ++++--
.../streaming/StreamTransformerExample.java | 3 +-
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 ++++++++++++++------
pom.xml | 1 +
7 files changed, 54 insertions(+), 25 deletions(-)
----------------------------------------------------------------------