Skip to content

Commit 63466dc

Browse files
committed
remove ignoreLabels
1 parent 8645968 commit 63466dc

File tree

1 file changed

+6
-19
lines changed

1 file changed

+6
-19
lines changed

core/src/main/scala/no/nrk/bigquery/BQSqlFrag.scala

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,8 @@ sealed trait BQSqlFrag {
113113
}
114114

115115
final def allReferencedAsPartitions: Seq[BQPartitionId[Any]] =
116-
allReferencedAsPartitions(ignoreLabels = TableLabels.Empty , expandAndExcludeViews = true)
117-
118-
final def allReferencedAsPartitions(ignoreLabels: TableLabels, expandAndExcludeViews: Boolean): Seq[BQPartitionId[Any]] = {
116+
allReferencedAsPartitions(expandAndExcludeViews = true)
117+
final def allReferencedAsPartitions(expandAndExcludeViews: Boolean): Seq[BQPartitionId[Any]] = {
119118
def pf: PartialFunction[BQSqlFrag, List[BQPartitionId[Any]]] = {
120119
case BQSqlFrag.PartitionRef(ref) =>
121120
ref.wholeTable match {
@@ -126,28 +125,16 @@ sealed trait BQSqlFrag {
126125
case BQSqlFrag.FilledTableRef(fill) => List(fill.tableDef.unpartitioned.assertPartition)
127126
}
128127

129-
this
130-
.collect(pf)
131-
.flatten
132-
.distinct
133-
.collect { pid =>
134-
pid.wholeTable match {
135-
case tableDef: BQTableDef[_] if !tableDef.labels.contains(ignoreLabels) => pid
136-
case ref: BQTableRef[_] if !ref.labels.contains(ignoreLabels) => pid
137-
}
138-
}
128+
this.collect(pf).flatten.distinct
139129
}
140130

141-
final def allReferencedTables: Seq[BQTableLike[Any]] = allReferencedTables(ignoreLabels = TableLabels.Empty)
142-
final def allReferencedTables(ignoreLabels: TableLabels): Seq[BQTableLike[Any]] =
143-
allReferencedAsPartitions(ignoreLabels, expandAndExcludeViews = true)
131+
final def allReferencedTables: Seq[BQTableLike[Any]] =
132+
allReferencedAsPartitions(expandAndExcludeViews = true)
144133
.map(_.wholeTable)
145134
.filterNot(tableLike => tableLike.isInstanceOf[BQTableDef.View[_]])
146135

147136
final def allReferencedTablesAsPartitions: Seq[BQPartitionId[Any]] =
148-
allReferencedTablesAsPartitions(ignoreLabels = TableLabels.Empty)
149-
final def allReferencedTablesAsPartitions(ignoreLabels: TableLabels): Seq[BQPartitionId[Any]] =
150-
allReferencedAsPartitions(ignoreLabels, expandAndExcludeViews = true)
137+
allReferencedAsPartitions(expandAndExcludeViews = true)
151138
.filterNot(pid => pid.wholeTable.isInstanceOf[BQTableDef.View[_]])
152139

153140
final def allReferencedUDFs: Seq[UDF[UDF.UDFId]] =

0 commit comments

Comments
 (0)