feat: exist function supports non-resource tags

deepflowio · Oct 9, 2024 · 8586788 · 8586788
1 parent 544956b
commit 8586788
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/server/querier/engine/clickhouse/clickhouse_test.go b/server/querier/engine/clickhouse/clickhouse_test.go
@@ -279,6 +279,9 @@ var (
 	}, {
 		input:  "SELECT chost_id_0 from l4_flow_log WHERE NOT exist(chost_0) LIMIT 1",
 		output: "SELECT if(l3_device_type_0=1,l3_device_id_0, 0) AS `chost_id_0` FROM flow_log.`l4_flow_log` PREWHERE NOT (l3_device_type_0=1) LIMIT 1",
+	}, {
+		input:  "SELECT response_code from l4_flow_log WHERE exist(response_code) LIMIT 1",
+		output: "SELECT response_code FROM flow_log.`l4_flow_log` PREWHERE ((isNotNull(response_code))) LIMIT 1",
 	}, {
 		input:  "SELECT `cloud.tag.xx_0` from l4_flow_log WHERE NOT exist(`cloud.tag.xx_0`) LIMIT 1",
 		output: "SELECT if(if(l3_device_type_0=1, dictGet(flow_tag.chost_cloud_tag_map, 'value', (toUInt64(l3_device_id_0),'xx')), '')!='',if(l3_device_type_0=1, dictGet(flow_tag.chost_cloud_tag_map, 'value', (toUInt64(l3_device_id_0),'xx')), ''), dictGet(flow_tag.pod_ns_cloud_tag_map, 'value', (toUInt64(pod_ns_id_0),'xx')) ) AS `cloud.tag.xx_0` FROM flow_log.`l4_flow_log` PREWHERE NOT (((toUInt64(l3_device_id_0) IN (SELECT id FROM flow_tag.chost_cloud_tag_map WHERE key='xx') AND l3_device_type_0=1) OR (toUInt64(pod_ns_id_0) IN (SELECT id FROM flow_tag.pod_ns_cloud_tag_map WHERE key='xx')))) LIMIT 1",

diff --git a/server/querier/engine/clickhouse/filter.go b/server/querier/engine/clickhouse/filter.go
@@ -156,6 +156,14 @@ func TransWhereTagFunction(db, table string, name string, args []string) (filter
 			} else {
 				filter = resourceInfo.ResourceName + "_id" + suffix + "!=0"
 			}
+		} else {
+			// non-resource tags
+			engine := &CHEngine{DB: db, Table: table}
+			notNullExpr, ok := GetNotNullFilter(resource, engine)
+			if !ok {
+				return
+			}
+			filter = notNullExpr.(*view.Expr).Value
 		}
 	}
 	return