Skip to content

Commit 7b96ffe

Browse files
OgnimalfOgnimalf
committed
Rename default db to "default_db"
1 parent 414fb6e commit 7b96ffe

File tree

88 files changed

+568
-568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+568
-568
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ infinity_obj = infinity.connect(REMOTE_HOST)
108108
### Get a database
109109

110110
```python
111-
db = infinity_obj.get_database("default")
111+
db = infinity_obj.get_database("default_db")
112112
```
113113

114114

‎benchmark/local_infinity/fulltext/fulltext_benchmark.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ int main(int argc, char *argv[]) {
324324
}
325325
RegisterSignal();
326326

327-
String db_name = "default";
327+
String db_name = "default_db";
328328
String table_name = "ft_dbpedia_benchmark";
329329
String index_name = "ft_dbpedia_index";
330330
String srcfile = test_data_path();

‎benchmark/local_infinity/fulltext/fulltext_query_benchmark.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ int main(int argn, char *argv[]) {
8787
return 1;
8888
}
8989

90-
std::string db_name = "default";
90+
std::string db_name = "default_db";
9191
std::string table_name = "ft_dbpedia_benchmark";
9292
std::string index_name = "ft_dbpedia_index";
9393

‎benchmark/local_infinity/infinity_benchmark.cpp

