[GitHub] [ignite] ptupitsyn commented on a change in pull request #6490: IGNITE-7285 Add default query timeout
ptupitsyn commented on a change in pull request #6490: IGNITE-7285 Add default query timeout URL: https://github.com/apache/ignite/pull/6490#discussion_r339406229 ## File path: modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs ## @@ -72,6 +72,11 @@ public class IgniteConfiguration /// public const int DefaultJvmMaxMem = -1; +/// +/// Default query timeout. +/// +public static readonly TimeSpan DefaultQueryTimeout = TimeSpan.FromMilliseconds(0); Review comment: I'm asking to remove `public static readonly TimeSpan DefaultQueryTimeout`, because it is zero. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [ignite] samaitra commented on a change in pull request #6490: IGNITE-7285 Add default query timeout
samaitra commented on a change in pull request #6490: IGNITE-7285 Add default query timeout URL: https://github.com/apache/ignite/pull/6490#discussion_r339395082 ## File path: modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs ## @@ -72,6 +72,11 @@ public class IgniteConfiguration /// public const int DefaultJvmMaxMem = -1; +/// +/// Default query timeout. +/// +public static readonly TimeSpan DefaultQueryTimeout = TimeSpan.FromMilliseconds(0); Review comment: @ptupitsyn Thank you for reviewing and sharing your feedback. Can you please clarify if you are asking to rename the parameter from `DefaultQueryTimeout ` to `QueryTimeout ` or to remove this parameter from `IgniteConfiguration.cs` 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [ignite] samaitra commented on a change in pull request #6490: IGNITE-7285 Add default query timeout
samaitra commented on a change in pull request #6490: IGNITE-7285 Add default
query timeout
URL: https://github.com/apache/ignite/pull/6490#discussion_r339394098
##
File path:
modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryDefaultTimeoutSelfTest.java
##
@@ -0,0 +1,199 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import javax.cache.CacheException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.cache.query.QueryCancelledException;
+import org.apache.ignite.internal.processors.GridProcessor;
+import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+/**
+ * Tests distributed SQL queries default timeouts.
+ */
+public class IgniteCacheDistributedQueryDefaultTimeoutSelfTest extends
GridCommonAbstractTest {
+/** Grids count. */
+private static final int GRIDS_CNT = 3;
+
+/** Cache size. */
+public static final int CACHE_SIZE = 10_000;
+
+/** Default query timeout */
+private static final long DEFAULT_QUERY_TIMEOUT = 1000;
+
+/** Value size. */
+public static final int VAL_SIZE = 16;
+
+/** */
+private static final String QRY_1 = "select a._val, b._val from String a,
String b";
+
+/** */
+private static final String QRY_2 = "select a._key, count(*) from String a
group by a._key";
+
+/** */
+private static final String QRY_3 = "select a._val from String a";
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+startGridsMultiThreaded(GRIDS_CNT);
+}
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+CacheConfiguration ccfg = new
CacheConfiguration<>(DEFAULT_CACHE_NAME);
+ccfg.setIndexedTypes(Integer.class, String.class);
+
+cfg.setCacheConfiguration(ccfg);
+
+if ("client".equals(igniteInstanceName))
+cfg.setClientMode(true);
+
+cfg.setDefaultQueryTimeout(DEFAULT_QUERY_TIMEOUT);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+super.afterTest();
+
+G.ignite().cache(DEFAULT_CACHE_NAME).removeAll();
Review comment:
yes updated
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [ignite] samaitra commented on a change in pull request #6490: IGNITE-7285 Add default query timeout
samaitra commented on a change in pull request #6490: IGNITE-7285 Add default
query timeout
URL: https://github.com/apache/ignite/pull/6490#discussion_r339394035
##
File path:
modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryDefaultTimeoutSelfTest.java
##
@@ -0,0 +1,199 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import javax.cache.CacheException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.cache.query.QueryCancelledException;
+import org.apache.ignite.internal.processors.GridProcessor;
+import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+/**
+ * Tests distributed SQL queries default timeouts.
+ */
+public class IgniteCacheDistributedQueryDefaultTimeoutSelfTest extends
GridCommonAbstractTest {
+/** Grids count. */
+private static final int GRIDS_CNT = 3;
+
+/** Cache size. */
+public static final int CACHE_SIZE = 10_000;
+
+/** Default query timeout */
+private static final long DEFAULT_QUERY_TIMEOUT = 1000;
+
+/** Value size. */
+public static final int VAL_SIZE = 16;
+
+/** */
+private static final String QRY_1 = "select a._val, b._val from String a,
String b";
+
+/** */
+private static final String QRY_2 = "select a._key, count(*) from String a
group by a._key";
+
+/** */
+private static final String QRY_3 = "select a._val from String a";
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+startGridsMultiThreaded(GRIDS_CNT);
+}
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+CacheConfiguration ccfg = new
CacheConfiguration<>(DEFAULT_CACHE_NAME);
+ccfg.setIndexedTypes(Integer.class, String.class);
+
+cfg.setCacheConfiguration(ccfg);
+
+if ("client".equals(igniteInstanceName))
+cfg.setClientMode(true);
+
+cfg.setDefaultQueryTimeout(DEFAULT_QUERY_TIMEOUT);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+super.afterTest();
+
+G.ignite().cache(DEFAULT_CACHE_NAME).removeAll();
+}
+
+/** */
+@Test
+public void testRemoteQueryExecutionTimeout() throws Exception {
+testQueryCancel(CACHE_SIZE, VAL_SIZE, QRY_1, 500,
TimeUnit.MILLISECONDS, true, true);
+}
+
+/** */
+@Test
+public void testRemoteQueryWithMergeTableTimeout() throws Exception {
+testQueryCancel(CACHE_SIZE, VAL_SIZE, QRY_2, 500,
TimeUnit.MILLISECONDS, true, false);
+}
+
+/** */
+@Test
+public void testRemoteQueryExecutionCancel0() throws Exception {
+testQueryCancel(CACHE_SIZE, VAL_SIZE, QRY_1, 1, TimeUnit.MILLISECONDS,
false, true);
+}
+
+/** */
+private void testQueryCancel(int keyCnt, int valSize, String sql, int
timeoutUnits, TimeUnit timeUnit,
+boolean timeout, boolean checkCanceled) throws Exception {
+try (Ignite client = startGrid("client")) {
+IgniteCache cache =
client.cache(DEFAULT_CACHE_NAME);
+
+
[GitHub] [ignite] samaitra commented on a change in pull request #6490: IGNITE-7285 Add default query timeout
samaitra commented on a change in pull request #6490: IGNITE-7285 Add default
query timeout
URL: https://github.com/apache/ignite/pull/6490#discussion_r339394035
##
File path:
modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryDefaultTimeoutSelfTest.java
##
@@ -0,0 +1,199 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import javax.cache.CacheException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.cache.query.QueryCancelledException;
+import org.apache.ignite.internal.processors.GridProcessor;
+import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+/**
+ * Tests distributed SQL queries default timeouts.
+ */
+public class IgniteCacheDistributedQueryDefaultTimeoutSelfTest extends
GridCommonAbstractTest {
+/** Grids count. */
+private static final int GRIDS_CNT = 3;
+
+/** Cache size. */
+public static final int CACHE_SIZE = 10_000;
+
+/** Default query timeout */
+private static final long DEFAULT_QUERY_TIMEOUT = 1000;
+
+/** Value size. */
+public static final int VAL_SIZE = 16;
+
+/** */
+private static final String QRY_1 = "select a._val, b._val from String a,
String b";
+
+/** */
+private static final String QRY_2 = "select a._key, count(*) from String a
group by a._key";
+
+/** */
+private static final String QRY_3 = "select a._val from String a";
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+startGridsMultiThreaded(GRIDS_CNT);
+}
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+CacheConfiguration ccfg = new
CacheConfiguration<>(DEFAULT_CACHE_NAME);
+ccfg.setIndexedTypes(Integer.class, String.class);
+
+cfg.setCacheConfiguration(ccfg);
+
+if ("client".equals(igniteInstanceName))
+cfg.setClientMode(true);
+
+cfg.setDefaultQueryTimeout(DEFAULT_QUERY_TIMEOUT);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+super.afterTest();
+
+G.ignite().cache(DEFAULT_CACHE_NAME).removeAll();
+}
+
+/** */
+@Test
+public void testRemoteQueryExecutionTimeout() throws Exception {
+testQueryCancel(CACHE_SIZE, VAL_SIZE, QRY_1, 500,
TimeUnit.MILLISECONDS, true, true);
+}
+
+/** */
+@Test
+public void testRemoteQueryWithMergeTableTimeout() throws Exception {
+testQueryCancel(CACHE_SIZE, VAL_SIZE, QRY_2, 500,
TimeUnit.MILLISECONDS, true, false);
+}
+
+/** */
+@Test
+public void testRemoteQueryExecutionCancel0() throws Exception {
+testQueryCancel(CACHE_SIZE, VAL_SIZE, QRY_1, 1, TimeUnit.MILLISECONDS,
false, true);
+}
+
+/** */
+private void testQueryCancel(int keyCnt, int valSize, String sql, int
timeoutUnits, TimeUnit timeUnit,
+boolean timeout, boolean checkCanceled) throws Exception {
+try (Ignite client = startGrid("client")) {
+IgniteCache cache =
client.cache(DEFAULT_CACHE_NAME);
+
+
[GitHub] [ignite] samaitra commented on issue #6490: IGNITE-7285 Add default query timeout
samaitra commented on issue #6490: IGNITE-7285 Add default query timeout URL: https://github.com/apache/ignite/pull/6490#issuecomment-546778525 > > > Additionally to comments for code lines there are some questions regarding testing approach. Actually, I do not see how different are expectations from test with and without configured default timeout. Basically, it is good to test following: > > > > > > 1. Only default timeout specified -- query is cancelled after it, it is clear that it was cancelled by timeout. > > > 2. Explicit timeout overrides default timeout. > > > > > > > > 1. My understanding is in the method testQueryCancel when we are passing the 3rd argument timeout as false then only default timeout is specified. > > 2. When we are passing the 3rd argument timeout as true then explicit timeout overrides default timeout. > > @samaitra I copied `IgniteCacheLocalQueryDefaultTimeoutSelfTest` and executed it on master. And tests passed, so I suppose tests do not distinguish cancellation after _default timeout_ vs other possible ways. @pavlukhin Thank you for reviewing and sharing feedback. If you note the tests in IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest also, it is similar to Default Query timeout tests. I suppose the reason being we are throwing QueryCancelledException for either manual cancel or query being cancelled due to timeout. I agree throwing a separate exception for timeout vs manual cancel will be better approach to handle different scenarios and help with logging and exception handling. I am also thinking if that change can be taken up as separate issue and we can close on default query handling change in this PR. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
