fix OrderItem equals logic for #557

apache · Jan 17, 2018 · 87a54b0 · 87a54b0
1 parent a35f887
commit 87a54b0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/...-core/src/main/java/io/shardingjdbc/core/merger/orderby/OrderByStreamResultSetMerger.java b/...-core/src/main/java/io/shardingjdbc/core/merger/orderby/OrderByStreamResultSetMerger.java
@@ -33,14 +33,14 @@
  *
  * @author zhangliang
  */
-@Getter(AccessLevel.PROTECTED)
 public class OrderByStreamResultSetMerger extends AbstractStreamResultSetMerger {
 
-    @Getter(AccessLevel.NONE)
     private final List<OrderItem> orderByItems;
 
+    @Getter(AccessLevel.PROTECTED)
     private final Queue<OrderByValue> orderByValuesQueue;
 
+    @Getter(AccessLevel.PROTECTED)
     private boolean isFirstNext;
 
     public OrderByStreamResultSetMerger(final List<ResultSet> resultSets, final List<OrderItem> orderByItems) throws SQLException {

diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/OrderItem.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/OrderItem.java
@@ -17,12 +17,12 @@
 
 package io.shardingjdbc.core.parsing.parser.context;
 
-import io.shardingjdbc.core.constant.OrderType;
 import com.google.common.base.Optional;
-import lombok.EqualsAndHashCode;
+import io.shardingjdbc.core.constant.OrderType;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Order item.
@@ -31,7 +31,6 @@
  */
 @Getter
 @Setter
-@EqualsAndHashCode
 @ToString
 public final class OrderItem {
 
@@ -92,4 +91,33 @@ public Optional<String> getQualifiedName() {
         }
         return owner.isPresent() ? Optional.of(owner.get() + "." + name.get()) : name;
     }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (null == obj || !(obj instanceof OrderItem)) {
+            return false;
+        }
+        OrderItem orderItem = (OrderItem) obj;
+        return type == orderItem.getType() && (columnLabelEquals(orderItem) || qualifiedNameEquals(orderItem) || indexEquals(orderItem));
+    }
+
+    private boolean qualifiedNameEquals(final OrderItem orderItem) {
+        Optional<String> thisQualifiedName = getQualifiedName();
+        Optional<String> thatQualifiedName = orderItem.getQualifiedName();
+        return thisQualifiedName.isPresent() && thatQualifiedName.isPresent() && thisQualifiedName.get().equalsIgnoreCase(thatQualifiedName.get());
+    }
+
+    private boolean columnLabelEquals(final OrderItem orderItem) {
+        String columnLabel = getColumnLabel();
+        return null != columnLabel && columnLabel.equalsIgnoreCase(orderItem.getColumnLabel());
+    }
+
+    private boolean indexEquals(final OrderItem orderItem) {
+        return -1 != index && index == orderItem.getIndex();
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 }