ENG-1142 Short-term repair of queries (#600)

* Revert "ENG-1122 use or-join-clause so the variables are exposed to the optimizer (#584)"

This reverts commit b7f1af9.

* revert the downgrade of disjunction

Author: maparent

apps/roam/src/utils/conditionToDatalog.ts

@@ -446,7 +446,7 @@ const translator: Record<string, Translator> = {
       if (currentUserMatch) {
         return [
           {
-            type: "or-join-clause",
+            type: "or-clause",
             clauses: [
               {
                 type: "data-pattern",
@@ -465,7 +465,6 @@ const translator: Record<string, Translator> = {
                 ],
               },
             ],
-            variables: [{ type: "variable", value: `${source}-String` }],
           },
           {
             type: "pred-expr",
@@ -482,7 +481,7 @@ const translator: Record<string, Translator> = {
         const rePattern = regexRePatternValue(target);
         return [
           {
-            type: "or-join-clause",
+            type: "or-clause",
             clauses: [
               {
                 type: "data-pattern",
@@ -501,7 +500,6 @@ const translator: Record<string, Translator> = {
                 ],
               },
             ],
-            variables: [{ type: "variable", value: `${source}-String` }],
           },
           {
             type: "fn-expr",
@@ -530,7 +528,7 @@ const translator: Record<string, Translator> = {
 
       return [
         {
-          type: "or-join-clause",
+          type: "or-clause",
           clauses: [
             {
               type: "data-pattern",
@@ -549,7 +547,6 @@ const translator: Record<string, Translator> = {
               ],
             },
           ],
-          variables: [{ type: "variable", value: `${source}-String` }],
         },
         {
           type: "pred-expr",

apps/roam/src/utils/fireQuery.ts

@@ -107,8 +107,7 @@ const optimizeQuery = (
         if (Array.from(allVars).every((v) => capturedVariables.has(v))) {
           score = 10;
         } else {
-          // downgrade disjunction and negation
-          score = c.type === "and-clause" ? 100002 : 100006;
+          score = 100002;
         }
       } else if (c.type === "not-join-clause" || c.type === "or-join-clause") {
         if (c.variables.every((v) => capturedVariables.has(v.value))) {