TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-23 11:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/viewer, types/views: implement support for json/v2 (#16852)

Browse Source 
This adds support for having every viewer type implement
jsonv2.MarshalerTo and jsonv2.UnmarshalerFrom.

This provides a significant boost in performance
as the json package no longer needs to validate
the entirety of the JSON value outputted by MarshalJSON,
nor does it need to identify the boundaries of a JSON value
in order to call UnmarshalJSON.

For deeply nested and recursive MarshalJSON or UnmarshalJSON calls,
this can improve runtime from O(N²) to O(N).

This still references "github.com/go-json-experiment/json"
instead of the experimental "encoding/json/v2" package
now available in Go 1.25 under goexperiment.jsonv2
so that code still builds without the experiment tag.
Of note, the "github.com/go-json-experiment/json" package
aliases the standard library under the right build conditions.

Updates tailscale/corp#791

Signed-off-by: Joe Tsai <joetsai@digital-static.net>
This commit is contained in:
Joe Tsai
2025-08-14 13:46:48 -07:00
committed by GitHub
parent c083a9b053
commit fbb91758ac
17 changed files with 1463 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
util/codegen/codegen.go
View File

@@ -85,28 +85,35 @@ func NewImportTracker(thisPkg *types.Package) *ImportTracker {
}
}
type namePkgPath struct {
name string // optional import name
pkgPath string
}
// ImportTracker provides a mechanism to track and build import paths.
type ImportTracker struct {
thisPkg *types.Package
packages map[string]bool
packages map[namePkgPath]bool
}
func (it *ImportTracker) Import(pkg string) {
if pkg != "" && !it.packages[pkg] {
mak.Set(&it.packages, pkg, true)
// Import imports pkgPath under an optional import name.
func (it *ImportTracker) Import(name, pkgPath string) {
if pkgPath != "" && !it.packages[namePkgPath{name, pkgPath}] {
mak.Set(&it.packages, namePkgPath{name, pkgPath}, true)
}
}
// Has reports whether the specified package has been imported.
func (it *ImportTracker) Has(pkg string) bool {
return it.packages[pkg]
// Has reports whether the specified package path has been imported
// under the particular import name.
func (it *ImportTracker) Has(name, pkgPath string) bool {
return it.packages[namePkgPath{name, pkgPath}]
}
func (it *ImportTracker) qualifier(pkg *types.Package) string {
if it.thisPkg == pkg {
return ""
}
it.Import(pkg.Path())
it.Import("", pkg.Path())
// TODO(maisem): handle conflicts?
return pkg.Name()
}
@@ -128,7 +135,11 @@ func (it *ImportTracker) PackagePrefix(pkg *types.Package) string {
func (it *ImportTracker) Write(w io.Writer) {
fmt.Fprintf(w, "import (\n")
for s := range it.packages {
fmt.Fprintf(w, "\t%q\n", s)
if s.name == "" {
fmt.Fprintf(w, "\t%q\n", s.pkgPath)
} else {
fmt.Fprintf(w, "\t%s %q\n", s.name, s.pkgPath)
}
}
fmt.Fprintf(w, ")\n\n")
}