Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gopackagesdriver: separates "s" files in pkg info #3165

Merged

Conversation

iamricard
Copy link
Contributor

What type of PR is this?

Bug fix

What does this PR do? Why is it needed?

We kept running into weird issues with the gopackagesdriver tool because
it would often run into "cannot parse non-Go file", and point to a .s
file. After some digging I decided to compare the output of the driver
vs the output for go list -json (continue reading for full
comparison). As it turns out, the driver includes all srcs in both the
GoFiles and CompiledGoFiles pkg info output. However ".s" files
have their own section (because they're not Go files) in the regular go
list JSON output. This commit modifies the aspect to account for that.

Somewhat (trimmed for readability) full output for the package
github.com/dgraph-io/ristretto/z:

// go list -json github.com/dgraph-io/ristretto/z
{
	"GoFiles": [
		"allocator.go",
		"bbloom.go",
		"btree.go",
		"buffer.go",
		"calloc.go",
		"calloc_64bit.go",
		"calloc_nojemalloc.go",
		"file.go",
		"file_default.go",
		"flags.go",
		"histogram.go",
		"mmap.go",
		"mmap_darwin.go",
		"rtutil.go",
		"z.go"
	],
	"SFiles": [
		"rtutil.s"
	],
    // CompileGoFiles not is not here
}
// from the driver
{
	"GoFiles": [
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/allocator.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/bbloom.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/btree.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/buffer.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_64bit.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_nojemalloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file_default.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/flags.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/histogram.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap_darwin.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.s",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/z.go"
	],
	"CompiledGoFiles": [
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/allocator.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/bbloom.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/btree.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/buffer.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_64bit.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_nojemalloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file_default.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/flags.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/histogram.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap_darwin.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.s",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/z.go"
	],
}
// driver after this change
{
	"ID": "@com_github_dgraph_io_ristretto//z:z",
	"Name": "z",
	"PkgPath": "github.com/dgraph-io/ristretto/z",
	"GoFiles": [
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/allocator.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/bbloom.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/btree.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/buffer.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_64bit.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_nojemalloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file_default.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/flags.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/histogram.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap_darwin.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/z.go"
	],
	"CompiledGoFiles": [
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/allocator.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/bbloom.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/btree.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/buffer.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_64bit.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_nojemalloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file_default.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/flags.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/histogram.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap_darwin.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/z.go"
	],
	"SFiles": [
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.s"
	],
}

We kept running into weird issues with the gopackagesdriver tool because
it would often run into "cannot parse non-Go file", and point to a .s
file. After some digging I decided to compare the output of the driver
vs the output for `go list -json` (continue reading for full
comparison). As it turns out, the driver includes all srcs in both the
`GoFiles` and `CompiledGoFiles` pkg info output. However ".s" files
have their own section (because they're not Go files) in the regular go
list JSON output. This commit modifies the aspect to account for that.

Somewhat (trimmed for readability) full output for the package
github.com/dgraph-io/ristretto/z:

```jsonc
// go list -json github.com/dgraph-io/ristretto/z
{
	"GoFiles": [
		"allocator.go",
		"bbloom.go",
		"btree.go",
		"buffer.go",
		"calloc.go",
		"calloc_64bit.go",
		"calloc_nojemalloc.go",
		"file.go",
		"file_default.go",
		"flags.go",
		"histogram.go",
		"mmap.go",
		"mmap_darwin.go",
		"rtutil.go",
		"z.go"
	],
	"SFiles": [
		"rtutil.s"
	],
    // CompileGoFiles not is not here
}
```

```jsonc
// from the driver
{
	"GoFiles": [
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/allocator.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/bbloom.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/btree.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/buffer.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_64bit.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_nojemalloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file_default.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/flags.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/histogram.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap_darwin.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.s",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/z.go"
	],
	"CompiledGoFiles": [
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/allocator.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/bbloom.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/btree.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/buffer.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_64bit.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_nojemalloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file_default.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/flags.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/histogram.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap_darwin.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.s",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/z.go"
	],
}
```

```jsonc
// driver after this change
{
	"ID": "@com_github_dgraph_io_ristretto//z:z",
	"Name": "z",
	"PkgPath": "github.com/dgraph-io/ristretto/z",
	"GoFiles": [
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/allocator.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/bbloom.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/btree.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/buffer.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_64bit.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_nojemalloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file_default.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/flags.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/histogram.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap_darwin.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/z.go"
	],
	"CompiledGoFiles": [
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/allocator.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/bbloom.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/btree.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/buffer.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_64bit.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/calloc_nojemalloc.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/file_default.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/flags.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/histogram.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/mmap_darwin.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.go",
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/z.go"
	],
	"SFiles": [
		"/private/var/tmp/_bazel_ricard.sole/b0012d46b327274ba1a89c748dd78c0b/external/com_github_dgraph_io_ristretto/z/rtutil.s"
	],
}
```
@iamricard iamricard force-pushed the ricard/separate-s-files-in-pkg branch from f41f8d9 to a6e2cea Compare May 31, 2022 10:03
@iamricard
Copy link
Contributor Author

Amended the commit with my corp email which has already signed the CLA.

@iamricard
Copy link
Contributor Author

@linzhp would you be able to have a quick look at this?

Copy link
Contributor

@linzhp linzhp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix.

cc. @JamyDev

@linzhp linzhp merged commit 15e43af into bazel-contrib:master Jun 7, 2022
@iamricard iamricard deleted the ricard/separate-s-files-in-pkg branch June 7, 2022 14:14
gcf-merge-on-green bot referenced this pull request in googleapis/gapic-generator-go Jul 19, 2022
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [io_bazel_rules_go](https://togithub.com/bazelbuild/rules_go) | http_archive | minor | `v0.33.0` -> `v0.34.0` |

---

### Release Notes

<details>
<summary>bazelbuild/rules_go</summary>

### [`v0.34.0`](https://togithub.com/bazelbuild/rules_go/releases/tag/v0.34.0)

[Compare Source](https://togithub.com/bazelbuild/rules_go/compare/v0.33.0...v0.34.0)

#### What's Changed

-   releaser: fix scrubbing timestamp from patch files by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3180](https://togithub.com/bazelbuild/rules_go/pull/3180)
-   Replace Starlark JSON parser with json.decode by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3184](https://togithub.com/bazelbuild/rules_go/pull/3184)
-   gopackagesdriver: separates "s" files in pkg info by [@&#8203;iamricard](https://togithub.com/iamricard) in [https://github.com/bazelbuild/rules_go/pull/3165](https://togithub.com/bazelbuild/rules_go/pull/3165)
-   Refactor away references to @&#8203;io_bazel_rules_go by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3185](https://togithub.com/bazelbuild/rules_go/pull/3185)
-   Do not print to stderr if cgo linking succeeds after retry by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3187](https://togithub.com/bazelbuild/rules_go/pull/3187)
-   Use param files with go-protoc by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3190](https://togithub.com/bazelbuild/rules_go/pull/3190)
-   Don't include non-executable go_binary in dependent's runfiles by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3151](https://togithub.com/bazelbuild/rules_go/pull/3151)
-   Link in native libraries of transitive dependencies in archive mode by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3186](https://togithub.com/bazelbuild/rules_go/pull/3186)
-   runfiles: remove deprecated api by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3198](https://togithub.com/bazelbuild/rules_go/pull/3198)
-   Fix failing open hermeticity test by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3206](https://togithub.com/bazelbuild/rules_go/pull/3206)
-   Fix go_googleapis Gazelle patch by [@&#8203;nickgooding](https://togithub.com/nickgooding) in [https://github.com/bazelbuild/rules_go/pull/3193](https://togithub.com/bazelbuild/rules_go/pull/3193)
-   Exclude unsupported C/C++ features by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3189](https://togithub.com/bazelbuild/rules_go/pull/3189)
-   Allow gomock to take Bazel common attributes by [@&#8203;linzhp](https://togithub.com/linzhp) in [https://github.com/bazelbuild/rules_go/pull/3207](https://togithub.com/bazelbuild/rules_go/pull/3207)
-   Transition on edges not self by [@&#8203;illicitonion](https://togithub.com/illicitonion) in [https://github.com/bazelbuild/rules_go/pull/3116](https://togithub.com/bazelbuild/rules_go/pull/3116)
-   Include go_transition_test in bazel aspect by [@&#8203;ian-h-chamberlain](https://togithub.com/ian-h-chamberlain) in [https://github.com/bazelbuild/rules_go/pull/3160](https://togithub.com/bazelbuild/rules_go/pull/3160)
-   Add an example for go_download_sdk.sdks by [@&#8203;fishy](https://togithub.com/fishy) in [https://github.com/bazelbuild/rules_go/pull/3139](https://togithub.com/bazelbuild/rules_go/pull/3139)
-   tests: nogo over generated code by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3214](https://togithub.com/bazelbuild/rules_go/pull/3214)
-   test nogo/coverage: test generated code by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3213](https://togithub.com/bazelbuild/rules_go/pull/3213)
-   Remove references to go_transition_test by [@&#8203;linzhp](https://togithub.com/linzhp) in [https://github.com/bazelbuild/rules_go/pull/3215](https://togithub.com/bazelbuild/rules_go/pull/3215)
-   Basic bzlmod setup by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3047](https://togithub.com/bazelbuild/rules_go/pull/3047)
-   Run BCR tests against Bazel 6.0.0-pre.20220608.2 by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3223](https://togithub.com/bazelbuild/rules_go/pull/3223)
-   Use repo-relative labels in MODULE.bazel by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3226](https://togithub.com/bazelbuild/rules_go/pull/3226)
-   upkeep: upgrade to go 1.18.3 and gazelle v0.26.0 by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3220](https://togithub.com/bazelbuild/rules_go/pull/3220)
-   nogo: ignore generated source files by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3216](https://togithub.com/bazelbuild/rules_go/pull/3216)
-   asm: Pass package path with -p by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3231](https://togithub.com/bazelbuild/rules_go/pull/3231)
-   bzlmod: Add support for gomock by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3232](https://togithub.com/bazelbuild/rules_go/pull/3232)
-   test cgo: ensure helper script works by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3236](https://togithub.com/bazelbuild/rules_go/pull/3236)
-   Fix //tests/legacy/examples/cgo:cgo_lib_test on M1 Macs by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3237](https://togithub.com/bazelbuild/rules_go/pull/3237)
-   gopackagesdriver: Descend into go_proto_compiler's deps by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3240](https://togithub.com/bazelbuild/rules_go/pull/3240)
-   new_library: remove unused resolver by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3219](https://togithub.com/bazelbuild/rules_go/pull/3219)
-   nogo: instantiate type info for generic types when running under Go >=1.18 by [@&#8203;farhaven](https://togithub.com/farhaven) in [https://github.com/bazelbuild/rules_go/pull/3212](https://togithub.com/bazelbuild/rules_go/pull/3212)

#### New Contributors

-   [@&#8203;iamricard](https://togithub.com/iamricard) made their first contribution in [https://github.com/bazelbuild/rules_go/pull/3165](https://togithub.com/bazelbuild/rules_go/pull/3165)
-   [@&#8203;ian-h-chamberlain](https://togithub.com/ian-h-chamberlain) made their first contribution in [https://github.com/bazelbuild/rules_go/pull/3160](https://togithub.com/bazelbuild/rules_go/pull/3160)
-   [@&#8203;fishy](https://togithub.com/fishy) made their first contribution in [https://github.com/bazelbuild/rules_go/pull/3139](https://togithub.com/bazelbuild/rules_go/pull/3139)
-   [@&#8203;farhaven](https://togithub.com/farhaven) made their first contribution in [https://github.com/bazelbuild/rules_go/pull/3212](https://togithub.com/bazelbuild/rules_go/pull/3212)

**Full Changelog**: bazel-contrib/rules_go@v0.33.0...v0.34.0

#### `WORKSPACE` code

    load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

    http_archive(
        name = "io_bazel_rules_go",
        sha256 = "16e9fca53ed6bd4ff4ad76facc9b7b651a89db1689a2877d6fd7b82aa824e366",
        urls = [
            "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.34.0/rules_go-v0.34.0.zip",
            "https://github.com/bazelbuild/rules_go/releases/download/v0.34.0/rules_go-v0.34.0.zip",
        ],
    )

    load("@&#8203;io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")

    go_rules_dependencies()

    go_register_toolchains(version = "1.18.4")

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-go).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzMi4xMTcuNCIsInVwZGF0ZWRJblZlciI6IjMyLjExNy40In0=-->
gcf-merge-on-green bot referenced this pull request in googleapis/gapic-config-validator Jul 19, 2022
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [io_bazel_rules_go](https://togithub.com/bazelbuild/rules_go) | http_archive | minor | `v0.33.0` -> `v0.34.0` |

---

### Release Notes

<details>
<summary>bazelbuild/rules_go</summary>

### [`v0.34.0`](https://togithub.com/bazelbuild/rules_go/releases/tag/v0.34.0)

[Compare Source](https://togithub.com/bazelbuild/rules_go/compare/v0.33.0...v0.34.0)

#### What's Changed

-   releaser: fix scrubbing timestamp from patch files by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3180](https://togithub.com/bazelbuild/rules_go/pull/3180)
-   Replace Starlark JSON parser with json.decode by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3184](https://togithub.com/bazelbuild/rules_go/pull/3184)
-   gopackagesdriver: separates "s" files in pkg info by [@&#8203;iamricard](https://togithub.com/iamricard) in [https://github.com/bazelbuild/rules_go/pull/3165](https://togithub.com/bazelbuild/rules_go/pull/3165)
-   Refactor away references to @&#8203;io_bazel_rules_go by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3185](https://togithub.com/bazelbuild/rules_go/pull/3185)
-   Do not print to stderr if cgo linking succeeds after retry by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3187](https://togithub.com/bazelbuild/rules_go/pull/3187)
-   Use param files with go-protoc by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3190](https://togithub.com/bazelbuild/rules_go/pull/3190)
-   Don't include non-executable go_binary in dependent's runfiles by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3151](https://togithub.com/bazelbuild/rules_go/pull/3151)
-   Link in native libraries of transitive dependencies in archive mode by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3186](https://togithub.com/bazelbuild/rules_go/pull/3186)
-   runfiles: remove deprecated api by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3198](https://togithub.com/bazelbuild/rules_go/pull/3198)
-   Fix failing open hermeticity test by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3206](https://togithub.com/bazelbuild/rules_go/pull/3206)
-   Fix go_googleapis Gazelle patch by [@&#8203;nickgooding](https://togithub.com/nickgooding) in [https://github.com/bazelbuild/rules_go/pull/3193](https://togithub.com/bazelbuild/rules_go/pull/3193)
-   Exclude unsupported C/C++ features by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3189](https://togithub.com/bazelbuild/rules_go/pull/3189)
-   Allow gomock to take Bazel common attributes by [@&#8203;linzhp](https://togithub.com/linzhp) in [https://github.com/bazelbuild/rules_go/pull/3207](https://togithub.com/bazelbuild/rules_go/pull/3207)
-   Transition on edges not self by [@&#8203;illicitonion](https://togithub.com/illicitonion) in [https://github.com/bazelbuild/rules_go/pull/3116](https://togithub.com/bazelbuild/rules_go/pull/3116)
-   Include go_transition_test in bazel aspect by [@&#8203;ian-h-chamberlain](https://togithub.com/ian-h-chamberlain) in [https://github.com/bazelbuild/rules_go/pull/3160](https://togithub.com/bazelbuild/rules_go/pull/3160)
-   Add an example for go_download_sdk.sdks by [@&#8203;fishy](https://togithub.com/fishy) in [https://github.com/bazelbuild/rules_go/pull/3139](https://togithub.com/bazelbuild/rules_go/pull/3139)
-   tests: nogo over generated code by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3214](https://togithub.com/bazelbuild/rules_go/pull/3214)
-   test nogo/coverage: test generated code by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3213](https://togithub.com/bazelbuild/rules_go/pull/3213)
-   Remove references to go_transition_test by [@&#8203;linzhp](https://togithub.com/linzhp) in [https://github.com/bazelbuild/rules_go/pull/3215](https://togithub.com/bazelbuild/rules_go/pull/3215)
-   Basic bzlmod setup by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3047](https://togithub.com/bazelbuild/rules_go/pull/3047)
-   Run BCR tests against Bazel 6.0.0-pre.20220608.2 by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3223](https://togithub.com/bazelbuild/rules_go/pull/3223)
-   Use repo-relative labels in MODULE.bazel by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3226](https://togithub.com/bazelbuild/rules_go/pull/3226)
-   upkeep: upgrade to go 1.18.3 and gazelle v0.26.0 by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3220](https://togithub.com/bazelbuild/rules_go/pull/3220)
-   nogo: ignore generated source files by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3216](https://togithub.com/bazelbuild/rules_go/pull/3216)
-   asm: Pass package path with -p by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3231](https://togithub.com/bazelbuild/rules_go/pull/3231)
-   bzlmod: Add support for gomock by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3232](https://togithub.com/bazelbuild/rules_go/pull/3232)
-   test cgo: ensure helper script works by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3236](https://togithub.com/bazelbuild/rules_go/pull/3236)
-   Fix //tests/legacy/examples/cgo:cgo_lib_test on M1 Macs by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3237](https://togithub.com/bazelbuild/rules_go/pull/3237)
-   gopackagesdriver: Descend into go_proto_compiler's deps by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/rules_go/pull/3240](https://togithub.com/bazelbuild/rules_go/pull/3240)
-   new_library: remove unused resolver by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/rules_go/pull/3219](https://togithub.com/bazelbuild/rules_go/pull/3219)
-   nogo: instantiate type info for generic types when running under Go >=1.18 by [@&#8203;farhaven](https://togithub.com/farhaven) in [https://github.com/bazelbuild/rules_go/pull/3212](https://togithub.com/bazelbuild/rules_go/pull/3212)

#### New Contributors

-   [@&#8203;iamricard](https://togithub.com/iamricard) made their first contribution in [https://github.com/bazelbuild/rules_go/pull/3165](https://togithub.com/bazelbuild/rules_go/pull/3165)
-   [@&#8203;ian-h-chamberlain](https://togithub.com/ian-h-chamberlain) made their first contribution in [https://github.com/bazelbuild/rules_go/pull/3160](https://togithub.com/bazelbuild/rules_go/pull/3160)
-   [@&#8203;fishy](https://togithub.com/fishy) made their first contribution in [https://github.com/bazelbuild/rules_go/pull/3139](https://togithub.com/bazelbuild/rules_go/pull/3139)
-   [@&#8203;farhaven](https://togithub.com/farhaven) made their first contribution in [https://github.com/bazelbuild/rules_go/pull/3212](https://togithub.com/bazelbuild/rules_go/pull/3212)

**Full Changelog**: bazel-contrib/rules_go@v0.33.0...v0.34.0

#### `WORKSPACE` code

    load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

    http_archive(
        name = "io_bazel_rules_go",
        sha256 = "16e9fca53ed6bd4ff4ad76facc9b7b651a89db1689a2877d6fd7b82aa824e366",
        urls = [
            "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.34.0/rules_go-v0.34.0.zip",
            "https://github.com/bazelbuild/rules_go/releases/download/v0.34.0/rules_go-v0.34.0.zip",
        ],
    )

    load("@&#8203;io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")

    go_rules_dependencies()

    go_register_toolchains(version = "1.18.4")

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-config-validator).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzMi4xMTcuNCIsInVwZGF0ZWRJblZlciI6IjMyLjExNy40In0=-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants