This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 9a8241951cb IGNITE-18719 Deprecate SqlFieldsQuery#lazy and set default
to true. (#10518)
9a8241951cb is described below
commit 9a8241951cb15836be0cd4f7623f4991e7e4480a
Author: Nikolay <[email protected]>
AuthorDate: Mon Feb 13 20:06:56 2023 +0300
IGNITE-18719 Deprecate SqlFieldsQuery#lazy and set default to true. (#10518)
---
.../common/RunningQueryInfoCheckInitiatorTest.java | 4 +--
.../internal/jdbc2/JdbcConnectionSelfTest.java | 13 ++++----
.../jdbc/thin/JdbcThinConnectionSelfTest.java | 39 +++++++++++-----------
.../jdbc/thin/JdbcThinDataSourceSelfTest.java | 13 ++++----
.../qa/query/WarningOnBigQueryResultsTest.java | 4 +--
.../apache/ignite/cache/query/SqlFieldsQuery.java | 15 ++++++---
.../jdbc/thin/ConnectionPropertiesImpl.java | 3 +-
.../ignite/internal/jdbc2/JdbcConnection.java | 3 +-
.../IgniteBinaryCacheQueryTestSuite.java | 8 +++++
.../IgniteBinaryCacheQueryTestSuite2.java | 8 +++++
.../IgniteBinaryCacheQueryTestSuite3.java | 8 +++++
.../IgniteBinaryCacheQueryTestSuite4.java | 8 +++++
12 files changed, 84 insertions(+), 42 deletions(-)
diff --git
a/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
b/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
index b8c5bc56854..38776d727c9 100644
---
a/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
@@ -227,8 +227,8 @@ public class RunningQueryInfoCheckInitiatorTest extends
JdbcThinAbstractSelfTest
final UUID grid0NodeId = grid(0).cluster().localNode().id();
GridTestUtils.runAsync(() -> {
- try (Connection conn = DriverManager.getConnection(
- CFG_URL_PREFIX + "nodeId=" + grid0NodeId +
"@modules/clients/src/test/config/jdbc-security-config.xml")) {
+ try (Connection conn =
DriverManager.getConnection(CFG_URL_PREFIX + "lazy=false:nodeId="
+ + grid0NodeId +
"@modules/clients/src/test/config/jdbc-security-config.xml")) {
try (Statement stmt = conn.createStatement()) {
stmt.execute(sql);
}
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
index 108a71f1e7a..763b0b46813 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
@@ -31,6 +31,7 @@ import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX;
+import static org.apache.ignite.cache.query.SqlFieldsQuery.DFLT_LAZY;
/**
* Connection test.
@@ -269,7 +270,7 @@ public class JdbcConnectionSelfTest extends
GridCommonAbstractTest {
assertTrue(((JdbcConnection)conn).isEnforceJoinOrder());
assertFalse(((JdbcConnection)conn).isDistributedJoins());
assertFalse(((JdbcConnection)conn).isCollocatedQuery());
- assertFalse(((JdbcConnection)conn).isLazy());
+ assertEquals(DFLT_LAZY, ((JdbcConnection)conn).isLazy());
assertFalse(((JdbcConnection)conn).skipReducerOnUpdate());
}
@@ -278,7 +279,7 @@ public class JdbcConnectionSelfTest extends
GridCommonAbstractTest {
assertFalse(((JdbcConnection)conn).isEnforceJoinOrder());
assertTrue(((JdbcConnection)conn).isDistributedJoins());
assertFalse(((JdbcConnection)conn).isCollocatedQuery());
- assertFalse(((JdbcConnection)conn).isLazy());
+ assertEquals(DFLT_LAZY, ((JdbcConnection)conn).isLazy());
assertFalse(((JdbcConnection)conn).skipReducerOnUpdate());
}
@@ -287,15 +288,15 @@ public class JdbcConnectionSelfTest extends
GridCommonAbstractTest {
assertFalse(((JdbcConnection)conn).isEnforceJoinOrder());
assertFalse(((JdbcConnection)conn).isDistributedJoins());
assertTrue(((JdbcConnection)conn).isCollocatedQuery());
- assertFalse(((JdbcConnection)conn).isLazy());
+ assertEquals(DFLT_LAZY, ((JdbcConnection)conn).isLazy());
assertFalse(((JdbcConnection)conn).skipReducerOnUpdate());
}
- try (final Connection conn =
DriverManager.getConnection(CFG_URL_PREFIX + "lazy=true@" + configURL())) {
+ try (final Connection conn =
DriverManager.getConnection(CFG_URL_PREFIX + "lazy=" + (!DFLT_LAZY) + "@" +
configURL())) {
assertFalse(((JdbcConnection)conn).isEnforceJoinOrder());
assertFalse(((JdbcConnection)conn).isDistributedJoins());
assertFalse(((JdbcConnection)conn).isCollocatedQuery());
- assertTrue(((JdbcConnection)conn).isLazy());
+ assertEquals(!DFLT_LAZY, ((JdbcConnection)conn).isLazy());
assertFalse(((JdbcConnection)conn).skipReducerOnUpdate());
}
try (final Connection conn =
DriverManager.getConnection(CFG_URL_PREFIX + "skipReducerOnUpdate=true@"
@@ -303,7 +304,7 @@ public class JdbcConnectionSelfTest extends
GridCommonAbstractTest {
assertFalse(((JdbcConnection)conn).isEnforceJoinOrder());
assertFalse(((JdbcConnection)conn).isDistributedJoins());
assertFalse(((JdbcConnection)conn).isCollocatedQuery());
- assertFalse(((JdbcConnection)conn).isLazy());
+ assertEquals(DFLT_LAZY, ((JdbcConnection)conn).isLazy());
assertTrue(((JdbcConnection)conn).skipReducerOnUpdate());
}
}
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
index 91e7c87559c..f40d34eb4d7 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
@@ -72,6 +72,7 @@ import static java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT;
import static java.sql.ResultSet.TYPE_FORWARD_ONLY;
import static java.sql.Statement.NO_GENERATED_KEYS;
import static java.sql.Statement.RETURN_GENERATED_KEYS;
+import static org.apache.ignite.cache.query.SqlFieldsQuery.DFLT_LAZY;
import static
org.apache.ignite.configuration.ClientConnectorConfiguration.DFLT_PORT;
import static
org.apache.ignite.internal.processors.odbc.SqlStateCode.TRANSACTION_STATE_EXCEPTION;
import static org.apache.ignite.testframework.GridTestUtils.assertThrows;
@@ -386,43 +387,43 @@ public class JdbcThinConnectionSelfTest extends
JdbcThinAbstractSelfTest {
@Test
public void testSqlHints() throws Exception {
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
- assertHints(conn, false, false, false, false, false,
+ assertHints(conn, false, false, false, false, DFLT_LAZY,
false, partitionAwareness);
}
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessProp +
"&distributedJoins=true")) {
- assertHints(conn, true, false, false, false, false,
+ assertHints(conn, true, false, false, false, DFLT_LAZY,
false, partitionAwareness);
}
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessProp +
"&enforceJoinOrder=true")) {
- assertHints(conn, false, true, false, false, false,
+ assertHints(conn, false, true, false, false, DFLT_LAZY,
false, partitionAwareness);
}
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessProp +
"&collocated=true")) {
- assertHints(conn, false, false, true, false, false,
+ assertHints(conn, false, false, true, false, DFLT_LAZY,
false, partitionAwareness);
}
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessProp +
"&replicatedOnly=true")) {
- assertHints(conn, false, false, false, true, false,
+ assertHints(conn, false, false, false, true, DFLT_LAZY,
false, partitionAwareness);
}
- try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessProp + "&lazy=true")) {
- assertHints(conn, false, false, false, false, true,
+ try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessProp + "&lazy=" +
(!DFLT_LAZY))) {
+ assertHints(conn, false, false, false, false, !DFLT_LAZY,
false, partitionAwareness);
}
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessProp +
"&skipReducerOnUpdate=true")) {
- assertHints(conn, false, false, false, false, false,
+ assertHints(conn, false, false, false, false, DFLT_LAZY,
true, partitionAwareness);
}
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessProp +
"&distributedJoins=true&" +
-
"enforceJoinOrder=true&collocated=true&replicatedOnly=true&lazy=true&skipReducerOnUpdate=true"))
{
- assertHints(conn, true, true, true, true, true,
+ "enforceJoinOrder=true&collocated=true&replicatedOnly=true&lazy="
+ (!DFLT_LAZY) + "&skipReducerOnUpdate=true")) {
+ assertHints(conn, true, true, true, true, !DFLT_LAZY,
true, partitionAwareness);
}
}
@@ -435,38 +436,38 @@ public class JdbcThinConnectionSelfTest extends
JdbcThinAbstractSelfTest {
@Test
public void testSqlHintsSemicolon() throws Exception {
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon +
";distributedJoins=true")) {
- assertHints(conn, true, false, false, false, false,
+ assertHints(conn, true, false, false, false, DFLT_LAZY,
false, partitionAwareness);
}
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon +
";enforceJoinOrder=true")) {
- assertHints(conn, false, true, false, false, false,
+ assertHints(conn, false, true, false, false, DFLT_LAZY,
false, partitionAwareness);
}
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon +
";collocated=true")) {
- assertHints(conn, false, false, true, false, false,
+ assertHints(conn, false, false, true, false, DFLT_LAZY,
false, partitionAwareness);
}
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon +
";replicatedOnly=true")) {
- assertHints(conn, false, false, false, true, false,
+ assertHints(conn, false, false, false, true, DFLT_LAZY,
false, partitionAwareness);
}
- try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon +
";lazy=true")) {
- assertHints(conn, false, false, false, false, true,
+ try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";lazy=" +
(!DFLT_LAZY))) {
+ assertHints(conn, false, false, false, false, !DFLT_LAZY,
false, partitionAwareness);
}
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon +
";skipReducerOnUpdate=true")) {
- assertHints(conn, false, false, false, false, false,
+ assertHints(conn, false, false, false, false, DFLT_LAZY,
true, partitionAwareness);
}
try (Connection conn =
DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon +
";distributedJoins=true;" +
-
"enforceJoinOrder=true;collocated=true;replicatedOnly=true;lazy=true;skipReducerOnUpdate=true"))
{
- assertHints(conn, true, true, true, true, true,
+ "enforceJoinOrder=true;collocated=true;replicatedOnly=true;lazy="
+ (!DFLT_LAZY) + ";skipReducerOnUpdate=true")) {
+ assertHints(conn, true, true, true, true, !DFLT_LAZY,
true, partitionAwareness);
}
}
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java
index 51545e5518a..e1d3854559e 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java
@@ -44,6 +44,7 @@ import
org.apache.ignite.internal.jdbc.thin.JdbcThinConnection;
import org.apache.ignite.internal.jdbc.thin.JdbcThinTcpIo;
import org.apache.ignite.testframework.GridTestUtils;
import org.junit.Test;
+import static org.apache.ignite.cache.query.SqlFieldsQuery.DFLT_LAZY;
/**
* DataSource test.
@@ -132,15 +133,15 @@ public class JdbcThinDataSourceSelfTest extends
JdbcThinAbstractSelfTest {
public void testResetUrl() throws Exception {
IgniteJdbcThinDataSource ids = new IgniteJdbcThinDataSource();
- ids.setUrl("jdbc:ignite:thin://127.0.0.1:10800/test?lazy=true");
+ ids.setUrl("jdbc:ignite:thin://127.0.0.1:10800/test?lazy=" +
(!DFLT_LAZY));
assertEquals("test", ids.getSchema());
- assertTrue(ids.isLazy());
+ assertEquals(!DFLT_LAZY, ids.isLazy());
ids.setUrl("jdbc:ignite:thin://mydomain.org,localhost?collocated=true");
assertNull(ids.getSchema());
- assertFalse(ids.isLazy());
+ assertEquals(DFLT_LAZY, ids.isLazy());
assertTrue(ids.isCollocated());
}
@@ -159,7 +160,7 @@ public class JdbcThinDataSourceSelfTest extends
JdbcThinAbstractSelfTest {
assertFalse(io.connectionProperties().isAutoCloseServerCursor());
assertFalse(io.connectionProperties().isCollocated());
assertFalse(io.connectionProperties().isEnforceJoinOrder());
- assertFalse(io.connectionProperties().isLazy());
+ assertEquals(DFLT_LAZY, io.connectionProperties().isLazy());
assertFalse(io.connectionProperties().isDistributedJoins());
assertFalse(io.connectionProperties().isReplicatedOnly());
}
@@ -168,7 +169,7 @@ public class JdbcThinDataSourceSelfTest extends
JdbcThinAbstractSelfTest {
ids.setAutoCloseServerCursor(true);
ids.setCollocated(true);
ids.setEnforceJoinOrder(true);
- ids.setLazy(true);
+ ids.setLazy(!DFLT_LAZY);
ids.setDistributedJoins(true);
ids.setReplicatedOnly(true);
@@ -178,7 +179,7 @@ public class JdbcThinDataSourceSelfTest extends
JdbcThinAbstractSelfTest {
assertTrue(io.connectionProperties().isAutoCloseServerCursor());
assertTrue(io.connectionProperties().isCollocated());
assertTrue(io.connectionProperties().isEnforceJoinOrder());
- assertTrue(io.connectionProperties().isLazy());
+ assertEquals(!DFLT_LAZY, io.connectionProperties().isLazy());
assertTrue(io.connectionProperties().isDistributedJoins());
assertTrue(io.connectionProperties().isReplicatedOnly());
}
diff --git
a/modules/clients/src/test/java/org/apache/ignite/qa/query/WarningOnBigQueryResultsTest.java
b/modules/clients/src/test/java/org/apache/ignite/qa/query/WarningOnBigQueryResultsTest.java
index bc8768a3e96..4fd2df85253 100644
---
a/modules/clients/src/test/java/org/apache/ignite/qa/query/WarningOnBigQueryResultsTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/qa/query/WarningOnBigQueryResultsTest.java
@@ -311,7 +311,7 @@ public class WarningOnBigQueryResultsTest extends
WarningOnBigQueryResultsBaseTe
assertFalse(listener(grid(0)).distributedJoin);
assertFalse(listener(grid(1)).distributedJoin);
- assertFalse(listener(grid(0)).lazy);
- assertFalse(listener(grid(1)).lazy);
+ assertTrue(listener(grid(0)).lazy);
+ assertTrue(listener(grid(1)).lazy);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
index a92cc36d38a..9096ff4c40d 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
@@ -59,7 +59,7 @@ public class SqlFieldsQuery extends Query<List<?>> {
/** Do not remove. For tests only. */
@SuppressWarnings("NonConstantFieldWithUpperCaseName")
- private static boolean DFLT_LAZY;
+ public static boolean DFLT_LAZY = true;
/** SQL Query. */
private String sql;
@@ -83,7 +83,10 @@ public class SqlFieldsQuery extends Query<List<?>> {
/** */
private boolean replicatedOnly;
- /** Lazy mode is default since Ignite v.2.8. */
+ /**
+ * Lazy mode is default since Ignite v.2.8.
+ * @deprecated Use {@link #setPageSize(int)} instead.
+ */
private boolean lazy = DFLT_LAZY;
/** Partitions for query */
@@ -322,18 +325,19 @@ public class SqlFieldsQuery extends Query<List<?>> {
/**
* Sets lazy query execution flag.
* <p>
- * By default Ignite attempts to fetch the whole query result set to
memory and send it to the client. For small
+ * If {@code lazy=false} Ignite will attempt to fetch the whole query
result set to memory and send it to the client. For small
* and medium result sets this provides optimal performance and minimize
duration of internal database locks, thus
* increasing concurrency.
* <p>
* If result set is too big to fit in available memory this could lead to
excessive GC pauses and even
- * OutOfMemoryError. Use this flag as a hint for Ignite to fetch result
set lazily, thus minimizing memory
+ * {@link OutOfMemoryError}. Use this flag as a hint for Ignite to fetch
result set lazily, thus minimizing memory
* consumption at the cost of moderate performance hit.
* <p>
- * Defaults to {@code false}, meaning that the whole result set is fetched
to memory eagerly.
+ * Defaults to {@code true}, meaning that the only first page of result
set is fetched to memory.
*
* @param lazy Lazy query execution flag.
* @return {@code this} For chaining.
+ * @deprecated Use {@link #setPageSize(int)} instead.
*/
public SqlFieldsQuery setLazy(boolean lazy) {
this.lazy = lazy;
@@ -347,6 +351,7 @@ public class SqlFieldsQuery extends Query<List<?>> {
* See {@link #setLazy(boolean)} for more information.
*
* @return Lazy flag.
+ * @deprecated Use {@link #getPageSize()} instead.
*/
public boolean isLazy() {
return lazy;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
index 91759a03c3d..de888ca6f07 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
@@ -31,6 +31,7 @@ import
org.apache.ignite.internal.processors.query.NestedTxMode;
import org.apache.ignite.internal.util.HostAndPortRange;
import org.apache.ignite.internal.util.typedef.F;
import org.jetbrains.annotations.Nullable;
+import static org.apache.ignite.cache.query.SqlFieldsQuery.DFLT_LAZY;
/**
* Holds JDBC connection properties.
@@ -86,7 +87,7 @@ public class ConnectionPropertiesImpl implements
ConnectionProperties, Serializa
/** Lazy query execution property. */
private BooleanProperty lazy = new BooleanProperty(
- "lazy", "Enable lazy query execution", false, false);
+ "lazy", "Enable lazy query execution", DFLT_LAZY, false);
/** Socket send buffer size property. */
private IntegerProperty socketSendBuffer = new IntegerProperty(
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java
index fca37f422f3..1916ed686e9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java
@@ -93,6 +93,7 @@ import static
org.apache.ignite.IgniteJdbcDriver.PROP_STREAMING_FLUSH_FREQ;
import static
org.apache.ignite.IgniteJdbcDriver.PROP_STREAMING_PER_NODE_BUF_SIZE;
import static
org.apache.ignite.IgniteJdbcDriver.PROP_STREAMING_PER_NODE_PAR_OPS;
import static org.apache.ignite.IgniteJdbcDriver.PROP_TX_ALLOWED;
+import static org.apache.ignite.cache.query.SqlFieldsQuery.DFLT_LAZY;
import static org.apache.ignite.internal.jdbc2.JdbcUtils.convertToSqlException;
import static
org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode.createJdbcSqlException;
@@ -223,7 +224,7 @@ public class JdbcConnection implements Connection {
collocatedQry =
Boolean.parseBoolean(props.getProperty(PROP_COLLOCATED));
distributedJoins =
Boolean.parseBoolean(props.getProperty(PROP_DISTRIBUTED_JOINS));
enforceJoinOrder =
Boolean.parseBoolean(props.getProperty(PROP_ENFORCE_JOIN_ORDER));
- lazy = Boolean.parseBoolean(props.getProperty(PROP_LAZY));
+ lazy = Boolean.parseBoolean(props.getProperty(PROP_LAZY,
String.valueOf(DFLT_LAZY)));
txAllowed = Boolean.parseBoolean(props.getProperty(PROP_TX_ALLOWED));
stream = Boolean.parseBoolean(props.getProperty(PROP_STREAMING));
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index 24dc627847a..221cfbd06d3 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -17,6 +17,7 @@
package org.apache.ignite.testsuites;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.internal.processors.cache.AffinityAliasKeyTest;
import
org.apache.ignite.internal.processors.cache.AffinityKeyNameAndValueFieldNameConflictTest;
import
org.apache.ignite.internal.processors.cache.CacheOffheapBatchIndexingMultiTypeTest;
@@ -154,6 +155,8 @@ import
org.apache.ignite.sqltests.CheckWarnJoinPartitionedTables;
import org.apache.ignite.sqltests.PartitionedSqlTest;
import org.apache.ignite.sqltests.ReplicatedSqlCustomPartitionsTest;
import org.apache.ignite.sqltests.ReplicatedSqlTest;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -338,4 +341,9 @@ import org.junit.runners.Suite;
})
public class IgniteBinaryCacheQueryTestSuite {
+ /** Setup lazy mode default. */
+ @BeforeClass
+ public static void setupLazy() {
+ GridTestUtils.setFieldValue(SqlFieldsQuery.class, "DFLT_LAZY", false);
+ }
}
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
index 5ee87132acc..63c332d0e77 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
@@ -17,6 +17,7 @@
package org.apache.ignite.testsuites;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
import
org.apache.ignite.internal.processors.cache.CacheScanPartitionQueryFallbackSelfTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheCrossCacheJoinRandomTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheObjectKeyIndexingSelfTest;
@@ -62,6 +63,8 @@ import
org.apache.ignite.internal.processors.query.SqlIndexConsistencyAfterInter
import
org.apache.ignite.internal.processors.query.SqlTwoCachesInGroupWithSameEntryTest;
import
org.apache.ignite.internal.processors.query.WrongQueryEntityFieldTypeTest;
import
org.apache.ignite.internal.processors.query.timeout.DefaultQueryTimeoutTestSuite;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -137,4 +140,9 @@ import org.junit.runners.Suite;
})
public class IgniteBinaryCacheQueryTestSuite2 {
+ /** Setup lazy mode default. */
+ @BeforeClass
+ public static void setupLazy() {
+ GridTestUtils.setFieldValue(SqlFieldsQuery.class, "DFLT_LAZY", false);
+ }
}
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
index 17dabe3b376..da53de60f37 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java
@@ -17,6 +17,7 @@
package org.apache.ignite.testsuites;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
import
org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndexKeyTypeRegistryTest;
import org.apache.ignite.internal.cdc.CacheEventsCdcTest;
import org.apache.ignite.internal.cdc.CdcIndexRebuildTest;
@@ -163,8 +164,10 @@ import
org.apache.ignite.internal.processors.sql.IgniteSQLColumnConstraintsTest;
import
org.apache.ignite.internal.processors.sql.IgniteTransactionSQLColumnConstraintTest;
import org.apache.ignite.internal.sql.SqlParserUserSelfTest;
import
org.apache.ignite.spi.communication.tcp.GridOrderedMessageCancelSelfTest;
+import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.util.KillCommandsMXBeanTest;
import org.apache.ignite.util.KillCommandsSQLTest;
+import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -381,4 +384,9 @@ import org.junit.runners.Suite;
CdcIndexRebuildTest.class
})
public class IgniteBinaryCacheQueryTestSuite3 {
+ /** Setup lazy mode default. */
+ @BeforeClass
+ public static void setupLazy() {
+ GridTestUtils.setFieldValue(SqlFieldsQuery.class, "DFLT_LAZY", false);
+ }
}
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java
index d1ff90961a1..3d2732584b3 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java
@@ -17,6 +17,7 @@
package org.apache.ignite.testsuites;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.internal.metric.SqlStatisticsUserQueriesFastTest;
import org.apache.ignite.internal.metric.SqlStatisticsUserQueriesLongTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxMultiNodeSelfTest;
@@ -41,6 +42,8 @@ import
org.apache.ignite.internal.processors.query.h2.twostep.RetryCauseMessageS
import
org.apache.ignite.internal.processors.query.h2.twostep.TableViewSubquerySelfTest;
import org.apache.ignite.sqltests.SqlByteArrayTest;
import org.apache.ignite.sqltests.SqlDataTypesCoverageTests;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -94,4 +97,9 @@ import org.junit.runners.Suite;
})
public class IgniteBinaryCacheQueryTestSuite4 {
+ /** Setup lazy mode default. */
+ @BeforeClass
+ public static void setupLazy() {
+ GridTestUtils.setFieldValue(SqlFieldsQuery.class, "DFLT_LAZY", false);
+ }
}
