Skip to content

Commit

Permalink
Merge pull request #91 from uber/easyjson-checksum
Browse files Browse the repository at this point in the history
Add checksum to speed up easyjson
  • Loading branch information
Raynos committed May 5, 2017
2 parents 8c62d35 + 7f5b7e5 commit 0aa3002
Show file tree
Hide file tree
Showing 47 changed files with 10,335 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ check-generate:
rm -rf ./examples/example-gateway/build
make generate
git status --porcelain > git-status.log
@[ ! -s git-status.log ] || ( cat git-status.log ; [ ! -s git-status.log ] );
@[ ! -s git-status.log ] || ( cat git-status.log ; git diff ; [ ! -s git-status.log ] );

.PHONY: test-all
test-all:
Expand Down
10 changes: 6 additions & 4 deletions codegen/runner/pre-steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ runtime=$((end-start))
echo "Compiled thriftrw : +$runtime"

echo "Generating Go code from Thrift files"
rm -rf "$BUILD_DIR/gen-code"
mkdir -p "$BUILD_DIR/gen-code"
for tfile in $(find "$CONFIG_DIR/idl" -name '*.thrift'); do
"$THRIFTRW_BINARY" --out="$BUILD_DIR/gen-code" \
Expand All @@ -59,9 +58,12 @@ runtime=$((end-start))
echo "Compiled easyjson : +$runtime"

echo "Generating JSON Marshal/Unmarshal"
for file in $(find "$BUILD_DIR/gen-code" -name "types.go" | grep -v "versioncheck.go");do
"$EASY_JSON_BINARY" -all -- "$file"
done
thriftrw_gofiles=(
$(find "$BUILD_DIR/gen-code" -name "*.go" | \
grep -v "versioncheck.go" | \
grep -v "easyjson.go" | sort)
)
"$EASY_JSON_BINARY" -all -- "${thriftrw_gofiles[@]}"

end=`date +%s`
runtime=$((end-start))
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0aa3002

Please sign in to comment.