Merge branch 'master' into returnUsedPreAggregation

Author: KSDaemon

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

@@ -347,10 +347,13 @@ impl TransportService for NodeBridgeTransport {
             .map(|s| s.span_id.clone())
             .unwrap_or_else(|| Uuid::new_v4().to_string());
 
+        let mut req_seq_id: u32 = 0;
+
         loop {
+            req_seq_id += 1;
             let extra = serde_json::to_string(&LoadRequest {
                 request: TransportRequest {
-                    id: format!("{}-span-{}", request_id, 1),
+                    id: format!("{}-span-{}", request_id, req_seq_id),
                     meta: Some(meta.clone()),
                 },
                 query: query.clone(),
@@ -433,15 +436,19 @@ impl TransportService for NodeBridgeTransport {
             .as_ref()
             .map(|s| s.span_id.clone())
             .unwrap_or_else(|| Uuid::new_v4().to_string());
+
+        let mut req_seq_id: u32 = 0;
+
         loop {
+            req_seq_id += 1;
             let native_auth = ctx
                 .as_any()
                 .downcast_ref::<NativeAuthContext>()
                 .expect("Unable to cast AuthContext to NativeAuthContext");
 
             let extra = serde_json::to_string(&LoadRequest {
                 request: TransportRequest {
-                    id: format!("{}-span-{}", request_id, 1),
+                    id: format!("{}-span-{}", request_id, req_seq_id),
                     meta: Some(meta.clone()),
                 },
                 query: query.clone(),

packages/cubejs-dremio-driver/package.json

@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing-shared": "1.1.9",
+    "@cubejs-backend/testing-shared": "1.1.11",
     "jest": "^27"
   },
   "license": "Apache-2.0",