Merge remote-tracking branch 'mega/branch-1.2' into branch-1.2

Former-commit-id: 5f0a9c8603f16bbadf9fecd6c87c5bd82956da7a
2025-12-31 07:55:38 +08:00 · 2019-05-30 11:18:33 +08:00 · 2019-05-30 11:18:33 +08:00 · 321dda5315
commit 321dda5315
parent 49fab66b70 f038c5d289
5 changed files with 2 additions and 6 deletions
--- 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
--- 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

--- a/cpp/src/thrift/gen-py/init.py
+++ b/cpp/src/thrift/gen-py/init.py
--- 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
--- a/cpp/src/thrift/py_gen.sh
+++ b/cpp/src/thrift/py_gen.sh
@ -1,4 +0,0 @@
-#!/bin/bash
-
-../../third_party/build/bin/thrift -r --gen py ./megasearch.thrift
-