Ajwerner/wrapped descriptors

Gopkg.toml

@@ -58,6 +58,10 @@ ignored = [
  name = "github.com/docker/docker"
  branch = "master"
 
+[[constraint]]
+ name = "github.com/dave/dst"
+ branch = "master"
+
 [[constraint]]
  name = "github.com/maruel/panicparse"
  revision = "f20d4c4d746f810c9110e21928d4135e1f2a3efa"

Makefile

@@ -482,7 +482,7 @@ LIBSNAPPY := $(SNAPPY_DIR)/libsnappy.a
 LIBEDIT := $(LIBEDIT_DIR)/src/.libs/libedit.a
 LIBROACH := $(LIBROACH_DIR)/libroach.a
 LIBROACHCCL := $(LIBROACH_DIR)/libroachccl.a
-LIBPROJ := $(PROJ_DIR)/lib/libproj.a
+LIBPROJ := $(PROJ_DIR)/lib/libproj$(if $(target-is-windows),_4_9).a
 LIBKRB5 := $(KRB5_DIR)/lib/libgssapi_krb5.a
 PROTOC := $(PROTOC_DIR)/protoc
 
@@ -553,7 +553,7 @@ $(BASE_CGO_FLAGS_FILES): Makefile build/defs.mk.sig | bin/.submodules-initialize
  @echo >> $@
  @echo 'package $(if $($(@D)-package),$($(@D)-package),$(notdir $(@D)))' >> $@
  @echo >> $@
- @echo '// #cgo CPPFLAGS: $(addprefix -I,$(JEMALLOC_DIR)/include $(KRB_CPPFLAGS) $(GEOS_DIR)/capi $(PROJ_DIR)/lib)' >> $@
+ @echo '// #cgo CPPFLAGS: $(addprefix -I,$(JEMALLOC_DIR)/include $(KRB_CPPFLAGS))' >> $@
  @echo '// #cgo LDFLAGS: $(addprefix -L,$(CRYPTOPP_DIR) $(PROTOBUF_DIR) $(JEMALLOC_DIR)/lib $(SNAPPY_DIR) $(LIBEDIT_DIR)/src/.libs $(ROCKSDB_DIR) $(LIBROACH_DIR) $(KRB_DIR) $(PROJ_DIR)/lib)' >> $@
  @echo 'import "C"' >> $@
 
@@ -825,7 +825,7 @@ SQLPARSER_TARGETS = \
 
 PROTOBUF_TARGETS := bin/.go_protobuf_sources bin/.gw_protobuf_sources bin/.cpp_protobuf_sources bin/.cpp_ccl_protobuf_sources
 
-DOCGEN_TARGETS := bin/.docgen_bnfs bin/.docgen_functions
+DOCGEN_TARGETS := bin/.docgen_bnfs bin/.docgen_functions docs/generated/redact_safe.md
 
 EXECGEN_TARGETS = \
  pkg/col/coldata/vec.eg.go \
@@ -972,7 +972,7 @@ buildshort: ## Build the CockroachDB binary without the admin UI.
 build: $(COCKROACH)
 buildoss: $(COCKROACHOSS)
 buildshort: $(COCKROACHSHORT)
-build buildoss buildshort: $(DOCGEN_TARGETS)
+build buildoss buildshort: $(if $(is-cross-compile),,$(DOCGEN_TARGETS))
 build buildshort: $(if $(is-cross-compile),,$(SETTINGS_DOC_PAGE))
 
 # For historical reasons, symlink cockroach to cockroachshort.
@@ -1528,6 +1528,19 @@ bin/.docgen_functions: bin/docgen
  docgen functions docs/generated/sql --quiet
  touch $@
 
+.PHONY: docs/generated/redact_safe.md
+
+docs/generated/redact_safe.md:
+ @(echo "The following types are considered always safe for reporting:"; echo; \
+ echo "File | Type"; echo "--|--") >$@.tmp
+ @git grep '^func \(.*\) SafeValue\(\)' | \
+ grep -v '^pkg/util/redact' | \
+ sed -E -e 's/^([^:]*):func \(([^ ]* )?(.*)\) SafeValue.*$$/\1 | \`\3\`/g' >>$@.tmp || rm -f $@.tmp
+ @git grep 'redact\.RegisterSafeType' | \
+ grep -v '^pkg/util/redact' | \
+ sed -E -e 's/^([^:]*):.*redact\.RegisterSafeType\((.*)\).*/\1 | \`\2\`/g' >>$@.tmp || rm -f $@.tmp
+ @mv -f $@.tmp $@
+
 settings-doc-gen := $(if $(filter buildshort,$(MAKECMDGOALS)),$(COCKROACHSHORT),$(COCKROACH))
 
 $(SETTINGS_DOC_PAGE): $(settings-doc-gen)
@@ -1671,6 +1684,7 @@ bins = \
  bin/benchmark \
  bin/cockroach-oss \
  bin/cockroach-short \
+ bin/compile-builds \
  bin/docgen \
  bin/execgen \
  bin/fuzz \
@@ -1715,7 +1729,8 @@ logictest-bins := bin/logictest bin/logictestopt bin/logictestccl
 # Additional dependencies for binaries that depend on generated code.
 #
 # TODO(benesch): Derive this automatically. This is getting out of hand.
-bin/workload bin/docgen bin/execgen bin/roachtest $(logictest-bins): $(LIBPROJ) $(CGO_FLAGS_FILES) $(SQLPARSER_TARGETS) $(PROTOBUF_TARGETS)
+bin/workload bin/docgen bin/execgen bin/roachtest $(logictest-bins): $(SQLPARSER_TARGETS) $(PROTOBUF_TARGETS)
+bin/workload bin/docgen bin/roachtest $(logictest-bins): $(LIBPROJ) $(CGO_FLAGS_FILES)
 bin/workload bin/roachtest $(logictest-bins): $(EXECGEN_TARGETS)
 bin/roachtest $(logictest-bins): $(C_LIBS_CCL) $(CGO_FLAGS_FILES) $(OPTGEN_TARGETS)
 

build/teamcity-compile-builds.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+export BUILDER_HIDE_GOPATH_SRC=1
+
+build/builder.sh go install ./pkg/cmd/compile-builds
+build/builder.sh env \
+ compile-builds