From 168ac46cdb2afb8e2644357cf458c8f6f54a5fca Mon Sep 17 00:00:00 2001 From: groot Date: Thu, 30 May 2019 09:24:14 +0800 Subject: [PATCH 1/3] fix thrift generate error Former-commit-id: 444233484091fe329e190a5fd62bf93c5e26e3f4 --- cpp/src/thrift/cpp_gen.sh | 2 +- cpp/src/thrift/megasearch.thrift | 1 - cpp/src/thrift/py_gen.sh | 2 +- cpp/src/thrift/thrift.REMOVED.git-id | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 cpp/src/thrift/thrift.REMOVED.git-id diff --git a/cpp/src/thrift/cpp_gen.sh b/cpp/src/thrift/cpp_gen.sh index df04e46c99..1284629e20 100755 --- a/cpp/src/thrift/cpp_gen.sh +++ b/cpp/src/thrift/cpp_gen.sh @@ -1,4 +1,4 @@ #!/bin/bash -../../third_party/build/bin/thrift -r --gen cpp ./megasearch.thrift +./thrift -r --gen cpp ./megasearch.thrift diff --git a/cpp/src/thrift/megasearch.thrift b/cpp/src/thrift/megasearch.thrift index e85b77dc3d..800faf5db8 100644 --- a/cpp/src/thrift/megasearch.thrift +++ b/cpp/src/thrift/megasearch.thrift @@ -3,7 +3,6 @@ * Unauthorized copying of this file, via any medium is strictly prohibited. * Proprietary and confidential. ******************************************************************************/ -namespace cl megasearch.thrift namespace cpp megasearch.thrift namespace py megasearch.thrift namespace d megasearch.thrift diff --git a/cpp/src/thrift/py_gen.sh b/cpp/src/thrift/py_gen.sh index de661cf0c3..49403969a2 100755 --- a/cpp/src/thrift/py_gen.sh +++ b/cpp/src/thrift/py_gen.sh @@ -1,4 +1,4 @@ #!/bin/bash -../../third_party/build/bin/thrift -r --gen py ./megasearch.thrift +./thrift -r --gen py ./megasearch.thrift diff --git a/cpp/src/thrift/thrift.REMOVED.git-id b/cpp/src/thrift/thrift.REMOVED.git-id new file mode 100644 index 0000000000..6c6116d0b1 --- /dev/null +++ b/cpp/src/thrift/thrift.REMOVED.git-id @@ -0,0 +1 @@ +03af6a3a9ba8f449a7722d9b7b6474528a80e48c \ No newline at end of file From f681c3ae8604253bdf069d2366e8ee8b7dbb75a6 Mon Sep 17 00:00:00 2001 From: groot Date: Thu, 30 May 2019 10:02:17 +0800 Subject: [PATCH 2/3] restruct thrift package Former-commit-id: d02f846e4ffa3c61d860b081054d4526e03eb930 --- cpp/src/thrift/cpp_gen.sh | 2 +- cpp/src/thrift/gen-py/__init__.py | 0 cpp/src/thrift/py_gen.sh | 4 ---- cpp/src/thrift/thrift.REMOVED.git-id | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 cpp/src/thrift/gen-py/__init__.py delete mode 100755 cpp/src/thrift/py_gen.sh delete mode 100644 cpp/src/thrift/thrift.REMOVED.git-id diff --git a/cpp/src/thrift/cpp_gen.sh b/cpp/src/thrift/cpp_gen.sh index 1284629e20..c3065b1f50 100755 --- a/cpp/src/thrift/cpp_gen.sh +++ b/cpp/src/thrift/cpp_gen.sh @@ -1,4 +1,4 @@ #!/bin/bash -./thrift -r --gen cpp ./megasearch.thrift +thrift -r --gen cpp ./megasearch.thrift diff --git a/cpp/src/thrift/gen-py/__init__.py b/cpp/src/thrift/gen-py/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/cpp/src/thrift/py_gen.sh b/cpp/src/thrift/py_gen.sh deleted file mode 100755 index 49403969a2..0000000000 --- a/cpp/src/thrift/py_gen.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -./thrift -r --gen py ./megasearch.thrift - diff --git a/cpp/src/thrift/thrift.REMOVED.git-id b/cpp/src/thrift/thrift.REMOVED.git-id deleted file mode 100644 index 6c6116d0b1..0000000000 --- a/cpp/src/thrift/thrift.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -03af6a3a9ba8f449a7722d9b7b6474528a80e48c \ No newline at end of file From f1bb41d34c771b24d0bcc43ce581f0a44ced3d82 Mon Sep 17 00:00:00 2001 From: groot Date: Thu, 30 May 2019 10:06:22 +0800 Subject: [PATCH 3/3] restruct thrift package Former-commit-id: 57d8eba6ad2df54f7b2d4e0544157788fe1eb127 --- cpp/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index efb810e2a5..1e0e501546 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -23,3 +23,4 @@ Please mark all change in change log and use the ticket from JIRA. - MS-4 - Refactor the vecwise_engine code structure - MS-20 - Clean Code Part 1 - MS-30 - Use faiss v1.5.2 +- MS-32 - Fix thrift error