Skip to content

Commit 561a3bc

Browse files
committed
review fixes
1 parent 2b29ff7 commit 561a3bc

16 files changed

Lines changed: 43 additions & 30 deletions

File tree

docs/_docs/SQL/sql-tuning.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ Avoid having too many columns in the result set of a `SELECT` query. Due to limi
5252

5353
== Lazy Loading
5454

55-
Ignite always operates in lazy loading mode. Query results are not loaded entirely into memory — data is streamed to
56-
the client in pages as the result set is iterated. The page size determines how many rows are fetched per network round
57-
trip, allowing you to balance memory consumption and performance and eliminating the risk of prolonged GC pauses
58-
and `OutOfMemoryError` exceptions for large result sets.
55+
Ignite always operates in lazy loading mode. Query results are not loaded entirely into memory when possible. Data
56+
is streamed to the client in pages as the result set is iterated. The page size determines how many rows are fetched
57+
per network round trip, allowing you to balance memory consumption and performance and eliminating the risk of
58+
prolonged GC pauses and `OutOfMemoryError` exceptions for large result sets.
5959

6060
== Querying Colocated Data
6161

docs/_docs/binary-client-protocol/sql-and-scan-queries.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ UPDATE = 2
267267
|bool| Replicated only - Whether query contains only replicated tables or not.
268268
|bool| Enforce join order.
269269
|bool| Collocated - Whether your data is co-located or not.
270+
|bool| [Deprecated] Lazy query execution. This flag is not used anymore on server side.
270271
|long| Timeout (milliseconds).
271272
|bool| Include field names.
272273
|===

docs/_docs/perf-and-troubleshooting/sql-tuning.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ with 100+ columns may perform worse than expected.
7878

7979
== Lazy Loading
8080

81-
Ignite always operates in lazy loading mode. Query results are not loaded entirely into memory — data is streamed to
82-
the client in pages as the result set is iterated. The page size determines how many rows are fetched per network round
83-
trip, allowing you to balance memory consumption and performance and eliminating the risk of prolonged GC pauses
84-
and `OutOfMemoryError` exceptions for large result sets.
81+
Ignite always operates in lazy loading mode. Query results are not loaded entirely into memory when possible. Data
82+
is streamed to the client in pages as the result set is iterated. The page size determines how many rows are fetched
83+
per network round trip, allowing you to balance memory consumption and performance and eliminating the risk of
84+
prolonged GC pauses and `OutOfMemoryError` exceptions for large result sets.
8585

8686
== Querying Colocated Data
8787

modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,13 @@ public void testSqlHintsSemicolon() throws Exception {
453453
* @throws Exception If failed.
454454
*/
455455
private void assertHints(
456-
Connection conn, boolean distributedJoins, boolean enforceJoinOrder, boolean collocated,
457-
boolean replicatedOnly, boolean skipReducerOnUpdate, boolean partitionAwarenessEnabled
456+
Connection conn,
457+
boolean distributedJoins,
458+
boolean enforceJoinOrder,
459+
boolean collocated,
460+
boolean replicatedOnly,
461+
boolean skipReducerOnUpdate,
462+
boolean partitionAwarenessEnabled
458463
) throws Exception {
459464
for (JdbcThinTcpIo io: ios(conn)) {
460465
assertEquals(distributedJoins, io.connectionProperties().isDistributedJoins());

modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,6 @@ private Query readFieldsQuery(BinaryReaderEx reader) {
14911491

14921492
boolean distrJoins = reader.readBoolean();
14931493
boolean enforceJoinOrder = reader.readBoolean();
1494-
reader.readBoolean(); // Lazy flag.
14951494
int timeout = reader.readInt();
14961495
boolean replicated = reader.readBoolean();
14971496
boolean collocated = reader.readBoolean();

modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2QueryInfo.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ public class H2QueryInfo implements TrackableQuery {
6464
/** Join batch enabled (distributed join). */
6565
private final boolean distributedJoin;
6666

67-
/** Lazy mode. */
68-
private final boolean lazy;
69-
7067
/** Prepared statement. */
7168
private final Prepared stmt;
7269

@@ -108,7 +105,6 @@ public H2QueryInfo(QueryType type, PreparedStatement stmt, String sql, UUID node
108105

109106
enforceJoinOrder = s.isForceJoinOrder();
110107
distributedJoin = s.isJoinBatchEnabled();
111-
lazy = s.isLazyQueryExecution();
112108
this.stmt = GridSqlQueryParser.prepared(stmt);
113109
}
114110
catch (SQLException e) {

modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/RegisteredQueryCursor.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,13 @@ public class RegisteredQueryCursor<T> extends QueryCursorImpl<T> {
6868
* @param qryId Registered running query id.
6969
* @param tracing Tracing processor.
7070
*/
71-
public RegisteredQueryCursor(Iterable<T> iterExec, GridQueryCancel cancel, RunningQueryManager runningQryMgr,
72-
long qryId, Tracing tracing) {
71+
public RegisteredQueryCursor(
72+
Iterable<T> iterExec,
73+
GridQueryCancel cancel,
74+
RunningQueryManager runningQryMgr,
75+
long qryId,
76+
Tracing tracing
77+
) {
7378
super(iterExec, cancel, true);
7479

7580
assert runningQryMgr != null;

modules/indexing/src/test/java/org/apache/ignite/client/FunctionalQueryTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,13 @@ public void testQueries() throws Exception {
125125
* @param expSize The size of the expected results.
126126
* @param exp Expected results.
127127
*/
128-
private void checkSqlFieldsQuery(ClientCache<Integer, Person> cache, int minId, int pageSize, int expSize,
129-
Map<Integer, Person> exp) {
128+
private void checkSqlFieldsQuery(
129+
ClientCache<Integer, Person> cache,
130+
int minId,
131+
int pageSize,
132+
int expSize,
133+
Map<Integer, Person> exp
134+
) {
130135
SqlFieldsQuery qry = new SqlFieldsQuery("select id, name from Person where id >= ?")
131136
.setArgs(minId)
132137
.setPageSize(pageSize);

modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/LongRunningQueryTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ private static CacheConfiguration cacheConfig(String name, Class<?>... idxTypes)
194194
*
195195
*/
196196
@Test
197-
public void testLongDistributedLazy() {
197+
public void testLongDistributed() {
198198
local = false;
199199

200200
checkLongRunning();
@@ -205,7 +205,7 @@ public void testLongDistributedLazy() {
205205
*
206206
*/
207207
@Test
208-
public void testLongDistributedLazyWithMergeTable() {
208+
public void testLongDistributedWithMergeTable() {
209209
local = false;
210210

211211
withMergeTable = true;
@@ -222,7 +222,7 @@ public void testLongDistributedLazyWithMergeTable() {
222222
*
223223
*/
224224
@Test
225-
public void testLongLocalLazy() {
225+
public void testLongLocal() {
226226
local = true;
227227

228228
checkLongRunning();
@@ -330,21 +330,21 @@ public void testLongRunningDeleteWithSubqueryLocal() {
330330
* the execution of distributed queries.
331331
*/
332332
@Test
333-
public void testDistributedLazyWithExternalWait() {
333+
public void testDistributedWithExternalWait() {
334334
local = false;
335335

336-
checkLazyWithExternalWait();
336+
checkWithExternalWait();
337337
}
338338

339339
/**
340340
* Test checks that no long-running queries warnings are printed in case of external waits during
341341
* the execution of local queries.
342342
*/
343343
@Test
344-
public void testlocalLazyWithExternalWait() {
344+
public void testLocalWithExternalWait() {
345345
local = true;
346346

347-
checkLazyWithExternalWait();
347+
checkWithExternalWait();
348348
}
349349

350350
/**
@@ -652,7 +652,7 @@ private FieldsQueryCursor<List<?>> sql(String cacheName, String sql, Object... a
652652
}
653653

654654
/** */
655-
public void checkLazyWithExternalWait() {
655+
public void checkWithExternalWait() {
656656
pageSize = 1;
657657

658658
LogListener lsnr = LogListener

modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/oom/AbstractQueryOOMTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ public void testHeavySortByNotIndexNotLazy() throws Exception {
271271
* @throws Exception On error.
272272
*/
273273
@Test
274-
public void testHeavyGroupByPkLazy() throws Exception {
274+
public void testHeavyGroupByPk() throws Exception {
275275
checkQuery("SELECT id, sum(val) from test GROUP BY id", KEY_CNT, true);
276276
}
277277

0 commit comments

Comments
 (0)