Skip to content

Commit 2be692a

Browse files
committed
Remove date expression support (separate PR)
1 parent b446716 commit 2be692a

File tree

7 files changed

+3
-771
lines changed

7 files changed

+3
-771
lines changed

src/main/scala/com/amazon/deequ/dqdl/execution/DQDLExecutor.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.amazon.deequ.dqdl.execution
1818

19-
import com.amazon.deequ.dqdl.execution.executors.{ColumnNamesMatchPatternExecutor, ColumnValuesDateExecutor, CompositeRulesExecutor, DataFreshnessExecutor, DeequRulesExecutor, ReferentialIntegrityExecutor, RowCountMatchExecutor, UnsupportedRulesExecutor}
20-
import com.amazon.deequ.dqdl.model.{ColumnNamesMatchPatternExecutableRule, ColumnValuesDateExecutableRule, CompositeExecutableRule, DataFreshnessExecutableRule, DeequExecutableRule, ExecutableRule, Failed, ReferentialIntegrityExecutableRule, RowCountMatchExecutableRule, RuleOutcome, UnsupportedExecutableRule}
19+
import com.amazon.deequ.dqdl.execution.executors.{ColumnNamesMatchPatternExecutor, CompositeRulesExecutor, DataFreshnessExecutor, DeequRulesExecutor, ReferentialIntegrityExecutor, RowCountMatchExecutor, UnsupportedRulesExecutor}
20+
import com.amazon.deequ.dqdl.model.{ColumnNamesMatchPatternExecutableRule, CompositeExecutableRule, DataFreshnessExecutableRule, DeequExecutableRule, ExecutableRule, Failed, ReferentialIntegrityExecutableRule, RowCountMatchExecutableRule, RuleOutcome, UnsupportedExecutableRule}
2121
import org.apache.spark.sql.DataFrame
2222
import software.amazon.glue.dqdl.model.DQRule
2323

@@ -40,8 +40,7 @@ object DQDLExecutor {
4040
classOf[RowCountMatchExecutableRule] -> RowCountMatchExecutor,
4141
classOf[ReferentialIntegrityExecutableRule] -> ReferentialIntegrityExecutor,
4242
classOf[DataFreshnessExecutableRule] -> DataFreshnessExecutor,
43-
classOf[ColumnNamesMatchPatternExecutableRule] -> ColumnNamesMatchPatternExecutor,
44-
classOf[ColumnValuesDateExecutableRule] -> ColumnValuesDateExecutor
43+
classOf[ColumnNamesMatchPatternExecutableRule] -> ColumnNamesMatchPatternExecutor
4544
)
4645

4746
def executeRules(rules: Seq[ExecutableRule], df: DataFrame,

src/main/scala/com/amazon/deequ/dqdl/execution/executors/ColumnValuesDateExecutor.scala

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/main/scala/com/amazon/deequ/dqdl/model/ExecutableRule.scala

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,6 @@ case class DataFreshnessExecutableRule(dqRule: DQRule,
5858
Some(s"Column.$column.DataFreshness.Compliance")
5959
}
6060

61-
case class ColumnValuesDateExecutableRule(dqRule: DQRule,
62-
column: String,
63-
dateColumnExpression: Column,
64-
filteredRow: FilteredRowOutcome) extends ExecutableRule {
65-
override val evaluatedMetricName: Option[String] =
66-
Some(s"Column.$column.ColumnValues.Compliance")
67-
}
68-
6961
case class ReferentialIntegrityExecutableRule(dqRule: DQRule,
7062
primaryColumns: Seq[String],
7163
referenceDatasetAlias: String,

src/main/scala/com/amazon/deequ/dqdl/translation/DQDLRuleTranslator.scala

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@ import com.amazon.deequ.dqdl.translation.rules.UniquenessRule
3535
import com.amazon.deequ.dqdl.translation.rules.ColumnLengthRule
3636
import com.amazon.deequ.dqdl.translation.rules.ColumnExistsRule
3737
import com.amazon.deequ.dqdl.translation.rules.ColumnValuesRule
38-
import com.amazon.deequ.dqdl.translation.rules.ColumnValuesDateRule
3938
import com.amazon.deequ.dqdl.translation.rules.RowCountMatchRule
4039
import com.amazon.deequ.dqdl.translation.rules.ReferentialIntegrityRule
4140
import com.amazon.deequ.dqdl.translation.rules.DataFreshnessRule
4241
import com.amazon.deequ.dqdl.translation.rules.ColumnNamesMatchPatternRule
4342
import software.amazon.glue.dqdl.model.DQRule
4443
import software.amazon.glue.dqdl.model.DQRuleset
45-
import software.amazon.glue.dqdl.model.condition.date.DateBasedCondition
4644

4745
import scala.jdk.CollectionConverters.collectionAsScalaIterableConverter
4846

@@ -110,11 +108,6 @@ object DQDLRuleTranslator {
110108
case Right(executableRule) => executableRule
111109
case Left(message) => UnsupportedExecutableRule(rule, Some(message))
112110
}
113-
case "ColumnValues" if rule.getCondition.isInstanceOf[DateBasedCondition] =>
114-
ColumnValuesDateRule.toExecutableRule(rule, FilteredRowOutcome.TRUE) match {
115-
case Right(executableRule) => executableRule
116-
case Left(message) => UnsupportedExecutableRule(rule, Some(message))
117-
}
118111
case _ =>
119112
translateRule(rule) match {
120113
case Right(deequExecutableRule) => deequExecutableRule

src/main/scala/com/amazon/deequ/dqdl/translation/rules/ColumnValuesDateRule.scala

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)