prepare 2.3.2 release (#31)

Author: LaunchDarklyCI

src/evaluate.c

@@ -112,6 +112,27 @@ addValue(
     return LDBooleanTrue;
 }
 
+static const char *
+LDi_getBucketAttribute(const struct LDJSON *const obj)
+{
+    const struct LDJSON *bucketBy;
+
+    LD_ASSERT(obj);
+    LD_ASSERT(LDJSONGetType(obj) == LDObject);
+
+    bucketBy = LDObjectLookup(obj, "bucketBy");
+
+    if (!LDi_notNull(bucketBy)) {
+        return "key";
+    }
+
+    if (LDJSONGetType(bucketBy) != LDText) {
+        return NULL;
+    }
+
+    return LDGetText(bucketBy);
+}
+
 EvalStatus
 LDi_evaluate(
     struct LDClient *const     client,
@@ -914,19 +935,18 @@ LDi_segmentRuleMatchUser(
 
         {
             float bucket;
+            const char *attribute;
 
-            const struct LDJSON *const bucketBy =
-                LDObjectLookup(segmentRule, "bucketBy");
-
-            const char *const attribute =
-                LDi_notNull(bucketBy) ? LDGetText(bucketBy) : "key";
+            attribute = LDi_getBucketAttribute(segmentRule);
 
-            if (!LDi_bucketUser(user, segmentKey, attribute, salt, &bucket)) {
-                LD_LOG(LD_LOG_ERROR, "LDi_bucketUser error");
+            if (attribute == NULL) {
+                LD_LOG(LD_LOG_ERROR, "failed to parse bucketBy");
 
-                return EVAL_MEM;
+                return EVAL_SCHEMA;
             }
 
+            LDi_bucketUser(user, segmentKey, attribute, salt, &bucket);
+
             if (bucket < LDGetNumber(weight) / 100000) {
                 return EVAL_MATCH;
             } else {
@@ -1127,6 +1147,7 @@ LDi_bucketUser(
     LD_ASSERT(bucket);
 
     attributeValue = NULL;
+    *bucket        = 0;
 
     if ((attributeValue = LDi_valueOfAttribute(user, attribute))) {
         char        raw[256], bucketableBuffer[256];
@@ -1261,10 +1282,18 @@ LDi_variationIndexForUser(
     variation = LDGetIter(variations);
     LD_ASSERT(variation);
 
-    if (!LDi_bucketUser(user, key, "key", salt, &userBucket)) {
-        LD_LOG(LD_LOG_ERROR, "failed to bucket user");
+    {
+        const char *attribute;
 
-        return LDBooleanFalse;
+        attribute = LDi_getBucketAttribute(rollout);
+
+        if (attribute == NULL) {
+            LD_LOG(LD_LOG_ERROR, "failed to parse bucketBy");
+
+            return LDBooleanFalse;
+        }
+
+        LDi_bucketUser(user, key, attribute, salt, &userBucket);
     }
 
     for (; variation; variation = LDIterNext(variation)) {

tests/test-eval.c

@@ -1152,6 +1152,11 @@ testLDi_bucketUserByKey()
     LD_ASSERT(LDi_bucketUser(user, "hashKey", "key", "saltyA", &bucket))
     LD_ASSERT(floateq(0.10343106, bucket));
     LDUserFree(user);
+
+    LD_ASSERT(user = LDUserNew("userKeyC"));
+    LD_ASSERT(!LDi_bucketUser(user, "hashKey", "unknown", "saltyA", &bucket))
+    LD_ASSERT(floateq(0.0, bucket));
+    LDUserFree(user);
 }
 
 int