expect regex extracted tokens in database bloom filters

pom.xml

@@ -203,6 +203,18 @@
       <version>2.2.224</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>nl.jqno.equalsverifier</groupId>
+      <artifactId>equalsverifier</artifactId>
+      <version>3.16.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.github.hakky54</groupId>
+      <artifactId>logcaptor</artifactId>
+      <version>2.9.3</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>

src/main/java/com/teragrep/pth_06/planner/StreamDBClient.java

@@ -344,9 +344,10 @@ private Table<Record> getTableStatement(Condition journaldbCondition, Date day)
                     .on(JOURNALDB.LOGFILE.HOST_ID.eq(GetArchivedObjectsFilterTable.host_id).and(JOURNALDB.LOGFILE.LOGTAG.eq(GetArchivedObjectsFilterTable.tag)));
 
             if (bloomEnabled) {
-                Set<Table<?>> tables = walker.patternMatchTables();
+                // join all tables needed for the condition generated by walker
+                final Set<Table<?>> tables = walker.conditionRequiredTables();
                 if (!tables.isEmpty()) {
-                    for (Table<?> table : tables) {
+                    for (final Table<?> table : tables) {
                         if (LOGGER.isInfoEnabled()) {
                             LOGGER.info("Left join pattern match table: <{}>", table.getName());
                         }

src/main/java/com/teragrep/pth_06/planner/CategoryTable.java → src/main/java/com/teragrep/pth_06/planner/bloomfilter/CategoryTable.java

@@ -43,15 +43,10 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.pth_06.planner;
-
-import com.teragrep.pth_06.planner.walker.conditions.QueryCondition;
+package com.teragrep.pth_06.planner.bloomfilter;
 
 public interface CategoryTable {
 
     void create();
 
-    void insertFilters();
-
-    QueryCondition bloommatchCondition();
 }

src/main/java/com/teragrep/pth_06/planner/CategoryTableImpl.java → src/main/java/com/teragrep/pth_06/planner/bloomfilter/CategoryTableImpl.java

@@ -43,11 +43,9 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.pth_06.planner;
+package com.teragrep.pth_06.planner.bloomfilter;
 
 import com.teragrep.pth_06.config.ConditionConfig;
-import com.teragrep.pth_06.planner.walker.conditions.CategoryTableCondition;
-import com.teragrep.pth_06.planner.walker.conditions.QueryCondition;
 import org.jooq.*;
 import org.jooq.impl.DSL;
 import org.slf4j.Logger;
@@ -88,40 +86,25 @@ public final class CategoryTableImpl implements CategoryTable {
     private final DSLContext ctx;
     private final Table<?> originTable;
     private final long bloomTermId;
-    private final CategoryTableCondition tableCondition;
     private final TableFilters tableFilters;
 
     public CategoryTableImpl(ConditionConfig config, Table<?> originTable, String value) {
         this(
                 config.context(),
                 originTable,
                 config.bloomTermId(),
-                new CategoryTableCondition(originTable, config.bloomTermId()),
                 new TableFilters(config.context(), originTable, config.bloomTermId(), value)
         );
     }
 
     public CategoryTableImpl(DSLContext ctx, Table<?> originTable, long bloomTermId, String value) {
-        this(
-                ctx,
-                originTable,
-                bloomTermId,
-                new CategoryTableCondition(originTable, bloomTermId),
-                new TableFilters(ctx, originTable, bloomTermId, value)
-        );
+        this(ctx, originTable, bloomTermId, new TableFilters(ctx, originTable, bloomTermId, value));
     }
 
-    public CategoryTableImpl(
-            DSLContext ctx,
-            Table<?> originTable,
-            long bloomTermId,
-            CategoryTableCondition tableCondition,
-            TableFilters tableFilters
-    ) {
+    public CategoryTableImpl(DSLContext ctx, Table<?> originTable, long bloomTermId, TableFilters tableFilters) {
         this.ctx = ctx;
         this.originTable = originTable;
         this.bloomTermId = bloomTermId;
-        this.tableCondition = tableCondition;
         this.tableFilters = tableFilters;
     }
 
@@ -144,24 +127,12 @@ public void create() {
         indexStep.execute();
     }
 
-    public void insertFilters() {
-        tableFilters.insertFiltersIntoCategoryTable();
-    }
-
-    /**
-     * Row condition that selects the same sized filter arrays from this category table and the origin table.
-     * 
-     * @return condition
-     */
-    public QueryCondition bloommatchCondition() {
-        return tableCondition;
-    }
-
     /**
-     * Equal only if all object parameters are same value and the instances of DSLContext are same
+     * Equal if the compared object is the same instance or if the compared object is of the same class, object fields
+     * are equal, and DSLContext is the same instance
      *
      * @param object object compared against
-     * @return true if all object is same class, object fields are equal and DSLContext is same instance
+     * @return true if equal
      */
     @Override
     public boolean equals(final Object object) {

src/main/java/com/teragrep/pth_06/planner/CreatedCategoryTable.java → src/main/java/com/teragrep/pth_06/planner/bloomfilter/CategoryTableWithFilters.java

@@ -43,34 +43,34 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.pth_06.planner;
+package com.teragrep.pth_06.planner.bloomfilter;
 
-import com.teragrep.pth_06.planner.walker.conditions.QueryCondition;
+import org.jooq.DSLContext;
+import org.jooq.Table;
 
 /**
- * Decorator that inserts category tables filter types into database
+ * Decorator that inserts category tables filter types into the table
  */
-public final class CreatedCategoryTable implements CategoryTable {
+public final class CategoryTableWithFilters implements CategoryTable {
 
     private final CategoryTable origin;
+    private final TableFilters filters;
 
-    public CreatedCategoryTable(final CategoryTable origin) {
+    public CategoryTableWithFilters(DSLContext ctx, Table<?> origin, long bloomTermId, String searchTerm) {
+        this(
+                new CategoryTableImpl(ctx, origin, bloomTermId, searchTerm),
+                new TableFilters(ctx, origin, bloomTermId, searchTerm)
+        );
+    }
+
+    public CategoryTableWithFilters(CategoryTable origin, TableFilters filters) {
         this.origin = origin;
+        this.filters = filters;
     }
 
     @Override
     public void create() {
         origin.create();
-    }
-
-    @Override
-    public void insertFilters() {
-        origin.insertFilters();
-    }
-
-    @Override
-    public QueryCondition bloommatchCondition() {
-        create();
-        return origin.bloommatchCondition();
+        filters.asBatch().execute();
     }
 }