gg-21461 #180
Open
gg-21461 #180
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit b5f3f72)
(cherry picked from commit 7883609)
(cherry picked from commit 7043f6c)
(cherry picked from commit 1a0fd3e)
…er doesn't configured explicitly. (cherry picked from commit c8bd480)
(cherry-picked from commit #fa8e5da60546bf2e46cc16b13baf0a21c394e7b6)
(cherry picked from commit cafab0d) # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java # modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
…ence.GridCacheOffheapManager#restorePartitionStates method. (cherry picked from commit 621f6af)
…) doesn't work. (cherry picked from commit 9350760)
…e-ignite into ignite-2.5-master
…asicIndexSelfTest
…ame make DR paused in case of persistence. (cherry picked from commit e093716)
…ueries. (cherry picked from commit 03283da)
…e same name make DR paused in case of persistence." This reverts commit 3616b6a.
…Left flaky failed on TC (cherry picked from commit fe0ec74)
…ctivateSimple_5_Servers_5_Clients_FromClient flaky failed on TC (cherry picked from commit 2578931)
…ormation about cache group. (cherry picked from commit 82409a9)
…or all x.x-master branches
… ignite system properties (cherry picked from commit 05cdf46)
… called (cherry picked from commit d1b0787)
…ientInForceServerModeStopsOnExchangeHistoryExhaustion is flaky.
… from 8.4.9 to 8.5.7 if POJO primary key is used
(cherry picked from commit 7baa018)
…es and test coverage. Phase #1.
…message, if applicable. (cherry picked from commit 4b045f5)
…about group and cache id. (cherry picked from commit f3017ea)
(cherry picked from commit f7f0b89)
(cherry picked from commit f7f0b89)
(cherry picked from commit 4f05cd9)
(cherry picked from commit fb2553a)
…ce.file.FilePageStore instances (cherry picked from commit 806b1b6)
(cherry picked from commit 0a17bb9)
…p for experemental commands. (cherry picked from commit 86ee0b5)
…pi without IgniteConfiguration.setIncludeEventTypes(EventType.EVT_TASK_FINISHED, EventType.EVT_TASK_FAILED) leads to memory leak - Fixed apache#6690. (apache#293) (cherry picked from commit e2d6632)
(cherry picked from commit d8753ae)
pavlukhin
reviewed
Jul 23, 2019
...java/org/apache/ignite/internal/processors/query/h2/database/H2TreeInlineObjectDetector.java
Outdated
Show resolved
Hide resolved
...java/org/apache/ignite/internal/processors/query/h2/database/H2TreeInlineObjectDetector.java
Outdated
Show resolved
Hide resolved
...java/org/apache/ignite/internal/processors/query/h2/database/H2TreeInlineObjectDetector.java
Outdated
Show resolved
Hide resolved
...java/org/apache/ignite/internal/processors/query/h2/database/H2TreeInlineObjectDetector.java
Outdated
Show resolved
Hide resolved
...java/org/apache/ignite/internal/processors/query/h2/database/H2TreeInlineObjectDetector.java
Outdated
Show resolved
Hide resolved
...java/org/apache/ignite/internal/processors/query/h2/database/H2TreeInlineObjectDetector.java
Outdated
Show resolved
Hide resolved
...java/org/apache/ignite/internal/processors/query/h2/database/H2TreeInlineObjectDetector.java
Show resolved
Hide resolved
...java/org/apache/ignite/internal/processors/query/h2/database/H2TreeInlineObjectDetector.java
Outdated
Show resolved
Hide resolved
| byte[] originalObjBytes = val.getBytesNoCopy(); | ||
|
|
||
| // read size more then available space or more then origin length | ||
| if(len > inlineSize - fieldOff - 3 || len > originalObjBytes.length){ |
There was a problem hiding this comment.
len > originalObjBytes.length seems to mean unexpected (garbage) data in current position. Cannot we do comparison in branch if (type == Value.JAVA_OBJECT) using following strategy:
- Prepare (virtually) an expected byte content which is saved by regular inline procedures.
- Compare that content with bytes stored in the index page.
- Exact match means that JAVA_OBJECT inline is (almost 100%) supported. Otherwise it is not (tree corruption is possible, might be warning is a good idea). In both cases we can finish tree scan here.
Also using of InlineIndexHelper.compare is dangerous below, because it is more broad method and it is used in different places. But here we are just solving a compatibility issue from certain point in history.
There was a problem hiding this comment.
for your comparison proposal - by fact it do the same way.
objections to use InlineIndexHelper.compare don't understand. Let's discuss internally.
...java/org/apache/ignite/internal/processors/query/h2/database/H2TreeInlineObjectDetector.java
Show resolved
Hide resolved
pavlukhin
reviewed
Jul 24, 2019
| @@ -148,7 +167,9 @@ protected H2Tree( | |||
| if (metaInfo.useUnwrappedPk()) | |||
| throw new IgniteCheckedException("Unwrapped PK is not supported by current version"); | |||
|
|
|||
| this.inlineSize = metaInfo.inlineSize(); | |||
| inlineSize = metaInfo.inlineSize(); | |||
There was a problem hiding this comment.
For my understanding. How is it possible that inlineSize passed to a constructor is not equal to metaInfo.inlineSize()?
There was a problem hiding this comment.
inlinesize can be different due to use different set of columns to calculate it ( as example before support JAVA_OBJECT type and after)
There was a problem hiding this comment.
@pavlukhin see org.apache.ignite.internal.processors.query.h2.database.H2TreeIndex#computeInlineSize
pavlukhin
reviewed
Jul 24, 2019
| for (InlineIndexHelper ih : inlineHelpers) { | ||
| if (fieldOff >= inlineSize) | ||
| return false; | ||
|
|
||
| if (ih.type() != Value.JAVA_OBJECT) { | ||
| if(ih.size() < 0) |
pavlukhin
reviewed
Jul 24, 2019
...java/org/apache/ignite/internal/processors/query/h2/database/H2TreeInlineObjectDetector.java
Outdated
Show resolved
Hide resolved
pavlukhin
reviewed
Jul 24, 2019
| byte[] inlineBytes = PageUtils.getBytes(pageAddr, off + fieldOff + 3, len); | ||
|
|
||
| for (int i = 0; i < len; i++) { | ||
| if (inlineBytes[i] == originalObjBytes[i]) |
There was a problem hiding this comment.
Seems more straightforward to me:
for (int i = 0; i < len; i++) {
if (inlineBytes[i] != originalObjBytes[i]) {
inlineObjectSupportedDecision(false, i + " byte compare");
return true;
}
}
pavlukhin
reviewed
Jul 24, 2019
| for (InlineIndexHelper ih : inlineHelpers) { | ||
| if (fieldOff >= inlineSize) | ||
| return false; | ||
|
|
||
| if (ih.type() != Value.JAVA_OBJECT) { | ||
| if(ih.size() < 0) | ||
| varLenPresents=true; |
There was a problem hiding this comment.
I suppose we can initialize it constructor.
There was a problem hiding this comment.
yes, but no reason to do it
vveider
force-pushed
the
ignite-2.5-master
branch
from
9f0de85
to
c77bc90
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
gg-21461