diff --git a/core/src/main/java/io/substrait/relation/Join.java b/core/src/main/java/io/substrait/relation/Join.java index 875d6d50b..e33e33d3e 100644 --- a/core/src/main/java/io/substrait/relation/Join.java +++ b/core/src/main/java/io/substrait/relation/Join.java @@ -63,14 +63,7 @@ public enum JoinType { /** * Right mark join: right rows with an appended boolean column marking whether a match exists. */ - RIGHT_MARK(JoinRel.JoinType.JOIN_TYPE_RIGHT_MARK), - // deprecated values last to not get them looked up first in fromProto() - /** use {@link #LEFT_SEMI} instead */ - @Deprecated - SEMI(JoinRel.JoinType.JOIN_TYPE_LEFT_SEMI), - /** use {@link #LEFT_ANTI} instead */ - @Deprecated - ANTI(JoinRel.JoinType.JOIN_TYPE_LEFT_ANTI); + RIGHT_MARK(JoinRel.JoinType.JOIN_TYPE_RIGHT_MARK); private JoinRel.JoinType proto; @@ -135,8 +128,6 @@ private Stream getRightTypes() { case OUTER: case LEFT_SINGLE: return getRight().getRecordType().fields().stream().map(TypeCreator::asNullable); - case SEMI: - case ANTI: case LEFT_SEMI: case LEFT_ANTI: case LEFT_MARK: diff --git a/isthmus/src/main/java/io/substrait/isthmus/SubstraitRelNodeConverter.java b/isthmus/src/main/java/io/substrait/isthmus/SubstraitRelNodeConverter.java index 0aef61857..1800c5424 100644 --- a/isthmus/src/main/java/io/substrait/isthmus/SubstraitRelNodeConverter.java +++ b/isthmus/src/main/java/io/substrait/isthmus/SubstraitRelNodeConverter.java @@ -259,12 +259,6 @@ private JoinRelType asJoinRelType(Join join) { if (type == JoinType.OUTER) { return JoinRelType.FULL; } - if (type == JoinType.SEMI) { - return JoinRelType.SEMI; - } - if (type == JoinType.ANTI) { - return JoinRelType.ANTI; - } if (type == JoinType.LEFT_SEMI) { return JoinRelType.SEMI; } diff --git a/spark/src/main/scala/io/substrait/spark/logical/ToLogicalPlan.scala b/spark/src/main/scala/io/substrait/spark/logical/ToLogicalPlan.scala index d2abf13c5..35c8badab 100644 --- a/spark/src/main/scala/io/substrait/spark/logical/ToLogicalPlan.scala +++ b/spark/src/main/scala/io/substrait/spark/logical/ToLogicalPlan.scala @@ -219,8 +219,6 @@ class ToLogicalPlan(val spark: AnyRef = SparkCompat.instance.getOrCreateSparkSes case relation.Join.JoinType.LEFT => LeftOuter case relation.Join.JoinType.RIGHT => RightOuter case relation.Join.JoinType.OUTER => FullOuter - case relation.Join.JoinType.SEMI => LeftSemi - case relation.Join.JoinType.ANTI => LeftAnti case relation.Join.JoinType.LEFT_SEMI => LeftSemi case relation.Join.JoinType.LEFT_ANTI => LeftAnti case relation.Join.JoinType.UNKNOWN =>