alex-plekhanov commented on code in PR #12911:
URL: https://github.com/apache/ignite/pull/12911#discussion_r3020830978
##########
modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/ModifyNode.java:
##########
@@ -200,9 +201,15 @@ private void flushTuples(boolean force) throws
IgniteCheckedException {
this.tuples = new ArrayList<>(MODIFY_BATCH_SIZE);
GridCacheContext<Object, Object> cctx = desc.cacheContext();
- GridCacheProxyImpl<Object, Object> cache = cctx.cache().keepBinary();
+ IgniteInternalCache<Object, Object> cache = cctx.cache();
GridNearTxLocal tx = Commons.queryTransaction(context(),
cctx.shared());
+ QueryProperties props = context().unwrap(QueryProperties.class);
+ boolean keepBinaryMode = props == null || props.keepBinary();
+
+ if (keepBinaryMode)
Review Comment:
As far as I understand now each UPDATE without keepBinary flag will force to
deserialize old object. I think it will lead to performance drop. Let's
deserialize only if CacheInterceptor is set.
##########
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/CacheWithInterceptorIntegrationTest.java:
##########
@@ -0,0 +1,212 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.query.calcite.integration;
+
+import java.util.Collection;
+import java.util.List;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.cache.CacheInterceptorAdapter;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.calcite.CalciteQueryEngineConfiguration;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.SqlConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static
org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
+
+/** Cache interceptor related tests. */
+@RunWith(Parameterized.class)
+public class CacheWithInterceptorIntegrationTest extends
GridCommonAbstractTest {
+ /** Node role. */
+ @Parameterized.Parameter(0)
+ public boolean keepBinary;
+
+ /** */
+ @Parameterized.Parameters(name = "keepBinary={0}")
+ public static Collection<?> parameters() {
+ return List.of(true, false);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids(true);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ var entity0 = new QueryEntity()
+ .setTableName("Pure")
+ .setKeyType(Integer.class.getName())
+ .setValueType(String.class.getName())
+ .addQueryField("id", Integer.class.getName(), null)
+ .addQueryField("name", String.class.getName(), null)
+ .setKeyFieldName("id")
+ .setValueFieldName("name");
+
+ var entity1 = new QueryEntity()
+ .setTableName("CITY")
+ .setKeyType(Integer.class.getName())
+ .setValueType(City.class.getName())
+ .addQueryField("id", Integer.class.getName(), null)
+ .addQueryField("name", String.class.getName(), null)
+ .setKeyFieldName("id");
+
+ var entity2 = new QueryEntity()
+ .setTableName("PERSON")
+ .setKeyType(Integer.class.getName())
+ .setValueType(Person.class.getName())
+ .addQueryField("id", Integer.class.getName(), null)
+ .addQueryField("name", String.class.getName(), null)
+ .addQueryField("city_id", Integer.class.getName(), null)
+ .setKeyFieldName("id");
+
+ var cacheCfg = new CacheConfiguration<Integer,
Object>(DEFAULT_CACHE_NAME)
+ .setAtomicityMode(TRANSACTIONAL)
+ .setSqlSchema("PUBLIC")
+ .setInterceptor(new TestCacheInterceptor(keepBinary))
+ .setQueryEntities(List.of(entity1, entity2));
+
+ var pureCacheCfg = new CacheConfiguration<Integer, Object>("Pure")
+ .setAtomicityMode(TRANSACTIONAL)
+ .setSqlSchema("PUBLIC")
+ .setInterceptor(new TestAlwaysUnwrappedValCacheInterceptor())
+ .setQueryEntities(List.of(entity0));
+
+ var calciteQryEngineCfg = new
CalciteQueryEngineConfiguration().setDefault(true);
+
+ return super.getConfiguration(igniteInstanceName)
+ .setSqlConfiguration(new
SqlConfiguration().setQueryEnginesConfiguration(calciteQryEngineCfg))
+ .setTransactionConfiguration(new
TransactionConfiguration().setTxAwareQueriesEnabled(true))
+ .setCacheConfiguration(cacheCfg, pureCacheCfg);
+ }
+
+ /** Test object unwrapped on interceptor side if applicable. */
+ @Test
+ public void testInterceptorUnwrapValIfNeeded() throws Exception {
+ startGrid(0);
+ Ignite client = startClientGrid("client");
+
+ IgniteCache<Integer, Object> cache = client.cache(DEFAULT_CACHE_NAME);
+
+ if (keepBinary)
+ cache = cache.withKeepBinary();
+
+ int incParam = 0;
+
+ try (Transaction tx = client.transactions().txStart(PESSIMISTIC,
READ_COMMITTED)) {
+ cache.query(new SqlFieldsQuery("insert into PUBLIC.PURE(id, name)
values (?, 'val')").setArgs(incParam++)).getAll();
+ cache.query(new SqlFieldsQuery("insert into PUBLIC.CITY(id, name)
values (?, 'val')").setArgs(incParam++)).getAll();
+ cache.query(new SqlFieldsQuery("insert into PUBLIC.PERSON(id,
name, city_id) values (?, 'val', 1)").setArgs(incParam++))
+ .getAll();
+
+ tx.commit();
+ }
+
+ cache.query(new SqlFieldsQuery("insert into PUBLIC.PURE(id, name)
values (?, 'val')").setArgs(incParam++)).getAll();
+ cache.query(new SqlFieldsQuery("insert into PUBLIC.CITY(id, name)
values (?, 'val')").setArgs(incParam++)).getAll();
+ cache.query(new SqlFieldsQuery("insert into PUBLIC.PERSON(id, name,
city_id) values (?, 'val', 1)").setArgs(incParam)).getAll();
+ }
+
+ /** */
+ private static class City {
+ /** */
+ @GridToStringInclude
+ int id;
+
+ /** */
+ @GridToStringInclude
+ String name;
+
+ /** */
+ City(int id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+ }
+
+ /** */
+ private static class Person {
+ /** */
+ @GridToStringInclude
+ int id;
+
+ /** */
+ @GridToStringInclude
+ String name;
+
+ /** */
+ @GridToStringInclude
+ int city_id;
+
+ /** */
+ Person(int id, String name, int city_id) {
+ this.id = id;
+ this.name = name;
+ this.city_id = city_id;
+ }
+ }
+
+ /** */
+ private static class TestAlwaysUnwrappedValCacheInterceptor extends
CacheInterceptorAdapter<Integer, Object> {
+ /** {@inheritDoc} */
+ @Override public @Nullable Object onBeforePut(Cache.Entry<Integer,
Object> entry, Object newVal) {
+ assertFalse(newVal instanceof BinaryObject);
+
+ return newVal;
+ }
+ }
+
+ /** */
+ private static class TestCacheInterceptor extends
CacheInterceptorAdapter<Integer, Object> {
+ /** */
+ private final boolean keepBinary;
+
+ /**
+ * @param keepBinary Keep binary defines flag.
+ */
+ TestCacheInterceptor(boolean keepBinary) {
+ this.keepBinary = keepBinary;
+ }
+
+ /** {@inheritDoc} */
+ @Override public @Nullable Object onBeforePut(Cache.Entry<Integer,
Object> entry, Object newVal) {
+ if (keepBinary)
+ assertTrue(newVal instanceof BinaryObject);
+ else
+ assertFalse(newVal instanceof BinaryObject);
Review Comment:
assertEquals(keepBinary, newVal instanceof BinaryObject);
##########
modules/calcite/src/test/java/org/apache/ignite/internal/processors/tx/TxWithExceptionalInterceptorTest.java:
##########
@@ -117,6 +117,13 @@ public static Collection<?> parameters() {
exceptionRaised.set(0);
}
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids(true);
Review Comment:
Do we still need `stopAllGrids` at `beforeTest`?
##########
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/CacheWithInterceptorIntegrationTest.java:
##########
@@ -0,0 +1,212 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.query.calcite.integration;
+
+import java.util.Collection;
+import java.util.List;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.cache.CacheInterceptorAdapter;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.calcite.CalciteQueryEngineConfiguration;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.SqlConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static
org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
+
+/** Cache interceptor related tests. */
+@RunWith(Parameterized.class)
+public class CacheWithInterceptorIntegrationTest extends
GridCommonAbstractTest {
Review Comment:
Maybe inherit from `AbstractBasicIntegrationTest` and simplify test? Like
using already defined `Employer` class.
##########
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/CacheWithInterceptorIntegrationTest.java:
##########
@@ -0,0 +1,212 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.query.calcite.integration;
+
+import java.util.Collection;
+import java.util.List;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.cache.CacheInterceptorAdapter;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.calcite.CalciteQueryEngineConfiguration;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.SqlConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static
org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
+
+/** Cache interceptor related tests. */
+@RunWith(Parameterized.class)
+public class CacheWithInterceptorIntegrationTest extends
GridCommonAbstractTest {
+ /** Node role. */
+ @Parameterized.Parameter(0)
+ public boolean keepBinary;
+
+ /** */
+ @Parameterized.Parameters(name = "keepBinary={0}")
+ public static Collection<?> parameters() {
+ return List.of(true, false);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids(true);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ var entity0 = new QueryEntity()
+ .setTableName("Pure")
+ .setKeyType(Integer.class.getName())
+ .setValueType(String.class.getName())
+ .addQueryField("id", Integer.class.getName(), null)
+ .addQueryField("name", String.class.getName(), null)
+ .setKeyFieldName("id")
+ .setValueFieldName("name");
+
+ var entity1 = new QueryEntity()
+ .setTableName("CITY")
+ .setKeyType(Integer.class.getName())
+ .setValueType(City.class.getName())
+ .addQueryField("id", Integer.class.getName(), null)
+ .addQueryField("name", String.class.getName(), null)
+ .setKeyFieldName("id");
+
+ var entity2 = new QueryEntity()
+ .setTableName("PERSON")
+ .setKeyType(Integer.class.getName())
+ .setValueType(Person.class.getName())
+ .addQueryField("id", Integer.class.getName(), null)
+ .addQueryField("name", String.class.getName(), null)
+ .addQueryField("city_id", Integer.class.getName(), null)
+ .setKeyFieldName("id");
Review Comment:
Why don't use `@SqlQueryField` annotation and simplify configuration?
##########
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/CacheWithInterceptorIntegrationTest.java:
##########
@@ -0,0 +1,212 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.query.calcite.integration;
+
+import java.util.Collection;
+import java.util.List;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.cache.CacheInterceptorAdapter;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.calcite.CalciteQueryEngineConfiguration;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.SqlConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static
org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
+
+/** Cache interceptor related tests. */
+@RunWith(Parameterized.class)
+public class CacheWithInterceptorIntegrationTest extends
GridCommonAbstractTest {
+ /** Node role. */
+ @Parameterized.Parameter(0)
+ public boolean keepBinary;
+
+ /** */
+ @Parameterized.Parameters(name = "keepBinary={0}")
+ public static Collection<?> parameters() {
+ return List.of(true, false);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids(true);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ var entity0 = new QueryEntity()
+ .setTableName("Pure")
+ .setKeyType(Integer.class.getName())
+ .setValueType(String.class.getName())
+ .addQueryField("id", Integer.class.getName(), null)
+ .addQueryField("name", String.class.getName(), null)
+ .setKeyFieldName("id")
+ .setValueFieldName("name");
+
+ var entity1 = new QueryEntity()
+ .setTableName("CITY")
+ .setKeyType(Integer.class.getName())
+ .setValueType(City.class.getName())
+ .addQueryField("id", Integer.class.getName(), null)
+ .addQueryField("name", String.class.getName(), null)
+ .setKeyFieldName("id");
+
+ var entity2 = new QueryEntity()
+ .setTableName("PERSON")
+ .setKeyType(Integer.class.getName())
+ .setValueType(Person.class.getName())
+ .addQueryField("id", Integer.class.getName(), null)
+ .addQueryField("name", String.class.getName(), null)
+ .addQueryField("city_id", Integer.class.getName(), null)
+ .setKeyFieldName("id");
+
+ var cacheCfg = new CacheConfiguration<Integer,
Object>(DEFAULT_CACHE_NAME)
+ .setAtomicityMode(TRANSACTIONAL)
+ .setSqlSchema("PUBLIC")
+ .setInterceptor(new TestCacheInterceptor(keepBinary))
+ .setQueryEntities(List.of(entity1, entity2));
+
+ var pureCacheCfg = new CacheConfiguration<Integer, Object>("Pure")
+ .setAtomicityMode(TRANSACTIONAL)
+ .setSqlSchema("PUBLIC")
+ .setInterceptor(new TestAlwaysUnwrappedValCacheInterceptor())
Review Comment:
`new TestCacheInterceptor(false)` and remove redundant class?
--
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]
