diff --git a/src/index_options.cpp b/src/index_options.cpp index fbcc9f5..2597cfa 100644 --- a/src/index_options.cpp +++ b/src/index_options.cpp @@ -1,12 +1,10 @@ #include "index_options.h" -#include - -#include - +#include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/numbers.h" #include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" #include "re2/re2.h" namespace vectorlite { @@ -27,7 +25,7 @@ absl::StatusOr IndexOptions::FromString( std::string key; std::string value; - std::string_view input(key_value); + absl::string_view input(key_value); while (re2::RE2::FindAndConsume(&input, kv_reg, &key, &value)) { if (key == "max_elements") { if (!absl::SimpleAtoi(value, &options.max_elements)) { diff --git a/src/index_options.h b/src/index_options.h index 9ed8c15..0a1ae2f 100644 --- a/src/index_options.h +++ b/src/index_options.h @@ -1,8 +1,7 @@ #pragma once -#include - #include "absl/status/statusor.h" +#include "absl/strings/string_view.h" namespace vectorlite { @@ -22,7 +21,7 @@ struct IndexOptions { // All parameters except max_elemnts are optional, default values are used // if not specified. static absl::StatusOr FromString( - std::string_view index_options); + absl::string_view index_options); }; } // namespace vectorlite \ No newline at end of file diff --git a/src/util.cpp b/src/util.cpp index 401ddfa..516d508 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -11,7 +11,7 @@ namespace vectorlite { -bool IsValidColumnName(std::string_view name) { +bool IsValidColumnName(absl::string_view name) { if (name.empty() || sqlite3_keyword_check(name.data(), name.size()) != 0) { return false; } diff --git a/src/util.h b/src/util.h index be85b8c..d5e452a 100644 --- a/src/util.h +++ b/src/util.h @@ -1,11 +1,9 @@ #pragma once -#include - #include -#include #include +#include "absl/strings/string_view.h" #include "hnswlib/hnswlib.h" namespace vectorlite { @@ -18,7 +16,7 @@ namespace vectorlite { // - It must not be a reserved keyword. // The input is of string type because built-in regex doesn't work with // string_view -bool IsValidColumnName(std::string_view name); +bool IsValidColumnName(absl::string_view name); // Returns which SIMD instruction set is used at build time. // e.g. SSE, AVX, AVX512 diff --git a/src/virtual_table.cpp b/src/virtual_table.cpp index 49ce100..e97c795 100644 --- a/src/virtual_table.cpp +++ b/src/virtual_table.cpp @@ -92,7 +92,7 @@ int VirtualTable::Create(sqlite3* db, void* pAux, int argc, return SQLITE_ERROR; } - std::string_view index_options_str = argv[1 + kModuleParamOffset]; + absl::string_view index_options_str = argv[1 + kModuleParamOffset]; DLOG(INFO) << "index_options_str: " << index_options_str; auto index_options = IndexOptions::FromString(index_options_str); if (!index_options.ok()) {