Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BugFix] fix expensive Partition.equals #34961

Merged
merged 1 commit into from
Nov 14, 2023

Conversation

murphyatwork
Copy link
Contributor

@murphyatwork murphyatwork commented Nov 14, 2023

Why I'm doing:

  • The Partition.equals is too expensive to used as map key

What I'm doing:

  • Avoid use Partition as Map key
  • Add Partition.id to hashCode

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.2
    • 3.1
    • 3.0
    • 2.5

@@ -1429,7 +1432,7 @@ private void addPartitions(Database db, String tableName, List<PartitionDesc> pa
checkPartitionType(partitionInfo);

// update partition info
updatePartitionInfo(partitionInfo, partitionMap, existPartitionNameSet, addPartitionClause, olapTable);
updatePartitionInfo(partitionInfo, newPartitions, existPartitionNameSet, addPartitionClause, olapTable);

colocateTableIndex.updateLakeTableColocationInfo(olapTable, true /* isJoin */,
null /* expectGroupId */);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The most risky bug in this code is:
Incorrect usage of Partition and PartitionDesc pairs after changing from a Map to a List<Pair<Partition, PartitionDesc>>.

You can modify the code like this:

// Wherever partitionMap was used, replace it with partitionList using appropriate methods
// For example, you would access the entries with something like this:
for (Pair<Partition, PartitionDesc> entry : partitionList) {
    Partition partition = entry.first;
    PartitionDesc partitionDesc = entry.second;
    // Use partition and partitionDesc as needed
}

Make sure to review the entire code and replace all usages of the old partitionMap with the new partitionList, accessing the items through their .first and .second properties.

Signed-off-by: Murphy <mofei@starrocks.com>
@murphyatwork murphyatwork force-pushed the murphy_fix_partition_map branch from efb33e5 to 62b27e3 Compare November 14, 2023 07:10
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 7 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

warning The version of Java (11.0.21) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

@murphyatwork murphyatwork enabled auto-merge (squash) November 14, 2023 07:57
Copy link

[BE Incremental Coverage Report]

pass : 0 / 0 (0%)

Copy link

[FE Incremental Coverage Report]

pass : 22 / 24 (91.67%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 com/starrocks/catalog/Partition.java 2 4 50.00% [580, 596]
🔵 com/starrocks/catalog/ListPartitionInfo.java 3 3 100.00% []
🔵 com/starrocks/catalog/RangePartitionInfo.java 4 4 100.00% []
🔵 com/starrocks/server/LocalMetastore.java 13 13 100.00% []

@murphyatwork murphyatwork merged commit 5cc830c into StarRocks:main Nov 14, 2023
Copy link

@Mergifyio backport branch-3.2

@github-actions github-actions bot removed the 3.2 label Nov 14, 2023
Copy link

@Mergifyio backport branch-3.1

@github-actions github-actions bot removed the 3.1 label Nov 14, 2023
Copy link
Contributor

mergify bot commented Nov 14, 2023

backport branch-3.2

✅ Backports have been created

Copy link
Contributor

mergify bot commented Nov 14, 2023

backport branch-3.1

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Nov 14, 2023
Signed-off-by: Murphy <mofei@starrocks.com>
(cherry picked from commit 5cc830c)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/catalog/Partition.java
#	fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java
mergify bot pushed a commit that referenced this pull request Nov 14, 2023
Signed-off-by: Murphy <mofei@starrocks.com>
(cherry picked from commit 5cc830c)
wanpengfei-git pushed a commit that referenced this pull request Nov 14, 2023
Signed-off-by: Murphy <mofei@starrocks.com>
(cherry picked from commit 5cc830c)
wanpengfei-git pushed a commit that referenced this pull request Nov 14, 2023
Signed-off-by: Murphy <mofei@starrocks.com>
(cherry picked from commit 5cc830c)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/catalog/Partition.java
#	fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants