timoninmaxim commented on a change in pull request #9118:
URL: https://github.com/apache/ignite/pull/9118#discussion_r660516364
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java
##########
@@ -377,6 +377,28 @@ public IndexesRebuildTask idxRebuild() {
}
}
+ /**
+ * Returns index for specified name.
+ *
+ * @param idxName Index name.
+ * @return Index for specified index name.
+ */
+ public Index index(IndexName idxName) {
+ ddlLock.readLock().lock();
+
+ try {
+ Map<String, Index> idxs = cacheToIdx.get(idxName.cacheName());
+
+ if (idxs == null)
+ return null;
+
+ return idxs.get(idxName.fullName());
+
+ } finally {
Review comment:
Also changed everywhere within this file.
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryProcessor.java
##########
@@ -0,0 +1,465 @@
+/*
+ * 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.cache.query.index;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.query.IndexQuery;
+import org.apache.ignite.cache.query.IndexQueryCriteria;
+import org.apache.ignite.cache.query.IndexQueryCriteriaBuilder;
+import org.apache.ignite.internal.cache.query.RangeIndexQueryCriteria;
+import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyDefinition;
+import
org.apache.ignite.internal.cache.query.index.sorted.IndexKeyTypeSettings;
+import org.apache.ignite.internal.cache.query.index.sorted.IndexRow;
+import org.apache.ignite.internal.cache.query.index.sorted.IndexRowComparator;
+import org.apache.ignite.internal.cache.query.index.sorted.IndexSearchRowImpl;
+import
org.apache.ignite.internal.cache.query.index.sorted.InlineIndexRowHandler;
+import
org.apache.ignite.internal.cache.query.index.sorted.SortedIndexDefinition;
+import
org.apache.ignite.internal.cache.query.index.sorted.inline.IndexQueryContext;
+import org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndex;
+import org.apache.ignite.internal.cache.query.index.sorted.keys.IndexKey;
+import
org.apache.ignite.internal.cache.query.index.sorted.keys.IndexKeyFactory;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.CacheObjectUtils;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.query.IndexQueryDesc;
+import org.apache.ignite.internal.processors.query.QueryUtils;
+import org.apache.ignite.internal.util.GridCloseableIteratorAdapter;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.lang.GridCursor;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+
+import static org.apache.ignite.internal.cache.query.index.SortOrder.DESC;
+
+/**
+ * Processor of {@link IndexQuery}.
+ */
+public class IndexQueryProcessor {
+ /** */
+ private final IndexProcessor idxProc;
+
+ /** */
+ public IndexQueryProcessor(IndexProcessor idxProc) {
+ this.idxProc = idxProc;
+ }
+
+ /** Run query on local node. */
+ public <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> queryLocal(
+ GridCacheContext<K, V> cctx, IndexQueryDesc idxQryDesc,
IndexQueryContext qryCtx, boolean keepBinary)
+ throws IgniteCheckedException {
+
+ Index idx = index(cctx, idxQryDesc);
+
+ if (idx == null)
+ throw new IgniteCheckedException(
+ "No index matches index query. Cache=" + cctx.name() + ";
Qry=" + idxQryDesc);
+
+ GridCursor<IndexRow> cursor = query(cctx, idx, idxQryDesc.criteria(),
qryCtx);
+
+ // Map IndexRow to Cache Key-Value pair.
+ return new GridCloseableIteratorAdapter<IgniteBiTuple<K, V>>() {
+ private IndexRow currVal;
+
+ private final CacheObjectContext coctx = cctx.cacheObjectContext();
+
+ /** {@inheritDoc} */
+ @Override protected boolean onHasNext() throws
IgniteCheckedException {
+ if (currVal != null)
+ return true;
+
+ if (!cursor.next())
+ return false;
+
+ currVal = cursor.get();
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteBiTuple<K, V> onNext() {
+ if (currVal == null)
+ if (!hasNext())
+ throw new NoSuchElementException();
+
+ IndexRow row = currVal;
+
+ currVal = null;
+
+ K k = (K) CacheObjectUtils.unwrapBinaryIfNeeded(coctx,
row.cacheDataRow().key(), keepBinary, false);
+ V v = (V) CacheObjectUtils.unwrapBinaryIfNeeded(coctx,
row.cacheDataRow().value(), keepBinary, false);
+
+ return new IgniteBiTuple<>(k, v);
+ }
+ };
+ }
+
+ /** Get index to run query by specified description. */
+ private Index index(GridCacheContext cctx, IndexQueryDesc idxQryDesc)
throws IgniteCheckedException {
+ Class<?> valCls = idxQryDesc.valCls() != null ? loadValClass(cctx,
idxQryDesc.valCls()) : null;
+
+ String tableName = cctx.kernalContext().query().tableName(cctx.name(),
valCls);
+
+ if (tableName == null)
+ return null;
+
+ // Find index by specified name.
+ if (idxQryDesc.idxName() != null) {
+ String name = idxQryDesc.idxName();
+
+ if (!QueryUtils.PRIMARY_KEY_INDEX.equals(name))
+ name = name.toUpperCase();
+
+ String schema = cctx.kernalContext().query().schemaName(cctx);
+
+ IndexName idxName = new IndexName(cctx.name(), schema, tableName,
name);
+
+ Index idx = idxProc.index(idxName);
+
+ if (idx == null)
+ return null;
+
+ return checkIndex(idxProc.indexDefinition(idx.id()),
idxQryDesc.criteria()) ? idx : null;
+ }
+
+ // Try get index by list of fields to query.
+ // Check all indexes by cache to find best index match: count of index
fields equals to count of index criteria fields.
+ Collection<Index> idxs = idxProc.indexes(cctx);
+
+ Index idx = null;
+ int idxFieldsCnt = 0;
+
+ for (Index i: idxs) {
+ IndexDefinition idxDef = idxProc.indexDefinition(i.id());
+
+ if (!tableName.equals(idxDef.idxName().tableName()))
+ continue;
+
+ int fldsCnt = idxDef.indexKeyDefinitions().size();
+
+ if (checkIndex(idxDef, idxQryDesc.criteria())) {
+ if (idx == null) {
+ idx = i;
+ idxFieldsCnt = fldsCnt;
+ }
+ else if (fldsCnt < idxFieldsCnt) {
+ idx = i;
+ idxFieldsCnt = fldsCnt;
+ }
+ else continue;
+
+ // Best match. Index query criteria matches full index.
+ if (idxQryDesc.criteria().fields().size() ==
idxDef.indexKeyDefinitions().size())
+ break;
+ }
+ }
+
+ return idx;
+ }
+
+ /** Checks that specified index matches index query criteria. */
+ private boolean checkIndex(IndexDefinition idxDef, IndexQueryCriteria
criteria) {
+ if (criteria.fields().size() > idxDef.indexKeyDefinitions().size())
+ return false;
+
+ for (int i = 0; i < criteria.fields().size(); i++) {
+ if
(!idxDef.indexKeyDefinitions().get(i).name().equalsIgnoreCase(criteria.fields().get(i)))
+ return false;
+ }
+
+ return true;
+ }
+
+ /** */
+ private Class<?> loadValClass(GridCacheContext cctx, String valClsName)
throws IgniteCheckedException {
+ try {
+ ClassLoader clsLdr =
U.resolveClassLoader(cctx.kernalContext().config());
+
+ return clsLdr.loadClass(valClsName);
+ }
+ catch (ClassNotFoundException e) {
+ throw new IgniteCheckedException("No cache serves class: " +
valClsName);
+ }
+ }
+
+ /** Runs a query and return single cursor or cursor over multiple index
segments. */
+ private GridCursor<IndexRow> query(GridCacheContext cctx, Index idx,
IndexQueryCriteria criteria, IndexQueryContext qryCtx)
+ throws IgniteCheckedException {
+
+ int segmentsCnt = cctx.isPartitioned() ?
cctx.config().getQueryParallelism() : 1;
+
+ if (segmentsCnt == 1)
+ return query(0, idx, criteria, qryCtx);
+
+ final GridCursor<IndexRow>[] segments = new GridCursor[segmentsCnt];
+
+ // Actually it just traverse BPlusTree to find boundaries. It's too
fast to parallelize this.
+ for (int i = 0; i < segmentsCnt; i++)
+ segments[i] = query(i, idx, criteria, qryCtx);
+
+ return new SegmentedIndexCursor(segments, ((SortedIndexDefinition)
idxProc.indexDefinition(idx.id())).rowComparator());
+ }
+
+ /** Coordinate query criteria. */
+ private GridCursor<IndexRow> query(int segment, Index idx,
IndexQueryCriteria criteria, IndexQueryContext qryCtx)
+ throws IgniteCheckedException {
+
+ if (criteria instanceof RangeIndexQueryCriteria)
+ return treeIndexRange((InlineIndex) idx, (RangeIndexQueryCriteria)
criteria, segment, qryCtx);
+
+ throw new IllegalStateException("Doesn't support index query criteria:
" + criteria.getClass().getName());
+ }
+
+ /**
+ * Runs range query over specified segment. There are 2 steps to run query:
+ * 1. Traverse index by specified boundaries;
+ * 2. Scan over cursor and filter rows that doesn't match user criteria.
+ *
+ * Filtering is required in 2 cases:
+ * 1. Exclusion of one of boundaries, as idx.find() includes both of them;
+ * 2. To apply criteria on non-first index fields. Tree apply boundaries
field by field, if first field match
+ * a boundary, then second field isn't checked within traversing.
+ */
+ private GridCursor<IndexRow> treeIndexRange(InlineIndex idx,
RangeIndexQueryCriteria criteria, int segment,
+ IndexQueryContext qryCtx) throws IgniteCheckedException {
+
+ InlineIndexRowHandler hnd = idx.segment(0).rowHandler();
+ CacheObjectContext coctx =
idx.segment(0).cacheContext().cacheObjectContext();
+
+ IndexKey[] lowerBounds = new
IndexKey[hnd.indexKeyDefinitions().size()];
+ IndexKey[] upperBounds = new
IndexKey[hnd.indexKeyDefinitions().size()];
+
+ boolean lowerAllNulls = true;
+ boolean upperAllNulls = true;
+
+ List<RangeIndexQueryCriteria.RangeCriterion> treeCriteria = new
ArrayList<>();
+
+ for (int i = 0; i < criteria.fields().size(); i++) {
+ String f = criteria.fields().get(i);
+
+ IndexKeyDefinition def = hnd.indexKeyDefinitions().get(i);
+
+ if (!def.name().equalsIgnoreCase(f))
+ throw new IgniteCheckedException("Range query doesn't match
index '" + idx.name() + "'");
+
+ RangeIndexQueryCriteria.RangeCriterion c =
criteria.criteria().get(i);
+
+ // If index is desc, then we need to swap boundaries as user
declare criteria in straight manner.
+ // For example, there is an idx (int Val desc). It means that
index stores data in reverse order (1 < 0).
+ // But user won't expect for criterion gt(1) to get 0 as result,
instead user will use lt(1) for getting
+ // 0. Then we need to swap user criterion.
+ if (def.order().sortOrder() == DESC)
+ c = c.swap();
+
+ treeCriteria.add(c);
+
+ IndexKey l = key(c.lower(), def, hnd.indexKeyTypeSettings(),
coctx);
+ IndexKey u = key(c.upper(), def, hnd.indexKeyTypeSettings(),
coctx);
+
+ if (l != null)
+ lowerAllNulls = false;
+
+ if (u != null)
+ upperAllNulls = false;
+
+ lowerBounds[i] = l;
+ upperBounds[i] = u;
+ }
+
+ IndexRow lower = lowerAllNulls ? null : new
IndexSearchRowImpl(lowerBounds, hnd);
+ IndexRow upper = upperAllNulls ? null : new
IndexSearchRowImpl(upperBounds, hnd);
+
+ // Step 1. Traverse index.
+ GridCursor<IndexRow> findRes = idx.find(lower, upper, segment, qryCtx);
+
+ // Step 2. Scan and filter.
+ return new GridCursor<IndexRow>() {
+ /** */
+ private final IndexRowComparator rowCmp = ((SortedIndexDefinition)
idxProc.indexDefinition(idx.id())).rowComparator();
+
+ /** {@inheritDoc} */
+ @Override public boolean next() throws IgniteCheckedException {
+ if (!findRes.next())
+ return false;
+
+ while (match(get(), lower, 1) || match(get(), upper, -1)) {
+ if (!findRes.next())
+ return false;
+ }
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IndexRow get() throws IgniteCheckedException {
+ return findRes.get();
+ }
+
+ /**
+ * Matches index row, boundary and inclusion mask to decide
whether this row will be excluded from result.
+ *
+ * @param row Result row to check.
+ * @param boundary Index search boundary.
+ * @param boundarySign {@code 1} for lower boundary and {@code -1}
for upper boundary.
+ * @return {@code true} if specified row has to be excluded from
result.
+ */
+ private boolean match(IndexRow row, IndexRow boundary, int
boundarySign) throws IgniteCheckedException {
Review comment:
Rename to `exclude`
##########
File path:
modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryLocalTest.java
##########
@@ -0,0 +1,157 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.cache.query;
+
+import java.util.List;
+import java.util.Objects;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+import static org.apache.ignite.cache.query.IndexQueryCriteriaBuilder.lt;
+
+/** */
+public class IndexQueryLocalTest extends GridCommonAbstractTest {
+ /** */
+ private static final String CACHE = "TEST_CACHE";
+
+ /** */
+ private static final int CNT = 10_000;
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() {
+ stopAllGrids();
+ }
+
+ /** Should return full data. */
+ @Test
+ public void testServerNodeReplicatedCache() throws Exception {
+ Ignite crd = startGrids(4);
+
+ IgniteCache cache = crd.getOrCreateCache(ccfg(CacheMode.REPLICATED));
+
+ insertData(crd, cache);
+
+ IndexQuery<Long, Person> qry = new IndexQuery<Long,
Person>(Person.class)
+ .setCriteria(lt("id", CNT / 2));
+
+ for (int i = 0; i < 4; i++) {
+ cache = grid(i).cache(CACHE);
+
+ List result = cache.query(qry.setLocal(true)).getAll();
+
+ assertEquals(CNT / 2, result.size());
+ }
+ }
+
+ /** Should return part of data only. */
+ @Test
+ public void testServerNodePartitionedCache() throws Exception {
+ Ignite crd = startGrids(4);
+
+ IgniteCache cache = crd.getOrCreateCache(ccfg(CacheMode.PARTITIONED));
+
+ insertData(crd, cache);
+
+ IndexQuery<Long, Person> qry = new IndexQuery<Long,
Person>(Person.class)
+ .setCriteria(lt("id", CNT / 2));
+
+ for (int i = 0; i < 4; i++) {
+ cache = grid(i).cache(CACHE);
+
+ List result = cache.query(qry.setLocal(true)).getAll();
+
+ assertTrue(CNT / 2 > result.size());
Review comment:
Don't understand why count of backups should affect result size?
Actually we return data from primary nodes only.
##########
File path:
modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryLocalTest.java
##########
@@ -0,0 +1,157 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.cache.query;
+
+import java.util.List;
+import java.util.Objects;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+import static org.apache.ignite.cache.query.IndexQueryCriteriaBuilder.lt;
+
+/** */
+public class IndexQueryLocalTest extends GridCommonAbstractTest {
+ /** */
+ private static final String CACHE = "TEST_CACHE";
+
+ /** */
+ private static final int CNT = 10_000;
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() {
+ stopAllGrids();
+ }
+
+ /** Should return full data. */
+ @Test
+ public void testServerNodeReplicatedCache() throws Exception {
+ Ignite crd = startGrids(4);
+
+ IgniteCache cache = crd.getOrCreateCache(ccfg(CacheMode.REPLICATED));
+
+ insertData(crd, cache);
+
+ IndexQuery<Long, Person> qry = new IndexQuery<Long,
Person>(Person.class)
+ .setCriteria(lt("id", CNT / 2));
+
+ for (int i = 0; i < 4; i++) {
+ cache = grid(i).cache(CACHE);
+
+ List result = cache.query(qry.setLocal(true)).getAll();
+
+ assertEquals(CNT / 2, result.size());
+ }
+ }
+
+ /** Should return part of data only. */
+ @Test
+ public void testServerNodePartitionedCache() throws Exception {
+ Ignite crd = startGrids(4);
+
+ IgniteCache cache = crd.getOrCreateCache(ccfg(CacheMode.PARTITIONED));
+
+ insertData(crd, cache);
+
+ IndexQuery<Long, Person> qry = new IndexQuery<Long,
Person>(Person.class)
+ .setCriteria(lt("id", CNT / 2));
+
+ for (int i = 0; i < 4; i++) {
+ cache = grid(i).cache(CACHE);
+
+ List result = cache.query(qry.setLocal(true)).getAll();
+
+ assertTrue(CNT / 2 > result.size());
+ }
+ }
+
+ /** Should fail as no data on nodes. */
+ @Test
+ public void testClientNodeReplicatedCache() throws Exception {
+ startGrid();
+
+ Ignite cln = startClientGrid(1);
+
+ IgniteCache cache = cln.getOrCreateCache(ccfg(CacheMode.REPLICATED));
+
+ insertData(cln, cache);
+
+ IndexQuery<Long, Person> qry = new IndexQuery<Long,
Person>(Person.class)
+ .setCriteria(lt("id", CNT / 2));
+
+ GridTestUtils.assertThrows(null, () ->
cache.query(qry.setLocal(true)).getAll(),
Review comment:
Yes, we have the same behavior for TextQuery.
##########
File path:
modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryQueryEntityTest.java
##########
@@ -0,0 +1,301 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.cache.query;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
+import java.util.Random;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.QueryIndex;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+import static org.apache.ignite.cache.query.IndexQueryCriteriaBuilder.lt;
+
+/** */
+public class IndexQueryQueryEntityTest extends GridCommonAbstractTest {
+ /** */
+ private static final String CACHE = "TEST_CACHE";
+
+ /** */
+ private static final String CACHE_TBL_NAME = "TEST_CACHE_TBL_NAME";
+
+ /** */
+ private static final String TABLE = "TEST_TABLE";
+
+ /** */
+ private static final String ID_IDX = "ID_IDX";
+
+ /** */
+ private static final String DESC_ID_IDX = "DESC_ID_IDX";
+
+ /** */
+ private static final int CNT = 10_000;
+
+ /** */
+ private IgniteCache<Long, Person> cache;
+
+ /** */
+ private IgniteCache<Long, Person> cacheTblName;
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ Ignite crd = startGrids(4);
+
+ cache = crd.cache(CACHE);
+ cacheTblName = crd.cache(CACHE_TBL_NAME);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() {
+ stopAllGrids();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+ QueryIndex idIdx = new QueryIndex("id", true, ID_IDX);
+ QueryIndex descIdIdx = new QueryIndex("descId", false, DESC_ID_IDX);
+
+ QueryEntity e = new QueryEntity(Long.class.getName(),
Person.class.getName())
+ .setFields(new LinkedHashMap<>(
+ F.asMap("id", Integer.class.getName(), "descId",
Integer.class.getName()))
+ )
+ .setIndexes(Arrays.asList(idIdx, descIdIdx));
+
+ CacheConfiguration<?, ?> ccfg1 = new CacheConfiguration<>()
+ .setName(CACHE)
+ .setQueryEntities(Collections.singletonList(e));
+
+ QueryEntity entTableName = new QueryEntity(e);
+ entTableName.setTableName(TABLE);
+
+ CacheConfiguration<?, ?> ccfg2 = new CacheConfiguration<>()
+ .setName(CACHE_TBL_NAME)
+ .setQueryEntities(Collections.singletonList(entTableName));
+
+ cfg.setCacheConfiguration(ccfg1, ccfg2);
+
+ return cfg;
+ }
+
+ /** */
+ @Test
+ public void testEmptyCache() {
+ IndexQuery<Long, Person> qry = new IndexQuery<Long,
Person>(Person.class)
+ .setCriteria(lt("id", Integer.MAX_VALUE));
+
+ assertTrue(cache.query(qry).getAll().isEmpty());
+
+ qry = new IndexQuery<Long, Person>(Person.class)
+ .setCriteria(lt("descId", Integer.MAX_VALUE));
+
+ assertTrue(cache.query(qry).getAll().isEmpty());
+
+ qry = new IndexQuery<Long, Person>(Person.class)
+ .setCriteria(lt("id", Integer.MAX_VALUE));
+
+ assertTrue(cache.query(qry).getAll().isEmpty());
+
+ qry = new IndexQuery<Long, Person>(Person.class)
Review comment:
Actually don't need it. Removed.
##########
File path:
modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQuerySqlIndexTest.java
##########
@@ -0,0 +1,221 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.cache.query;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Random;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+import static org.apache.ignite.cache.query.IndexQueryCriteriaBuilder.lt;
+
+/** */
+public class IndexQuerySqlIndexTest extends GridCommonAbstractTest {
+ /** */
+ private static final String CACHE = "TEST_CACHE";
+
+ /** */
+ private static final String CACHE_TABLE = "TEST_CACHE_TABLE";
+
+ /** */
+ private static final String TABLE = "TEST_TABLE";
+
+ /** */
+ private static final String DESC_ID_IDX = "DESC_ID_IDX";
+
+ /** */
+ private static final int CNT = 10_000;
+
+ /** */
+ private IgniteCache cache;
+
+ /** */
+ private Ignite crd;
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ crd = startGrids(4);
+
+ cache = crd.cache(CACHE);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() {
+ stopAllGrids();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+ CacheConfiguration ccfg = new CacheConfiguration<>()
Review comment:
How does it help? All tests (except 2) have different
`getConfiguration()`, the only common thing is a cache name. But do we really
need a separate class for that? Also flat structure make tests more convenient
for debug.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
