Skip to content

Commit a62eb42

Browse files
authored
Merge branch 'master' into feature/clickhouse_utf8_filter_order
2 parents bd29d16 + b3777c3 commit a62eb42

File tree

12 files changed

+229
-514
lines changed

12 files changed

+229
-514
lines changed

packages/cubejs-backend-native/Cargo.lock

Lines changed: 47 additions & 142 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cubejs-backend-native/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#![feature(async_closure)]
2-
#![feature(thread_id_value)]
31
#![allow(clippy::result_large_err)]
42

3+
#[cfg(feature = "python")]
54
extern crate findshlibs;
65

76
pub mod auth;

packages/cubejs-backend-native/src/template/workers.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ impl JinjaEngineWorker {
5151
);
5252
} else {
5353
trace!(
54-
"Closing jinja thread, id: {}, threadId: {}",
54+
"Closing jinja thread, id: {}, threadId: {:?}",
5555
id,
56-
std::thread::current().id().as_u64()
56+
// TODO: Use as_u64 when it will be stable - https://github.com/rust-lang/rust/issues/67939
57+
std::thread::current().id()
5758
);
5859

5960
return;

packages/cubejs-jdbc-driver/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
"devDependencies": {
4646
"@cubejs-backend/linter": "1.2.4",
47-
"@cubejs-backend/shared": "^0.35.67",
47+
"@cubejs-backend/shared": "1.2.4",
4848
"@types/generic-pool": "^3.1.9",
4949
"@types/node": "^18",
5050
"@types/sqlstring": "^2.3.0",

0 commit comments

Comments
 (0)