Skip to content

Commit bd4129e

Browse files
committed
Fixed tracing index table type for SQL stores
1 parent e54c3ab commit bd4129e

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

crates/common/src/enterprise/config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ impl Enterprise {
6060
.property_or_default::<Option<Duration>>("storage.undelete.retention", "false")
6161
.unwrap_or_default(),
6262
trace_hold_period: config
63-
.property_or_default::<Option<Duration>>("tracing.history.retention", "90d")
64-
.unwrap_or(Some(Duration::from_secs(90 * 24 * 60 * 60))),
63+
.property_or_default::<Option<Duration>>("tracing.history.retention", "30d")
64+
.unwrap_or(Some(Duration::from_secs(30 * 24 * 60 * 60))),
6565
trace_store: config
6666
.value("tracing.history.store")
6767
.and_then(|name| stores.stores.get(name))

crates/store/src/backend/mysql/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ impl MysqlStore {
106106
SUBSPACE_FTS_INDEX,
107107
SUBSPACE_LOGS,
108108
SUBSPACE_TRACE,
109+
SUBSPACE_TRACE_INDEX,
109110
] {
110111
let table = char::from(table);
111112
conn.query_drop(&format!(
@@ -135,7 +136,6 @@ impl MysqlStore {
135136
SUBSPACE_BITMAP_ID,
136137
SUBSPACE_BITMAP_TAG,
137138
SUBSPACE_BITMAP_TEXT,
138-
SUBSPACE_TRACE_INDEX,
139139
] {
140140
let table = char::from(table);
141141
conn.query_drop(&format!(

crates/store/src/backend/postgres/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ impl PostgresStore {
9494
SUBSPACE_LOGS,
9595
SUBSPACE_BLOBS,
9696
SUBSPACE_TRACE,
97+
SUBSPACE_TRACE_INDEX,
9798
] {
9899
let table = char::from(table);
99100
conn.execute(
@@ -114,7 +115,6 @@ impl PostgresStore {
114115
SUBSPACE_BITMAP_ID,
115116
SUBSPACE_BITMAP_TAG,
116117
SUBSPACE_BITMAP_TEXT,
117-
SUBSPACE_TRACE_INDEX,
118118
] {
119119
let table = char::from(table);
120120
conn.execute(

crates/store/src/backend/sqlite/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ impl SqliteStore {
105105
SUBSPACE_LOGS,
106106
SUBSPACE_BLOBS,
107107
SUBSPACE_TRACE,
108+
SUBSPACE_TRACE_INDEX,
108109
] {
109110
let table = char::from(table);
110111
conn.execute(
@@ -124,7 +125,6 @@ impl SqliteStore {
124125
SUBSPACE_BITMAP_ID,
125126
SUBSPACE_BITMAP_TAG,
126127
SUBSPACE_BITMAP_TEXT,
127-
SUBSPACE_TRACE_INDEX,
128128
] {
129129
let table = char::from(table);
130130
conn.execute(

crates/store/src/dispatch/store.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ impl Store {
746746
(SUBSPACE_BITMAP_TEXT, false),
747747
(SUBSPACE_INDEXES, false),
748748
(SUBSPACE_TRACE, true),
749-
(SUBSPACE_TRACE_INDEX, false),
749+
(SUBSPACE_TRACE_INDEX, true),
750750
] {
751751
let from_key = crate::write::AnyKey {
752752
subspace,

tests/src/jmap/enterprise.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ async fn undelete(_params: &mut JMAPTest) {
219219
api.get::<serde_json::Value>("/api/store/purge/account/[email protected]")
220220
.await
221221
.unwrap();
222+
tokio::time::sleep(Duration::from_millis(200)).await;
222223
let deleted = api
223224
.get::<List<DeletedBlob<String, String, String>>>("/api/store/undelete/[email protected]")
224225
.await

tests/src/jmap/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ pub async fn jmap_tests() {
300300
)
301301
.await;
302302

303-
/*webhooks::test(&mut params).await;
303+
webhooks::test(&mut params).await;
304304
email_query::test(&mut params, delete).await;
305305
email_get::test(&mut params).await;
306306
email_set::test(&mut params).await;
@@ -325,7 +325,7 @@ pub async fn jmap_tests() {
325325
quota::test(&mut params).await;
326326
crypto::test(&mut params).await;
327327
blob::test(&mut params).await;
328-
purge::test(&mut params).await;*/
328+
purge::test(&mut params).await;
329329
enterprise::test(&mut params).await;
330330

331331
if delete {

0 commit comments

Comments
 (0)