这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Dec 10, 2021. It is now read-only.

Migrate to grpc-gateway #105

Merged
merged 20 commits into from
Aug 27, 2019
Merged

Migrate to grpc-gateway #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1165042
Migrate to grpc-gateway
mosuka Aug 20, 2019
9f2ed1d
Add HTTP server
mosuka Aug 20, 2019
0a22468
Change REST API parameter
mosuka Aug 20, 2019
189e737
Migrate to grpc-gateway
mosuka Aug 20, 2019
21c429c
Update REST API
mosuka Aug 21, 2019
2ed12bd
Change protobuf
mosuka Aug 22, 2019
21d3a4f
Change index protobuf
mosuka Aug 22, 2019
613691e
Add delete document endpoint
mosuka Aug 22, 2019
3d36d0a
Add bulk delete endpoint
mosuka Aug 22, 2019
addca3e
Add search endpoint
mosuka Aug 23, 2019
19a8bc7
Migrate to grpc-gateway
mosuka Aug 24, 2019
118ee8d
Update protobuf
mosuka Aug 25, 2019
a831eeb
Refactoring
mosuka Aug 26, 2019
2d19c10
Refactoring
mosuka Aug 26, 2019
4de7a61
Add swagger.json
mosuka Aug 26, 2019
11d9036
Generate protobuf and swagger.json
mosuka Aug 26, 2019
8416605
Revert swagger.json
mosuka Aug 26, 2019
5332a3e
Update Dockerfile
mosuka Aug 26, 2019
3030d91
Update wkipedia example
mosuka Aug 27, 2019
54a9b6c
Update CHANGES.md
mosuka Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Use protobuf document #98
- Change node state to Node_SHUTDOWN in a error #99
- Fix a bug for waiting to receive an indexer cluster updates from the stream #100
- Migrate to grpc-gateway #105

## [v0.7.1] - 2019-07-18

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ COPY --from=0 /go/src/github.com/blevesearch/cld2/cld2/internal/*.so /usr/local/
COPY --from=0 /go/src/github.com/mosuka/blast/bin/* /usr/bin/
COPY --from=0 /go/src/github.com/mosuka/blast/docker-entrypoint.sh /usr/bin/

EXPOSE 2000 5000 8000
EXPOSE 2000 5000 6000 8000

ENTRYPOINT [ "/usr/bin/docker-entrypoint.sh" ]
CMD [ "blast", "--help" ]
7 changes: 6 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ PROTOBUFS = $(shell find . -name '*.proto' -print0 | xargs -0 -n1 dirname | sort

TARGET_PACKAGES = $(shell find . -name 'main.go' -print0 | xargs -0 -n1 dirname | sort | uniq | grep -v /vendor/)

GRPC_GATEWAY_PATH = $(shell $(GO) list -m -f "{{.Dir}}" github.com/grpc-ecosystem/grpc-gateway)

ifeq ($(VERSION),)
VERSION = latest
endif
Expand All @@ -44,7 +46,10 @@ endif
.PHONY: protoc
protoc:
@echo ">> generating proto3 code"
@for proto_dir in $(PROTOBUFS); do echo $$proto_dir; protoc --proto_path=. --proto_path=$$proto_dir --go_out=plugins=grpc:$(GOPATH)/src $$proto_dir/*.proto || exit 1; done
@echo " GRPC_GATEWAY_PATH = $(GRPC_GATEWAY_PATH)"
@for proto_dir in $(PROTOBUFS); do echo $$proto_dir; protoc --proto_path=. --proto_path=${GRPC_GATEWAY_PATH}/third_party/googleapis --proto_path=$$proto_dir --go_out=plugins=grpc:$(GOPATH)/src $$proto_dir/*.proto || exit 1; done
@for proto_dir in $(PROTOBUFS); do echo $$proto_dir; protoc --proto_path=. --proto_path=${GRPC_GATEWAY_PATH}/third_party/googleapis --proto_path=$$proto_dir --grpc-gateway_out=logtostderr=true,allow_delete_body=true:$(GOPATH)/src $$proto_dir/*.proto || exit 1; done
# @for proto_dir in $(PROTOBUFS); do echo $$proto_dir; protoc --proto_path=. --proto_path=${GRPC_GATEWAY_PATH}/third_party/googleapis --proto_path=$$proto_dir --swagger_out=logtostderr=true,allow_delete_body=true:. $$proto_dir/*.proto || exit 1; done

.PHONY: format
format:
Expand Down
Loading