Unverified Commit 40c7e8ba authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #1616 from JinHai-CN/master 

Add more print log
parents e7d83d90 2f815a7d

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ Please mark all change in change log and use the issue from GitHub 
-   \#1507 set_config for insert_buffer_size is wrong

-   \#1510 Add set interfaces for WAL configurations

-   \#1511 Fix big integer cannot pass to server correctly

-   \#1517 result is not correct when search vectors in multi partition, index type is RNSG 

-   \#1517 Result is not correct when search vectors in multi partition, index type is RNSG 

-   \#1518 Table count did not match after deleting vectors and compact

-   \#1521 Make cache_insert_data take effect in-service

-   \#1525 Add setter API for config preload_table

core/src/db/insert/MemTable.cpp

+30 −21
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ MemTable::ApplyDeletes() { 


    auto start_total = std::chrono::high_resolution_clock::now();



    auto start = std::chrono::high_resolution_clock::now();

    //    auto start = std::chrono::high_resolution_clock::now();



    std::vector<int> file_types{meta::TableFileSchema::FILE_TYPE::RAW, meta::TableFileSchema::FILE_TYPE::TO_INDEX,

                                meta::TableFileSchema::FILE_TYPE::BACKUP};
@@ -220,9 +220,9 @@ MemTable::ApplyDeletes() { 


    OngoingFileChecker::GetInstance().MarkOngoingFiles(files_to_check);



    auto end = std::chrono::high_resolution_clock::now();

    std::chrono::duration<double> diff = end - start;

    ENGINE_LOG_DEBUG << "Found " << ids_to_check_map.size() << " segment to apply deletes in " << diff.count() << " s";

    auto time0 = std::chrono::high_resolution_clock::now();

    std::chrono::duration<double> diff0 = time0 - start_total;

    ENGINE_LOG_DEBUG << "Found " << ids_to_check_map.size() << " segment to apply deletes in " << diff0.count() << " s";



    meta::TableFilesSchema table_files_to_update;
@@ -230,7 +230,7 @@ MemTable::ApplyDeletes() { 
        auto& table_file = table_files[kv.first];

        ENGINE_LOG_DEBUG << "Applying deletes in segment: " << table_file.segment_id_;



        start = std::chrono::high_resolution_clock::now();

        auto time1 = std::chrono::high_resolution_clock::now();



        std::string segment_dir;

        utils::GetParentPath(table_file.location_, segment_dir);
@@ -274,17 +274,15 @@ MemTable::ApplyDeletes() { 


        segment::DeletedDocsPtr deleted_docs = std::make_shared<segment::DeletedDocs>();



        end = std::chrono::high_resolution_clock::now();

        diff = end - start;

        ENGINE_LOG_DEBUG << "Loading uids and deleted docs took " << diff.count() << " s";



        start = std::chrono::high_resolution_clock::now();

        auto time2 = std::chrono::high_resolution_clock::now();

        std::chrono::duration<double> diff1 = time2 - time1;

        ENGINE_LOG_DEBUG << "Loading uids and deleted docs took " << diff1.count() << " s";



        std::sort(ids_to_check.begin(), ids_to_check.end());



        end = std::chrono::high_resolution_clock::now();

        diff = end - start;

        ENGINE_LOG_DEBUG << "Sorting " << ids_to_check.size() << " ids took " << diff.count() << " s";

        auto time3 = std::chrono::high_resolution_clock::now();

        std::chrono::duration<double> diff2 = time3 - time2;

        ENGINE_LOG_DEBUG << "Sorting " << ids_to_check.size() << " ids took " << diff2.count() << " s";



        size_t delete_count = 0;

        auto find_diff = std::chrono::duration<double>::zero();
@@ -324,11 +322,13 @@ MemTable::ApplyDeletes() { 
                         << find_diff.count() << " s in total";

        ENGINE_LOG_DEBUG << "Setting deleted docs and bloom filter took " << set_diff.count() << " s in total";



        auto time4 = std::chrono::high_resolution_clock::now();



        for (auto i = 0; i < indexes.size(); ++i) {

            indexes[i]->SetBlacklist(blacklists[i]);

        }



        start = std::chrono::high_resolution_clock::now();

        //        start = std::chrono::high_resolution_clock::now();



        segment::Segment tmp_segment;

        segment::SegmentWriter segment_writer(segment_dir);
@@ -337,21 +337,21 @@ MemTable::ApplyDeletes() { 
            break;

        }



        end = std::chrono::high_resolution_clock::now();

        diff = end - start;

        auto time5 = std::chrono::high_resolution_clock::now();

        std::chrono::duration<double> diff4 = time5 - time4;

        ENGINE_LOG_DEBUG << "Appended " << deleted_docs->GetSize()

                         << " offsets to deleted docs in segment: " << table_file.segment_id_ << " in " << diff.count()

                         << " offsets to deleted docs in segment: " << table_file.segment_id_ << " in " << diff4.count()

                         << " s";



        start = std::chrono::high_resolution_clock::now();

        //        start = std::chrono::high_resolution_clock::now();



        status = segment_writer.WriteBloomFilter(id_bloom_filter_ptr);

        if (!status.ok()) {

            break;

        }

        end = std::chrono::high_resolution_clock::now();

        diff = end - start;

        ENGINE_LOG_DEBUG << "Updated bloom filter in segment: " << table_file.segment_id_ << " in " << diff.count()

        auto time6 = std::chrono::high_resolution_clock::now();

        std::chrono::duration<double> diff5 = time6 - time5;

        ENGINE_LOG_DEBUG << "Updated bloom filter in segment: " << table_file.segment_id_ << " in " << diff5.count()

                         << " s";



        // Update table file row count
@@ -362,8 +362,15 @@ MemTable::ApplyDeletes() { 
                table_files_to_update.emplace_back(file);

            }

        }

        auto time7 = std::chrono::high_resolution_clock::now();

        std::chrono::duration<double> diff6 = time7 - time6;

        diff6 = time6 - time5;

        ENGINE_LOG_DEBUG << "Update table file row count in vector of segment: " << table_file.segment_id_ << " in "

                         << diff6.count() << " s";

    }



    auto time7 = std::chrono::high_resolution_clock::now();



    status = meta_->UpdateTableFilesRowCount(table_files_to_update);



    if (!status.ok()) {
@@ -375,6 +382,8 @@ MemTable::ApplyDeletes() { 
    doc_ids_to_delete_.clear();



    auto end_total = std::chrono::high_resolution_clock::now();

    std::chrono::duration<double> diff7 = end_total - time7;

    ENGINE_LOG_DEBUG << "Update deletes to meta in table " << table_id_ << " in " << diff7.count() << " s";

    std::chrono::duration<double> diff_total = end_total - start_total;

    ENGINE_LOG_DEBUG << "Finished applying deletes in table " << table_id_ << " in " << diff_total.count() << " s";