Skip to content
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

BigQuery IT test with null optional and empty repeated values #5040

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

BigQuery IT test with null optional and empty repeated values #5040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
107 changes: 70 additions & 37 deletions integration/src/main/scala/com/spotify/scio/bigquery/PopulateTestData.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ object PopulateTestData {
log.info(s"Dataset $projectId:$datasetId exists.")
case NonFatal(e) => e.printStackTrace()
}
()
}

private def populatePartitionedTables(bq: BigQuery, projectId: String): Unit = {
Expand Down Expand Up @@ -165,17 +164,13 @@ object PopulateTestData {
s"Populated $projectId:samples_eu.shakespeare, $projectId:partition_a, " +
s"$projectId:partition_b and $projectId:partition_c."
)
()
}

private def populateStorageTables(bq: BigQuery, projectId: String): Unit = {
val required = (0 until 10).toList.map(newRequired)
val optional = (0 until 10).toList.map(newOptional)
val repeated = (0 until 10).toList.map(newRepeated)
val nested = (0 until 10).toList.map { i =>
val r = Record(i.toLong, s"s$i")
Nested(r, Some(r), List(r))
}
val nested = (0 until 10).toList.map(newNested)

bq.writeTypedRows(s"$projectId:storage.required", required, WRITE_TRUNCATE)
bq.writeTypedRows(s"$projectId:storage.optional", optional, WRITE_TRUNCATE)
Expand All @@ -184,7 +179,6 @@ object PopulateTestData {
log.info(
s"Populated $projectId:storage, $projectId:optional, $projectId:repeated, and $projectId:nested."
)
()
}

private def newRequired(i: Int): Required = {
Expand All @@ -195,8 +189,8 @@ object PopulateTestData {
i.toLong,
i.toDouble,
BigDecimal(i),
s"s$i",
ByteString.copyFromUtf8(s"s$i"),
i.toString,
ByteString.copyFromUtf8(i.toString),
t.plus(Duration.millis(i.toLong)),
dt.toLocalDate.plusDays(i),
dt.toLocalTime.plusMillis(i),
Expand All @@ -205,36 +199,75 @@ object PopulateTestData {
}

private def newOptional(i: Int): Optional = {
val t = new Instant(0)
val dt = t.toDateTime(DateTimeZone.UTC)
Optional(
Some(true),
Some(i.toLong),
Some(i.toDouble),
Some(BigDecimal(i)),
Some(s"s$i"),
Some(ByteString.copyFromUtf8(s"s$i")),
Some(t.plus(Duration.millis(i.toLong))),
Some(dt.toLocalDate.plusDays(i)),
Some(dt.toLocalTime.plusMillis(i)),
Some(dt.toLocalDateTime.plusMillis(i))
)
if (i == 0) {
Optional(
None,
None,
None,
None,
None,
None,
None,
None,
None,
None
)
} else {
val t = new Instant(0)
val dt = t.toDateTime(DateTimeZone.UTC)
Optional(
Some(true),
Some(i.toLong),
Some(i.toDouble),
Some(BigDecimal(i)),
Some(i.toString),
Some(ByteString.copyFromUtf8(i.toString)),
Some(t.plus(Duration.millis(i.toLong))),
Some(dt.toLocalDate.plusDays(i)),
Some(dt.toLocalTime.plusMillis(i)),
Some(dt.toLocalDateTime.plusMillis(i))
)
}
}

private def newRepeated(i: Int): Repeated = {
val t = new Instant(0)
val dt = t.toDateTime(DateTimeZone.UTC)
Repeated(
List(true),
List(i.toLong),
List(i.toDouble),
List(BigDecimal(i)),
List(s"s$i"),
List(ByteString.copyFromUtf8(s"s$i")),
List(t.plus(Duration.millis(i.toLong))),
List(dt.toLocalDate.plusDays(i)),
List(dt.toLocalTime.plusMillis(i)),
List(dt.toLocalDateTime.plusMillis(i))
)
if (i == 0) {
Repeated(
Nil,
Nil,
Nil,
Nil,
Nil,
Nil,
Nil,
Nil,
Nil,
Nil
)
} else {
val t = new Instant(0)
val dt = t.toDateTime(DateTimeZone.UTC)
Repeated(
List(true),
List(i.toLong),
List(i.toDouble),
List(BigDecimal(i)),
List(i.toString),
List(ByteString.copyFromUtf8(i.toString)),
List(t.plus(Duration.millis(i.toLong))),
List(dt.toLocalDate.plusDays(i)),
List(dt.toLocalTime.plusMillis(i)),
List(dt.toLocalDateTime.plusMillis(i))
)
}
}

private def newNested(i: Int): Nested = {
val required = Record(i, i.toString)
if (i == 0) {
Nested(required, None, Nil)
} else {
Nested(required, Some(required), List(required))
}
}
}
Loading