merged with 5.6 expressions

Author: jonas32

aerospike-core/src/commands/buffer.rs

@@ -492,11 +492,8 @@ impl Buffer {
                         OperationType::Read
                         | OperationType::CdtRead
                         | OperationType::BitRead
-                        | OperationType::HllRead,
-                    ..
-                }
-                | Operation {
-                    op: OperationType::ExpRead,
+                        | OperationType::HllRead
+                        | OperationType::ExpRead,
                     ..
                 } => read_attr |= INFO1_READ,
                 _ => write_attr |= INFO2_WRITE,

aerospike-core/src/operations/cdt_context.rs

@@ -14,9 +14,9 @@
 
 //! Operation Context for nested Operations
 use crate::operations::lists::{list_order_flag, ListOrderType};
+use crate::operations::maps::map_order_flag;
 use crate::operations::MapOrder;
 use crate::Value;
-use crate::operations::maps::map_order_flag;
 
 #[doc(hidden)]
 // Empty Context for scalar operations

src/operations/exp.rs renamed to aerospike-core/src/operations/exp.rs

@@ -45,7 +45,8 @@ pub enum ExpWriteFlags {
 }
 
 #[doc(hidden)]
-pub type ExpressionEncoder = Box<dyn Fn(&mut Option<&mut Buffer>, &ExpOperation) -> Result<usize>>;
+pub type ExpressionEncoder =
+    Box<dyn Fn(&mut Option<&mut Buffer>, &ExpOperation) -> Result<usize> + Send + Sync + 'static>;
 
 #[doc(hidden)]
 pub struct ExpOperation<'a> {

aerospike-core/src/operations/maps.rs

@@ -231,7 +231,7 @@ pub const fn map_order_flag(order: MapOrder) -> u8 {
     match order {
         MapOrder::KeyOrdered => 0x80,
         MapOrder::Unordered => 0x40,
-        MapOrder::KeyValueOrdered => 0xc0
+        MapOrder::KeyValueOrdered => 0xc0,
     }
 }
 

tests/client.rs

@@ -35,15 +35,15 @@ async fn node_names() {
     let client = common::client().await;
     let names = client.node_names().await;
     assert!(!names.is_empty());
-    client.close().await;
+    client.close().await.unwrap();
 }
 
 #[aerospike_macro::test]
 async fn nodes() {
     let client = common::client().await;
     let nodes = client.nodes().await;
     assert!(!nodes.is_empty());
-    client.close().await;
+    client.close().await.unwrap();
 }
 
 #[aerospike_macro::test]
@@ -53,7 +53,7 @@ async fn get_node() {
         let node = client.get_node(&name).await;
         assert!(node.is_ok());
     }
-    client.close().await;
+    client.close().await.unwrap();
 }
 
 #[aerospike_macro::test]

tests/src/batch.rs

@@ -79,5 +79,5 @@ async fn batch_get() {
     assert_eq!(result.key, key4);
     let record = result.record;
     assert!(record.is_none());
-    client.close().await;
+    client.close().await.unwrap();
 }

tests/src/cdt_bitwise.rs

@@ -189,5 +189,5 @@ async fn cdt_bitwise() {
     let ops = &vec![bitwise::rscan("bin", 19, 8, true)];
     let rec = client.operate(&wpolicy, &key, ops).await.unwrap();
     assert_eq!(*rec.bins.get("bin").unwrap(), Value::Int(7));
-    client.close().await;
+    client.close().await.unwrap();
 }

tests/src/cdt_list.rs

@@ -448,5 +448,5 @@ fn cdt_list() {
     )];
     let rec = client.operate(&wpolicy, &key, ops).await.unwrap();
     assert_eq!(*rec.bins.get("bin").unwrap(), as_list!(8, 9));
-    client.close().await;
+    client.close().await.unwrap();
 }

tests/src/cdt_map.rs

@@ -306,13 +306,16 @@ async fn map_operations() {
     let xkey = as_val!("y");
     let xval = as_val!(8);
     let op = [maps::put(&mpolicy, bin_name, &xkey, &xval).set_context(ctx)];
-    client.operate(&wpolicy, &key, &op).unwrap();
+    client.operate(&wpolicy, &key, &op).await.unwrap();
     let op = [maps::get_by_key(bin_name, &xkey, MapReturnType::Value).set_context(ctx)];
-    let rec = client.operate(&wpolicy, &key, &op).unwrap();
+    let rec = client.operate(&wpolicy, &key, &op).await.unwrap();
     assert_eq!(*rec.bins.get(bin_name).unwrap(), as_val!(8));
 
     let mkey2 = as_val!("ctxtest3");
-    let ctx = &vec![ctx_map_key(mkey), ctx_map_key_create(mkey2, MapOrder::Unordered)];
+    let ctx = &vec![
+        ctx_map_key(mkey),
+        ctx_map_key_create(mkey2, MapOrder::Unordered),
+    ];
     let xkey = as_val!("c");
     let xval = as_val!(9);
     let op = [maps::put(&mpolicy, bin_name, &xkey, &xval).set_context(ctx)];
@@ -321,5 +324,5 @@ async fn map_operations() {
     let rec = client.operate(&wpolicy, &key, &op).await.unwrap();
     assert_eq!(*rec.bins.get(bin_name).unwrap(), as_val!(9));
 
-    client.close().await;
+    client.close().await.unwrap();
 }