Searching columns globally by labels filters only by labels assigned to the column.

Author: piotrczarnas

dqops/src/main/java/com/dqops/metadata/search/ColumnSearchFilters.java

@@ -55,6 +55,10 @@ public class ColumnSearchFilters {
             "The labels are assigned on the labels screen and stored in the *labels* node in the *.dqotable.yaml* file.")
     private String[] labels;
 
+    @JsonPropertyDescription("An array of labels assigned only to a column. All labels must be present on a column to match. The labels can use patterns:  'prefix\\*', '\\*suffix', 'prefix\\*suffix'. " +
+            "The labels are assigned on the labels screen and stored in the *labels* node in the *.dqotable.yaml* file.")
+    private String[] columnLabels;
+
     @JsonPropertyDescription("Optional limit for the maximum number of results to return.")
     private Integer maxResults;
 
@@ -68,6 +72,9 @@ public class ColumnSearchFilters {
     private SearchPattern[] tagsSearchPatterns;
     @JsonIgnore
     private SearchPattern[] labelsSearchPatterns;
+    @JsonIgnore
+    private SearchPattern[] columnLabelSearchPatterns;
+
 
     /**
      * Create a hierarchy tree node traversal visitor that will search for nodes matching the current filter.
@@ -207,6 +214,22 @@ public void setLabels(String[] labels) {
         this.labels = labels;
     }
 
+    /**
+     * Returns a list of labels that must be present only on a column.
+     * @return Column level labels.
+     */
+    public String[] getColumnLabels() {
+        return columnLabels;
+    }
+
+    /**
+     * Sets a filter with a list of labels that must be present on a column (not a table).
+     * @param columnLabels Column level label filters.
+     */
+    public void setColumnLabels(String[] columnLabels) {
+        this.columnLabels = columnLabels;
+    }
+
     /**
      * Sets the limit for the maximum number of results to return.
      * @return Limit or null.
@@ -298,4 +321,21 @@ public SearchPattern getLabelSearchPatternAt(int i) {
 
         return labelsSearchPatterns[i];
     }
+
+    /**
+     * Returns the {@link SearchPattern} related to a specific column label in <code>labels</code>.
+     * Lazy getter, parses each <code>label</code> as a search pattern when requested and returns parsed object.
+     * @param i Index of requested label search pattern. Corresponds to <code>labels[i]</code>.
+     * @return {@link SearchPattern} related to <code>i</code>'th <code>label</code>.
+     */
+    public SearchPattern getColumnLabelSearchPatternAt(int i) {
+        if (columnLabelSearchPatterns == null) {
+            columnLabelSearchPatterns = new SearchPattern[columnLabels.length];
+        }
+        if (columnLabelSearchPatterns[i] == null && columnLabels[i] != null) {
+            columnLabelSearchPatterns[i] = SearchPattern.create(false, columnLabels[i]);
+        }
+
+        return columnLabelSearchPatterns[i];
+    }
 }

dqops/src/main/java/com/dqops/metadata/search/ColumnSearchFiltersVisitor.java

@@ -264,6 +264,10 @@ public TreeNodeTraversalResult accept(ColumnSpec columnSpec, SearchParameterObje
             return TreeNodeTraversalResult.SKIP_CHILDREN;
         }
 
+        if (this.filters.getColumnLabels() != null && !LabelsSearchMatcher.hasAllLabels(this.filters.getColumnLabels(), columnSpec.getLabels())) {
+            return TreeNodeTraversalResult.SKIP_CHILDREN;
+        }
+
         String columnNameFilter = this.filters.getColumnName();
         if (Strings.isNullOrEmpty(columnNameFilter)) {
             parameter.getNodes().add(columnSpec);

dqops/src/main/java/com/dqops/metadata/search/LabelsSearchMatcher.java

@@ -134,6 +134,9 @@ public static boolean hasAllLabels(String[] requiredLabels, LabelSetSpec labels)
 		if (requiredLabels == null) {
 			return true;
 		}
+		if (labels == null && requiredLabels.length > 0) {
+			return false;
+		}
 		for (String label : requiredLabels) {
 			if (!containsPattern(label, labels)) {
 				return false;

dqops/src/main/java/com/dqops/rest/controllers/SearchController.java

@@ -272,7 +272,7 @@ public ResponseEntity<Flux<ColumnListModel>> findColumns(
         columnSearchFilters.setSchemaTableName(tableNameFilter + "." + schemaNameFilter);
 
         if (label.isPresent() && label.get().size() > 0) {
-            columnSearchFilters.setLabels(label.get().toArray(String[]::new));
+            columnSearchFilters.setColumnLabels(label.get().toArray(String[]::new));
         }
 
         columnSearchFilters.setColumnName(column.orElse(null));