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

Jump to bottom

Revert "fix: remove actor system for transactions" #4975

Merged
merged 1 commit into from
Aug 9, 2024
Merged

Revert "fix: remove actor system for transactions" #4975

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
41 changes: 0 additions & 41 deletions Cargo.lock
View file
Open in desktop

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

1 change: 0 additions & 1 deletion libs/crosstarget-utils/src/native/time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use std::{

use crate::common::TimeoutError;

#[derive(Clone, Copy)]
pub struct ElapsedTimeCounter {
instant: Instant,
}
Expand Down
1 change: 0 additions & 1 deletion libs/crosstarget-utils/src/wasm/time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ extern "C" {

}

#[derive(Clone, Copy)]
pub struct ElapsedTimeCounter {
start_time: f64,
}
Expand Down
1 change: 0 additions & 1 deletion libs/query-engine-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ thiserror = "1"
url.workspace = true
query-connector = { path = "../../query-engine/connectors/query-connector" }
query-core = { path = "../../query-engine/core" }
telemetry = { path = "../telemetry" }
user-facing-errors = { path = "../user-facing-errors" }
serde_json.workspace = true
serde.workspace = true
Expand Down
1 change: 1 addition & 0 deletions libs/query-engine-common/src/tracer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use opentelemetry::{
},
trace::{TraceError, TracerProvider},
};
use query_core::telemetry;
use std::fmt::{self, Debug};

/// Pipeline builder
Expand Down
32 changes: 0 additions & 32 deletions libs/telemetry/Cargo.toml
View file
Open in desktop

This file was deleted.

141 changes: 0 additions & 141 deletions libs/telemetry/src/helpers.rs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions query-engine/connector-test-kit-rs/query-engine-tests/tests/new/interactive_tx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ use std::borrow::Cow;

#[test_suite(schema(generic), exclude(Sqlite("cfd1")))]
mod interactive_tx {
use std::time::{Duration, Instant};

use query_engine_tests::*;
use tokio::time;

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

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

if matches!(runner.connector_version(), ConnectorVersion::MongoDb(_)) {
assert!(res.is_err());
Expand Down
1 change: 0 additions & 1 deletion query-engine/connector-test-kit-rs/query-tests-setup/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ sql-query-connector = { path = "../../connectors/sql-query-connector" }
query-engine = { path = "../../query-engine" }
psl.workspace = true
user-facing-errors = { path = "../../../libs/user-facing-errors" }
telemetry = { path = "../../../libs/telemetry" }
thiserror = "1.0"
async-trait.workspace = true
nom = "7.1"
Expand Down
2 changes: 1 addition & 1 deletion query-engine/connector-test-kit-rs/query-tests-setup/src/logging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use query_core::telemetry::helpers as telemetry_helpers;
use query_engine_metrics::MetricRegistry;
use telemetry::helpers as telemetry_helpers;
use tracing::Subscriber;
use tracing_error::ErrorLayer;
use tracing_subscriber::{prelude::*, Layer};
Expand Down
3 changes: 0 additions & 3 deletions query-engine/connectors/mongodb-query-connector/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ path = "../query-connector"
[dependencies.prisma-value]
path = "../../../libs/prisma-value"

[dependencies.telemetry]
path = "../../../libs/telemetry"

[dependencies.chrono]
features = ["serde"]
version = "0.4"
Expand Down
Loading
Loading