Changeset 7911

Timestamp:

Feb 17, 2021, 12:56:26 PM (10 months ago)

Author:

Nicklas Nordborg

Message:

References #2237: Implement extension mechanism for query filtering

The IdListRestriction now got support for NOT IN (...).

Location:

trunk/src/core/net/sf/basedb/core

Files:

• ItemContext.java (modified) (1 diff)
• query/IdListRestriction.java (modified) (7 diffs)

trunk/src/core/net/sf/basedb/core/ItemContext.java

@@ -2376 +2376 @@
         if (rowIdList != null)
         {
-          rowIdList.intersect((IdListRestriction)r);
+          rowIdList.mergeAnd((IdListRestriction)r);
           r = null;
         }

trunk/src/core/net/sf/basedb/core/query/IdListRestriction.java

@@ -34 +34 @@
   
   id IN (a, b, c, ....)
+  id NOT IN (a, b, c, ....)
   
   @author nicklas
@@ -42 +43 @@
 {
 
-  private final Set<Integer> idList;
+  private boolean notIn;
+  private Set<Integer> idList;
   private final Expression idExpression;
   
   public IdListRestriction()
   {
-    this(new HashSet<>());
+    this(false, new HashSet<>());
+  }
+  
+  /**
+    @since 3.18
+  */
+  public IdListRestriction(boolean notIn)
+  {
+    this(notIn, new HashSet<>());
   }
   
   public IdListRestriction(Set<Integer> idList)
   {
+    this(false, idList);
+  }
+  
+  /**
+    @since 3.18
+  */
+  public IdListRestriction(boolean notIn, Set<Integer> idList)
+  {
+    this.notIn = notIn;
     this.idList = new HashSet<>(idList);
     this.idExpression = Hql.property("id");
@@ -60 +79 @@
   {
     String idString = idList.size() == 0 ? "0" : Values.getString(idList, ", ", true);
-    return "(" + idExpression.toQl(query, dc) + " IN (" + idString + "))";
+    return "(" + idExpression.toQl(query, dc) + (notIn ? " NOT IN " : " IN ") +"(" + idString + "))";
   }
 
@@ -72 +91 @@
   {
     String idString = idList.size() == 0 ? "0" : Values.getString(idList, ", ", true);
-    return idExpression.toString() + " IN (" + idString + ")";
+    return idExpression.toString() + (notIn ? " NOT IN " : " IN ") + "(" + idString + ")";
   }
 
@@ -78 +97 @@
     Merge this id list with another list. This list will now 
     contain the combined set of ids from both lists.
+    NOTE! This method ignore the 'notIn' setting for both lists.
   */
   public void union(IdListRestriction other)
@@ -87 +107 @@
     Merge this id list with another list. This list will
     now contain only the ids that are found in both lists.
+    NOTE! This method ignore the 'notIn' setting for both lists.
   */
   public void intersect(IdListRestriction other)
@@ -93 +114 @@
   }
   
+  /**
+    Merge this id list with another list by removing
+    ids that are found in the other list.
+    NOTE! This method ignore the 'notIn' setting for both lists.
+  */
+  public void remove(IdListRestriction other)
+  {
+    this.idList.removeAll(other.idList);
+  }
+  
+  /**
+    Merge this list with another list with AND logic respecting
+    the notIn setting. This may cause the list of ids and notIn 
+    setting of this list to change.
+    @since 3.18
+  */
+  public void mergeAnd(IdListRestriction other)
+  {
+    if (notIn == other.notIn)
+    {
+      if (notIn)
+      {
+        // NOT IN(A,B) AND NOT IN(B,C) --> NOT IN(A,B,C)
+        // Merge with UNION and keep notIn setting
+        union(other);
+      }
+      else
+      {
+        // IN(A,B) AND IN(B,C) --> IN(B)
+        // Merge with INTERSECT and keep notIn setting
+        intersect(other);
+      }
+    }
+    else
+    {
+      if (notIn)
+      {
+        // NOT IN(A,B) AND IN(B,C) --> IN(C)
+        // Swap, merge with REMOVE and change notIn setting
+        Set<Integer> tmp = new HashSet<>(other.idList);
+        tmp.removeAll(idList);
+        idList = tmp;
+        notIn = false;
+      }
+      else
+      {
+        // IN(A,B) AND NOT IN(B,C) --> IN(A)
+        // Merge with REMOVE and keep notIn setting
+        remove(other);
+      }
+    }
+  }
   
 }