Skip to content

Commit 199caaa

Browse files
committed
typo fix
1 parent c0194c9 commit 199caaa

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionContext.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public class ExecutionContext<Row> extends AbstractQueryContext implements DataC
146146
private Object[] correlations = new Object[16];
147147

148148
/** Modified entries holder. */
149-
@Nullable private final TxAwareModifiedEntriesHolder mofiedEntriesHolder;
149+
@Nullable private final TxAwareModifiedEntriesHolder modifiedEntriesHolder;
150150

151151
/**
152152
* @param qctx Parent base query context.
@@ -188,7 +188,7 @@ public ExecutionContext(
188188
this.params = params;
189189
this.timeout = timeout;
190190
this.qryTxEntries = qryTxEntries;
191-
this.mofiedEntriesHolder = mofiedEntriesHolder;
191+
this.modifiedEntriesHolder = mofiedEntriesHolder;
192192

193193
startTs = U.currentTimeMillis();
194194

@@ -427,8 +427,8 @@ public void execute(RunnableX task, Consumer<Throwable> onError) {
427427

428428
executor.execute(qryId, fragmentId(), () -> {
429429
try {
430-
if (mofiedEntriesHolder != null)
431-
mofiedEntriesHolder.store(qryTxEntries);
430+
if (modifiedEntriesHolder != null)
431+
modifiedEntriesHolder.store(qryTxEntries);
432432

433433
if (!isCancelled())
434434
task.run();
@@ -437,8 +437,8 @@ public void execute(RunnableX task, Consumer<Throwable> onError) {
437437
onError.accept(e);
438438
}
439439
finally {
440-
if (mofiedEntriesHolder != null)
441-
mofiedEntriesHolder.detach();
440+
if (modifiedEntriesHolder != null)
441+
modifiedEntriesHolder.detach();
442442
}
443443
});
444444
}

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionServiceImpl.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public class ExecutionServiceImpl<Row> extends AbstractService implements Execut
213213
*
214214
* @see TransactionConfiguration#isTxAwareQueriesEnabled()
215215
*/
216-
private TxAwareModifiedEntriesHolder mofiedEntriesHolder;
216+
private TxAwareModifiedEntriesHolder modifiedEntriesHolder;
217217

218218
/**
219219
* @param ctx Kernal.
@@ -487,15 +487,15 @@ public void injectService(InjectResourcesService injectSvc) {
487487
eventManager().addDiscoveryEventListener(discoLsnr, EventType.EVT_NODE_FAILED, EventType.EVT_NODE_LEFT);
488488

489489
iteratorsHolder().init();
490-
mofiedEntriesHolder = new TxAwareModifiedEntriesHolder(U.isTxAwareQueriesEnabled(ctx));
490+
modifiedEntriesHolder = new TxAwareModifiedEntriesHolder(U.isTxAwareQueriesEnabled(ctx));
491491
}
492492

493493
/** {@inheritDoc} */
494494
@Override public void tearDown() {
495495
eventManager().removeDiscoveryEventListener(discoLsnr, EventType.EVT_NODE_FAILED, EventType.EVT_NODE_LEFT);
496496

497497
iteratorsHolder().tearDown();
498-
mofiedEntriesHolder = null;
498+
modifiedEntriesHolder = null;
499499
}
500500

501501
/** */
@@ -528,7 +528,7 @@ private FragmentPlan prepareFragment(BaseQueryContext ctx, String jsonFragment)
528528
ListFieldsQueryCursor<?> cur = mapAndExecutePlan(
529529
qry,
530530
(MultiStepPlan)plan,
531-
mofiedEntriesHolder
531+
modifiedEntriesHolder
532532
);
533533

534534
cur.iterator().hasNext();
@@ -539,7 +539,7 @@ private FragmentPlan prepareFragment(BaseQueryContext ctx, String jsonFragment)
539539
return mapAndExecutePlan(
540540
qry,
541541
(MultiStepPlan)plan,
542-
mofiedEntriesHolder
542+
modifiedEntriesHolder
543543
);
544544

545545
case EXPLAIN:
@@ -641,7 +641,7 @@ private ListFieldsQueryCursor<?> mapAndExecutePlan(
641641
MemoryTracker qryMemoryTracker = qry.createMemoryTracker(memoryTracker, cfg.getQueryMemoryQuota());
642642

643643
final GridNearTxLocal userTx = Commons.queryTransaction(qry.context(), ctx.cache().context());
644-
final Collection<QueryTxEntry> writeEntrs = userTx == null ?
644+
final @Nullable Collection<QueryTxEntry> writeEntries = userTx == null ?
645645
mofiedEntriesHolder.retrieve() : ExecutionContext.transactionChanges(userTx.writeEntries());
646646

647647
ExecutionContext<Row> ectx = new ExecutionContext<>(
@@ -658,7 +658,7 @@ private ListFieldsQueryCursor<?> mapAndExecutePlan(
658658
createIoTracker(locNodeId, qry.localQueryId()),
659659
timeout,
660660
qryParams,
661-
writeEntrs,
661+
writeEntries,
662662
mofiedEntriesHolder);
663663

664664
Node<Row> node = new LogicalRelImplementor<>(ectx, partitionService(), mailboxRegistry(),

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/TxAwareModifiedEntriesHolder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public void store(Collection<QueryTxEntry> items) {
4040
holder.set(items);
4141
}
4242

43-
/** Retirieve entries if applicable. */
44-
public Collection<QueryTxEntry> retrieve() {
43+
/** Retrieve entries if applicable. */
44+
@Nullable public Collection<QueryTxEntry> retrieve() {
4545
if (holder != null)
4646
return holder.get();
4747
else

0 commit comments

Comments
 (0)