update field names to also list vl_*_id

Author: func25

lib/logstorage/pipe_field_names.go

@@ -136,6 +136,13 @@ func (pfp *pipeFieldNamesProcessor) writeBlock(workerID uint, br *blockResult) {
 		shard.updateColumnHits("_time", filter, hits)
 		shard.updateColumnHits("_stream", filter, hits)
 		shard.updateColumnHits("_stream_id", filter, hits)
+		if br.bs.bsw.pso.isMultiTenant {
+			for _, columnName := range tenantColumns {
+				if !br.bs.isHiddenField(columnName) {
+					shard.updateColumnHits(columnName, filter, hits)
+				}
+			}
+		}
 	}
 }
 
@@ -145,6 +152,10 @@ func (shard *pipeFieldNamesProcessorShard) updateHits(refs []columnHeaderRef, br
 		if br.bs.isHiddenField(columnName) {
 			continue
 		}
+		if br.bs.bsw.pso.isMultiTenant && isTenantColumn(columnName) {
+			// The stored column is shadowed by the automatically generated tenant column.
+			continue
+		}
 		shard.updateColumnHits(columnName, filter, hits)
 	}
 }

lib/logstorage/storage_search_test.go

@@ -1749,6 +1749,54 @@ func newTestQueryContext(tenantIDs []TenantID, q *Query) *QueryContext {
 	return NewQueryContext(context.Background(), qs, tenantIDs, false, q, false, nil)
 }
 
+func TestStorageGetFieldNamesMultitenant(t *testing.T) {
+	t.Parallel()
+
+	path := t.TempDir()
+	s := MustOpenStorage(path, &StorageConfig{
+		Retention: 24 * time.Hour,
+	})
+	defer s.MustClose()
+
+	now := time.Now().UnixNano()
+	lr := GetLogRows(nil, nil, nil, nil, "")
+	for i := range 3 {
+		tenantID := TenantID{
+			AccountID: uint32(i + 1),
+			ProjectID: uint32(i + 11),
+		}
+		fields := []Field{
+			{Name: "_msg", Value: fmt.Sprintf("message-%d", i)},
+		}
+		if i < 2 {
+			fields = append(fields,
+				Field{Name: "vl_account_id", Value: "stored-account-id"},
+				Field{Name: "vl_project_id", Value: "stored-project-id"},
+			)
+		}
+		lr.mustAdd(tenantID, now+int64(i), fields)
+	}
+	s.MustAddRows(lr)
+	PutLogRows(lr)
+	s.DebugFlush()
+
+	q := mustParseQuery("*")
+	qs := &QueryStats{}
+	qctx := NewQueryContext(context.Background(), qs, nil, true, q, false, nil)
+	results, err := s.GetFieldNames(qctx, "vl_")
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+
+	resultsExpected := []ValueWithHits{
+		{"vl_account_id", 3},
+		{"vl_project_id", 3},
+	}
+	if !reflect.DeepEqual(results, resultsExpected) {
+		t.Fatalf("unexpected result; got\n%v\nwant\n%v", results, resultsExpected)
+	}
+}
+
 func TestGetTenantFilter(t *testing.T) {
 	t.Parallel()