+19-19
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ int main() {
9797
{
9898
auto tims_costing_second =
9999
Measurement("Get Database", thread_num, total_times, [&](SizeT i, SharedPtr<Infinity> infinity, std::thread::id thread_id) {
100-
__attribute__((unused)) auto ignored = infinity->GetDatabase("default");
100+
__attribute__((unused)) auto ignored = infinity->GetDatabase("default_db");
101101
});
102102
results.push_back(fmt::format("-> Get Database QPS: {}", total_times / tims_costing_second));
103103
}
@@ -146,31 +146,31 @@ int main() {
146146
{
147147
// Init Table
148148
SharedPtr<Infinity> infinity = Infinity::LocalConnect();
149-
// auto [ database, status ] = infinity->GetDatabase("default");
149+
// auto [ database, status ] = infinity->GetDatabase("default_db");
150150
__attribute__((unused)) auto ignored =
151-
infinity->CreateTable("default", "benchmark_test", column_defs, Vector<TableConstraint *>(), create_table_opts);
151+
infinity->CreateTable("default_db", "benchmark_test", column_defs, Vector<TableConstraint *>(), create_table_opts);
152152
infinity->LocalDisconnect();
153153
}
154154
// {
155155
// auto tims_costing_second = Measurement(thread_num, total_times, [&](SizeT i, SharedPtr<Infinity> infinity, std::thread::id
156156
// thread_id) {
157-
// __attribute__((unused)) auto ignored = infinity->GetDatabase("default")->ListTables();
157+
// __attribute__((unused)) auto ignored = infinity->GetDatabase("default_db")->ListTables();
158158
// });
159159
// results.push_back(fmt::format("-> List Tables QPS: {}", total_times / tims_costing_second));
160160
// }
161161
{
162162
auto tims_costing_second =
163163
Measurement("Get Tables", thread_num, total_times, [&](SizeT i, SharedPtr<Infinity> infinity, std::thread::id thread_id) {
164-
// auto [ database, status ] = infinity->GetDatabase("default");
165-
__attribute__((unused)) auto ignored = infinity->GetTable("default", "benchmark_test");
164+
// auto [ database, status ] = infinity->GetDatabase("default_db");
165+
__attribute__((unused)) auto ignored = infinity->GetTable("default_db", "benchmark_test");
166166
});
167167
results.push_back(fmt::format("-> Get Tables QPS: {}", total_times / tims_costing_second));
168168
}
169169
{
170170
auto tims_costing_second =
171171
Measurement("Describe Tables", thread_num, total_times, [&](SizeT i, SharedPtr<Infinity> infinity, std::thread::id thread_id) {
172-
// auto [ database, status ] = infinity->GetDatabase("default");
173-
__attribute__((unused)) auto ignored = infinity->ShowTable("default", "benchmark_test");
172+
// auto [ database, status ] = infinity->GetDatabase("default_db");
173+
__attribute__((unused)) auto ignored = infinity->ShowTable("default_db", "benchmark_test");
174174
});
175175
results.push_back(fmt::format("-> Describe Tables QPS: {}", total_times / tims_costing_second));
176176
}
@@ -191,16 +191,16 @@ int main() {
191191
auto col_def_2 = new ColumnDef(1, col_type, col_name_2, HashSet<ConstraintType>());
192192
column_definitions.emplace_back(col_def_2);
193193

194-
// auto [database, status] = infinity->GetDatabase("default");
194+
// auto [database, status] = infinity->GetDatabase("default_db");
195195
__attribute__((unused)) auto ignored =
196-
infinity->CreateTable("default", std::to_string(i), column_definitions, Vector<TableConstraint *>(), create_table_opts);
196+
infinity->CreateTable("default_db", std::to_string(i), column_definitions, Vector<TableConstraint *>(), create_table_opts);
197197
});
198198
results.push_back(fmt::format("-> Create Table QPS: {}", total_times / tims_costing_second));
199199
}
200200
{
201201
auto tims_costing_second =
202202
Measurement("Drop Table", thread_num, total_times, [&](SizeT i, SharedPtr<Infinity> infinity, std::thread::id thread_id) {
203-
__attribute__((unused)) auto ignored = infinity->DropTable("default", std::to_string(i), drop_table_options);
203+
__attribute__((unused)) auto ignored = infinity->DropTable("default_db", std::to_string(i), drop_table_options);
204204
});
205205
results.push_back(fmt::format("-> Drop Table QPS: {}", total_times / tims_costing_second));
206206
}
@@ -217,7 +217,7 @@ int main() {
217217
col2->names_.emplace_back("col2");
218218
output_columns->emplace_back(col2);
219219

220-
__attribute__((unused)) auto ignored = infinity->Search("default", "benchmark_test", nullptr, nullptr, output_columns);
220+
__attribute__((unused)) auto ignored = infinity->Search("default_db", "benchmark_test", nullptr, nullptr, output_columns);
221221
});
222222
results.push_back(fmt::format("-> Select QPS: {}", total_times / tims_costing_second));
223223
}
@@ -239,7 +239,7 @@ int main() {
239239
value2->integer_value_ = i;
240240
values->at(0)->emplace_back(value2);
241241

242-
__attribute__((unused)) auto ignored = infinity->Insert("default", "benchmark_test", columns, values);
242+
__attribute__((unused)) auto ignored = infinity->Insert("default_db", "benchmark_test", columns, values);
243243
});
244244
results.push_back(fmt::format("-> Insert QPS: {}", total_times / tims_costing_second));
245245
}
@@ -267,14 +267,14 @@ int main() {
267267
values->push_back(update_expr1);
268268
values->push_back(update_expr2);
269269

270-
__attribute__((unused)) auto ignored = infinity->Update("default", "benchmark_test", nullptr, values);
270+
__attribute__((unused)) auto ignored = infinity->Update("default_db", "benchmark_test", nullptr, values);
271271
});
272272
results.push_back(fmt::format("-> Update QPS: {}", total_times / tims_costing_second));
273273
}
274274
{
275275
auto tims_costing_second =
276276
Measurement("Delete", thread_num, total_times, [&](SizeT i, SharedPtr<Infinity> infinity, std::thread::id thread_id) {
277-
__attribute__((unused)) auto ignored = infinity->Delete("default", "benchmark_test", nullptr);
277+
__attribute__((unused)) auto ignored = infinity->Delete("default_db", "benchmark_test", nullptr);
278278
});
279279
results.push_back(fmt::format("-> Delete QPS: {}", total_times / tims_costing_second));
280280
}
@@ -305,7 +305,7 @@ int main() {
305305

306306
SharedPtr<Infinity> infinity = Infinity::LocalConnect();
307307
__attribute__((unused)) auto ignored =
308-
infinity->CreateTable("default", "benchmark_test", column_definitions, Vector<TableConstraint *>(), create_table_opts);
308+
infinity->CreateTable("default_db", "benchmark_test", column_definitions, Vector<TableConstraint *>(), create_table_opts);
309309
infinity->LocalDisconnect();
310310
}
311311
{
@@ -326,7 +326,7 @@ int main() {
326326
value2->integer_value_ = std::rand();
327327
values->at(0)->emplace_back(value2);
328328

329-
__attribute__((unused)) auto ignored = infinity->Insert("default", "benchmark_test", columns, values);
329+
__attribute__((unused)) auto ignored = infinity->Insert("default_db", "benchmark_test", columns, values);
330330
});
331331
results.push_back(fmt::format("-> Insert for Sort Time: {}s", tims_costing_second));
332332
}
@@ -359,7 +359,7 @@ int main() {
359359
auto col1_def = std::make_unique<ColumnDef>(0, col1_type, col1_name, std::unordered_set<ConstraintType>());
360360
column_defs.emplace_back(col1_def.release());
361361

362-
std::string db_name = "default";
362+
std::string db_name = "default_db";
363363
std::string table_name = "knn_benchmark";
364364
std::string index_name = "hnsw_index";
365365

@@ -407,7 +407,7 @@ int main() {
407407
// std::cout << "--- Start to run search benchmark: ";
408408
// auto tims_costing_second = Measurement(thread_num, total_times, [&](size_t i, std::shared_ptr<Infinity> infinity,
409409
// std::thread::id thread_id) {
410-
// __attribute__((unused)) auto ignored = infinity->GetDatabase("default")->GetTable("benchmark_test")->Search(nullptr, nullptr,
410+
// __attribute__((unused)) auto ignored = infinity->GetDatabase("default_db")->GetTable("benchmark_test")->Search(nullptr, nullptr,
411411
// nullptr);
412412
// });
413413
// results.push_back(fmt::format("-> SEARCH QPS: {}", total_times / tims_costing_second));

‎benchmark/local_infinity/knn/knn_import_benchmark.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) {
9999
auto col1_def = std::make_unique<ColumnDef>(0, col1_type, col1_name, std::unordered_set<ConstraintType>());
100100
column_defs.emplace_back(col1_def.release());
101101

102-
std::string db_name = "default";
102+
std::string db_name = "default_db";
103103
std::string index_name = "hnsw_index";
104104

105105
std::shared_ptr<Infinity> infinity = Infinity::LocalConnect();

‎benchmark/local_infinity/knn/knn_query_benchmark.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ template <typename Function>
6666
inline void LoopFor(size_t id_begin, size_t id_end, size_t thread_id, Function fn, const std::string &db_name, const std::string &table_name) {
6767
std::cout << "thread_id = " << thread_id << " [" << id_begin << ", " << id_end << ")" << std::endl;
6868
std::shared_ptr<Infinity> infinity = Infinity::LocalConnect();
69-
// auto [data_base, status1] = infinity->GetDatabase("default");
69+
// auto [data_base, status1] = infinity->GetDatabase("default_db");
7070
// auto [table, status2] = data_base->GetTable(table_name);
7171
// std::shared_ptr<Table> shared_table(std::move(table));
7272
for (auto id = id_begin; id < id_end; ++id) {
@@ -137,7 +137,7 @@ int main(int argc, char *argv[]) {
137137
size_t dimension = 0;
138138
int64_t topk = 100;
139139

140-
std::string db_name = "default";
140+
std::string db_name = "default_db";
141141
std::string table_name;
142142
if (sift) {
143143
dimension = 128;

‎benchmark/remote_infinity/remote_query_benchmark.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ int main() {
190190
{
191191
req.session_id = client.session_id;
192192
req.__isset.session_id = true;
193-
req.db_name = "default";
193+
req.db_name = "default_db";
194194
req.__isset.db_name = true;
195195
req.table_name = "sift_benchmark";
196196
req.__isset.table_name = true;

‎docs/references/http_api_reference.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ curl --request GET \
9696
```
9797
{
9898
"error_code": 0,
99-
"database_name": "default"
99+
"database_name": "default_db"
100100
"store_dir": "/var/infinity/data/nIHniKeHIB_db_default"
101101
"table_count": 0
102102
}
@@ -131,7 +131,7 @@ curl --request GET \
131131
{
132132
"error_code": 0,
133133
"databases": [
134-
"default",
134+
"default_db",
135135
"my_db"
136136
]
137137
}
@@ -304,7 +304,7 @@ curl --request GET \
304304
```
305305
{
306306
"error_code": 0,
307-
"database_name": "default",
307+
"database_name": "default_db",
308308
"table_name": "my_table",
309309
"store_dir": "/var/infinity/data/nIHniKeHIB_db_default/h1abZcWuBs_table_my_table",
310310
"column_count" : 3,
@@ -472,7 +472,7 @@ curl --request GET \
472472
```
473473
{
474474
"error_code": 0,
475-
"database_name": "default",
475+
"database_name": "default_db",
476476
"table_name": "test_index_tbl",
477477
"index_name": "idx1",
478478
"index_column_ids": "0",

‎docs/references/pysdk_api_reference.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ res = table_obj.create_index("my_index",[index.IndexInfo("c1", index.IndexType.
456456
assert res.error_code == ErrorCode.OK
457457
res = table_obj.show_index("my_index")
458458
print(res)
459-
#ShowIndexResponse(error_code=0, error_msg='', db_name='default', table_name='test_create_index_show_index', index_name='my_index',
459+
#ShowIndexResponse(error_code=0, error_msg='', db_name="default_db", table_name='test_create_index_show_index', index_name='my_index',
460460
#index_type='IVFFlat', index_column_names='c1', index_column_ids='0', other_parameters='metric = l2, centroids_count = 128', store_dir='/var/
461461
#infinity/data/7SJK3mOSl2_db_default/f3AsBt7SRC_table_test_create_index_show_index/1hbFtMVaRY_index_my_index', segment_index_count='0')
462462
```

‎python/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ from infinity.common import REMOTE_HOST
3030
from infinity.common import ConflictType
3131

3232
infinity_obj = infinity.connect(REMOTE_HOST)
33-
db = infinity_obj.get_database("default")
33+
db = infinity_obj.get_database("default_db")
3434
db.drop_table("my_table", ConflictType.Ignore)
3535
table = db.create_table(
3636
"my_table", {"num": "integer", "body": "varchar", "vec": "vector,5,float"}, None)

‎python/benchmark/clients/infinity_client.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def upload(self):
4242
"""
4343
Upload data and build indexes (parameters are parsed by __init__).
4444
"""
45-
db_obj = self.client.get_database("default")
45+
db_obj = self.client.get_database("default_db")
4646
db_obj.drop_table(self.collection_name)
4747
db_obj.create_table(self.collection_name, self.data["schema"])
4848
table_obj = db_obj.get_table(self.collection_name)
@@ -97,7 +97,7 @@ def search(self) -> list[list[Any]]:
9797
Execute the corresponding query tasks (vector search, full-text search, hybrid search) based on the parsed parameters.
9898
The function returns id list.
9999
"""
100-
db_obj = self.client.get_database("default")
100+
db_obj = self.client.get_database("default_db")
101101
table_obj = db_obj.get_table(self.collection_name)
102102
query_path = os.path.join(self.path_prefix, self.data["query_path"])
103103
_, ext = os.path.splitext(query_path)

‎python/benchmark/fulltext_import_benchmark.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def import_file(db_obj, path):
7070

7171
infinity_obj = infinity.connect(REMOTE_HOST)
7272
assert infinity_obj
73-
db_obj = infinity_obj.get_database("default")
73+
db_obj = infinity_obj.get_database("default_db")
7474
assert db_obj
7575

7676
start_time = time.time()

‎python/benchmark/legacy_benchmark/fulltext_import_benchmark.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def import_file(db_obj, path):
7070

7171
infinity_obj = infinity.connect(REMOTE_HOST)
7272
assert infinity_obj
73-
db_obj = infinity_obj.get_database("default")
73+
db_obj = infinity_obj.get_database("default_db")
7474
assert db_obj
7575

7676
start_time = time.time()

‎python/benchmark/legacy_benchmark/remote_benchmark_knn.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def work(queries, topk, metric_type, column_name, data_type, table_name="sift_be
116116
conn = ThriftInfinityClient(REMOTE_HOST)
117117
for query in queries:
118118
# print(len(query))
119-
table = RemoteTable(conn, "default", table_name)
119+
table = RemoteTable(conn, "default_db", table_name)
120120
# table.knn(column_name, query_vec, data_type, metric_type, topk).output(["_row_id"]).to_result()
121121
query_builder = InfinityThriftQueryBuilder(table)
122122
query_builder.output(["_row_id"])
@@ -179,7 +179,7 @@ def one_thread(rounds, query_path, ground_truth_path, table_name):
179179

180180
for i in range(rounds):
181181
conn = ThriftInfinityClient(REMOTE_HOST)
182-
table = RemoteTable(conn, "default", table_name)
182+
table = RemoteTable(conn, "default_db", table_name)
183183

184184
query_results = [[] for _ in range(len(queries))]
185185

‎python/benchmark/legacy_benchmark/remote_benchmark_knn_import.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def import_sift_1m(path):
2323
infinity_obj = infinity.connect(REMOTE_HOST)
2424
assert infinity_obj
2525

26-
db_obj = infinity_obj.get_database("default")
26+
db_obj = infinity_obj.get_database("default_db")
2727
assert db_obj
2828
db_obj.drop_table("sift_benchmark")
2929
db_obj.create_table("sift_benchmark", {"col1": "vector,128,float"})
@@ -51,7 +51,7 @@ def import_gist_1m(path):
5151
infinity_obj = infinity.connect(REMOTE_HOST)
5252
assert infinity_obj
5353

54-
db_obj = infinity_obj.get_database("default")
54+
db_obj = infinity_obj.get_database("default_db")
5555
assert db_obj
5656
db_obj.drop_table("gist_benchmark")
5757
db_obj.create_table("gist_benchmark", {"col1": "vector,960,float"})
@@ -77,7 +77,7 @@ def import_gist_1m(path):
7777

7878
def create_index(table_name):
7979
conn = ThriftInfinityClient(REMOTE_HOST)
80-
table = RemoteTable(conn, "default", table_name)
80+
table = RemoteTable(conn, "default_db", table_name)
8181
res = table.create_index("hnsw_index",
8282
[index.IndexInfo("col1",
8383
index.IndexType.Hnsw,

‎python/benchmark/legacy_benchmark/remote_benchmark_knn_insert.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def insert_sift_1m(path):
4444
infinity_obj = infinity.connect(REMOTE_HOST)
4545
assert infinity_obj
4646

47-
db_obj = infinity_obj.get_database("default")
47+
db_obj = infinity_obj.get_database("default_db")
4848
assert db_obj
4949
db_obj.drop_table("sift_benchmark")
5050
db_obj.create_table("sift_benchmark", {"col1": "vector,128,float"})
@@ -83,7 +83,7 @@ def insert_gist_1m(path):
8383
infinity_obj = infinity.connect(REMOTE_HOST)
8484
assert infinity_obj
8585

86-
db_obj = infinity_obj.get_database("default")
86+
db_obj = infinity_obj.get_database("default_db")
8787
assert db_obj
8888
db_obj.drop_table("gist_benchmark")
8989
db_obj.create_table("gist_benchmark", {"col1": "vector,960,float"})
@@ -121,7 +121,7 @@ def insert_gist_1m(path):
121121

122122
def create_index(table_name):
123123
conn = ThriftInfinityClient(REMOTE_HOST)
124-
table = RemoteTable(conn, "default", table_name)
124+
table = RemoteTable(conn, "default_db", table_name)
125125
res = table.create_index("hnsw_index",
126126
[index.IndexInfo("col1",
127127
index.IndexType.Hnsw,
@@ -139,7 +139,7 @@ def create_index(table_name):
139139
def work(vectors, table_name, column_name):
140140
infinity_obj = infinity.connect(REMOTE_HOST)
141141
assert infinity_obj
142-
db_obj = infinity_obj.get_database("default")
142+
db_obj = infinity_obj.get_database("default_db")
143143
assert db_obj
144144
table_obj = db_obj.get_table(table_name)
145145
assert table_obj
@@ -156,7 +156,7 @@ def process_pool(threads, path, table_name):
156156
infinity_obj = infinity.connect(REMOTE_HOST)
157157
assert infinity_obj
158158

159-
db_obj = infinity_obj.get_database("default")
159+
db_obj = infinity_obj.get_database("default_db")
160160
assert db_obj
161161
db_obj.drop_table(table_name)
162162
db_obj.create_table(table_name, {"col1": "vector,128,float"})

0 commit comments

Comments
 (0)