amaters-net 0.2.0

Network layer for AmateRS (Musubi)
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
//! gRPC service bridge implementation
//!
//! This module provides the bridge between the tonic-generated gRPC service
//! and the AqlServiceImpl business logic.

use crate::proto::aql;
use crate::server::{AqlServiceImpl, StreamConfig};
use amaters_core::traits::StorageEngine;
use futures::StreamExt;
use std::sync::Arc;
use tonic::{Request, Response, Status};
use tracing::{Instrument, debug, error};

/// gRPC service bridge that implements the tonic-generated trait
///
/// This struct wraps the AqlServiceImpl and provides the tonic-specific
/// interface required for gRPC service implementation.
pub struct AqlGrpcService<S: StorageEngine> {
    /// Inner service implementation
    service: Arc<AqlServiceImpl<S>>,
}

impl<S: StorageEngine> AqlGrpcService<S> {
    /// Create a new gRPC service bridge
    pub fn new(service: Arc<AqlServiceImpl<S>>) -> Self {
        Self { service }
    }

    /// Convert a NetError to a tonic Status
    fn net_error_to_status(error: &crate::error::NetError) -> Status {
        use crate::error::NetError;

        match error {
            NetError::MissingField(field) => {
                Status::invalid_argument(format!("Missing required field: {}", field))
            }
            NetError::MalformedMessage(msg) => Status::invalid_argument(msg.clone()),
            NetError::UnsupportedVersion(v) => {
                Status::invalid_argument(format!("Unsupported protocol version: {}", v))
            }
            NetError::InvalidRequest(msg) => Status::failed_precondition(msg.clone()),
            NetError::ServerInternal(msg) => Status::internal(msg.clone()),
            NetError::Storage(err) => Status::internal(format!("Storage error: {}", err)),
            NetError::ServerUnavailable(msg) => Status::unavailable(msg.clone()),
            NetError::ConnectionRefused(msg) => Status::unavailable(msg.clone()),
            NetError::ConnectionReset(msg) => Status::unavailable(msg.clone()),
            NetError::TlsHandshake(msg) => Status::unauthenticated(format!("TLS error: {}", msg)),
            NetError::Timeout(msg) => Status::deadline_exceeded(msg.clone()),
            NetError::Transport(err) => Status::unavailable(format!("Transport error: {}", err)),
            NetError::DnsFailure(msg) => Status::unavailable(msg.clone()),
            NetError::AuthFailed(msg) => Status::unauthenticated(msg.clone()),
            NetError::AuthExpired(msg) => Status::unauthenticated(msg.clone()),
            NetError::InsufficientPermissions(msg) => Status::permission_denied(msg.clone()),
            NetError::InvalidCertificate(msg) => Status::unauthenticated(msg.clone()),
            NetError::RateLimitExceeded(e) => Status::resource_exhausted(e.to_string()),
            NetError::ServerOverloaded(msg) => Status::resource_exhausted(msg.clone()),
            NetError::ServerShuttingDown(msg) => Status::unavailable(msg.clone()),
            NetError::GrpcStatus(msg) => Status::unknown(msg.clone()),
            NetError::Unknown(msg) => Status::unknown(msg.clone()),
            NetError::TlsError(msg) => Status::unauthenticated(format!("TLS error: {}", msg)),
        }
    }
}

