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

Jump to bottom

Refactor Column #11760

Merged
merged 1 commit into from Aug 11, 2021
Merged

Refactor Column #11760

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions ...-core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/Column.java
View file
Open in desktop
Expand Up @@ -17,15 +17,14 @@

package org.apache.shardingsphere.sharding.route.engine.condition;

import com.google.common.base.Objects;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.ToString;

import java.util.Objects;

/**
* Column.
*/
@RequiredArgsConstructor
@Getter
@ToString
public final class Column {
Expand All @@ -34,17 +33,25 @@ public final class Column {

private final String tableName;

private final int hashCode;

public Column(final String name, final String tableName) {
this.name = name;
this.tableName = tableName;
hashCode = Objects.hash(name.toUpperCase(), tableName.toUpperCase());
}

@Override
public boolean equals(final Object obj) {
if (obj instanceof Column) {
Column column = (Column) obj;
return Objects.equal(name.toUpperCase(), column.name.toUpperCase()) && Objects.equal(tableName.toUpperCase(), column.tableName.toUpperCase());
return (name == column.name || null != name && name.equalsIgnoreCase(column.name)) && (tableName == column.tableName || null != tableName && tableName.equalsIgnoreCase(column.tableName));
}
return false;
}

@Override
public int hashCode() {
return Objects.hashCode(name.toUpperCase(), tableName.toUpperCase());
return hashCode;
}
}