Small fixes to where clause logic

Author: Jairik

data-generation/commands_50k.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a4a5b427c437bab2b9c7e0e76a58dde6f72e0379626d501e986d226ec61376a
-size 5932421
+oid sha256:65cc586dc93a57806c48beabc75d67668cc652f4dbdc754c7a5bde10b77f8247
+size 5931870

engine/serial/executeEngine-serial.c

@@ -357,9 +357,14 @@ struct resultSetS *executeQuerySelectSerial(
     // Get all indexed attributes in the WHERE clause, using the B+ tree indexes where possible
     struct whereClauseS *wc = whereClause;
     while (wc != NULL) {
+        // Skip nested conditions for index lookup (they don't have a direct attribute)
+        if (wc->attribute == NULL) {
+            wc = wc->next;
+            continue;
+        }
+
         for (int i = 0; i < engine->num_indexes; i++) {
             if (strcmp(wc->attribute, engine->indexed_attributes[i]) == 0) {
-                anyIndexExists = true;
                 indexExists[i] = true;
 
                 // Use B+ tree index for this attribute
@@ -427,6 +432,8 @@ struct resultSetS *executeQuerySelectSerial(
                     continue;
                 }
 
+                anyIndexExists = true;
+
                 // Allocating for keys, using num_records as upper bound.
                 KEY_T *returned_keys = malloc(engine->num_records * sizeof(KEY_T));
                 ROW_PTR *returned_pointers = malloc(engine->num_records * sizeof(ROW_PTR));

sample-queries.txt

@@ -36,4 +36,4 @@ WHERE sudo_used = TRUE OR (risk_level = 5 AND shell_type = "bash");
 # -- Sample 8:
 SELECT user_name, working_directory, base_command
 FROM Commands
-WHERE user_id = 1001 OR (user_name = "student1002" AND shell_type = "zsh");
+WHERE user_id = 1001 OR (user_name = "student1002" AND shell_type = "zsh");