aturoczy commented on code in PR #5037:
URL: https://github.com/apache/hive/pull/5037#discussion_r1466719874
##########
ql/src/java/org/apache/hadoop/hive/ql/plan/mapper/PlanMapper.java:
##########
@@ -200,54 +199,30 @@ public void merge(Object o1, Object o2) {
}
private void link(Object o1, Object o2, boolean mayMerge) {
-
- Set<Object> keySet = Collections.newSetFromMap(new IdentityHashMap<Object,
Boolean>());
- keySet.add(o1);
- keySet.add(o2);
- keySet.add(getKeyFor(o1));
- keySet.add(getKeyFor(o2));
-
- Set<EquivGroup> mGroups = Collections.newSetFromMap(new
IdentityHashMap<EquivGroup, Boolean>());
-
- for (Object object : keySet) {
- EquivGroup group = objectMap.get(object);
- if (group != null) {
- mGroups.add(group);
- }
- }
- if (mGroups.size() > 1) {
+ final EquivGroup group1 = objectMap.get(o1);
+ final EquivGroup group2 = objectMap.get(o2);
+ if (group1 != null && group2 != null && group1 != group2) {
Review Comment:
I would change the logic a bit. In my mind, from Clean Code perspective if
you check the true path it is easier to process and maintain the code.
i.e:
if (group1 == null || group2 == null || group1 == group2)
return;
##########
ql/src/java/org/apache/hadoop/hive/ql/plan/mapper/PlanMapper.java:
##########
@@ -200,54 +199,30 @@ public void merge(Object o1, Object o2) {
}
private void link(Object o1, Object o2, boolean mayMerge) {
-
- Set<Object> keySet = Collections.newSetFromMap(new IdentityHashMap<Object,
Boolean>());
- keySet.add(o1);
- keySet.add(o2);
- keySet.add(getKeyFor(o1));
- keySet.add(getKeyFor(o2));
-
- Set<EquivGroup> mGroups = Collections.newSetFromMap(new
IdentityHashMap<EquivGroup, Boolean>());
-
- for (Object object : keySet) {
- EquivGroup group = objectMap.get(object);
- if (group != null) {
- mGroups.add(group);
- }
- }
- if (mGroups.size() > 1) {
+ final EquivGroup group1 = objectMap.get(o1);
+ final EquivGroup group2 = objectMap.get(o2);
+ if (group1 != null && group2 != null && group1 != group2) {
if (!mayMerge) {
throw new RuntimeException("equivalence mapping violation");
}
EquivGroup newGrp = new EquivGroup();
newGrp.add(o1);
newGrp.add(o2);
- for (EquivGroup g : mGroups) {
- for (Object o : g.members) {
- newGrp.add(o);
- }
- }
+ group1.members.forEach(newGrp::add);
+ group2.members.forEach(newGrp::add);
groups.add(newGrp);
- groups.removeAll(mGroups);
+ groups.remove(group1);
+ groups.remove(group2);
} else {
- EquivGroup targetGroup = mGroups.isEmpty() ? new EquivGroup() :
mGroups.iterator().next();
+ EquivGroup targetGroup = group1 != null ? group1 : (group2 != null ?
group2 : new EquivGroup());
Review Comment:
The logic is great, but my eyes hurted with this amount of ? : operator :)
##########
ql/src/java/org/apache/hadoop/hive/ql/plan/mapper/PlanMapper.java:
##########
@@ -200,54 +199,30 @@ public void merge(Object o1, Object o2) {
}
private void link(Object o1, Object o2, boolean mayMerge) {
-
- Set<Object> keySet = Collections.newSetFromMap(new IdentityHashMap<Object,
Boolean>());
- keySet.add(o1);
- keySet.add(o2);
- keySet.add(getKeyFor(o1));
- keySet.add(getKeyFor(o2));
-
- Set<EquivGroup> mGroups = Collections.newSetFromMap(new
IdentityHashMap<EquivGroup, Boolean>());
-
- for (Object object : keySet) {
- EquivGroup group = objectMap.get(object);
- if (group != null) {
- mGroups.add(group);
- }
- }
- if (mGroups.size() > 1) {
+ final EquivGroup group1 = objectMap.get(o1);
+ final EquivGroup group2 = objectMap.get(o2);
+ if (group1 != null && group2 != null && group1 != group2) {
if (!mayMerge) {
throw new RuntimeException("equivalence mapping violation");
Review Comment:
If we touch this change please the exception message to Uppercase the first
word
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
