[CLIENT-1351] Adds Expressions

Author: khaf

.travis.yml

@@ -3,7 +3,6 @@ os:
 - linux
 dist: xenial
 go:
-- "1.12"
 - "1.13"
 - "1.14"
 - "1.15"

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change History
 
+## November 27 2020: v4.0.0
+
+  Major feature release. Deprecates `PredExp` filters and replaces them with the far more capable Expressions.
+
+  * **New Features**:
+
+    - [CLIENT-1361] Replace predicate filters with new Aerospike Expressions.
+
+  * **Fixes**
+
+    - Allows unmarshalling of bool fields to sub objects in reflection API. (Github #325)
+    - Fixes an issue where BatchIndexGet commands were not retried in some circumstances.
+
+  * **Incompatible changes**:
+
+    - Changes the `BitResizeFlagsXXX` enum types to  `BitResizeFlags` type. This should not affect any code if the enums were used.
+    - Changes the `ListSortFlagsXXX` enum types to`ListSortFlags` are now typed. This should not affect any code if the enums were used.
+
 ## November 9 2020: v3.1.1
 
   Hotfix release. We recommend upgrading to this version, or cherry-picking the changeset to your vendored version if possible.

bit_resize_flags.go

@@ -15,17 +15,18 @@
 package aerospike
 
 // BitResizeFlags specifies the bitwise operation flags for resize.
+type BitResizeFlags int
 
 const (
 	// BitResizeFlagsDefault specifies the defalt flag.
-	BitResizeFlagsDefault = 0
+	BitResizeFlagsDefault BitResizeFlags = 0
 
 	// BitResizeFlagsFromFront Adds/removes bytes from the beginning instead of the end.
-	BitResizeFlagsFromFront = 1
+	BitResizeFlagsFromFront BitResizeFlags = 1
 
 	// BitResizeFlagsGrowOnly will only allow the byte[] size to increase.
-	BitResizeFlagsGrowOnly = 2
+	BitResizeFlagsGrowOnly BitResizeFlags = 2
 
 	// BitResizeFlagsShrinkOnly will only allow the byte[] size to decrease.
-	BitResizeFlagsShrinkOnly = 4
+	BitResizeFlagsShrinkOnly BitResizeFlags = 4
 )

cdt_bitwise.go

@@ -58,7 +58,7 @@ const (
 // byteSize = 4
 // resizeFlags = 0
 // bin result = [0b00000001, 0b01000010, 0b00000000, 0b00000000]
-func BitResizeOp(policy *BitPolicy, binName string, byteSize int, resizeFlags int, ctx ...*CDTContext) *Operation {
+func BitResizeOp(policy *BitPolicy, binName string, byteSize int, resizeFlags BitResizeFlags, ctx ...*CDTContext) *Operation {
 	return &Operation{
 		opType:   _BIT_MODIFY,
 		ctx:      ctx,

cdt_context.go

@@ -16,6 +16,16 @@
  */
 package aerospike
 
+const (
+	ctxTypeListIndex = 0x10
+	ctxTypeListRank  = 0x11
+	ctxTypeListValue = 0x13
+	ctxTypeMapIndex  = 0x20
+	ctxTypeMapRank   = 0x21
+	ctxTypeMapKey    = 0x22
+	ctxTypeMapValue  = 0x23
+)
+
 // CDTContext defines Nested CDT context. Identifies the location of nested list/map to apply the operation.
 // for the current level.
 // An array of CTX identifies location of the list/map on multiple
@@ -25,6 +35,36 @@ type CDTContext struct {
 	value Value
 }
 
+func (ctx *CDTContext) pack(cmd BufferEx) (int, error) {
+	size := 0
+	sz, err := packAInt64(cmd, int64(ctx.id))
+	size += sz
+	if err != nil {
+		return size, err
+	}
+
+	sz, err = ctx.value.pack(cmd)
+	size += sz
+
+	return size, err
+}
+
+// cdtContextList is used in FilterExpression API
+type cdtContextList []*CDTContext
+
+func (ctxl cdtContextList) pack(cmd BufferEx) (int, error) {
+	size := 0
+	for i := range ctxl {
+		sz, err := ctxl[i].pack(cmd)
+		size += sz
+		if err != nil {
+			return size, err
+		}
+	}
+
+	return size, nil
+}
+
 // CtxListIndex defines Lookup list by index offset.
 // If the index is negative, the resolved index starts backwards from end of list.
 // If an index is out of bounds, a parameter error will be returned.
@@ -34,25 +74,25 @@ type CDTContext struct {
 // -1: Last item.
 // -3: Third to last item.
 func CtxListIndex(index int) *CDTContext {
-	return &CDTContext{0x10, IntegerValue(index)}
+	return &CDTContext{ctxTypeListIndex, IntegerValue(index)}
 }
 
 // CtxListIndexCreate list with given type at index offset, given an order and pad.
 func CtxListIndexCreate(index int, order ListOrderType, pad bool) *CDTContext {
-	return &CDTContext{0x10 | cdtListOrderFlag(order, pad), IntegerValue(index)}
+	return &CDTContext{ctxTypeListIndex | cdtListOrderFlag(order, pad), IntegerValue(index)}
 }
 
 // CtxListRank defines Lookup list by rank.
 // 0 = smallest value
 // N = Nth smallest value
 // -1 = largest value
 func CtxListRank(rank int) *CDTContext {
-	return &CDTContext{0x11, IntegerValue(rank)}
+	return &CDTContext{ctxTypeListRank, IntegerValue(rank)}
 }
 
 // CtxListValue defines Lookup list by value.
 func CtxListValue(key Value) *CDTContext {
-	return &CDTContext{0x13, key}
+	return &CDTContext{ctxTypeListValue, key}
 }
 
 // CtxMapIndex defines Lookup map by index offset.
@@ -64,28 +104,28 @@ func CtxListValue(key Value) *CDTContext {
 // -1: Last item.
 // -3: Third to last item.
 func CtxMapIndex(index int) *CDTContext {
-	return &CDTContext{0x20, IntegerValue(index)}
+	return &CDTContext{ctxTypeMapIndex, IntegerValue(index)}
 }
 
 // CtxMapRank defines Lookup map by rank.
 // 0 = smallest value
 // N = Nth smallest value
 // -1 = largest value
 func CtxMapRank(rank int) *CDTContext {
-	return &CDTContext{0x21, IntegerValue(rank)}
+	return &CDTContext{ctxTypeMapRank, IntegerValue(rank)}
 }
 
 // CtxMapKey defines Lookup map by key.
 func CtxMapKey(key Value) *CDTContext {
-	return &CDTContext{0x22, key}
+	return &CDTContext{ctxTypeMapKey, key}
 }
 
 // Create map with given type at map key.
 func CtxMapKeyCreate(key Value, order mapOrderType) *CDTContext {
-	return &CDTContext{0x22 | order.flag, key}
+	return &CDTContext{ctxTypeMapKey | order.flag, key}
 }
 
 // CtxMapValue defines Lookup map by value.
 func CtxMapValue(key Value) *CDTContext {
-	return &CDTContext{0x23, key}
+	return &CDTContext{ctxTypeMapValue, key}
 }

cdt_list.go

@@ -158,15 +158,15 @@ const (
 )
 
 // ListSortFlags detemines sort flags for CDT lists
-// type ListSortFlags int
+type ListSortFlags int
 
 const (
 	// ListSortFlagsDefault is the default sort flag for CDT lists, and sort in Ascending order.
-	ListSortFlagsDefault = 0
+	ListSortFlagsDefault ListSortFlags = 0
 	// ListSortFlagsDescending will sort the contents of the list in descending order.
-	ListSortFlagsDescending = 1
+	ListSortFlagsDescending ListSortFlags = 1
 	// ListSortFlagsDropDuplicates will drop duplicate values in the results of the CDT list operation.
-	ListSortFlagsDropDuplicates = 2
+	ListSortFlagsDropDuplicates ListSortFlags = 2
 )
 
 // ListWriteFlags detemines write flags for CDT lists
@@ -700,7 +700,7 @@ func ListGetRangeFromOp(binName string, index int, ctx ...*CDTContext) *Operatio
 // ListSortOp creates list sort operation.
 // Server sorts list according to sortFlags.
 // Server does not return a result by default.
-func ListSortOp(binName string, sortFlags int, ctx ...*CDTContext) *Operation {
+func ListSortOp(binName string, sortFlags ListSortFlags, ctx ...*CDTContext) *Operation {
 	return &Operation{opType: _CDT_MODIFY, ctx: ctx, binName: binName, binValue: ListValue{_CDT_LIST_SORT, IntegerValue(sortFlags)}, encoder: listGenericOpEncoder}
 }