Skip to content

Commit e1242e1

Browse files
author
Serhii Tatarintsev
authored
Revert "fix: remove actor system for transactions (#4940)" (#4975)
This reverts commit 662419b.
1 parent 8c1ddb7 commit e1242e1

File tree

64 files changed

+1585
-1360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1585
-1360
lines changed

‎Cargo.lock

-41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎libs/crosstarget-utils/src/native/time.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use std::{
55

66
use crate::common::TimeoutError;
77

8-
#[derive(Clone, Copy)]
98
pub struct ElapsedTimeCounter {
109
instant: Instant,
1110
}

‎libs/crosstarget-utils/src/wasm/time.rs

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ extern "C" {
2121

2222
}
2323

24-
#[derive(Clone, Copy)]
2524
pub struct ElapsedTimeCounter {
2625
start_time: f64,
2726
}

‎libs/query-engine-common/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ thiserror = "1"
88
url.workspace = true
99
query-connector = { path = "../../query-engine/connectors/query-connector" }
1010
query-core = { path = "../../query-engine/core" }
11-
telemetry = { path = "../telemetry" }
1211
user-facing-errors = { path = "../user-facing-errors" }
1312
serde_json.workspace = true
1413
serde.workspace = true

‎libs/query-engine-common/src/tracer.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use opentelemetry::{
88
},
99
trace::{TraceError, TracerProvider},
1010
};
11+
use query_core::telemetry;
1112
use std::fmt::{self, Debug};
1213

1314
/// Pipeline builder

‎libs/telemetry/Cargo.toml

-32
This file was deleted.

‎libs/telemetry/src/helpers.rs

-141
This file was deleted.

‎query-engine/connector-test-kit-rs/query-engine-tests/tests/new/interactive_tx.rs

-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ use std::borrow::Cow;
33

44
#[test_suite(schema(generic), exclude(Sqlite("cfd1")))]
55
mod interactive_tx {
6-
use std::time::{Duration, Instant};
7-
86
use query_engine_tests::*;
97
use tokio::time;
108

@@ -233,9 +231,7 @@ mod interactive_tx {
233231
let batch_results = runner.batch(queries, false, None).await?;
234232
batch_results.assert_failure(2002, None);
235233

236-
let now = Instant::now();
237234
let res = runner.commit_tx(tx_id.clone()).await?;
238-
assert!(now.elapsed() <= Duration::from_millis(5000));
239235

240236
if matches!(runner.connector_version(), ConnectorVersion::MongoDb(_)) {
241237
assert!(res.is_err());

‎query-engine/connector-test-kit-rs/query-tests-setup/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ sql-query-connector = { path = "../../connectors/sql-query-connector" }
1515
query-engine = { path = "../../query-engine" }
1616
psl.workspace = true
1717
user-facing-errors = { path = "../../../libs/user-facing-errors" }
18-
telemetry = { path = "../../../libs/telemetry" }
1918
thiserror = "1.0"
2019
async-trait.workspace = true
2120
nom = "7.1"

‎query-engine/connector-test-kit-rs/query-tests-setup/src/logging.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use query_core::telemetry::helpers as telemetry_helpers;
12
use query_engine_metrics::MetricRegistry;
2-
use telemetry::helpers as telemetry_helpers;
33
use tracing::Subscriber;
44
use tracing_error::ErrorLayer;
55
use tracing_subscriber::{prelude::*, Layer};

‎query-engine/connectors/mongodb-query-connector/Cargo.toml

-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ path = "../query-connector"
3838
[dependencies.prisma-value]
3939
path = "../../../libs/prisma-value"
4040

41-
[dependencies.telemetry]
42-
path = "../../../libs/telemetry"
43-
4441
[dependencies.chrono]
4542
features = ["serde"]
4643
version = "0.4"

0 commit comments

Comments
 (0)