Skip to content

Feature/prepare udf #73

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

Merged
merged 4 commits into from
May 5, 2023
Merged

Feature/prepare udf #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5f9a4f
feat: prepare EnsureUpdated to support UDFs
ingarabr May 4, 2023
a1d5076
chore: raise some compiler warnings to error
ingarabr May 4, 2023
7c405d0
feat: make mkFragment work with cats foldable
ingarabr May 5, 2023
b6dd68a
fix: support for multiple js libs in udfs
ingarabr May 5, 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
9 changes: 7 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,15 @@ val commonSettings = Seq(
},
scalacOptions -= "-source:3.0-migration",
scalacOptions ++= {
val compilerWarnings =
List(
"cat=other-match-analysis:e", // error on exhaustive match
"cat=other:e" // compare values like 1 == "str"
).mkString("-Wconf:", ",", ",any:wv")
if (scalaVersion.value.startsWith("3")) {
Seq("-source:3.2-migration")
Seq("-source:3.2-migration", compilerWarnings)
} else {
Seq("-feature", "-language:implicitConversions")
Seq("-feature", "-language:implicitConversions", compilerWarnings)
}
}
)
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/no/nrk/bigquery/BQSqlFrag.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ object BQSqlFrag {
def backticks(string: String): BQSqlFrag = Frag("`" + string + "`")

case class Frag(string: String) extends BQSqlFrag
case class Call(udf: UDF, args: Seq[BQSqlFrag]) extends BQSqlFrag {
case class Call(udf: UDF, args: List[BQSqlFrag]) extends BQSqlFrag {
require(
udf.params.length == args.length,
s"UDF ${udf.name.value}: Expected ${udf.params.length} arguments, got ${args.length}"
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/scala/no/nrk/bigquery/BigQueryClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import com.google.cloud.http.HttpTransportOptions
import fs2.{Chunk, Stream}
import io.circe.Encoder
import no.nrk.bigquery.syntax.showJob
import no.nrk.bigquery.internal.TableUpdateOperation
import no.nrk.bigquery.metrics.{BQMetrics, MetricsOps}
import no.nrk.bigquery.util.StreamUtils
import org.apache.avro
Expand Down Expand Up @@ -319,7 +320,7 @@ class BigQueryClient[F[_]](
}
.flatMap(tmp =>
F.interruptible {
val tempTableBqDef = UpdateOperation.createNew(tmp).table
val tempTableBqDef = TableUpdateOperation.createNew(tmp).table
val expirationTime =
Instant.now.plusMillis(expirationDuration.getOrElse(1.hour).toMillis)

Expand Down
Loading