Fix client.Get when policy.FilterExpression and bin names are both pr…

…ovided
aerospike · Jun 7, 2022 · 09c3eb9 · 09c3eb9
1 parent 9c0665a
commit 09c3eb9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/command.go b/command.go
@@ -414,9 +414,13 @@ func (cmd *baseCommand) setRead(policy *BasePolicy, key *Key, binNames []string)
 
 		predSize := 0
 		if policy.FilterExpression != nil {
-			if err := cmd.writeFilterExpression(policy.FilterExpression, predSize); err != nil {
+			predSize, err = cmd.estimateExpressionSize(policy.FilterExpression)
+			if err != nil {
 				return err
 			}
+			if predSize > 0 {
+				fieldCount++
+			}
 		} else if len(policy.PredExp) > 0 {
 			predSize = cmd.estimatePredExpSize(policy.PredExp)
 			fieldCount++

diff --git a/expression_test.go b/expression_test.go
@@ -708,7 +708,7 @@ var _ = gg.Describe("Expression Filters", func() {
 					as.ExpIntBin("bin"),
 					as.ExpIntVal(35),
 				)
-				_, err = client.Get(rpolicy, key)
+				_, err = client.Get(rpolicy, key, "bin")
 				gm.Expect(err).ToNot(gm.HaveOccurred())
 
 			})