Update mixer at v1.18.0 (#897)

datacommonsorg · Apr 22, 2021 · 1633367 · 1633367
1 parent e733925
commit 1633367
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/mixer b/mixer
diff --git a/scripts/sync_mixer.sh b/scripts/sync_mixer.sh
@@ -24,6 +24,8 @@ ROOT="$(dirname "$DIR")"
 
 # Update mixer
 cd $ROOT/mixer
+git checkout master
+git pull origin master
 git fetch --all --tags
 git pull origin $(git describe --tags --abbrev=0)
 cd ..
+3 −1		.gitignore
+5 −8		build/ci/cloudbuild.push.yaml
+6 −0		build/push_go_protoc_image.sh
+38 −34		deploy/base/deployment.yaml
+7 −7		deploy/base/ingress.yaml
+5 −4		deploy/base/kustomization.yaml
+24 −0		deploy/git/kustomization.yaml
+0 −0		deploy/git/mixer_hash.txt
+21 −14		deploy/overlays/autopush/kustomization.yaml
+21 −14		deploy/overlays/prod/kustomization.yaml
+21 −14		deploy/overlays/staging/kustomization.yaml
+6 −0		deploy/push_deploy_tool_image.sh
+1 −1		deploy/storage-svobs/bigquery.version
+1 −1		deploy/storage-svobs/bigtable.version
+1 −1		deploy/storage/bigquery.version
+1 −1		deploy/storage/bigtable.version
+992 −834		internal/proto/mixer.pb.go
+38 −0		internal/proto/mixer_grpc.pb.go
+1 −1		internal/proto/stat.pb.go
+69 −12		internal/server/ranking.go
+30 −26		internal/server/statvar_group.go
+34 −0		internal/server/version.go
+23 −0		proto/mixer.proto
+3 −0		scripts/deploy_gke.sh
+26 −0		scripts/prod_version.sh
+27 −0		scripts/push_binary.sh
+4 −3		test/integration/get_stat_all_test.go
+6 −4		test/integration/get_stat_set_series_test.go
+5 −4		test/integration/get_stats_test.go
+25 −1		test/integration/get_statvar_group_test.go
+80 −5		test/integration/golden_response/staging/get_landing_page_data/asm.json
+116 −62		test/integration/golden_response/staging/get_landing_page_data/tha.json
+56 −61		test/integration/golden_response/staging/get_landing_page_data/zuid-nederland.json
+4 −4		test/integration/golden_response/staging/get_related_locations/county.json
+0 −27		test/integration/golden_response/staging/get_stat_all/result.json
+842 −0		test/integration/golden_response/staging/get_stat_all/result.json.popobs
+8 −8		test/integration/golden_response/staging/get_stat_ranking/california.json
+381 −0		test/integration/golden_response/staging/get_stat_set_series/misc.json
+1,234 −0		test/integration/golden_response/staging/get_stat_set_series/misc.json.popobs
+534 −2		test/integration/golden_response/staging/get_stat_set_series/nyt_covid_cases.json
+802 −0		test/integration/golden_response/staging/get_stat_set_series/nyt_covid_cases.json.popobs
+17 −0		test/integration/golden_response/staging/get_stats/census_acs.json.popobs
+335 −0		test/integration/golden_response/staging/get_stats/census_pep.json.popobs
+38 −0		test/integration/golden_response/staging/get_stats/gdp.json.popobs
+38 −0		test/integration/golden_response/staging/get_stats/internet_user.json.popobs
+47 −0		test/integration/golden_response/staging/get_stats/median_age.json.popobs
+536 −4		test/integration/golden_response/staging/get_stats/nyt_covid_cases.json
+779 −0		test/integration/golden_response/staging/get_stats/nyt_covid_cases.json.popobs
+38 −0		test/integration/golden_response/staging/get_stats/total_crimes.json.popobs
+1 −0		test/integration/golden_response/staging/get_statvar_group/empty.json
+41 −24		test/integration/golden_response/staging/get_statvar_group/uk.json