Skip to content

[SPARK-44018][SQL] Improve the hashCode and toString for some DS V2 Expression #41543

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

Closed
beliefer wants to merge 3 commits into from
Closed

[SPARK-44018][SQL] Improve the hashCode and toString for some DS V2 Expression #41543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
293be4e
[SPARK-44018][SQL] Improve the hashCode for Some DS V2 Expression
beliefer Jun 10, 2023
3b806f1
Update code
beliefer Jun 12, 2023
2158903
Update code
beliefer Jun 19, 2023
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
10 changes: 7 additions & 3 deletions ...yst/src/main/java/org/apache/spark/sql/connector/expressions/GeneralScalarExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.spark.sql.connector.expressions;

import java.util.Arrays;
import java.util.Objects;

import org.apache.spark.annotation.Evolving;
import org.apache.spark.sql.connector.expressions.filter.Predicate;
Expand Down Expand Up @@ -441,12 +440,17 @@ public GeneralScalarExpression(String name, Expression[] children) {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;

GeneralScalarExpression that = (GeneralScalarExpression) o;
return Objects.equals(name, that.name) && Arrays.equals(children, that.children);

if (!name.equals(that.name)) return false;
return Arrays.equals(children, that.children);
}

@Override
public int hashCode() {
return Objects.hash(name, children);
int result = name.hashCode();
result = 31 * result + Arrays.hashCode(children);
return result;
}
}
13 changes: 9 additions & 4 deletions ...alyst/src/main/java/org/apache/spark/sql/connector/expressions/UserDefinedScalarFunc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.spark.sql.connector.expressions;

import java.util.Arrays;
import java.util.Objects;

import org.apache.spark.annotation.Evolving;
import org.apache.spark.sql.internal.connector.ExpressionWithToString;
Expand Down Expand Up @@ -51,13 +50,19 @@ public UserDefinedScalarFunc(String name, String canonicalName, Expression[] chi
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;

UserDefinedScalarFunc that = (UserDefinedScalarFunc) o;
return Objects.equals(name, that.name) && Objects.equals(canonicalName, that.canonicalName) &&
Arrays.equals(children, that.children);

if (!name.equals(that.name)) return false;
if (!canonicalName.equals(that.canonicalName)) return false;
return Arrays.equals(children, that.children);
}

@Override
public int hashCode() {
return Objects.hash(name, canonicalName, children);
int result = name.hashCode();
result = 31 * result + canonicalName.hashCode();
result = 31 * result + Arrays.hashCode(children);
return result;
}
}
22 changes: 22 additions & 0 deletions .../main/java/org/apache/spark/sql/connector/expressions/aggregate/GeneralAggregateFunc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.apache.spark.sql.connector.expressions.aggregate;

import java.util.Arrays;

import org.apache.spark.annotation.Evolving;
import org.apache.spark.sql.connector.expressions.Expression;
import org.apache.spark.sql.internal.connector.ExpressionWithToString;
Expand Down Expand Up @@ -60,4 +62,24 @@ public GeneralAggregateFunc(String name, boolean isDistinct, Expression[] childr

@Override
public Expression[] children() { return children; }

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;

GeneralAggregateFunc that = (GeneralAggregateFunc) o;

if (isDistinct != that.isDistinct) return false;
if (!name.equals(that.name)) return false;
return Arrays.equals(children, that.children);
}

@Override
public int hashCode() {
int result = name.hashCode();
result = 31 * result + (isDistinct ? 1 : 0);
result = 31 * result + Arrays.hashCode(children);
return result;
}
}
24 changes: 24 additions & 0 deletions ...n/java/org/apache/spark/sql/connector/expressions/aggregate/UserDefinedAggregateFunc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.apache.spark.sql.connector.expressions.aggregate;

import java.util.Arrays;

import org.apache.spark.annotation.Evolving;
import org.apache.spark.sql.connector.expressions.Expression;
import org.apache.spark.sql.internal.connector.ExpressionWithToString;
Expand Down Expand Up @@ -50,4 +52,26 @@ public UserDefinedAggregateFunc(

@Override
public Expression[] children() { return children; }

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;

UserDefinedAggregateFunc that = (UserDefinedAggregateFunc) o;

if (isDistinct != that.isDistinct) return false;
if (!name.equals(that.name)) return false;
if (!canonicalName.equals(that.canonicalName)) return false;
return Arrays.equals(children, that.children);
}

@Override
public int hashCode() {
int result = name.hashCode();
result = 31 * result + canonicalName.hashCode();
result = 31 * result + (isDistinct ? 1 : 0);
result = 31 * result + Arrays.hashCode(children);
return result;
}
}