IGNITE-23554 ScanQuery code cleanup #11645
Conversation
| * Checks if transaction mode supported for transaction aware queries. | ||
| * @param isolation Transaction isolation to check. | ||
| */ | ||
| public static void ensureTransactionModeSupported(TransactionIsolation isolation) { |
There was a problem hiding this comment.
Only one usage. Do we really need this method? Can we keep it inlined?
There was a problem hiding this comment.
The second usage appear in #11580
| try { | ||
| Integer part = qry.partition(); | ||
|
|
||
| if (part != null && (part < 0 || part >= cctx.affinity().partitions())) | ||
| return new GridEmptyCloseableIterator() { | ||
| @Override public void close() throws IgniteCheckedException { | ||
| if (intFilter != null) |
There was a problem hiding this comment.
Why we don't need to close qry.scanFilter() anymore?
There was a problem hiding this comment.
Because, here we don't allocate any resources.
It required and happens only inside ScanQueryIterator.
ScanQueryIterator correctly manage those resources inside.
You are correct. Fixed.
| @@ -869,36 +852,6 @@ private GridCloseableIterator scanIterator(final CacheQuery<?> qry, IgniteClosur | |||
| return iter; | |||
| } | |||
| catch (IgniteCheckedException | RuntimeException e) { | |||
| if (intFilter != null) | |||
There was a problem hiding this comment.
qry.scanFilter() is not closed now (for example, when we cant reserve locPart)
There was a problem hiding this comment.
Good catch. Fixed. Thanks.
|
|
||
| /** */ | ||
| static void closeFilter(IgniteBiPredicate<?, ?> filter) { | ||
| if (filter instanceof PlatformCacheEntryFilter) |
There was a problem hiding this comment.
Looks like after sendboxing PlatformCacheEntryFilter is not instanceof PlatformCacheEntryFilter anymore
There was a problem hiding this comment.
Good catch. Thanks. Fixed.
...e/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
Show resolved
Hide resolved
.../core/src/main/java/org/apache/ignite/internal/processors/cache/query/ScanQueryIterator.java
Outdated
Show resolved
Hide resolved
nizhikov
force-pushed
the
IGNITE-23554
branch
from
f6cb41e to
896b1c6
Compare
|
Thank you for submitting the pull request to the Apache Ignite.
In order to streamline the review of the contribution
we ask you to ensure the following steps have been taken:
The Contribution Checklist
The description explains WHAT and WHY was made instead of HOW.
The following pattern must be used:
IGNITE-XXXX Change summarywhereXXXX- number of JIRA issue.(see the Maintainers list)
the
green visaattached to the JIRA ticket (see TC.Bot: Check PR)Notes
If you need any help, please email [email protected] or ask anу advice on http://asf.slack.com #ignite channel.