You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ignite.apache.org by GitBox <gi...@apache.org> on 2022/02/03 11:24:10 UTC
[GitHub] [ignite] alex-plekhanov commented on a change in pull request #9788: IGNITE-16446: Fix IndexQuery incorrect work with indexes built for _VAL field
alex-plekhanov commented on a change in pull request #9788:
URL: https://github.com/apache/ignite/pull/9788#discussion_r798464804
##########
File path: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/reducer/IndexQueryReducer.java
##########
@@ -138,12 +138,29 @@ public IndexQueryReducer(
/** */
private IndexKey key(String key, int type, IgniteBiTuple<?, ?> entry) throws IgniteCheckedException {
- GridQueryProperty prop = typeDesc.property(key);
+ Object o;
- // PrimaryKey field.
- Object o = prop == null ? entry.getKey() : prop.value(entry.getKey(), entry.getValue());
+ if (isKeyField(key))
+ o = entry.getKey();
+ else if (isValueField(key))
+ o = entry.getValue();
+ else {
+ GridQueryProperty prop = typeDesc.property(key);
+
+ o = prop.value(entry.getKey(), entry.getValue());
+ }
return IndexKeyFactory.wrap(o, type, cctx.cacheObjectContext(), meta.keyTypeSettings());
}
+
+ /** */
+ private boolean isKeyField(String fld) {
+ return fld.equals(typeDesc.keyFieldAlias()) || fld.equals(QueryUtils.KEY_FIELD_NAME);
Review comment:
`equalsIgnoreCase`?
##########
File path: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/reducer/IndexQueryReducer.java
##########
@@ -138,12 +138,29 @@ public IndexQueryReducer(
/** */
private IndexKey key(String key, int type, IgniteBiTuple<?, ?> entry) throws IgniteCheckedException {
- GridQueryProperty prop = typeDesc.property(key);
+ Object o;
- // PrimaryKey field.
- Object o = prop == null ? entry.getKey() : prop.value(entry.getKey(), entry.getValue());
+ if (isKeyField(key))
+ o = entry.getKey();
+ else if (isValueField(key))
+ o = entry.getValue();
+ else {
+ GridQueryProperty prop = typeDesc.property(key);
+
+ o = prop.value(entry.getKey(), entry.getValue());
+ }
return IndexKeyFactory.wrap(o, type, cctx.cacheObjectContext(), meta.keyTypeSettings());
}
+
+ /** */
+ private boolean isKeyField(String fld) {
+ return fld.equals(typeDesc.keyFieldAlias()) || fld.equals(QueryUtils.KEY_FIELD_NAME);
+ }
+
+ /** */
+ private boolean isValueField(String fld) {
+ return fld.equals(typeDesc.valueFieldAlias()) || fld.equals(QueryUtils.VAL_FIELD_NAME);
Review comment:
`equalsIgnoreCase`?
##########
File path: modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryCacheKeyValueFieldsTest.java
##########
@@ -0,0 +1,120 @@
+/*
+ * 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.LinkedHashMap;
+import java.util.Random;
+import javax.cache.Cache;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteDataStreamer;
+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.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+import static org.apache.ignite.cache.query.IndexQueryCriteriaBuilder.gt;
+
+/** The test checks that IndexQuery correctly works with indexes contain single field: cache key or value. */
+public class IndexQueryCacheKeyValueFieldsTest extends GridCommonAbstractTest {
+ /** */
+ private static final String CACHE = "TEST_CACHE";
+
+ /** */
+ private static final int CNT = 10_000;
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ Ignite crd = startGrids(2);
+
+ try (IgniteDataStreamer<String, Integer> streamer = crd.dataStreamer(CACHE)) {
+ for (int i = 0; i < CNT; i++)
+ streamer.addData(key(i), i);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String instanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(instanceName);
+
+ // Cache with signle value field.
+ LinkedHashMap<String, String> fields = new LinkedHashMap<>();
+ fields.put("f1", "java.lang.String");
+ fields.put("f2", "java.lang.Integer");
+
+ QueryEntity qryEntity = new QueryEntity()
+ .setKeyFieldName("f1")
+ .setValueFieldName("f2")
+ .setTableName("TEST")
+ .setKeyType(String.class.getName())
+ .setValueType(Integer.class.getName())
+ .setFields(fields)
+ .setIndexes(F.asList(
+ new QueryIndex("f1"),
+ new QueryIndex("f2"),
+ new QueryIndex("_VAL")));
+
+ return cfg.setCacheConfiguration(
+ new CacheConfiguration<String, Integer>("TEST_CACHE")
+ .setQueryEntities(F.asList(qryEntity)));
+ }
+
+ /** */
+ @Test
+ public void testValueAliasField() {
+ check("f2", false);
+ }
+
+ /** */
+ @Test
+ public void testValueField() {
+ check("_VAL", false);
+ }
+
+ /** */
+ @Test
+ public void testKeyAliasField() {
+ check("f1", true);
+ }
+
+ /** */
+ @Test
+ public void testKeyField() {
+ check("_KEY", true);
+ }
+
+ /** */
+ private void check(String fld, boolean key) {
+ int pivot = new Random().nextInt(CNT / 2);
+
+ QueryCursor<Cache.Entry<String, Integer>> cursor = grid(0).cache(CACHE).query(
+ new IndexQuery<String, Integer>(Integer.class)
+ .setCriteria(gt(fld, key ? key(pivot) : pivot))
+ );
+
+ assertEquals(CNT - pivot - 1, cursor.getAll().size());
+ }
+
+ /** */
+ private static String key(int val) {
+ return String.format("key_%1$" + 5 + "s", val).replace(' ', '0');
Review comment:
`"key_%1$5s"` - for better readability.
##########
File path: modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryCacheKeyValueFieldsTest.java
##########
@@ -0,0 +1,120 @@
+/*
+ * 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.LinkedHashMap;
+import java.util.Random;
+import javax.cache.Cache;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteDataStreamer;
+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.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+import static org.apache.ignite.cache.query.IndexQueryCriteriaBuilder.gt;
+
+/** The test checks that IndexQuery correctly works with indexes contain single field: cache key or value. */
+public class IndexQueryCacheKeyValueFieldsTest extends GridCommonAbstractTest {
+ /** */
+ private static final String CACHE = "TEST_CACHE";
+
+ /** */
+ private static final int CNT = 10_000;
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ Ignite crd = startGrids(2);
+
+ try (IgniteDataStreamer<String, Integer> streamer = crd.dataStreamer(CACHE)) {
+ for (int i = 0; i < CNT; i++)
+ streamer.addData(key(i), i);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String instanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(instanceName);
+
+ // Cache with signle value field.
+ LinkedHashMap<String, String> fields = new LinkedHashMap<>();
+ fields.put("f1", "java.lang.String");
+ fields.put("f2", "java.lang.Integer");
+
+ QueryEntity qryEntity = new QueryEntity()
+ .setKeyFieldName("f1")
+ .setValueFieldName("f2")
+ .setTableName("TEST")
+ .setKeyType(String.class.getName())
+ .setValueType(Integer.class.getName())
+ .setFields(fields)
+ .setIndexes(F.asList(
+ new QueryIndex("f1"),
+ new QueryIndex("f2"),
+ new QueryIndex("_VAL")));
+
+ return cfg.setCacheConfiguration(
+ new CacheConfiguration<String, Integer>("TEST_CACHE")
+ .setQueryEntities(F.asList(qryEntity)));
+ }
+
+ /** */
+ @Test
+ public void testValueAliasField() {
+ check("f2", false);
+ }
+
+ /** */
+ @Test
+ public void testValueField() {
+ check("_VAL", false);
+ }
+
+ /** */
+ @Test
+ public void testKeyAliasField() {
+ check("f1", true);
+ }
+
+ /** */
+ @Test
+ public void testKeyField() {
Review comment:
Let's also add tests with upper/lower case letters
--
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: notifications-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org