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
21 changes: 15 additions & 6 deletions src/spanner/src/batch_read_only_transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crate::database_client::DatabaseClient;
use crate::model::PartitionOptions;
use crate::precommit::PrecommitTokenTracker;
use crate::read_only_transaction::{
MultiUseReadOnlyTransaction, MultiUseReadOnlyTransactionBuilder,
MultiUseReadOnlyTransaction, MultiUseReadOnlyTransactionBuilder, ReadContextTransactionSelector,
};
use crate::result_set::{ResultSet, StreamOperation};
use crate::statement::Statement;
Expand Down Expand Up @@ -44,7 +44,8 @@ pub struct BatchReadOnlyTransactionBuilder {
impl BatchReadOnlyTransactionBuilder {
pub(crate) fn new(client: DatabaseClient) -> Self {
Self {
inner: MultiUseReadOnlyTransactionBuilder::new(client),
inner: MultiUseReadOnlyTransactionBuilder::new(client)
.with_explicit_begin_transaction(true),
}
}

Expand Down Expand Up @@ -148,7 +149,7 @@ impl BatchReadOnlyTransaction {
.clone()
.into_partition_query_request()
.set_session(self.inner.context.client.session.name.clone())
.set_transaction(self.inner.context.transaction_selector.clone())
.set_transaction(self.inner.context.transaction_selector.selector())
.set_partition_options(options);

let response = self
Expand All @@ -165,7 +166,7 @@ impl BatchReadOnlyTransaction {
.map(|p| Partition {
inner: PartitionedOperation::Query {
partition_token: p.partition_token,
transaction_selector: self.inner.context.transaction_selector.clone(),
transaction_selector: self.inner.context.transaction_selector.selector(),
session_name: self.inner.context.client.session.name.clone(),
statement: statement.clone(),
},
Expand Down Expand Up @@ -203,7 +204,7 @@ impl BatchReadOnlyTransaction {
.clone()
.into_partition_read_request()
.set_session(self.inner.context.client.session.name.clone())
.set_transaction(self.inner.context.transaction_selector.clone())
.set_transaction(self.inner.context.transaction_selector.selector())
.set_partition_options(options);

let response = self
Expand All @@ -220,7 +221,7 @@ impl BatchReadOnlyTransaction {
.map(|p| Partition {
inner: PartitionedOperation::Read {
partition_token: p.partition_token,
transaction_selector: self.inner.context.transaction_selector.clone(),
transaction_selector: self.inner.context.transaction_selector.selector(),
session_name: self.inner.context.client.session.name.clone(),
read_request: read.clone(),
},
Expand Down Expand Up @@ -344,6 +345,10 @@ impl Partition {

Ok(ResultSet::new(
stream,
Some(ReadContextTransactionSelector::Fixed(
transaction_selector.clone(),
None,
)),
PrecommitTokenTracker::new_noop(),
client.clone(),
StreamOperation::Query(request),
Expand Down Expand Up @@ -373,6 +378,10 @@ impl Partition {

Ok(ResultSet::new(
stream,
Some(ReadContextTransactionSelector::Fixed(
transaction_selector.clone(),
None,
)),
PrecommitTokenTracker::new_noop(),
client.clone(),
StreamOperation::Read(request),
Expand Down
Loading
Loading