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 2017/05/24 18:05:40 UTC
[17/32] ignite git commit: IGNITE-5281: Indexing: changed "space" to
"cacheName". No more "spaces". This closes #1992.
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index c099d77..0ce905b 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -228,10 +228,7 @@ import static org.apache.ignite.internal.processors.query.h2.opt.GridH2QueryType
/**
* Indexing implementation based on H2 database engine. In this implementation main query language is SQL,
- * fulltext indexing can be performed using Lucene. For each registered space
- * the SPI will create respective schema, for default space (where space name is null) schema
- * with name {@code ""} will be used. To avoid name conflicts user should not explicitly name
- * a schema {@code ""}.
+ * fulltext indexing can be performed using Lucene.
* <p>
* For each registered {@link GridQueryTypeDescriptor} this SPI will create respective SQL table with
* {@code '_key'} and {@code '_val'} fields for key and value, and fields from
@@ -336,8 +333,8 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/** */
private GridReduceQueryExecutor rdcQryExec;
- /** space name -> schema name */
- private final Map<String, String> space2schema = new ConcurrentHashMap8<>();
+ /** Cache name -> schema name */
+ private final Map<String, String> cacheName2schema = new ConcurrentHashMap8<>();
/** */
private AtomicLong qryIdGen;
@@ -429,12 +426,12 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/**
- * @param space Space.
+ * @param cacheName Cache name.
* @return Connection.
*/
- public Connection connectionForSpace(String space) {
+ public Connection connectionForCache(String cacheName) {
try {
- return connectionForThread(schema(space));
+ return connectionForThread(schema(cacheName));
}
catch (IgniteCheckedException e) {
throw new IgniteException(e);
@@ -484,13 +481,13 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/** {@inheritDoc} */
- @Override public PreparedStatement prepareNativeStatement(String space, String sql) throws SQLException {
- return prepareStatement(connectionForSpace(space), sql, true);
+ @Override public PreparedStatement prepareNativeStatement(String cacheName, String sql) throws SQLException {
+ return prepareStatement(connectionForCache(cacheName), sql, true);
}
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override public IgniteDataStreamer<?, ?> createStreamer(String spaceName, PreparedStatement nativeStmt,
+ @Override public IgniteDataStreamer<?, ?> createStreamer(String cacheName, PreparedStatement nativeStmt,
long autoFlushFreq, int nodeBufSize, int nodeParOps, boolean allowOverwrite) {
Prepared prep = GridSqlQueryParser.prepared(nativeStmt);
@@ -498,7 +495,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
throw new IgniteSQLException("Only INSERT operations are supported in streaming mode",
IgniteQueryErrorCode.UNSUPPORTED_OPERATION);
- IgniteDataStreamer streamer = ctx.grid().dataStreamer(spaceName);
+ IgniteDataStreamer streamer = ctx.grid().dataStreamer(cacheName);
streamer.autoFlushFrequency(autoFlushFreq);
@@ -640,7 +637,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/** {@inheritDoc} */
- @Override public void store(String spaceName,
+ @Override public void store(String cacheName,
String typeName,
KeyCacheObject k,
int partId,
@@ -648,7 +645,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
GridCacheVersion ver,
long expirationTime,
long link) throws IgniteCheckedException {
- TableDescriptor tbl = tableDescriptor(typeName, spaceName);
+ TableDescriptor tbl = tableDescriptor(typeName, cacheName);
if (tbl == null)
return; // Type was rejected.
@@ -674,29 +671,29 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/**
- * @param space Space.
+ * @param cacheName Cache name.
* @return Cache object context.
*/
- private CacheObjectContext objectContext(String space) {
+ private CacheObjectContext objectContext(String cacheName) {
if (ctx == null)
return null;
- return ctx.cache().internalCache(space).context().cacheObjectContext();
+ return ctx.cache().internalCache(cacheName).context().cacheObjectContext();
}
/**
- * @param space Space.
+ * @param cacheName Cache name.
* @return Cache object context.
*/
- private GridCacheContext cacheContext(String space) {
+ private GridCacheContext cacheContext(String cacheName) {
if (ctx == null)
return null;
- return ctx.cache().internalCache(space).context();
+ return ctx.cache().internalCache(cacheName).context();
}
/** {@inheritDoc} */
- @Override public void remove(String spaceName,
+ @Override public void remove(String cacheName,
GridQueryTypeDescriptor type,
KeyCacheObject key,
int partId,
@@ -705,7 +702,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
if (log.isDebugEnabled())
log.debug("Removing key from cache query index [locId=" + nodeId + ", key=" + key + ", val=" + val + ']');
- TableDescriptor tbl = tableDescriptor(type.name(), spaceName);
+ TableDescriptor tbl = tableDescriptor(type.name(), cacheName);
if (tbl == null)
return;
@@ -764,12 +761,12 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/**
* Add initial user index.
*
- * @param spaceName Space name.
+ * @param cacheName Cache name.
* @param desc Table descriptor.
* @param h2Idx User index.
* @throws IgniteCheckedException If failed.
*/
- private void addInitialUserIndex(String spaceName, TableDescriptor desc, GridH2IndexBase h2Idx)
+ private void addInitialUserIndex(String cacheName, TableDescriptor desc, GridH2IndexBase h2Idx)
throws IgniteCheckedException {
GridH2Table h2Tbl = desc.tbl;
@@ -778,7 +775,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
try {
String sql = indexCreateSql(desc.fullTableName(), h2Idx, false, desc.schema.escapeAll());
- executeSql(spaceName, sql);
+ executeSql(cacheName, sql);
}
catch (Exception e) {
// Rollback and re-throw.
@@ -789,11 +786,11 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/** {@inheritDoc} */
- @Override public void dynamicIndexCreate(final String spaceName, final String tblName,
+ @Override public void dynamicIndexCreate(final String cacheName, final String tblName,
final QueryIndexDescriptorImpl idxDesc, boolean ifNotExists, SchemaIndexCacheVisitor cacheVisitor)
throws IgniteCheckedException {
// Locate table.
- String schemaName = schema(spaceName);
+ String schemaName = schema(cacheName);
Schema schema = schemas.get(schemaName);
@@ -834,7 +831,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
// prepared statements are re-built.
String sql = indexCreateSql(desc.fullTableName(), h2Idx, ifNotExists, schema.escapeAll());
- executeSql(spaceName, sql);
+ executeSql(cacheName, sql);
}
catch (Exception e) {
// Rollback and re-throw.
@@ -846,27 +843,27 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/** {@inheritDoc} */
@SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
- @Override public void dynamicIndexDrop(final String spaceName, String idxName, boolean ifExists)
+ @Override public void dynamicIndexDrop(final String cacheName, String idxName, boolean ifExists)
throws IgniteCheckedException{
- String schemaName = schema(spaceName);
+ String schemaName = schema(cacheName);
Schema schema = schemas.get(schemaName);
String sql = indexDropSql(schemaName, idxName, ifExists, schema.escapeAll());
- executeSql(spaceName, sql);
+ executeSql(cacheName, sql);
}
/**
* Execute DDL command.
*
- * @param spaceName Space name.
+ * @param cacheName Cache name.
* @param sql SQL.
* @throws IgniteCheckedException If failed.
*/
- private void executeSql(String spaceName, String sql) throws IgniteCheckedException {
+ private void executeSql(String cacheName, String sql) throws IgniteCheckedException {
try {
- Connection conn = connectionForSpace(spaceName);
+ Connection conn = connectionForCache(cacheName);
try (PreparedStatement stmt = prepareStatement(conn, sql, false)) {
stmt.execute();
@@ -984,12 +981,12 @@ public class IgniteH2Indexing implements GridQueryIndexing {
@SuppressWarnings("unchecked")
@Override public <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> queryLocalText(
- String spaceName, String qry, String typeName,
+ String cacheName, String qry, String typeName,
IndexingQueryFilter filters) throws IgniteCheckedException {
- TableDescriptor tbl = tableDescriptor(typeName, spaceName);
+ TableDescriptor tbl = tableDescriptor(typeName, cacheName);
if (tbl != null && tbl.luceneIdx != null) {
- GridRunningQueryInfo run = new GridRunningQueryInfo(qryIdGen.incrementAndGet(), qry, TEXT, spaceName,
+ GridRunningQueryInfo run = new GridRunningQueryInfo(qryIdGen.incrementAndGet(), qry, TEXT, cacheName,
U.currentTimeMillis(), null, true);
try {
@@ -1006,9 +1003,9 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/** {@inheritDoc} */
- @Override public void unregisterType(String spaceName, String typeName)
+ @Override public void unregisterType(String cacheName, String typeName)
throws IgniteCheckedException {
- TableDescriptor tbl = tableDescriptor(typeName, spaceName);
+ TableDescriptor tbl = tableDescriptor(typeName, cacheName);
if (tbl != null)
removeTable(tbl);
@@ -1017,10 +1014,10 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/**
* Queries individual fields (generally used by JDBC drivers).
*
- * @param spaceName Space name.
+ * @param cacheName Cache name.
* @param qry Query.
* @param params Query parameters.
- * @param filter Space name and key filter.
+ * @param filter Cache name and key filter.
* @param enforceJoinOrder Enforce join order of tables in the query.
* @param timeout Query timeout in milliseconds.
* @param cancel Query cancel.
@@ -1028,11 +1025,11 @@ public class IgniteH2Indexing implements GridQueryIndexing {
* @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("unchecked")
- public GridQueryFieldsResult queryLocalSqlFields(final String spaceName, final String qry,
+ public GridQueryFieldsResult queryLocalSqlFields(final String cacheName, final String qry,
@Nullable final Collection<Object> params, final IndexingQueryFilter filter, boolean enforceJoinOrder,
final int timeout, final GridQueryCancel cancel)
throws IgniteCheckedException {
- final Connection conn = connectionForSpace(spaceName);
+ final Connection conn = connectionForCache(cacheName);
setupConnection(conn, false, enforceJoinOrder);
@@ -1049,7 +1046,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
fldsQry.setEnforceJoinOrder(enforceJoinOrder);
fldsQry.setTimeout(timeout, TimeUnit.MILLISECONDS);
- return dmlProc.updateLocalSqlFields(spaceName, stmt, fldsQry, filter, cancel);
+ return dmlProc.updateLocalSqlFields(cacheName, stmt, fldsQry, filter, cancel);
}
else if (DdlStatementsProcessor.isDdlStatement(p))
throw new IgniteSQLException("DDL statements are supported for the whole cluster only",
@@ -1074,12 +1071,12 @@ public class IgniteH2Indexing implements GridQueryIndexing {
GridH2QueryContext.set(ctx);
GridRunningQueryInfo run = new GridRunningQueryInfo(qryIdGen.incrementAndGet(), qry, SQL_FIELDS,
- spaceName, U.currentTimeMillis(), cancel, true);
+ cacheName, U.currentTimeMillis(), cancel, true);
runs.putIfAbsent(run.id(), run);
try {
- ResultSet rs = executeSqlQueryWithTimer(spaceName, stmt, conn, qry, params, timeout, cancel);
+ ResultSet rs = executeSqlQueryWithTimer(cacheName, stmt, conn, qry, params, timeout, cancel);
return new FieldsIterator(rs);
}
@@ -1093,9 +1090,9 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/** {@inheritDoc} */
- @Override public long streamUpdateQuery(String spaceName, String qry,
+ @Override public long streamUpdateQuery(String cacheName, String qry,
@Nullable Object[] params, IgniteDataStreamer<?, ?> streamer) throws IgniteCheckedException {
- final Connection conn = connectionForSpace(spaceName);
+ final Connection conn = connectionForCache(cacheName);
final PreparedStatement stmt;
@@ -1235,7 +1232,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/**
* Executes sql query and prints warning if query is too slow..
*
- * @param space Space name.
+ * @param cacheName Cache name.
* @param conn Connection,.
* @param sql Sql query.
* @param params Parameters.
@@ -1244,21 +1241,21 @@ public class IgniteH2Indexing implements GridQueryIndexing {
* @return Result.
* @throws IgniteCheckedException If failed.
*/
- public ResultSet executeSqlQueryWithTimer(String space,
+ public ResultSet executeSqlQueryWithTimer(String cacheName,
Connection conn,
String sql,
@Nullable Collection<Object> params,
boolean useStmtCache,
int timeoutMillis,
@Nullable GridQueryCancel cancel) throws IgniteCheckedException {
- return executeSqlQueryWithTimer(space, preparedStatementWithParams(conn, sql, params, useStmtCache),
+ return executeSqlQueryWithTimer(cacheName, preparedStatementWithParams(conn, sql, params, useStmtCache),
conn, sql, params, timeoutMillis, cancel);
}
/**
* Executes sql query and prints warning if query is too slow.
*
- * @param space Space name.
+ * @param cacheName Cache name.
* @param stmt Prepared statement for query.
* @param conn Connection.
* @param sql Sql query.
@@ -1267,7 +1264,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
* @return Result.
* @throws IgniteCheckedException If failed.
*/
- private ResultSet executeSqlQueryWithTimer(String space, PreparedStatement stmt,
+ private ResultSet executeSqlQueryWithTimer(String cacheName, PreparedStatement stmt,
Connection conn,
String sql,
@Nullable Collection<Object> params,
@@ -1280,7 +1277,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
long time = U.currentTimeMillis() - start;
- long longQryExecTimeout = schemas.get(schema(space)).ccfg.getLongQueryWarningTimeout();
+ long longQryExecTimeout = schemas.get(schema(cacheName)).ccfg.getLongQueryWarningTimeout();
if (time > longQryExecTimeout) {
String msg = "Query execution is too long (" + time + " ms): " + sql;
@@ -1350,11 +1347,11 @@ public class IgniteH2Indexing implements GridQueryIndexing {
else {
final boolean keepBinary = cctx.keepBinary();
- final String space = cctx.name();
+ final String cacheName = cctx.name();
final String sql = qry.getSql();
final Object[] args = qry.getArgs();
- final GridQueryFieldsResult res = queryLocalSqlFields(space, sql, F.asList(args), filter,
+ final GridQueryFieldsResult res = queryLocalSqlFields(cacheName, sql, F.asList(args), filter,
qry.isEnforceJoinOrder(), qry.getTimeout(), cancel);
QueryCursorImpl<List<?>> cursor = new QueryCursorImpl<>(new Iterable<List<?>>() {
@@ -1385,7 +1382,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
return queryDistributedSql(cctx, qry);
}
else {
- String space = cctx.name();
+ String cacheName = cctx.name();
String type = qry.getType();
String sqlQry = qry.getSql();
String alias = qry.getAlias();
@@ -1393,7 +1390,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
GridQueryCancel cancel = new GridQueryCancel();
- final GridCloseableIterator<IgniteBiTuple<K, V>> i = queryLocalSql(space, sqlQry, alias,
+ final GridCloseableIterator<IgniteBiTuple<K, V>> i = queryLocalSql(cacheName, sqlQry, alias,
F.asList(params), type, filter, cancel);
return new QueryCursorImpl<Cache.Entry<K, V>>(new Iterable<Cache.Entry<K, V>>() {
@@ -1427,19 +1424,19 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/**
* Executes regular query.
*
- * @param spaceName Space name.
+ * @param cacheName Cache name.
* @param qry Query.
* @param alias Table alias.
* @param params Query parameters.
* @param type Query return type.
- * @param filter Space name and key filter.
+ * @param filter Cache name and key filter.
* @return Queried rows.
* @throws IgniteCheckedException If failed.
*/
- public <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> queryLocalSql(String spaceName,
+ public <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> queryLocalSql(String cacheName,
final String qry, String alias, @Nullable final Collection<Object> params, String type,
final IndexingQueryFilter filter, GridQueryCancel cancel) throws IgniteCheckedException {
- final TableDescriptor tbl = tableDescriptor(type, spaceName);
+ final TableDescriptor tbl = tableDescriptor(type, cacheName);
if (tbl == null)
throw new IgniteSQLException("Failed to find SQL table for type: " + type,
@@ -1454,13 +1451,13 @@ public class IgniteH2Indexing implements GridQueryIndexing {
GridH2QueryContext.set(new GridH2QueryContext(nodeId, nodeId, 0, LOCAL).filter(filter)
.distributedJoinMode(OFF));
- GridRunningQueryInfo run = new GridRunningQueryInfo(qryIdGen.incrementAndGet(), qry, SQL, spaceName,
+ GridRunningQueryInfo run = new GridRunningQueryInfo(qryIdGen.incrementAndGet(), qry, SQL, cacheName,
U.currentTimeMillis(), null, true);
runs.put(run.id(), run);
try {
- ResultSet rs = executeSqlQueryWithTimer(spaceName, conn, sql, params, true, 0, cancel);
+ ResultSet rs = executeSqlQueryWithTimer(cacheName, conn, sql, params, true, 0, cancel);
return new KeyValIterator(rs);
}
@@ -1500,9 +1497,9 @@ public class IgniteH2Indexing implements GridQueryIndexing {
@SuppressWarnings("unchecked")
@Override public <K, V> QueryCursor<Cache.Entry<K, V>> queryDistributedSql(GridCacheContext<?, ?> cctx, SqlQuery qry) {
String type = qry.getType();
- String space = cctx.name();
+ String cacheName = cctx.name();
- TableDescriptor tblDesc = tableDescriptor(type, space);
+ TableDescriptor tblDesc = tableDescriptor(type, cacheName);
if (tblDesc == null)
throw new IgniteSQLException("Failed to find SQL table for type: " + type,
@@ -1571,10 +1568,10 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/** {@inheritDoc} */
@Override public FieldsQueryCursor<List<?>> queryDistributedSqlFields(GridCacheContext<?, ?> cctx, SqlFieldsQuery qry,
GridQueryCancel cancel) {
- final String space = cctx.name();
+ final String cacheName = cctx.name();
final String sqlQry = qry.getSql();
- Connection c = connectionForSpace(space);
+ Connection c = connectionForCache(cacheName);
final boolean enforceJoinOrder = qry.isEnforceJoinOrder();
final boolean distributedJoins = qry.isDistributedJoins();
@@ -1585,7 +1582,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
GridCacheTwoStepQuery twoStepQry = null;
List<GridQueryFieldMetadata> meta;
- final TwoStepCachedQueryKey cachedQryKey = new TwoStepCachedQueryKey(space, sqlQry, grpByCollocated,
+ final TwoStepCachedQueryKey cachedQryKey = new TwoStepCachedQueryKey(cacheName, sqlQry, grpByCollocated,
distributedJoins, enforceJoinOrder, qry.isLocal());
TwoStepCachedQuery cachedQry = twoStepCache.get(cachedQryKey);
@@ -1680,7 +1677,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
LinkedHashSet<Integer> caches0 = new LinkedHashSet<>();
- // Setup spaces from schemas.
+ // Setup caches from schemas.
assert twoStepQry != null;
int tblCnt = twoStepQry.tablesCount();
@@ -1689,9 +1686,9 @@ public class IgniteH2Indexing implements GridQueryIndexing {
caches0.add(cctx.cacheId());
for (QueryTable table : twoStepQry.tables()) {
- String cacheName = cacheNameForSchemaAndTable(table.schema(), table.table());
+ String tblCacheName = cacheNameForSchemaAndTable(table.schema(), table.table());
- int cacheId = CU.cacheId(cacheName);
+ int cacheId = CU.cacheId(tblCacheName);
caches0.add(cacheId);
}
@@ -1752,8 +1749,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
* @return Cache name.
*/
private String cacheNameForSchemaAndTable(String schemaName, String tblName) {
- // TODO: This need to be changed.
- return space(schemaName);
+ return cacheName(schemaName);
}
/**
@@ -1848,11 +1844,11 @@ public class IgniteH2Indexing implements GridQueryIndexing {
* @param type Type description.
* @throws IgniteCheckedException In case of error.
*/
- @Override public boolean registerType(String spaceName, GridQueryTypeDescriptor type)
+ @Override public boolean registerType(String cacheName, GridQueryTypeDescriptor type)
throws IgniteCheckedException {
validateTypeDescriptor(type);
- String schemaName = schema(spaceName);
+ String schemaName = schema(cacheName);
Schema schema = schemas.get(schemaName);
@@ -1861,7 +1857,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
try {
Connection conn = connectionForThread(schemaName);
- createTable(spaceName, schema, tbl, conn);
+ createTable(cacheName, schema, tbl, conn);
schema.add(tbl);
}
@@ -1969,14 +1965,14 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/**
* Create db table by using given table descriptor.
*
- * @param spaceName Space name.
+ * @param cacheName Cache name.
* @param schema Schema.
* @param tbl Table descriptor.
* @param conn Connection.
* @throws SQLException If failed to create db table.
* @throws IgniteCheckedException If failed.
*/
- private void createTable(String spaceName, Schema schema, TableDescriptor tbl, Connection conn)
+ private void createTable(String cacheName, Schema schema, TableDescriptor tbl, Connection conn)
throws SQLException, IgniteCheckedException {
assert schema != null;
assert tbl != null;
@@ -2011,7 +2007,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
GridH2Table h2Tbl = H2TableEngine.createTable(conn, sql.toString(), rowDesc, rowFactory, tbl);
for (GridH2IndexBase usrIdx : tbl.createUserIndexes())
- addInitialUserIndex(spaceName, tbl, usrIdx);
+ addInitialUserIndex(cacheName, tbl, usrIdx);
if (dataTables.putIfAbsent(h2Tbl.identifier(), h2Tbl) != null)
throw new IllegalStateException("Table already exists: " + h2Tbl.identifierString());
@@ -2069,14 +2065,14 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/**
- * Gets table descriptor by type and space names.
+ * Gets table descriptor by type and cache names.
*
* @param type Type name.
- * @param space Space name.
+ * @param cacheName Cache name.
* @return Table descriptor.
*/
- @Nullable private TableDescriptor tableDescriptor(String type, String space) {
- Schema s = schemas.get(schema(space));
+ @Nullable private TableDescriptor tableDescriptor(String type, String cacheName) {
+ Schema s = schemas.get(schema(cacheName));
if (s == null)
return null;
@@ -2100,13 +2096,13 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/**
- * Gets database schema from space.
+ * Gets database schema from cache name.
*
- * @param space Space name. {@code null} would be converted to an empty string.
- * @return Schema name. Should not be null since we should not fail for an invalid space name.
+ * @param cacheName Cache name. {@code null} would be converted to an empty string.
+ * @return Schema name. Should not be null since we should not fail for an invalid cache name.
*/
- private String schema(String space) {
- return emptyIfNull(space2schema.get(emptyIfNull(space)));
+ private String schema(String cacheName) {
+ return emptyIfNull(cacheName2schema.get(emptyIfNull(cacheName)));
}
/**
@@ -2127,7 +2123,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/** {@inheritDoc} */
- @Override public String space(String schemaName) {
+ @Override public String cacheName(String schemaName) {
assert schemaName != null;
Schema schema = schemas.get(schemaName);
@@ -2139,19 +2135,19 @@ public class IgniteH2Indexing implements GridQueryIndexing {
schema = schemas.get(escapeName(schemaName, true));
}
- return schema.spaceName;
+ return schema.cacheName;
}
/**
* Rebuild indexes from hash index.
*
- * @param spaceName Space name.
+ * @param cacheName Cache name.
* @param type Type descriptor.
* @throws IgniteCheckedException If failed.
*/
- @Override public void rebuildIndexesFromHash(String spaceName,
+ @Override public void rebuildIndexesFromHash(String cacheName,
GridQueryTypeDescriptor type) throws IgniteCheckedException {
- TableDescriptor tbl = tableDescriptor(type.name(), spaceName);
+ TableDescriptor tbl = tableDescriptor(type.name(), cacheName);
if (tbl == null)
return;
@@ -2208,8 +2204,8 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/** {@inheritDoc} */
- @Override public void markForRebuildFromHash(String spaceName, GridQueryTypeDescriptor type) {
- TableDescriptor tbl = tableDescriptor(type.name(), spaceName);
+ @Override public void markForRebuildFromHash(String cacheName, GridQueryTypeDescriptor type) {
+ TableDescriptor tbl = tableDescriptor(type.name(), cacheName);
if (tbl == null)
return;
@@ -2222,18 +2218,18 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/**
* Gets size (for tests only).
*
- * @param spaceName Space name.
+ * @param cacheName Cache name.
* @param typeName Type name.
* @return Size.
* @throws IgniteCheckedException If failed or {@code -1} if the type is unknown.
*/
- long size(String spaceName, String typeName) throws IgniteCheckedException {
- TableDescriptor tbl = tableDescriptor(typeName, spaceName);
+ long size(String cacheName, String typeName) throws IgniteCheckedException {
+ TableDescriptor tbl = tableDescriptor(typeName, cacheName);
if (tbl == null)
return -1;
- Connection conn = connectionForSpace(spaceName);
+ Connection conn = connectionForCache(cacheName);
setupConnection(conn, false, false);
@@ -2519,7 +2515,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
conns.clear();
schemas.clear();
- space2schema.clear();
+ cacheName2schema.clear();
try (Connection c = DriverManager.getConnection(dbUrl);
Statement s = c.createStatement()) {
@@ -2539,14 +2535,14 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/** {@inheritDoc} */
- @Override public void registerCache(String spaceName, GridCacheContext<?, ?> cctx, CacheConfiguration<?, ?> ccfg)
+ @Override public void registerCache(String cacheName, GridCacheContext<?, ?> cctx, CacheConfiguration<?, ?> ccfg)
throws IgniteCheckedException {
String schema = schemaNameFromCacheConf(ccfg);
- if (schemas.putIfAbsent(schema, new Schema(spaceName, schema, cctx, ccfg)) != null)
- throw new IgniteCheckedException("Cache already registered: " + U.maskName(spaceName));
+ if (schemas.putIfAbsent(schema, new Schema(cacheName, schema, cctx, ccfg)) != null)
+ throw new IgniteCheckedException("Cache already registered: " + U.maskName(cacheName));
- space2schema.put(emptyIfNull(spaceName), schema);
+ cacheName2schema.put(emptyIfNull(cacheName), schema);
createSchema(schema);
@@ -2554,14 +2550,14 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/** {@inheritDoc} */
- @Override public void unregisterCache(String spaceName) {
- String schema = schema(spaceName);
+ @Override public void unregisterCache(String cacheName) {
+ String schema = schema(cacheName);
Schema rmv = schemas.remove(schema);
if (rmv != null) {
- space2schema.remove(emptyIfNull(rmv.spaceName));
- mapQryExec.onCacheStop(spaceName);
- dmlProc.onCacheStop(spaceName);
+ cacheName2schema.remove(emptyIfNull(rmv.cacheName));
+ mapQryExec.onCacheStop(cacheName);
+ dmlProc.onCacheStop(cacheName);
rmv.onDrop();
@@ -2569,7 +2565,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
dropSchema(schema);
}
catch (IgniteCheckedException e) {
- U.error(log, "Failed to drop schema on cache stop (will ignore): " + U.maskName(spaceName), e);
+ U.error(log, "Failed to drop schema on cache stop (will ignore): " + U.maskName(cacheName), e);
}
for (TableDescriptor tblDesc : rmv.tbls.values())
@@ -2580,7 +2576,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
it.hasNext(); ) {
Map.Entry<TwoStepCachedQueryKey, TwoStepCachedQuery> e = it.next();
- if (F.eq(e.getKey().space, spaceName))
+ if (F.eq(e.getKey().cacheName, cacheName))
it.remove();
}
}
@@ -2594,8 +2590,8 @@ public class IgniteH2Indexing implements GridQueryIndexing {
final AffinityTopologyVersion topVer0 = topVer != null ? topVer : AffinityTopologyVersion.NONE;
return new IndexingQueryFilter() {
- @Nullable @Override public <K, V> IgniteBiPredicate<K, V> forSpace(String spaceName) {
- final GridCacheAdapter<Object, Object> cache = ctx.cache().internalCache(spaceName);
+ @Nullable @Override public <K, V> IgniteBiPredicate<K, V> forCache(String cacheName) {
+ final GridCacheAdapter<Object, Object> cache = ctx.cache().internalCache(cacheName);
if (cache.context().isReplicated())
return null;
@@ -2677,7 +2673,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
*/
private static final class TwoStepCachedQueryKey {
/** */
- private final String space;
+ private final String cacheName;
/** */
private final String sql;
@@ -2695,20 +2691,20 @@ public class IgniteH2Indexing implements GridQueryIndexing {
private final boolean isLocal;
/**
- * @param space Space.
+ * @param cacheName Cache name.
* @param sql Sql.
* @param grpByCollocated Collocated GROUP BY.
* @param distributedJoins Distributed joins enabled.
* @param enforceJoinOrder Enforce join order of tables.
* @param isLocal Query is local flag.
*/
- private TwoStepCachedQueryKey(String space,
+ private TwoStepCachedQueryKey(String cacheName,
String sql,
boolean grpByCollocated,
boolean distributedJoins,
boolean enforceJoinOrder,
boolean isLocal) {
- this.space = space;
+ this.cacheName = cacheName;
this.sql = sql;
this.grpByCollocated = grpByCollocated;
this.distributedJoins = distributedJoins;
@@ -2735,7 +2731,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
if (enforceJoinOrder != that.enforceJoinOrder)
return false;
- if (space != null ? !space.equals(that.space) : that.space != null)
+ if (cacheName != null ? !cacheName.equals(that.cacheName) : that.cacheName != null)
return false;
return isLocal == that.isLocal && sql.equals(that.sql);
@@ -2743,7 +2739,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/** {@inheritDoc} */
@Override public int hashCode() {
- int res = space != null ? space.hashCode() : 0;
+ int res = cacheName != null ? cacheName.hashCode() : 0;
res = 31 * res + sql.hashCode();
res = 31 * res + (grpByCollocated ? 1 : 0);
res = res + (distributedJoins ? 2 : 0);
@@ -3165,7 +3161,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
if (type().valueClass() == String.class) {
try {
- luceneIdx = new GridLuceneIndex(ctx, schema.offheap, schema.spaceName, type);
+ luceneIdx = new GridLuceneIndex(ctx, schema.offheap, schema.cacheName, type);
}
catch (IgniteCheckedException e1) {
throw new IgniteException(e1);
@@ -3178,7 +3174,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
if (textIdx != null) {
try {
- luceneIdx = new GridLuceneIndex(ctx, schema.offheap, schema.spaceName, type);
+ luceneIdx = new GridLuceneIndex(ctx, schema.offheap, schema.cacheName, type);
}
catch (IgniteCheckedException e1) {
throw new IgniteException(e1);
@@ -3450,7 +3446,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
*/
private class Schema {
/** */
- private final String spaceName;
+ private final String cacheName;
/** */
private final String schemaName;
@@ -3471,14 +3467,14 @@ public class IgniteH2Indexing implements GridQueryIndexing {
private final CacheConfiguration<?, ?> ccfg;
/**
- * @param spaceName Space name.
+ * @param cacheName Cache name.
* @param schemaName Schema name.
* @param cctx Cache context.
* @param ccfg Cache configuration.
*/
- private Schema(String spaceName, String schemaName, GridCacheContext<?, ?> cctx,
+ private Schema(String cacheName, String schemaName, GridCacheContext<?, ?> cctx,
CacheConfiguration<?, ?> ccfg) {
- this.spaceName = spaceName;
+ this.cacheName = cacheName;
this.cctx = cctx;
this.schemaName = schemaName;
this.ccfg = ccfg;
@@ -3653,9 +3649,9 @@ public class IgniteH2Indexing implements GridQueryIndexing {
CacheObject co = (CacheObject)obj;
if (type == Value.JAVA_OBJECT)
- return new GridH2ValueCacheObject(cacheContext(schema.spaceName), co);
+ return new GridH2ValueCacheObject(cacheContext(schema.cacheName), co);
- obj = co.value(objectContext(schema.spaceName), false);
+ obj = co.value(objectContext(schema.cacheName), false);
}
switch (type) {
@@ -3733,7 +3729,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
"or configure key type as common super class for all actual keys for this value type.", e);
}
- GridCacheContext cctx = cacheContext(schema.spaceName);
+ GridCacheContext cctx = cacheContext(schema.cacheName);
if (cctx.offheapIndex()) {
row.ver = ver;
@@ -4013,7 +4009,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/** {@inheritDoc} */
@Override public TableBase createTable(CreateTableData createTblData) {
- resTbl0 = new GridH2Table(createTblData, rowDesc0, rowFactory0, tblDesc0, tblDesc0.schema.spaceName);
+ resTbl0 = new GridH2Table(createTblData, rowDesc0, rowFactory0, tblDesc0, tblDesc0.schema.cacheName);
return resTbl0;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2PkHashIndex.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2PkHashIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2PkHashIndex.java
index 7579fa5..7caf354 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2PkHashIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2PkHashIndex.java
@@ -90,9 +90,9 @@ public class H2PkHashIndex extends GridH2IndexBase {
IgniteBiPredicate<Object, Object> p = null;
if (f != null) {
- String spaceName = getTable().cacheName();
+ String cacheName = getTable().cacheName();
- p = f.forSpace(spaceName);
+ p = f.forCache(cacheName);
}
KeyCacheObject lowerObj = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
index 814df77..c1c1d9c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
@@ -167,9 +167,9 @@ public class H2TreeIndex extends GridH2IndexBase {
IgniteBiPredicate<Object, Object> p = null;
if (f != null) {
- String spaceName = getTable().cacheName();
+ String cacheName = getTable().cacheName();
- p = f.forSpace(spaceName);
+ p = f.forCache(cacheName);
}
int seg = threadLocalSegment();
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
index 30fb612..3dabc58 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
@@ -1686,18 +1686,16 @@ public abstract class GridH2IndexBase extends BaseIndex {
* @param cursor GridCursor.
* @param time Time for expired rows filtering.
* @param qryFilter Filter.
- * @param spaceName Space name.
+ * @param cacheName Cache name.
*/
- protected FilteringCursor(GridCursor<GridH2Row> cursor,
- long time,
- IndexingQueryFilter qryFilter,
- String spaceName) {
+ protected FilteringCursor(GridCursor<GridH2Row> cursor, long time, IndexingQueryFilter qryFilter,
+ String cacheName) {
this.cursor = cursor;
this.time = time;
if (qryFilter != null) {
- this.fltr = qryFilter.forSpace(spaceName);
+ this.fltr = qryFilter.forCache(cacheName);
this.isValRequired = qryFilter.isValueRequired();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
index ec728de..cb9042e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
@@ -222,7 +222,7 @@ public class GridH2Table extends TableBase {
}
/**
- * @return Space name.
+ * @return Cache name.
*/
@Nullable public String cacheName() {
return cacheName;
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
index 39256d4..03fedcb 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
@@ -206,7 +206,7 @@ public class GridH2TreeIndex extends GridH2IndexBase implements Comparator<GridS
int seg = threadLocalSegment();
// Fast path if we don't need to perform any filtering.
- if (f == null || f.forSpace((getTable()).cacheName()) == null)
+ if (f == null || f.forCache((getTable()).cacheName()) == null)
try {
return treeForRead(seg).size();
} catch (IgniteCheckedException e) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
index 6671dc6..48c0cb9 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.Collection;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cache.QueryIndexType;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.CacheObjectContext;
@@ -71,7 +70,7 @@ public class GridLuceneIndex implements AutoCloseable {
public static final String EXPIRATION_TIME_FIELD_NAME = "_gg_expires__";
/** */
- private final String spaceName;
+ private final String cacheName;
/** */
private final GridQueryTypeDescriptor type;
@@ -96,14 +95,14 @@ public class GridLuceneIndex implements AutoCloseable {
*
* @param ctx Kernal context.
* @param mem Unsafe memory.
- * @param spaceName Space name.
+ * @param cacheName Cache name.
* @param type Type descriptor.
* @throws IgniteCheckedException If failed.
*/
public GridLuceneIndex(GridKernalContext ctx, @Nullable GridUnsafeMemory mem,
- @Nullable String spaceName, GridQueryTypeDescriptor type) throws IgniteCheckedException {
+ @Nullable String cacheName, GridQueryTypeDescriptor type) throws IgniteCheckedException {
this.ctx = ctx;
- this.spaceName = spaceName;
+ this.cacheName = cacheName;
this.type = type;
dir = new GridLuceneDirectory(mem == null ? new GridUnsafeMemory(0) : mem);
@@ -141,7 +140,7 @@ public class GridLuceneIndex implements AutoCloseable {
if (ctx == null)
return null;
- return ctx.cache().internalCache(spaceName).context().cacheObjectContext();
+ return ctx.cache().internalCache(cacheName).context().cacheObjectContext();
}
/**
@@ -275,7 +274,7 @@ public class GridLuceneIndex implements AutoCloseable {
IgniteBiPredicate<K, V> fltr = null;
if (filters != null)
- fltr = filters.forSpace(spaceName);
+ fltr = filters.forCache(cacheName);
return new It<>(reader, searcher, docs.scoreDocs, fltr);
}
@@ -382,7 +381,7 @@ public class GridLuceneIndex implements AutoCloseable {
ClassLoader ldr = null;
if (ctx != null && ctx.deploy().enabled())
- ldr = ctx.cache().internalCache(spaceName).context().deploy().globalLoader();
+ ldr = ctx.cache().internalCache(cacheName).context().deploy().globalLoader();
K k = unmarshall(org.apache.commons.codec.binary.Base64.decodeBase64(doc.get(KEY_FIELD_NAME)), ldr);
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index 6d76eea..1d8a762 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -579,7 +579,7 @@ public class GridMapQueryExecutor {
}
}
- Connection conn = h2.connectionForSpace(mainCctx.name());
+ Connection conn = h2.connectionForCache(mainCctx.name());
setupConnection(conn, distributedJoinMode != OFF, enforceJoinOrder);
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/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 75914ef..1ecbb40 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
@@ -540,10 +540,10 @@ public class GridReduceQueryExecutor {
final long qryReqId = qryIdGen.incrementAndGet();
- final String space = cctx.name();
+ final String cacheName = cctx.name();
- final QueryRun r = new QueryRun(qryReqId, qry.originalSql(), space,
- h2.connectionForSpace(space), qry.mapQueries().size(), qry.pageSize(),
+ final QueryRun r = new QueryRun(qryReqId, qry.originalSql(), cacheName,
+ h2.connectionForCache(cacheName), qry.mapQueries().size(), qry.pageSize(),
U.currentTimeMillis(), cancel);
AffinityTopologyVersion topVer = h2.readyTopologyVersion();
@@ -794,11 +794,11 @@ public class GridReduceQueryExecutor {
try {
if (qry.explain())
- return explainPlan(r.conn, space, qry, params);
+ return explainPlan(r.conn, cacheName, qry, params);
GridCacheSqlQuery rdc = qry.reduceQuery();
- ResultSet res = h2.executeSqlQueryWithTimer(space,
+ ResultSet res = h2.executeSqlQueryWithTimer(cacheName,
r.conn,
rdc.query(),
F.asList(rdc.parameters(params)),
@@ -1030,12 +1030,12 @@ public class GridReduceQueryExecutor {
}
/**
- * @param space Cache name.
+ * @param cacheName Cache name.
* @param topVer Topology version.
* @return Collection of data nodes.
*/
- private Collection<ClusterNode> dataNodes(String space, AffinityTopologyVersion topVer) {
- Collection<ClusterNode> res = ctx.discovery().cacheAffinityNodes(space, topVer);
+ private Collection<ClusterNode> dataNodes(String cacheName, AffinityTopologyVersion topVer) {
+ Collection<ClusterNode> res = ctx.discovery().cacheAffinityNodes(cacheName, topVer);
return res != null ? res : Collections.<ClusterNode>emptySet();
}
@@ -1049,12 +1049,12 @@ public class GridReduceQueryExecutor {
private Set<ClusterNode> replicatedUnstableDataNodes(GridCacheContext<?,?> cctx) {
assert cctx.isReplicated() : cctx.name() + " must be replicated";
- String space = cctx.name();
+ String cacheName = cctx.name();
- Set<ClusterNode> dataNodes = new HashSet<>(dataNodes(space, NONE));
+ Set<ClusterNode> dataNodes = new HashSet<>(dataNodes(cacheName, NONE));
if (dataNodes.isEmpty())
- throw new CacheException("Failed to find data nodes for cache: " + space);
+ throw new CacheException("Failed to find data nodes for cache: " + cacheName);
// Find all the nodes owning all the partitions for replicated cache.
for (int p = 0, parts = cctx.affinity().partitions(); p < parts; p++) {
@@ -1213,18 +1213,18 @@ public class GridReduceQueryExecutor {
/**
* @param c Connection.
- * @param space Space.
+ * @param cacheName Cache name.
* @param qry Query.
* @param params Query parameters.
* @return Cursor for plans.
* @throws IgniteCheckedException if failed.
*/
- private Iterator<List<?>> explainPlan(JdbcConnection c, String space, GridCacheTwoStepQuery qry, Object[] params)
+ private Iterator<List<?>> explainPlan(JdbcConnection c, String cacheName, GridCacheTwoStepQuery qry, Object[] params)
throws IgniteCheckedException {
List<List<?>> lists = new ArrayList<>();
for (int i = 0, mapQrys = qry.mapQueries().size(); i < mapQrys; i++) {
- ResultSet rs = h2.executeSqlQueryWithTimer(space, c,
+ ResultSet rs = h2.executeSqlQueryWithTimer(cacheName, c,
"SELECT PLAN FROM " + mergeTableIdentifier(i), null, false, 0, null);
lists.add(F.asList(getPlan(rs)));
@@ -1240,7 +1240,7 @@ public class GridReduceQueryExecutor {
GridCacheSqlQuery rdc = qry.reduceQuery();
- ResultSet rs = h2.executeSqlQueryWithTimer(space,
+ ResultSet rs = h2.executeSqlQueryWithTimer(cacheName,
c,
"EXPLAIN " + rdc.query(),
F.asList(rdc.parameters(params)),
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
index 1241d0c..7e3473f 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
@@ -1020,13 +1020,13 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
/**
* Synchronously create index.
*
- * @param space Space.
+ * @param cacheName Cache name.
* @param tblName Table name.
* @param idx Index.
* @param ifNotExists When set to true operation will fail if index already exists.
* @throws Exception If failed.
*/
- private void dynamicIndexCreate(String space, String tblName, QueryIndex idx, boolean ifNotExists)
+ private void dynamicIndexCreate(String cacheName, String tblName, QueryIndex idx, boolean ifNotExists)
throws Exception {
GridStringBuilder sql = new SB("CREATE INDEX ")
.a(ifNotExists ? "IF NOT EXISTS " : "")
@@ -1051,32 +1051,32 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
sql.a(')');
- executeSql(space, sql.toString());
+ executeSql(cacheName, sql.toString());
}
/**
* Synchronously drop index.
*
- * @param space Space.
+ * @param cacheName Cache name.
* @param idxName Index name.
* @param ifExists When set to true operation fill fail if index doesn't exists.
* @throws Exception if failed.
*/
- private void dynamicIndexDrop(String space, String idxName, boolean ifExists) throws Exception {
+ private void dynamicIndexDrop(String cacheName, String idxName, boolean ifExists) throws Exception {
String sql = "DROP INDEX " + (ifExists ? "IF EXISTS " : "") + "\"" + idxName + "\"";
- executeSql(space, sql);
+ executeSql(cacheName, sql);
}
/**
* Execute SQL.
*
- * @param space Space.
+ * @param cacheName Cache name.
* @param sql SQL.
*/
- private void executeSql(String space, String sql) {
+ private void executeSql(String cacheName, String sql) {
log.info("Executing DDL: " + sql);
- node().cache(space).query(new SqlFieldsQuery(sql)).getAll();
+ node().cache(cacheName).query(new SqlFieldsQuery(sql)).getAll();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java
index f9e2f75..3600022 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java
@@ -1033,20 +1033,20 @@ public abstract class DynamicIndexAbstractConcurrentSelfTest extends DynamicInde
*/
private static class BlockingIndexing extends IgniteH2Indexing {
/** {@inheritDoc} */
- @Override public void dynamicIndexCreate(@NotNull String spaceName, String tblName,
+ @Override public void dynamicIndexCreate(@NotNull String cacheName, String tblName,
QueryIndexDescriptorImpl idxDesc, boolean ifNotExists, SchemaIndexCacheVisitor cacheVisitor)
throws IgniteCheckedException {
awaitIndexing(ctx.localNodeId());
- super.dynamicIndexCreate(spaceName, tblName, idxDesc, ifNotExists, cacheVisitor);
+ super.dynamicIndexCreate(cacheName, tblName, idxDesc, ifNotExists, cacheVisitor);
}
/** {@inheritDoc} */
- @Override public void dynamicIndexDrop(@NotNull String spaceName, String idxName, boolean ifExists)
+ @Override public void dynamicIndexDrop(@NotNull String cacheName, String idxName, boolean ifExists)
throws IgniteCheckedException{
awaitIndexing(ctx.localNodeId());
- super.dynamicIndexDrop(spaceName, idxName, ifExists);
+ super.dynamicIndexDrop(cacheName, idxName, ifExists);
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java
index ddaea8a..13c0cb2 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java
@@ -191,7 +191,7 @@ public class IgniteQueryDedicatedPoolTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public Iterator<Cache.Entry<?, ?>> query(@Nullable String spaceName, Collection<Object> params,
+ @Override public Iterator<Cache.Entry<?, ?>> query(@Nullable String cacheName, Collection<Object> params,
@Nullable IndexingQueryFilter filters) {
return idx.containsKey(GridIoPolicy.QUERY_POOL) ?
Collections.<Cache.Entry<?, ?>>singletonList(
@@ -200,12 +200,12 @@ public class IgniteQueryDedicatedPoolTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void store(@Nullable String spaceName, Object key, Object val, long expirationTime) {
+ @Override public void store(@Nullable String cacheName, Object key, Object val, long expirationTime) {
idx.put(key, val);
}
/** {@inheritDoc} */
- @Override public void remove(@Nullable String spaceName, Object key) {
+ @Override public void remove(@Nullable String cacheName, Object key) {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
index 3832878..7ba7d56 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
@@ -246,32 +246,32 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
public void testSpi() throws Exception {
IgniteH2Indexing spi = getIndexing();
- assertEquals(-1, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(-1, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(-1, spi.size(typeBA.space(), typeBA.name()));
+ assertEquals(-1, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(-1, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(-1, spi.size(typeBA.cacheName(), typeBA.name()));
IgniteCache<Integer, BinaryObject> cacheA = ignite0.createCache(cacheACfg());
- assertEquals(0, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(0, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(-1, spi.size(typeBA.space(), typeBA.name()));
+ assertEquals(0, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(0, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(-1, spi.size(typeBA.cacheName(), typeBA.name()));
IgniteCache<Integer, BinaryObject> cacheB = ignite0.createCache(cacheBCfg());
// Initially all is empty.
- assertEquals(0, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(0, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(0, spi.size(typeBA.space(), typeBA.name()));
+ assertEquals(0, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(0, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(0, spi.size(typeBA.cacheName(), typeBA.name()));
- assertFalse(spi.queryLocalSql(typeAA.space(), "select * from A.A", null, Collections.emptySet(), typeAA.name(), null, null).hasNext());
- assertFalse(spi.queryLocalSql(typeAB.space(), "select * from A.B", null, Collections.emptySet(), typeAB.name(), null, null).hasNext());
- assertFalse(spi.queryLocalSql(typeBA.space(), "select * from B.A", null, Collections.emptySet(), typeBA.name(), null, null).hasNext());
+ assertFalse(spi.queryLocalSql(typeAA.cacheName(), "select * from A.A", null, Collections.emptySet(), typeAA.name(), null, null).hasNext());
+ assertFalse(spi.queryLocalSql(typeAB.cacheName(), "select * from A.B", null, Collections.emptySet(), typeAB.name(), null, null).hasNext());
+ assertFalse(spi.queryLocalSql(typeBA.cacheName(), "select * from B.A", null, Collections.emptySet(), typeBA.name(), null, null).hasNext());
- assertFalse(spi.queryLocalSql(typeBA.space(), "select * from B.A, A.B, A.A", null,
+ assertFalse(spi.queryLocalSql(typeBA.cacheName(), "select * from B.A, A.B, A.A", null,
Collections.emptySet(), typeBA.name(), null, null).hasNext());
try {
- spi.queryLocalSql(typeBA.space(), "select aa.*, ab.*, ba.* from A.A aa, A.B ab, B.A ba", null,
+ spi.queryLocalSql(typeBA.cacheName(), "select aa.*, ab.*, ba.* from A.A aa, A.B ab, B.A ba", null,
Collections.emptySet(), typeBA.name(), null, null).hasNext();
fail("Enumerations of aliases in select block must be prohibited");
@@ -280,60 +280,60 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
// all fine
}
- assertFalse(spi.queryLocalSql(typeAB.space(), "select ab.* from A.B ab", null,
+ assertFalse(spi.queryLocalSql(typeAB.cacheName(), "select ab.* from A.B ab", null,
Collections.emptySet(), typeAB.name(), null, null).hasNext());
- assertFalse(spi.queryLocalSql(typeBA.space(), "select ba.* from B.A as ba", null,
+ assertFalse(spi.queryLocalSql(typeBA.cacheName(), "select ba.* from B.A as ba", null,
Collections.emptySet(), typeBA.name(), null, null).hasNext());
cacheA.put(1, aa("A", 1, "Vasya", 10).build());
- assertEquals(1, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(0, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(0, spi.size(typeBA.space(), typeBA.name()));
+ assertEquals(1, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(0, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(0, spi.size(typeBA.cacheName(), typeBA.name()));
cacheA.put(1, ab(1, "Vasya", 20, "Some text about Vasya goes here.").build());
- // In one space all keys must be unique.
- assertEquals(0, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(1, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(0, spi.size(typeBA.space(), typeBA.name()));
+ // In one cache all keys must be unique.
+ assertEquals(0, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(1, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(0, spi.size(typeBA.cacheName(), typeBA.name()));
cacheB.put(1, ba(2, "Petya", 25, true).build());
- // No replacement because of different space.
- assertEquals(0, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(1, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(1, spi.size(typeBA.space(), typeBA.name()));
+ // No replacement because of different cache.
+ assertEquals(0, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(1, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(1, spi.size(typeBA.cacheName(), typeBA.name()));
cacheB.put(1, ba(2, "Kolya", 25, true).build());
// Replacement in the same table.
- assertEquals(0, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(1, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(1, spi.size(typeBA.space(), typeBA.name()));
+ assertEquals(0, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(1, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(1, spi.size(typeBA.cacheName(), typeBA.name()));
cacheA.put(2, aa("A", 2, "Valera", 19).build());
- assertEquals(1, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(1, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(1, spi.size(typeBA.space(), typeBA.name()));
+ assertEquals(1, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(1, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(1, spi.size(typeBA.cacheName(), typeBA.name()));
cacheA.put(3, aa("A", 3, "Borya", 18).build());
- assertEquals(2, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(1, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(1, spi.size(typeBA.space(), typeBA.name()));
+ assertEquals(2, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(1, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(1, spi.size(typeBA.cacheName(), typeBA.name()));
cacheA.put(4, ab(4, "Vitalya", 20, "Very Good guy").build());
- assertEquals(2, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(2, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(1, spi.size(typeBA.space(), typeBA.name()));
+ assertEquals(2, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(2, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(1, spi.size(typeBA.cacheName(), typeBA.name()));
// Query data.
Iterator<IgniteBiTuple<Integer, BinaryObjectImpl>> res =
- spi.queryLocalSql(typeAA.space(), "from a order by age", null, Collections.emptySet(), typeAA.name(), null, null);
+ spi.queryLocalSql(typeAA.cacheName(), "from a order by age", null, Collections.emptySet(), typeAA.name(), null, null);
assertTrue(res.hasNext());
assertEquals(aa("A", 3, "Borya", 18).build(), value(res.next()));
@@ -341,7 +341,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
assertEquals(aa("A", 2, "Valera", 19).build(), value(res.next()));
assertFalse(res.hasNext());
- res = spi.queryLocalSql(typeAA.space(), "select aa.* from a aa order by aa.age", null,
+ res = spi.queryLocalSql(typeAA.cacheName(), "select aa.* from a aa order by aa.age", null,
Collections.emptySet(), typeAA.name(), null, null);
assertTrue(res.hasNext());
@@ -350,7 +350,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
assertEquals(aa("A", 2, "Valera", 19).build(), value(res.next()));
assertFalse(res.hasNext());
- res = spi.queryLocalSql(typeAB.space(), "from b order by name", null, Collections.emptySet(), typeAB.name(), null, null);
+ res = spi.queryLocalSql(typeAB.cacheName(), "from b order by name", null, Collections.emptySet(), typeAB.name(), null, null);
assertTrue(res.hasNext());
assertEquals(ab(1, "Vasya", 20, "Some text about Vasya goes here.").build(), value(res.next()));
@@ -358,7 +358,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
assertEquals(ab(4, "Vitalya", 20, "Very Good guy").build(), value(res.next()));
assertFalse(res.hasNext());
- res = spi.queryLocalSql(typeAB.space(), "select bb.* from b as bb order by bb.name", null,
+ res = spi.queryLocalSql(typeAB.cacheName(), "select bb.* from b as bb order by bb.name", null,
Collections.emptySet(), typeAB.name(), null, null);
assertTrue(res.hasNext());
@@ -368,14 +368,14 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
assertFalse(res.hasNext());
- res = spi.queryLocalSql(typeBA.space(), "from a", null, Collections.emptySet(), typeBA.name(), null, null);
+ res = spi.queryLocalSql(typeBA.cacheName(), "from a", null, Collections.emptySet(), typeBA.name(), null, null);
assertTrue(res.hasNext());
assertEquals(ba(2, "Kolya", 25, true).build(), value(res.next()));
assertFalse(res.hasNext());
// Text queries
- Iterator<IgniteBiTuple<Integer, BinaryObjectImpl>> txtRes = spi.queryLocalText(typeAB.space(), "good",
+ Iterator<IgniteBiTuple<Integer, BinaryObjectImpl>> txtRes = spi.queryLocalText(typeAB.cacheName(), "good",
typeAB.name(), null);
assertTrue(txtRes.hasNext());
@@ -410,32 +410,32 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
// Remove
cacheA.remove(2);
- assertEquals(1, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(2, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(1, spi.size(typeBA.space(), typeBA.name()));
+ assertEquals(1, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(2, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(1, spi.size(typeBA.cacheName(), typeBA.name()));
cacheB.remove(1);
- assertEquals(1, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(2, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(0, spi.size(typeBA.space(), typeBA.name()));
+ assertEquals(1, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(2, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(0, spi.size(typeBA.cacheName(), typeBA.name()));
// Unregister.
- spi.unregisterType(typeAA.space(), typeAA.name());
+ spi.unregisterType(typeAA.cacheName(), typeAA.name());
- assertEquals(-1, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(2, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(0, spi.size(typeBA.space(), typeBA.name()));
+ assertEquals(-1, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(2, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(0, spi.size(typeBA.cacheName(), typeBA.name()));
- spi.unregisterType(typeAB.space(), typeAB.name());
+ spi.unregisterType(typeAB.cacheName(), typeAB.name());
- assertEquals(-1, spi.size(typeAA.space(), typeAA.name()));
- assertEquals(-1, spi.size(typeAB.space(), typeAB.name()));
- assertEquals(0, spi.size(typeBA.space(), typeBA.name()));
+ assertEquals(-1, spi.size(typeAA.cacheName(), typeAA.name()));
+ assertEquals(-1, spi.size(typeAB.cacheName(), typeAB.name()));
+ assertEquals(0, spi.size(typeBA.cacheName(), typeBA.name()));
- spi.unregisterType(typeBA.space(), typeBA.name());
+ spi.unregisterType(typeBA.cacheName(), typeBA.name());
- assertEquals(-1, spi.size(typeAA.space(), typeAA.name()));
+ assertEquals(-1, spi.size(typeAA.cacheName(), typeAA.name()));
}
/**
@@ -533,7 +533,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
private final String name;
/** */
- private final String space;
+ private final String cacheName;
/** */
private final Map<String, Class<?>> valFields;
@@ -542,14 +542,14 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
private final GridQueryIndexDescriptor textIdx;
/**
- * @param space Space name.
+ * @param cacheName Cache name.
* @param name Type name.
* @param valFields Fields.
* @param textIdx Fulltext index.
*/
- private TypeDesc(String space, String name, Map<String, Class<?>> valFields, GridQueryIndexDescriptor textIdx) {
+ private TypeDesc(String cacheName, String name, Map<String, Class<?>> valFields, GridQueryIndexDescriptor textIdx) {
this.name = name;
- this.space = space;
+ this.cacheName = cacheName;
this.valFields = Collections.unmodifiableMap(valFields);
this.textIdx = textIdx;
}
@@ -570,10 +570,10 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
}
/**
- * @return Space name.
+ * @return Cache name.
*/
- String space() {
- return space;
+ String cacheName() {
+ return cacheName;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbf0b2a5/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 21666d6..9838084 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
@@ -686,7 +686,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
IgniteH2Indexing idx = U.field(qryProcessor, "idx");
- return (JdbcConnection)idx.connectionForSpace(DEFAULT_CACHE_NAME);
+ return (JdbcConnection)idx.connectionForCache(DEFAULT_CACHE_NAME);
}
/**