diff --git a/AnnService/inc/IndexBuilder/Options.h b/AnnService/inc/IndexBuilder/Options.h index c724419f..f35d6099 100644 --- a/AnnService/inc/IndexBuilder/Options.h +++ b/AnnService/inc/IndexBuilder/Options.h @@ -29,7 +29,7 @@ class BuilderOptions : public Helper::ArgumentsParser std::string m_vectorDelimiter; - bool m_append; + bool m_append; SPTAG::VectorValueType m_inputValueType; diff --git a/AnnService/src/IndexBuilder/Options.cpp b/AnnService/src/IndexBuilder/Options.cpp index 288438dc..45c1a5f5 100644 --- a/AnnService/src/IndexBuilder/Options.cpp +++ b/AnnService/src/IndexBuilder/Options.cpp @@ -22,8 +22,8 @@ BuilderOptions::BuilderOptions() AddRequiredOption(m_inputFiles, "-i", "--input", "Input raw data."); AddRequiredOption(m_outputFolder, "-o", "--outputfolder", "Output folder."); AddRequiredOption(m_indexAlgoType, "-a", "--algo", "Index Algorithm type."); - AddOptionalOption(m_builderConfigFile, "-c", "--config", "Config file for builder."); - AddOptionalOption(m_append, "-p", "--append", "Append to existing index."); + AddOptionalOption(m_builderConfigFile, "-c", "--config", "Config file for builder."); + AddOptionalOption(m_append, "-p", "--append", "Append to existing index."); } diff --git a/AnnService/src/IndexBuilder/main.cpp b/AnnService/src/IndexBuilder/main.cpp index 3e23e475..7fbd4f07 100644 --- a/AnnService/src/IndexBuilder/main.cpp +++ b/AnnService/src/IndexBuilder/main.cpp @@ -55,8 +55,8 @@ int main(int argc, char* argv[]) indexBuilder->SetParameter(iter.first.c_str(), iter.second.c_str()); } - std::shared_ptr p_vectorSet = nullptr; - std::shared_ptr p_metaSet = nullptr; + std::shared_ptr p_vectorSet = nullptr; + std::shared_ptr p_metaSet = nullptr; if (options->m_inputFiles.find("BIN:") == 0) { std::vector files = SPTAG::Helper::StrUtils::SplitString(options->m_inputFiles.substr(4), ","); @@ -88,20 +88,20 @@ int main(int argc, char* argv[]) exit(1); } - p_vectorSet = vectorReader->GetVectorSet(); - p_metaSet = vectorReader->GetMetadataSet(); + p_vectorSet = vectorReader->GetVectorSet(); + p_metaSet = vectorReader->GetMetadataSet(); } - ErrorCode code; - std::shared_ptr vecIndex; - if (options->m_append && ErrorCode::Success == indexBuilder->LoadIndex(options->m_outputFolder, vecIndex) && nullptr != vecIndex) { - code = vecIndex->AddIndex(p_vectorSet, p_metaSet); - indexBuilder = vecIndex; - } - else { - code = indexBuilder->BuildIndex(p_vectorSet, p_metaSet); - } - indexBuilder->SaveIndex(options->m_outputFolder); + ErrorCode code; + std::shared_ptr vecIndex; + if (options->m_append && ErrorCode::Success == indexBuilder->LoadIndex(options->m_outputFolder, vecIndex) && nullptr != vecIndex) { + code = vecIndex->AddIndex(p_vectorSet, p_metaSet); + indexBuilder = vecIndex; + } + else { + code = indexBuilder->BuildIndex(p_vectorSet, p_metaSet); + } + indexBuilder->SaveIndex(options->m_outputFolder); if (ErrorCode::Success != code) {