#[tonic::async_trait]
impl<S: StorageEngine + Send + Sync + 'static> aql::aql_service_server::AqlService
    for AqlGrpcService<S>
{
    /// Execute a single query
    async fn execute_query(
        &self,
        request: Request<aql::QueryRequest>,
    ) -> Result<Response<aql::QueryResponse>, Status> {
        let req = request.into_inner();
        let request_id = req.request_id.clone().unwrap_or_default();
        let trace_id = crate::tracing_middleware::generate_trace_id();
        let span = crate::tracing_middleware::grpc_span("ExecuteQuery", &request_id, &trace_id);

        let response = async {
            debug!("Received ExecuteQuery gRPC request");
            self.service.execute_query(req).await
        }
        .instrument(span)
        .await;

        Ok(Response::new(response))
    }

    /// Execute a batch of queries (transaction)
    async fn execute_batch(
        &self,
        request: Request<aql::BatchRequest>,
    ) -> Result<Response<aql::BatchResponse>, Status> {
        let req = request.into_inner();
        let request_id = req.request_id.clone().unwrap_or_default();
        let trace_id = crate::tracing_middleware::generate_trace_id();
        let span = crate::tracing_middleware::grpc_span("ExecuteBatch", &request_id, &trace_id);

        let response = async {
            debug!("Received ExecuteBatch gRPC request");
            self.service.execute_batch(req).await
        }
        .instrument(span)
        .await;

        Ok(Response::new(response))
    }

    /// Server streaming RPC for large result sets
    ///
    /// Accepts a query request and returns results as a chunked stream.
    /// Each `StreamResponse` contains a batch of key-value pairs, allowing
    /// efficient transfer of large result sets without loading everything
    /// into a single response message.
    type ExecuteStreamStream =
        futures::stream::BoxStream<'static, Result<aql::StreamResponse, Status>>;

    async fn execute_stream(
        &self,
        request: Request<aql::QueryRequest>,
    ) -> Result<Response<Self::ExecuteStreamStream>, Status> {
        debug!("Received ExecuteStream gRPC request");

        let req = request.into_inner();

        // Extract chunk_size from timeout_ms field as a convention,
        // or use default config. The proto QueryRequest has a timeout_ms
        // field we repurpose; real chunk_size negotiation can be added later.
        let config = StreamConfig::default();

        // Delegate to the service layer's streaming implementation
        let inner_stream = self.service.execute_stream(req, config);

        // Map NetError to tonic::Status for the gRPC layer
        let grpc_stream = inner_stream.map(|result| match result {
            Ok(response) => Ok(response),
            Err(net_error) => {
                error!("Stream error: {}", net_error);
                Err(Self::net_error_to_status(&net_error))
            }
        });

        Ok(Response::new(grpc_stream.boxed()))
    }

    /// Bidirectional streaming for interactive queries
    type ExecuteInteractiveStream =
        futures::stream::BoxStream<'static, Result<aql::QueryResponse, Status>>;

    async fn execute_interactive(
        &self,
        request: Request<tonic::Streaming<aql::QueryRequest>>,
    ) -> Result<Response<Self::ExecuteInteractiveStream>, Status> {
        debug!("Received ExecuteInteractive gRPC request");

        let mut stream = request.into_inner();
        let service = self.service.clone();

        // Create a stream that processes incoming requests
        use futures::StreamExt;

        let response_stream = async_stream::stream! {
            while let Some(result) = stream.next().await {
                match result {
                    Ok(req) => {
                        let response = service.execute_query(req).await;
                        yield Ok(response);
                    }
                    Err(e) => {
                        error!("Error receiving interactive query request: {}", e);
                        yield Err(e);
                        break;
                    }
                }
            }
        };

        Ok(Response::new(response_stream.boxed()))
    }

    /// Health check
    async fn health_check(
        &self,
        request: Request<aql::HealthCheckRequest>,
    ) -> Result<Response<aql::HealthCheckResponse>, Status> {
        let trace_id = crate::tracing_middleware::generate_trace_id();
        let span = crate::tracing_middleware::grpc_span("HealthCheck", "", &trace_id);

        let response = async {
            debug!("Received HealthCheck gRPC request");
            let req = request.into_inner();
            self.service.health_check(req).await
        }
        .instrument(span)
        .await;

        Ok(Response::new(response))
    }

    /// Get server information
    async fn get_server_info(
        &self,
        request: Request<aql::ServerInfoRequest>,
    ) -> Result<Response<aql::ServerInfoResponse>, Status> {
        let trace_id = crate::tracing_middleware::generate_trace_id();
        let span = crate::tracing_middleware::grpc_span("GetServerInfo", "", &trace_id);

        let response = async {
            debug!("Received GetServerInfo gRPC request");
            let req = request.into_inner();
            self.service.get_server_info(req).await
        }
        .instrument(span)
        .await;

        Ok(Response::new(response))
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::convert::{cipher_blob_to_proto, create_version, key_to_proto};
    use amaters_core::Query;
    use amaters_core::storage::MemoryStorage;
    use amaters_core::types::{CipherBlob, Key};

    #[tokio::test]
    async fn test_grpc_service_creation() {
        let storage = Arc::new(MemoryStorage::new());
        let service_impl = Arc::new(AqlServiceImpl::new(storage));
        let _grpc_service = AqlGrpcService::new(service_impl);
        // Just verify it compiles and creates
    }

    #[tokio::test]
    async fn test_execute_query_via_grpc() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());
        let service_impl = Arc::new(AqlServiceImpl::new(storage.clone()));
        let grpc_service = AqlGrpcService::new(service_impl);

        // First, put some data
        let key = Key::from_str("test_key");
        let value = CipherBlob::new(vec![1, 2, 3, 4, 5]);
        storage.put(&key, &value).await.expect("Failed to put");

        // Now query via gRPC interface
        let query = crate::proto::query::Query {
            query: Some(crate::proto::query::query::Query::Get(
                crate::proto::query::GetQuery {
                    collection: "test".to_string(),
                    key: Some(key_to_proto(&key)),
                },
            )),
        };

        let request = Request::new(aql::QueryRequest {
            query: Some(query),
            request_id: Some("test-123".to_string()),
            timeout_ms: None,
            transaction_id: None,
            version: Some(create_version()),
        });

        let response = grpc_service.execute_query(request).await;
        assert!(response.is_ok());

        let resp = response.ok().map(|r| r.into_inner());
        assert!(resp.is_some());
    }

    #[tokio::test]
    async fn test_health_check_via_grpc() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());
        let service_impl = Arc::new(AqlServiceImpl::new(storage));
        let grpc_service = AqlGrpcService::new(service_impl);

        let request = Request::new(aql::HealthCheckRequest { service: None });

        let response = grpc_service.health_check(request).await;
        assert!(response.is_ok());

        let resp = response.ok().map(|r| r.into_inner());
        assert!(resp.is_some());
        assert_eq!(
            resp.map(|r| r.status),
            Some(aql::HealthStatus::HealthServing as i32)
        );
    }

    #[tokio::test]
    async fn test_server_info_via_grpc() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());
        let service_impl = Arc::new(AqlServiceImpl::new(storage));
        let grpc_service = AqlGrpcService::new(service_impl);

        let request = Request::new(aql::ServerInfoRequest {});

        let response = grpc_service.get_server_info(request).await;
        assert!(response.is_ok());

        let resp = response.ok().map(|r| r.into_inner());
        assert!(resp.is_some());

        let info = resp.expect("No server info");
        assert!(info.version.is_some());
        assert!(!info.capabilities.is_empty());
    }

    /// Helper to build a Set query proto message
    fn make_set_query(key: &Key, value: &CipherBlob) -> crate::proto::query::Query {
        crate::proto::query::Query {
            query: Some(crate::proto::query::query::Query::Set(
                crate::proto::query::SetQuery {
                    collection: "test".to_string(),
                    key: Some(key_to_proto(key)),
                    value: Some(cipher_blob_to_proto(value)),
                },
            )),
        }
    }

    /// Helper to build a Get query proto message
    fn make_get_query(key: &Key) -> crate::proto::query::Query {
        crate::proto::query::Query {
            query: Some(crate::proto::query::query::Query::Get(
                crate::proto::query::GetQuery {
                    collection: "test".to_string(),
                    key: Some(key_to_proto(key)),
                },
            )),
        }
    }

    /// Helper to build a Delete query proto message
    fn make_delete_query(key: &Key) -> crate::proto::query::Query {
        crate::proto::query::Query {
            query: Some(crate::proto::query::query::Query::Delete(
                crate::proto::query::DeleteQuery {
                    collection: "test".to_string(),
                    key: Some(key_to_proto(key)),
                },
            )),
        }
    }

    #[tokio::test]
    async fn test_execute_batch_multiple_puts() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());
        let service_impl = Arc::new(AqlServiceImpl::new(storage.clone()));
        let grpc_service = AqlGrpcService::new(service_impl);

        let key1 = Key::from_str("batch_key_1");
        let key2 = Key::from_str("batch_key_2");
        let key3 = Key::from_str("batch_key_3");
        let val1 = CipherBlob::new(vec![10, 20, 30]);
        let val2 = CipherBlob::new(vec![40, 50, 60]);
        let val3 = CipherBlob::new(vec![70, 80, 90]);

        let request = Request::new(aql::BatchRequest {
            queries: vec![
                make_set_query(&key1, &val1),
                make_set_query(&key2, &val2),
                make_set_query(&key3, &val3),
            ],
            request_id: Some("batch-test-1".to_string()),
            timeout_ms: None,
            isolation_level: 0,
            version: Some(create_version()),
        });

        let response = grpc_service.execute_batch(request).await;
        assert!(response.is_ok());

        let resp = response.expect("batch response failed").into_inner();
        match resp.response {
            Some(aql::batch_response::Response::Results(batch_result)) => {
                assert_eq!(batch_result.results.len(), 3);
                // All should be success results
                for result in &batch_result.results {
                    match &result.result {
                        Some(crate::proto::query::query_result::Result::Success(s)) => {
                            assert_eq!(s.affected_rows, 1);
                        }
                        other => panic!("Expected Success result, got {:?}", other),
                    }
                }
            }
            other => panic!("Expected Results response, got {:?}", other),
        }

        // Verify all keys were actually stored
        let stored1 = storage.get(&key1).await.expect("Failed to get key1");
        assert!(stored1.is_some());
        assert_eq!(stored1.expect("no val1"), val1);

        let stored2 = storage.get(&key2).await.expect("Failed to get key2");
        assert!(stored2.is_some());
        assert_eq!(stored2.expect("no val2"), val2);

        let stored3 = storage.get(&key3).await.expect("Failed to get key3");
        assert!(stored3.is_some());
        assert_eq!(stored3.expect("no val3"), val3);
    }

    #[tokio::test]
    async fn test_execute_batch_mixed_operations() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());

        // Pre-populate a key
        let existing_key = Key::from_str("existing_key");
        let existing_val = CipherBlob::new(vec![1, 2, 3]);
        storage
            .put(&existing_key, &existing_val)
            .await
            .expect("Failed to pre-populate");

        let service_impl = Arc::new(AqlServiceImpl::new(storage.clone()));
        let grpc_service = AqlGrpcService::new(service_impl);

        let new_key = Key::from_str("new_key");
        let new_val = CipherBlob::new(vec![4, 5, 6]);

        // Batch: Set new_key, Get existing_key, Delete existing_key
        let request = Request::new(aql::BatchRequest {
            queries: vec![
                make_set_query(&new_key, &new_val),
                make_get_query(&existing_key),
                make_delete_query(&existing_key),
            ],
            request_id: Some("batch-mixed-1".to_string()),
            timeout_ms: None,
            isolation_level: 0,
            version: Some(create_version()),
        });

        let response = grpc_service.execute_batch(request).await;
        assert!(response.is_ok());

        let resp = response.expect("batch response failed").into_inner();
        match resp.response {
            Some(aql::batch_response::Response::Results(batch_result)) => {
                assert_eq!(batch_result.results.len(), 3);

                // First: Set -> Success
                match &batch_result.results[0].result {
                    Some(crate::proto::query::query_result::Result::Success(s)) => {
                        assert_eq!(s.affected_rows, 1);
                    }
                    other => panic!("Expected Success for Set, got {:?}", other),
                }

                // Second: Get -> Single result with value
                match &batch_result.results[1].result {
                    Some(crate::proto::query::query_result::Result::Single(s)) => {
                        assert!(s.value.is_some());
                    }
                    other => panic!("Expected Single for Get, got {:?}", other),
                }

                // Third: Delete -> Success
                match &batch_result.results[2].result {
                    Some(crate::proto::query::query_result::Result::Success(s)) => {
                        assert_eq!(s.affected_rows, 1);
                    }
                    other => panic!("Expected Success for Delete, got {:?}", other),
                }
            }
            other => panic!("Expected Results response, got {:?}", other),
        }

        // Verify final state: new_key exists, existing_key deleted
        let stored_new = storage.get(&new_key).await.expect("Failed to get new_key");
        assert!(stored_new.is_some());

        let stored_existing = storage
            .get(&existing_key)
            .await
            .expect("Failed to get existing_key");
        assert!(stored_existing.is_none());
    }

    #[tokio::test]
    async fn test_execute_batch_empty() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());
        let service_impl = Arc::new(AqlServiceImpl::new(storage));
        let grpc_service = AqlGrpcService::new(service_impl);

        let request = Request::new(aql::BatchRequest {
            queries: Vec::new(),
            request_id: Some("batch-empty".to_string()),
            timeout_ms: None,
            isolation_level: 0,
            version: Some(create_version()),
        });

        let response = grpc_service.execute_batch(request).await;
        assert!(response.is_ok());

        let resp = response.expect("batch response failed").into_inner();
        match resp.response {
            Some(aql::batch_response::Response::Results(batch_result)) => {
                assert!(batch_result.results.is_empty());
            }
            other => panic!("Expected empty Results response, got {:?}", other),
        }
        assert_eq!(resp.request_id, Some("batch-empty".to_string()));
    }

    #[tokio::test]
    async fn test_execute_batch_partial_failure_with_rollback() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());
        let service_impl = Arc::new(AqlServiceImpl::new(storage.clone()));
        let grpc_service = AqlGrpcService::new(service_impl);

        let key1 = Key::from_str("rollback_key_1");
        let val1 = CipherBlob::new(vec![10, 20, 30]);

        // Batch: first query succeeds (Set), second query has no query field (will fail parsing)
        let invalid_query = crate::proto::query::Query { query: None };

        let request = Request::new(aql::BatchRequest {
            queries: vec![make_set_query(&key1, &val1), invalid_query],
            request_id: Some("batch-fail".to_string()),
            timeout_ms: None,
            isolation_level: 0,
            version: Some(create_version()),
        });

        let response = grpc_service.execute_batch(request).await;
        assert!(response.is_ok());

        let resp = response.expect("batch response failed").into_inner();

        // Should be an error response
        match resp.response {
            Some(aql::batch_response::Response::Error(err)) => {
                assert!(
                    err.message.contains("Query 1 in batch failed"),
                    "Error message was: {}",
                    err.message
                );
            }
            other => panic!(
                "Expected Error response for partial failure, got {:?}",
                other
            ),
        }

        // key1 should have been rolled back (deleted since it didn't exist before)
        let stored = storage.get(&key1).await.expect("Failed to get key1");
        assert!(
            stored.is_none(),
            "key1 should have been rolled back (deleted)"
        );
    }

    #[tokio::test]
    async fn test_execute_batch_rollback_restores_old_values() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());

        // Pre-populate key with an original value
        let key = Key::from_str("overwrite_key");
        let original_val = CipherBlob::new(vec![1, 2, 3]);
        storage
            .put(&key, &original_val)
            .await
            .expect("Failed to pre-populate");

        let service_impl = Arc::new(AqlServiceImpl::new(storage.clone()));
        let grpc_service = AqlGrpcService::new(service_impl);

        let new_val = CipherBlob::new(vec![99, 98, 97]);

        // Batch: overwrite key, then fail on invalid query
        let invalid_query = crate::proto::query::Query { query: None };

        let request = Request::new(aql::BatchRequest {
            queries: vec![make_set_query(&key, &new_val), invalid_query],
            request_id: Some("batch-restore".to_string()),
            timeout_ms: None,
            isolation_level: 0,
            version: Some(create_version()),
        });

        let response = grpc_service.execute_batch(request).await;
        assert!(response.is_ok());

        let resp = response.expect("batch response failed").into_inner();
        // Should be error
        assert!(matches!(
            resp.response,
            Some(aql::batch_response::Response::Error(_))
        ));

        // The original value should be restored
        let stored = storage.get(&key).await.expect("Failed to get key");
        assert!(stored.is_some(), "Key should still exist after rollback");
        assert_eq!(
            stored.expect("no stored value"),
            original_val,
            "Original value should be restored after rollback"
        );
    }

    #[tokio::test]
    async fn test_execute_batch_rollback_delete_undo() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());

        // Pre-populate key
        let key = Key::from_str("delete_undo_key");
        let original_val = CipherBlob::new(vec![11, 22, 33]);
        storage
            .put(&key, &original_val)
            .await
            .expect("Failed to pre-populate");

        let service_impl = Arc::new(AqlServiceImpl::new(storage.clone()));
        let grpc_service = AqlGrpcService::new(service_impl);

        // Batch: delete key, then fail on invalid query
        let invalid_query = crate::proto::query::Query { query: None };

        let request = Request::new(aql::BatchRequest {
            queries: vec![make_delete_query(&key), invalid_query],
            request_id: Some("batch-delete-undo".to_string()),
            timeout_ms: None,
            isolation_level: 0,
            version: Some(create_version()),
        });

        let response = grpc_service.execute_batch(request).await;
        assert!(response.is_ok());

        let resp = response.expect("batch response failed").into_inner();
        assert!(matches!(
            resp.response,
            Some(aql::batch_response::Response::Error(_))
        ));

        // The key should be restored after rollback
        let stored = storage.get(&key).await.expect("Failed to get key");
        assert!(
            stored.is_some(),
            "Deleted key should be restored after rollback"
        );
        assert_eq!(
            stored.expect("no stored value"),
            original_val,
            "Original value should be restored after delete rollback"
        );
    }

    /// Helper to build a Range query proto message
    fn make_range_query(start: &Key, end: &Key) -> crate::proto::query::Query {
        crate::proto::query::Query {
            query: Some(crate::proto::query::query::Query::Range(
                crate::proto::query::RangeQuery {
                    collection: "test".to_string(),
                    start: Some(key_to_proto(start)),
                    end: Some(key_to_proto(end)),
                    limit: None,
                },
            )),
        }
    }

    /// Helper to make a streaming QueryRequest from a proto Query
    fn make_stream_request(query: crate::proto::query::Query) -> Request<aql::QueryRequest> {
        Request::new(aql::QueryRequest {
            query: Some(query),
            request_id: Some("stream-test".to_string()),
            timeout_ms: None,
            transaction_id: None,
            version: Some(create_version()),
        })
    }

    /// Helper to collect all StreamResponse items from a stream
    async fn collect_stream_responses(
        stream: futures::stream::BoxStream<'static, Result<aql::StreamResponse, Status>>,
    ) -> Vec<Result<aql::StreamResponse, Status>> {
        use futures::StreamExt;
        stream.collect::<Vec<_>>().await
    }

    #[tokio::test]
    async fn test_stream_basic() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());

        // Insert 10 items
        for i in 0u8..10 {
            let key = Key::from_str(&format!("stream_key_{:02}", i));
            let value = CipherBlob::new(vec![i]);
            storage.put(&key, &value).await.expect("Failed to put");
        }

        let service_impl = Arc::new(AqlServiceImpl::new(storage.clone()));
        let grpc_service = AqlGrpcService::new(service_impl);

        let start = Key::from_str("stream_key_00");
        let end = Key::from_str("stream_key_99");
        let request = make_stream_request(make_range_query(&start, &end));

        let response = grpc_service.execute_stream(request).await;
        assert!(response.is_ok(), "execute_stream should succeed");

        let stream = response.expect("stream failed").into_inner();
        let responses = collect_stream_responses(stream).await;

        // Should have at least 1 batch + 1 end marker
        assert!(
            responses.len() >= 2,
            "Expected at least 2 responses (batch + end), got {}",
            responses.len()
        );

        // All responses should be Ok
        for resp in &responses {
            assert!(resp.is_ok(), "All stream responses should be Ok");
        }

        // Last response should be the end marker
        let last = responses.last().expect("no last response");
        let last_resp = last.as_ref().expect("last response is error");
        match &last_resp.chunk {
            Some(aql::stream_response::Chunk::End(end_marker)) => {
                assert_eq!(end_marker.total_count, 10, "Should report 10 total items");
            }
            other => panic!("Expected End chunk, got {:?}", other),
        }

        // Count total items across all batch chunks
        let mut total_items = 0u64;
        for resp in &responses {
            let r = resp.as_ref().expect("response is error");
            if let Some(aql::stream_response::Chunk::Batch(batch)) = &r.chunk {
                total_items += batch.values.len() as u64;
            }
        }
        assert_eq!(total_items, 10, "Should have streamed 10 items total");
    }

    #[tokio::test]
    async fn test_stream_empty_results() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());
        // No data inserted

        let service_impl = Arc::new(AqlServiceImpl::new(storage.clone()));
        let grpc_service = AqlGrpcService::new(service_impl);

        let start = Key::from_str("nonexistent_00");
        let end = Key::from_str("nonexistent_99");
        let request = make_stream_request(make_range_query(&start, &end));

        let response = grpc_service.execute_stream(request).await;
        assert!(response.is_ok());

        let stream = response.expect("stream failed").into_inner();
        let responses = collect_stream_responses(stream).await;

        // Should have exactly 1 response: the end marker with count 0
        assert_eq!(
            responses.len(),
            1,
            "Empty result should produce only an end marker"
        );

        let resp = responses[0].as_ref().expect("response is error");
        match &resp.chunk {
            Some(aql::stream_response::Chunk::End(end_marker)) => {
                assert_eq!(end_marker.total_count, 0);
            }
            other => panic!("Expected End chunk for empty results, got {:?}", other),
        }
    }

    #[tokio::test]
    async fn test_stream_large_dataset() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());

        // Insert 1000 items
        for i in 0u32..1000 {
            let key = Key::from_str(&format!("large_{:04}", i));
            let value = CipherBlob::new(i.to_le_bytes().to_vec());
            storage.put(&key, &value).await.expect("Failed to put");
        }

        let service_impl = Arc::new(AqlServiceImpl::new(storage.clone()));
        let grpc_service = AqlGrpcService::new(service_impl);

        let start = Key::from_str("large_0000");
        let end = Key::from_str("large_9999");
        let request = make_stream_request(make_range_query(&start, &end));

        let response = grpc_service.execute_stream(request).await;
        assert!(response.is_ok());

        let stream = response.expect("stream failed").into_inner();
        let responses = collect_stream_responses(stream).await;

        // Default chunk size is 100, so 1000 items = 10 batches + 1 end marker
        assert_eq!(
            responses.len(),
            11,
            "1000 items with chunk_size=100 should produce 10 batches + 1 end marker"
        );

        // Verify all batch chunks have exactly 100 items
        let mut total_items = 0u64;
        let mut batch_count = 0u64;
        for resp in &responses {
            let r = resp.as_ref().expect("response is error");
            if let Some(aql::stream_response::Chunk::Batch(batch)) = &r.chunk {
                assert_eq!(
                    batch.values.len(),
                    100,
                    "Each batch should have exactly 100 items"
                );
                batch_count += 1;
                total_items += batch.values.len() as u64;
            }
        }
        assert_eq!(batch_count, 10, "Should have 10 batch chunks");
        assert_eq!(total_items, 1000, "Should have 1000 total items");

        // Verify end marker
        let last = responses.last().expect("no last response");
        let last_resp = last.as_ref().expect("last response is error");
        match &last_resp.chunk {
            Some(aql::stream_response::Chunk::End(end_marker)) => {
                assert_eq!(end_marker.total_count, 1000);
            }
            other => panic!("Expected End chunk, got {:?}", other),
        }
    }

    #[tokio::test]
    async fn test_stream_chunk_size() {
        // Test that custom chunk sizes work via the server.rs execute_stream method directly
        let storage = Arc::new(MemoryStorage::new());

        // Insert 25 items
        for i in 0u8..25 {
            let key = Key::from_str(&format!("chunk_{:02}", i));
            let value = CipherBlob::new(vec![i]);
            storage.put(&key, &value).await.expect("Failed to put");
        }

        let service_impl = AqlServiceImpl::new(storage.clone());

        let query = crate::proto::query::Query {
            query: Some(crate::proto::query::query::Query::Range(
                crate::proto::query::RangeQuery {
                    collection: "test".to_string(),
                    start: Some(key_to_proto(&Key::from_str("chunk_00"))),
                    end: Some(key_to_proto(&Key::from_str("chunk_99"))),
                    limit: None,
                },
            )),
        };

        let request = aql::QueryRequest {
            query: Some(query),
            request_id: Some("chunk-size-test".to_string()),
            timeout_ms: None,
            transaction_id: None,
            version: Some(create_version()),
        };

        // Use chunk size of 7 => 25 items / 7 = 3 full chunks + 1 partial chunk + 1 end marker
        let config = StreamConfig::default().with_chunk_size(7);
        let stream = service_impl.execute_stream(request, config);

        use futures::StreamExt;
        let responses: Vec<_> = stream.collect().await;

        // 4 batch chunks + 1 end marker = 5 responses
        assert_eq!(
            responses.len(),
            5,
            "25 items / chunk_size=7 => 4 batches + 1 end marker"
        );

        // First 3 batches should have 7 items each
        for (i, response) in responses.iter().enumerate().take(3) {
            let r = response.as_ref().expect("response is error");
            if let Some(aql::stream_response::Chunk::Batch(batch)) = &r.chunk {
                assert_eq!(batch.values.len(), 7, "Batch {} should have 7 items", i);
                assert!(batch.has_more, "Batch {} should have has_more=true", i);
            } else {
                panic!("Expected Batch chunk at index {}", i);
            }
        }

        // Last batch should have 4 items (25 - 3*7 = 4)
        let last_batch = responses[3].as_ref().expect("response is error");
        if let Some(aql::stream_response::Chunk::Batch(batch)) = &last_batch.chunk {
            assert_eq!(batch.values.len(), 4, "Last batch should have 4 items");
            assert!(!batch.has_more, "Last batch should have has_more=false");
        } else {
            panic!("Expected Batch chunk at index 3");
        }

        // End marker
        let end = responses[4].as_ref().expect("response is error");
        match &end.chunk {
            Some(aql::stream_response::Chunk::End(end_marker)) => {
                assert_eq!(end_marker.total_count, 25);
            }
            other => panic!("Expected End chunk, got {:?}", other),
        }
    }

    #[tokio::test]
    async fn test_stream_single_chunk() {
        use aql::aql_service_server::AqlService;

        let storage = Arc::new(MemoryStorage::new());

        // Insert 5 items (less than default chunk size of 100)
        for i in 0u8..5 {
            let key = Key::from_str(&format!("single_{:02}", i));
            let value = CipherBlob::new(vec![i]);
            storage.put(&key, &value).await.expect("Failed to put");
        }

        let service_impl = Arc::new(AqlServiceImpl::new(storage.clone()));
        let grpc_service = AqlGrpcService::new(service_impl);

        let start = Key::from_str("single_00");
        let end = Key::from_str("single_99");
        let request = make_stream_request(make_range_query(&start, &end));

        let response = grpc_service.execute_stream(request).await;
        assert!(response.is_ok());

        let stream = response.expect("stream failed").into_inner();
        let responses = collect_stream_responses(stream).await;

        // 5 items fits in one batch + end marker = 2 responses
        assert_eq!(
            responses.len(),
            2,
            "Small result set should produce 1 batch + 1 end marker"
        );

        // Single batch should have all 5 items
        let first = responses[0].as_ref().expect("response is error");
        match &first.chunk {
            Some(aql::stream_response::Chunk::Batch(batch)) => {
                assert_eq!(batch.values.len(), 5, "Single batch should have 5 items");
                assert!(!batch.has_more, "Single batch should have has_more=false");
            }
            other => panic!("Expected Batch chunk, got {:?}", other),
        }

        // Verify sequence numbers are sequential
        for (idx, resp) in responses.iter().enumerate() {
            let r = resp.as_ref().expect("response is error");
            assert_eq!(
                r.sequence, idx as u64,
                "Sequence number should be sequential"
            );
        }
    }
}