test state

Author: chu11

src/modules/job-list/match.c

@@ -85,6 +85,7 @@ static bool match_not (struct list_constraint *c, const struct job *job)
 }
 
 static struct list_constraint *conditional_constraint (const char *type,
+                                                       match_f match_or_cb,
                                                        match_f match_not_cb,
                                                        create_f create_cb,
                                                        json_t *values,
@@ -104,7 +105,7 @@ static struct list_constraint *conditional_constraint (const char *type,
     if (streq (type, "and"))
         c->match = match_and;
     else if (streq (type, "or"))
-        c->match = match_or;
+        c->match = match_or_cb;
     else if (streq (type, "not"))
         c->match = match_not_cb;
     zlistx_set_destructor (c->values, list_constraint_destructor);
@@ -454,6 +455,7 @@ struct list_constraint *list_constraint_create (json_t *constraint,
             return create_since_constraint (values, errp);
         else if (streq (op, "or") || streq (op, "and") || streq (op, "not"))
             return conditional_constraint (op,
+                                           match_or,
                                            match_not,
                                            list_constraint_create,
                                            values,
@@ -473,6 +475,22 @@ bool job_match (const struct job *job, struct list_constraint *constraint)
     return constraint->match (constraint, job);
 }
 
+static bool match_or_checkempty (struct list_constraint *c, const struct job *job)
+{
+    struct list_constraint *cp = zlistx_first (c->values);
+    bool ran_a_match = false;
+    while (cp) {
+        if (cp->match (cp, job))
+            return true;
+        ran_a_match = true;
+        cp = zlistx_next (c->values);
+    }
+    /* corner case: if no ops, assume this is true */
+    if (!ran_a_match)
+        return true;
+    return false;
+}
+
 static bool match_not_checkempty (struct list_constraint *c, const struct job *job)
 {
     struct list_constraint *cp = zlistx_first (c->values);
@@ -519,6 +537,7 @@ struct list_constraint *state_constraint_create (json_t *constraint,
             return create_states_constraint (values, errp);
         else if (streq (op, "or") || streq (op, "and") || streq (op, "not"))
             return conditional_constraint (op,
+                                           match_or_checkempty,
                                            match_not_checkempty,
                                            state_constraint_create,
                                            values,