Merge branch 'master' into async

# Conflicts:
#	tests/src/cdt_map.rs
#	tests/src/exp.rs

Author: jonas32

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.2.0] - 2021-10-22
+
+* **New Features**
+  * Support Aerospike server v5.6+ expressions in Operate API.
+
+* **Bug Fixes**
+  * Fix for buffer size when using CDT contexts.
+
 ## [1.1.0] - 2021-10-12
 This version of the client drops support for the older server versions without changing the API. `ScanPolicy.fail_on_cluster_change`, `ScanPolicy.scan_percent` and `BasePolicy.priority` are deprected for the Scan operations and will not be sent to the server. They remain in the API to avoid breaking the API.
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aerospike"
-version = "1.1.0"
+version = "1.2.0"
 edition = "2018"
 authors = ["Khosrow Afroozeh <khosrow@aerospike.com>", "Jan Hecking <jhecking@aerospike.com>"]
 description = "Aerospike Client for Rust"

aerospike-core/src/commands/buffer.rs

@@ -494,13 +494,20 @@ impl Buffer {
                         | OperationType::BitRead
                         | OperationType::HllRead,
                     ..
+                }
+                | Operation {
+                    op: OperationType::ExpRead,
+                    ..
                 } => read_attr |= INFO1_READ,
                 _ => write_attr |= INFO2_WRITE,
             }
 
             let each_op = matches!(
                 operation.data,
-                OperationData::CdtMapOp(_) | OperationData::CdtBitOp(_)
+                OperationData::CdtMapOp(_)
+                    | OperationData::CdtBitOp(_)
+                    | OperationData::HLLOp(_)
+                    | OperationData::EXPOp(_)
             );
 
             if policy.respond_per_each_op || each_op {
@@ -543,7 +550,6 @@ impl Buffer {
         for operation in operations {
             operation.write_to(self)?;
         }
-
         self.end()
     }
 

aerospike-core/src/expressions/hll.rs

@@ -23,6 +23,7 @@ const MODULE: i64 = 2;
 
 #[doc(hidden)]
 pub enum HllExpOp {
+    Init = 0,
     Add = 1,
     Count = 50,
     Union = 51,
@@ -33,6 +34,33 @@ pub enum HllExpOp {
     MayContain = 56,
 }
 
+/// Create expression that creates a new HLL or resets an existing HLL.
+pub fn init(
+    policy: HLLPolicy,
+    index_bit_count: FilterExpression,
+    bin: FilterExpression,
+) -> FilterExpression {
+    init_with_min_hash(policy, index_bit_count, int_val(-1), bin)
+}
+
+/// Create expression that creates a new HLL or resets an existing HLL with minhash bits.
+pub fn init_with_min_hash(
+    policy: HLLPolicy,
+    index_bit_count: FilterExpression,
+    min_hash_count: FilterExpression,
+    bin: FilterExpression,
+) -> FilterExpression {
+    add_write(
+        bin,
+        vec![
+            ExpressionArgument::Value(Value::from(HllExpOp::Init as i64)),
+            ExpressionArgument::FilterExpression(index_bit_count),
+            ExpressionArgument::FilterExpression(min_hash_count),
+            ExpressionArgument::Value(Value::from(policy.flags as i64)),
+        ],
+    )
+}
+
 /// Create expression that adds list values to a HLL set and returns HLL set.
 /// The function assumes HLL bin already exists.
 /// ```