From 849951be1d1a7ee9f9302006ccb187bf5b4e36f3 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Wed, 22 Jul 2026 23:51:18 +0300 Subject: =?UTF-8?q?feat:=20DTail=20fork=20=E2=80=94=20server/client=20feat?= =?UTF-8?q?ure=20development?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squashed development of the snonux/dtail fork's product code (internal/, cmd/) since diverging from mimecast/dtail. Major areas: - Read/output path: the former "turbo" channel-less path is now the single, default server-side read/output path for cat/grep/tail and MapReduce; the old channel-based path and its config/env toggles were removed. - MapReduce: single aggregate implementation (server + serverless) fed directly by a processor pipeline, with input-exhausted finalization via the shutdown coordinator; high-concurrency and data-race fixes. - Journal source reads (journal:unit.service) via journalctl, Linux-gated behind a journal-v1 capability. - Auth-key fast reconnect: in-memory per-user public-key cache with TTL/max-keys, registered over an authenticated session (AUTHKEY), checked before authorized_keys. - Interactive query reload (--interactive-query) with SESSION START/UPDATE generation boundaries and capability negotiation. - Client-side deadlines: --timeout / --shutdownAfter as context deadlines; follow shutdown handling. - Client logging: diagnostics-only daily log by default, opt-in payload tee via --log-payload. - Numerous correctness fixes (buffer-pool double-recycle races, EOF-sentinel leaks, glob-expansion cap, TOCTOU in CSV parsing) with accompanying unit tests. Co-Authored-By: Claude Opus 4.8 --- internal/mapr/queryvariables_test.go | 78 ++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 internal/mapr/queryvariables_test.go (limited to 'internal/mapr/queryvariables_test.go') diff --git a/internal/mapr/queryvariables_test.go b/internal/mapr/queryvariables_test.go new file mode 100644 index 0000000..35d56df --- /dev/null +++ b/internal/mapr/queryvariables_test.go @@ -0,0 +1,78 @@ +package mapr + +import ( + "reflect" + "testing" +) + +func TestEffectiveLogFormat(t *testing.T) { + tests := []struct { + name string + query string + configured string + want string + }{ + {name: "explicit logformat wins", query: "select $line logformat generickv", want: "generickv"}, + {name: "no from downgrades to generic", query: "select service,sum(bytes) group by service", want: "generic"}, + {name: "from without configured default uses default", query: "from STATS select $line", want: "default"}, + {name: "from honours configured default", query: "from STATS select $line", configured: "mimecast", want: "mimecast"}, + } + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + query, err := NewQuery(tc.query) + if err != nil { + t.Fatalf("NewQuery(%q): %v", tc.query, err) + } + if got := query.EffectiveLogFormat(tc.configured); got != tc.want { + t.Errorf("EffectiveLogFormat(%q) = %q, want %q", tc.configured, got, tc.want) + } + }) + } + + // A nil query falls back to the configured default (or "default"). + var nilQuery *Query + if got := nilQuery.EffectiveLogFormat(""); got != "default" { + t.Errorf("nil query EffectiveLogFormat(\"\") = %q, want \"default\"", got) + } +} + +func TestReferencedVariables(t *testing.T) { + tests := []struct { + name string + query string + want []string + }{ + { + name: "collects $-vars across select, group-by and aggregation", + query: "from STATS select $service,sum($bytes) group by $service", + want: []string{"$bytes", "$service"}, + }, + { + name: "barewords are never returned", + query: "from STATS select service,sum(bytes) group by service", + want: nil, + }, + { + name: "where clause $-vars are collected alongside select vars", + query: "from STATS select $line where $bogus eq foo", + want: []string{"$bogus", "$line"}, + }, + { + name: "set-defined LHS is excluded but unknown set RHS is included", + query: "from STATS select $masked set $masked = maskdigits($mystery)", + want: []string{"$mystery"}, + }, + } + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + query, err := NewQuery(tc.query) + if err != nil { + t.Fatalf("NewQuery(%q): %v", tc.query, err) + } + got := query.ReferencedVariables() + if !reflect.DeepEqual(got, tc.want) { + t.Errorf("ReferencedVariables() = %v, want %v", got, tc.want) + } + }) + } +} -- cgit v1.2.3