Skip to content

HIVE-28874 Incorrect comparison in LlapFixedRegistryImpl #5742

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.

Sign up for GitHub

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

Merged
abstractdog merged 2 commits into from
Jun 19, 2025
Merged

HIVE-28874 Incorrect comparison in LlapFixedRegistryImpl #5742

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46e30a4
HIVE-28874 Incorrect comparison in LlapFixedRegistryImpl
dk2k Apr 2, 2025
42ce5ba
Merge branch 'master' into HIVE-28874
dk2k Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapFixedRegistryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public List<LlapServiceInstance> getAllInstancesOrdered(boolean consistentIndexe
Collections.sort(list, new Comparator<LlapServiceInstance>() {
@Override
public int compare(LlapServiceInstance o1, LlapServiceInstance o2) {
return o2.getWorkerIdentity().compareTo(o2.getWorkerIdentity());
return o1.getWorkerIdentity().compareTo(o2.getWorkerIdentity());
Copy link
Contributor

@SourabhBadhya SourabhBadhya Apr 12, 2025

Choose a reason for hiding this comment

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

Doesn't this change the sorting order? I think now you will see it in ascending order when compared to descending order.

Copy link

@DmKryukov DmKryukov Apr 14, 2025

Choose a reason for hiding this comment

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

Previously there was no order (and inconsistency instead) as o2 was compared to o2 and they are always equal.
Ascending Order (o1.compareTo(o2))
Descending Order (o2.compareTo(o1))
Please let me know if descending order is expected

Copy link
Contributor

@SourabhBadhya SourabhBadhya Apr 14, 2025

Choose a reason for hiding this comment

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

Do we really need this sorting then since it was working without it.

cc @abstractdog Do you think it makes sense to use sorting here?

Copy link
Contributor

@abstractdog abstractdog Jun 15, 2025

Choose a reason for hiding this comment

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

Considering that the comparison was incorrect and FixedServiceInstanceSet failed to comply with any sorting requirements (unlike DynamicServiceInstanceSet, which uses a TreeMap to maintain order), it doesn't really matter whether we fix the sorting or remove it entirely.

However, since the interface implies that some ordering is expected, it's reasonable to fix it now using a simple ascending order, which aligns better with intuitive expectations and brings consistency to the implementation.

}
});
return list;
Expand Down
Loading