admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-04 18:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(db): update schema and unsigned long type handling

Browse Source 
Former-commit-id: 03f17b0f071817350b4137ed31abfb1d5b7066be
This commit is contained in:
Xu Peng 2019-05-24 14:56:13 +08:00
parent 3b83dbf672
commit 7565a53290
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cpp/src/db/DBMetaImpl.cpp
View File

@ -29,6 +29,7 @@ inline auto StoragePrototype(const std::string& path) {
make_column("id", &GroupSchema::id, primary_key()),
make_column("group_id", &GroupSchema::group_id, unique()),
make_column("dimension", &GroupSchema::dimension),
make_column("created_on", &GroupSchema::created_on),
make_column("files_cnt", &GroupSchema::files_cnt, default_value(0))),
make_table("GroupFile",
make_column("id", &GroupFileSchema::id, primary_key()),
@ -37,6 +38,7 @@ inline auto StoragePrototype(const std::string& path) {
make_column("file_type", &GroupFileSchema::file_type),
make_column("rows", &GroupFileSchema::rows, default_value(0)),
make_column("updated_time", &GroupFileSchema::updated_time),
make_column("created_on", &GroupFileSchema::created_on),
make_column("date", &GroupFileSchema::date))
);
@ -455,8 +457,9 @@ Status DBMetaImpl::archive_files() {
auto& criteria = kv.first;
auto& limit = kv.second;
if (criteria == "days") {
auto usecs = 3600*24*limit*1000000;
auto now = utils::GetMicroSecTimeStamp();
long usecs = 3600*24*limit*1000000UL;
long now = utils::GetMicroSecTimeStamp();
LOG(DEBUG) << "Limit " << limit << " TimeLimit " << now - usecs;
try
{
ConnectorPtr->update_all(
@ -464,7 +467,7 @@ Status DBMetaImpl::archive_files() {
c(&GroupFileSchema::file_type) = (int)GroupFileSchema::TO_DELETE
),
where(
c(&GroupFileSchema::created_on) < now - usecs and
c(&GroupFileSchema::created_on) < (long)(now - usecs) and
c(&GroupFileSchema::file_type) != (int)GroupFileSchema::TO_DELETE
));
} catch (std::exception & e) {
@ -473,7 +476,7 @@ Status DBMetaImpl::archive_files() {
}
}
if (criteria == "disk") {
size_t G = 1024*1024*1024;
size_t G = 1024*1024*1024UL;
long unsigned int sum = 0;
try {
auto sum_c = ConnectorPtr->sum(