Skip to content

Commit

Permalink
more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrooTheChen committed Sep 28, 2024
1 parent 8896c4b commit 44948bd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions src/sinks/gcp/bigquery/config.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use codecs::encoding::ProtobufSerializerConfig;
use vector_lib::codecs::encoding::ProtobufSerializerConfig;
use futures::FutureExt;
use http::Uri;
use indoc::indoc;
use tonic::transport::Channel;
use vector_config::configurable_component;
use vector_lib::configurable::configurable_component;

use super::proto::third_party::google::cloud::bigquery::storage::v1 as proto;
use super::request_builder::{BigqueryRequestBuilder, MAX_BATCH_PAYLOAD_SIZE};
Expand Down Expand Up @@ -75,7 +75,7 @@ pub struct BigqueryConfig {
#[serde(
default,
deserialize_with = "crate::serde::bool_or_struct",
skip_serializing_if = "crate::serde::skip_serializing_if_default"
skip_serializing_if = "crate::serde::is_default"
)]
acknowledgements: AcknowledgementsConfig,
}
Expand Down
8 changes: 4 additions & 4 deletions src/sinks/gcp/bigquery/request_builder.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use bytes::BytesMut;
use codecs::encoding::ProtobufSerializer;
use vector_lib::codecs::encoding::ProtobufSerializer;
use prost::Message;
use std::num::NonZeroUsize;
use tokio_util::codec::Encoder;
Expand All @@ -22,8 +22,8 @@ pub enum BigqueryRequestBuilderError {
ProtobufEncoding { message: String }, // `error` needs to be some concrete type
}

impl From<vector_common::Error> for BigqueryRequestBuilderError {
fn from(error: vector_common::Error) -> Self {
impl From<vector_lib::Error> for BigqueryRequestBuilderError {
fn from(error: vector_lib::Error) -> Self {
BigqueryRequestBuilderError::ProtobufEncoding {
message: format!("{:?}", error),
}
Expand Down Expand Up @@ -142,7 +142,7 @@ mod test {
use codecs::encoding::{ProtobufSerializerConfig, ProtobufSerializerOptions};
use std::collections::BTreeMap;
use std::path::PathBuf;
use vector_core::event::{Event, EventMetadata, LogEvent, Value};
use vector_lib::event::{Event, EventMetadata, LogEvent, Value};

use super::BigqueryRequestBuilder;
use crate::sinks::util::IncrementalRequestBuilder;
Expand Down
6 changes: 3 additions & 3 deletions src/sinks/gcp/bigquery/sink.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ use futures_util::{
stream::{self, BoxStream},
StreamExt,
};
use vector_core::event::Event;
use vector_core::sink::StreamSink;
use vector_core::stream::BatcherSettings;
use vector_lib::event::Event;
use vector_lib::sink::StreamSink;
use vector_lib::stream::BatcherSettings;

use super::request_builder::BigqueryRequestBuilder;
use super::service::BigqueryService;
Expand Down

0 comments on commit 44948bd

Please sign in to comment.