Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/bigquery-write/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ gaxi = { workspace = true, features = ["_internal-common"

[dev-dependencies]
anyhow.workspace = true
test-case.workspace = true
bigquery-write-grpc-mock = { path = "grpc-mock" }
google-cloud-auth.workspace = true
google-cloud-bigquery-write = { path = ".", features = ["default-rustls-provider"] }
Expand Down
61 changes: 55 additions & 6 deletions src/bigquery-write/src/arrow/writer_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use crate::Result;
use crate::arrow::DefaultWriter;
use crate::model::ArrowSchema;
use crate::transport::Transport;
use crate::{Error, Result};
use gaxi::path_parameter::{PathMismatchBuilder, try_match};
use gaxi::routing_parameter::Segment;
use google_cloud_gax::error::binding::BindingError;
use std::sync::Arc;

/// A builder to create a stream writer
Expand All @@ -31,31 +34,77 @@ impl WriterBuilder {
Self { inner, schema }
}

// TODO(#6224) - add an example showing the format of `table`
/// Create a writer for the [default stream] for the given table.
///
/// [default stream]: https://docs.cloud.google.com/bigquery/docs/write-api#default_stream
pub fn default<T: Into<String>>(self, table: T) -> Result<DefaultWriter> {
// TODO(#6249) - validate table resource format
let mut write_stream = table.into();
let table = table.into();
validate_table(table.as_str())?;
let mut write_stream = table;
write_stream.push_str("/streams/_default");
Ok(DefaultWriter::new(self.inner, write_stream, self.schema))
}
}

fn validate_table(table: &str) -> Result<()> {
let segments = &[
Segment::Literal("projects/"),
Segment::SingleWildcard,
Segment::Literal("/datasets/"),
Segment::SingleWildcard,
Segment::Literal("/tables/"),
Segment::SingleWildcard,
];
try_match(Some(table), segments)
.ok_or_else(|| {
let builder = PathMismatchBuilder::default().maybe_add(
Some(table),
segments,
"table",
"projects/*/datasets/*/tables/*",
);
Error::binding(BindingError {
paths: vec![builder.build()],
})
})
.map(|_| ())
}
Comment thread
dbolduc marked this conversation as resolved.
Comment on lines +50 to +71

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, TIL about this PathMismatch thing.


#[cfg(test)]
mod tests {
use super::*;
use crate::transport::tests::test_transport;
use test_case::test_case;

#[tokio::test]
async fn default() -> anyhow::Result<()> {
let transport = Arc::new(test_transport("http://ignored:1".to_string()).await?);
let schema = ArrowSchema::new().set_serialized_schema("test");
let builder = WriterBuilder::new(transport, schema.clone());
let writer = builder.default("projects/p/tables/t")?;
assert_eq!(writer.write_stream, "projects/p/tables/t/streams/_default");
let writer = builder.default("projects/p/datasets/d/tables/t")?;
assert_eq!(
writer.write_stream,
"projects/p/datasets/d/tables/t/streams/_default"
);
assert_eq!(writer.schema, schema);
Ok(())
}

#[test_case("projects/p")]
#[test_case("projects/p/tables/t")]
#[test_case("projects/p/datasets/d/tables/")]
#[test_case("projects/p/instances/i/tables/t")]
#[test_case("projects/p/datasets/d/tables/t/streams")]
#[test_case("projects/p/datasets/d/tables/t/streams/_default")]
#[tokio::test]
async fn bad_table_format(table: &str) -> anyhow::Result<()> {
let transport = Arc::new(test_transport("http://ignored:1".to_string()).await?);
let schema = ArrowSchema::new().set_serialized_schema("test");
let builder = WriterBuilder::new(transport, schema.clone());
let err = builder
.default(table)
.expect_err("should fail locally on bad format");
assert!(err.is_binding(), "{err:?}");
Ok(())
}
}
Loading