Merge branch 'asynos-ctx-fix'

Author: khaf

src/operations/cdt_context.rs

@@ -16,6 +16,7 @@
 use crate::operations::lists::{list_order_flag, ListOrderType};
 use crate::operations::MapOrder;
 use crate::Value;
+use crate::operations::maps::map_order_flag;
 
 #[doc(hidden)]
 // Empty Context for scalar operations
@@ -133,7 +134,7 @@ pub const fn ctx_map_key(key: Value) -> CdtContext {
 pub const fn ctx_map_key_create(key: Value, order: MapOrder) -> CdtContext {
     CdtContext {
         id: CtxType::MapKey as u8,
-        flags: order as u8,
+        flags: map_order_flag(order),
         value: key,
     }
 }

src/operations/maps.rs

@@ -226,6 +226,15 @@ const fn map_order_arg(policy: &MapPolicy) -> Option<CdtArgument> {
     }
 }
 
+#[doc(hidden)]
+pub const fn map_order_flag(order: MapOrder) -> u8 {
+    match order {
+        MapOrder::KeyOrdered => 0x80,
+        MapOrder::Unordered => 0x40,
+        MapOrder::KeyValueOrdered => 0xc0
+    }
+}
+
 /// Create set map policy operation. Server set the map policy attributes. Server does not
 /// return a result.
 ///

tests/src/cdt_map.rs

@@ -18,8 +18,8 @@ use std::collections::HashMap;
 use crate::common;
 use env_logger;
 
-use aerospike::operations::cdt_context::ctx_map_key;
-use aerospike::operations::maps;
+use aerospike::operations::cdt_context::{ctx_map_key, ctx_map_key_create};
+use aerospike::operations::{maps, MapOrder};
 use aerospike::{
     as_bin, as_key, as_list, as_map, as_val, Bins, MapPolicy, MapReturnType, ReadPolicy,
     WritePolicy,
@@ -300,4 +300,24 @@ fn map_operations() {
     let op = maps::get_by_key(bin_name, &xkey, MapReturnType::Value).set_context(ctx);
     let rec = client.operate(&wpolicy, &key, &[op]).unwrap();
     assert_eq!(*rec.bins.get(bin_name).unwrap(), as_val!(8));
+
+    let mkey = as_val!("ctxtest2");
+    let ctx = &vec![ctx_map_key_create(mkey.clone(), MapOrder::KeyOrdered)];
+    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();
+    let op = [maps::get_by_key(bin_name, &xkey, MapReturnType::Value).set_context(ctx)];
+    let rec = client.operate(&wpolicy, &key, &op).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 xkey = as_val!("c");
+    let xval = as_val!(9);
+    let op = [maps::put(&mpolicy, bin_name, &xkey, &xval).set_context(ctx)];
+    client.operate(&wpolicy, &key, &op).unwrap();
+    let op = [maps::get_by_key(bin_name, &xkey, MapReturnType::Value).set_context(ctx)];
+    let rec = client.operate(&wpolicy, &key, &op).unwrap();
+    assert_eq!(*rec.bins.get(bin_name).unwrap(), as_val!(9));
 }