PLM-178: Fix selective filter logic (#119)

Author: inelpandzic

sel/sel.go

@@ -21,14 +21,39 @@ func MakeFilter(include, exclude []string) NSFilter {
 	excludeFilter := doMakeFitler(exclude)
 
 	return func(db, coll string) bool {
-		if len(includeFilter) != 0 && !includeFilter.Has(db, coll) {
+		_, dbIncluded := includeFilter[db]
+		_, dbExcluded := excludeFilter[db]
+
+		nsIncluded := len(includeFilter) > 0 && includeFilter.Has(db, coll)
+		nsExcluded := len(excludeFilter) > 0 && excludeFilter.Has(db, coll)
+
+		if nsIncluded && dbIncluded && !nsExcluded {
+			// If the namespace is included, it is allowed.
+			// Also make sure that the namespace is not excluded,
+			// because exclusion takes precedence.
+			return true
+		}
+
+		if dbIncluded && !nsExcluded {
+			// If the database is included in the filter,
+			// but the namespace is not included, it is not allowed.
+			// Also make sure that the namespace is not excluded,
+			// because exclusion takes precedence.
 			return false
 		}
 
-		if len(excludeFilter) != 0 && excludeFilter.Has(db, coll) {
+		if nsExcluded && dbExcluded {
+			// If the namespace is excluded, it is not allowed.
 			return false
 		}
 
+		if dbExcluded {
+			// If the database is included in the filter,
+			// but the namespace is not excluded, it is allowed.
+			return true
+		}
+
+		// If the namespace is not present in either filter, it is allowed by default.
 		return true
 	}
 }

sel/sel_test.go

@@ -30,9 +30,9 @@ func TestFilter(t *testing.T) {
 				"coll_2": false,
 			},
 			"db_2": {
-				"coll_0": false,
-				"coll_1": false,
-				"coll_2": false,
+				"coll_0": true,
+				"coll_1": true,
+				"coll_2": true,
 			},
 		}
 
@@ -99,6 +99,7 @@ func TestFilter(t *testing.T) {
 		excludedFilter := []string{
 			"db_0.*",
 			"db_1.coll_0",
+			"db_3.coll_1",
 		}
 
 		namespaces := map[string]map[string]bool{
@@ -117,6 +118,11 @@ func TestFilter(t *testing.T) {
 				"coll_1": true,
 				"coll_2": false,
 			},
+			"db_3": {
+				"coll_0": true,
+				"coll_1": false,
+				"coll_2": true,
+			},
 		}
 
 		isIncluded := sel.MakeFilter(includedFilter, excludedFilter)

tests/test_selective.py

@@ -93,9 +93,9 @@ def test_create_collection(t: testing.Testing, phase: Runner.Phase):
         t.plm,
         phase,
         include_ns=["db_0.*", "db_1.coll_0", "db_1.coll_1", "db_2.coll_0", "db_2.coll_1"],
-        exclude_ns=["db_0.*", "db_1.coll_0"],
+        exclude_ns=["db_0.*", "db_1.coll_0", "db_3.coll_1"],
     ):
-        for db in range(3):
+        for db in range(4):
             for coll in range(3):
                 t.source["db_1"]["coll_1"].create_index({"i": 1})
                 t.source[f"db_{db}"][f"coll_{coll}"].insert_one({})
@@ -104,12 +104,18 @@ def test_create_collection(t: testing.Testing, phase: Runner.Phase):
         # "db_0.coll_0",
         # "db_0.coll_1",
         # "db_0.coll_2",
+
         # "db_1.coll_0",
         "db_1.coll_1",
         # "db_1.coll_2",
+
         "db_2.coll_0",
         "db_2.coll_1",
         # "db_2.coll_2",
+
+        "db_3.coll_0",
+        # "db_3.coll_1",
+        "db_3.coll_2",
     }
 
     assert expected == set(testing.list_all_namespaces(t.target))