From 32ca9a40d8e30c613a04fd420cde18ab805cc350 Mon Sep 17 00:00:00 2001 From: Ian Adams Date: Thu, 25 Jul 2024 12:07:30 -0700 Subject: [PATCH 1/7] Caching Descriptor Set Location --- src/DescriptorsCommand.cc | 13 +++++++++++++ src/QueryHandlerPMGD.cc | 6 ++++++ src/RSCommand.h | 8 +++++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/DescriptorsCommand.cc b/src/DescriptorsCommand.cc index 61d5988e..3757be9c 100644 --- a/src/DescriptorsCommand.cc +++ b/src/DescriptorsCommand.cc @@ -56,6 +56,17 @@ DescriptorsCommand::DescriptorsCommand(const std::string &cmd_name) std::string DescriptorsCommand::get_set_path(PMGDQuery &query_tx, const std::string &set_name, int &dim) { + + // Check cache for descriptor set, if its found set dimensions and return path, + //otherwise we go forward and query PMGD to locate the descriptor set + auto element = _desc_set_locator.find(set_name); + std::string mapped_path; + if (element != _desc_set_locator.end()) { + mapped_path = element->second; + dim = _desc_set_dims[set_name]; + return mapped_path; + } + // Will issue a read-only transaction to check // if the Set exists PMGDQuery query(query_tx.get_pmgd_qh()); @@ -97,6 +108,8 @@ std::string DescriptorsCommand::get_set_path(PMGDQuery &query_tx, assert(ent.isMember(VDMS_DESC_SET_PATH_PROP)); std::string set_path = ent[VDMS_DESC_SET_PATH_PROP].asString(); dim = ent[VDMS_DESC_SET_DIM_PROP].asInt(); + _desc_set_dims[set_name] = dim; + _desc_set_locator[set_name] = set_path; return set_path; } diff --git a/src/QueryHandlerPMGD.cc b/src/QueryHandlerPMGD.cc index eabbe6df..12a78a58 100644 --- a/src/QueryHandlerPMGD.cc +++ b/src/QueryHandlerPMGD.cc @@ -59,6 +59,12 @@ using namespace VDMS; std::unordered_map QueryHandlerPMGD::_rs_cmds; +//Static globals for use in looking up descriptor set locations, defined in RSCommand.h +tbb::concurrent_unordered_map + RSCommand::_desc_set_locator; +tbb::concurrent_unordered_map + RSCommand::_desc_set_dims; + void QueryHandlerPMGD::init() { DescriptorsManager::init(); diff --git a/src/RSCommand.h b/src/RSCommand.h index ef7e7945..f802a0a2 100644 --- a/src/RSCommand.h +++ b/src/RSCommand.h @@ -5,7 +5,7 @@ * * The MIT License * - * @copyright Copyright (c) 2017 Intel Corporation + * @copyright Copyright (c) 2024 Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), @@ -34,6 +34,7 @@ #include #include #include +#include "tbb/concurrent_unordered_map.h" #include "PMGDQuery.h" #include "queryMessage.pb.h" @@ -41,6 +42,8 @@ // Json parsing files #include + + namespace VDMS { // Helper classes for handling various JSON commands. @@ -49,6 +52,9 @@ class RSCommand { const std::string _cmd_name; std::map _valid_params_map; + static tbb::concurrent_unordered_map _desc_set_locator; + static tbb::concurrent_unordered_map _desc_set_dims; + template T get_value(const Json::Value &json, const std::string &key, T def = T()); From 9f2f8bb782b6ba499bdb4ac90a98ab0907099fe8 Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 26 Jul 2024 09:31:34 -0700 Subject: [PATCH 2/7] Update src/RSCommand.h formatting cleanup Co-authored-by: Chaunte W. Lacewell --- src/RSCommand.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/RSCommand.h b/src/RSCommand.h index f802a0a2..dc834100 100644 --- a/src/RSCommand.h +++ b/src/RSCommand.h @@ -42,8 +42,6 @@ // Json parsing files #include - - namespace VDMS { // Helper classes for handling various JSON commands. From 85f9db2e7bd4b698f7e426da35ddc452fc6ff605 Mon Sep 17 00:00:00 2001 From: sys_vdms Date: Fri, 26 Jul 2024 17:51:48 +0000 Subject: [PATCH 3/7] Automated updates: Format and/or coverage --- .github/coverage/cpp.develop.coverage_report.txt | 6 +++--- .github/coverage/cpp.develop.coverage_value.txt | 2 +- src/DescriptorsCommand.cc | 11 ++++++----- src/QueryHandlerPMGD.cc | 8 ++++---- src/RSCommand.h | 5 +++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/coverage/cpp.develop.coverage_report.txt b/.github/coverage/cpp.develop.coverage_report.txt index 734ba520..1514549b 100644 --- a/.github/coverage/cpp.develop.coverage_report.txt +++ b/.github/coverage/cpp.develop.coverage_report.txt @@ -11,7 +11,7 @@ src/BackendNeo4j.cc 121 0 0% 4,6-17,20,24,2 src/BlobCommand.cc 87 66 75% 76,130-132,136-139,145,147,165,186-189,192-196,202 src/BoundingBoxCommand.cc 180 4 2% 45,49,51,53-54,56-59,62,64-67,70-73,76,83,87,90-91,93-97,101,103,105,114,118,122-123,125-132,137-138,140-144,147-150,152,154-160,162-165,167-169,171-173,176-177,179-181,183-184,186-187,190,193,196-197,199,201-204,206-210,213,215-219,222-223,225-227,229-237,240-244,246,251-256,259-261,263,265-266,268,270,272-274,276-277,281-283,286,288,292-294,296,298,300-303,307-308,310-313,316-319,321-326,329-330,335,338-339,341 src/CommunicationManager.cc 46 0 0% 42-43,46-47,49-50,52-54,57,61-66,68-71,73-81,84,86-88,93,96-97,100-101,105,107-108,110,113-116 -src/DescriptorsCommand.cc 594 107 18% 56,61,63-67,69-73,75,77,80-81,84,86-87,90,92-93,96-100,103,106,109,156-158,162,176-180,220-231,241,255-257,261,276-283,285,297-300,305,310-314,330,338,340-345,348-351,354,357-358,360-364,367,370,372-373,376-378,380-381,383-384,387-388,390-392,398,402,404,406,408-409,412,414-417,423-424,427,429-430,432,434-435,438,441,443,445,448,450-455,457-461,463,466,469-470,473-474,485,488,491,493-495,503,507,509,512,514-517,520-525,527-531,533,536,538,540,543,546-547,549,551,553-558,561,563-565,568-569,571,573,575-576,578,580,582-584,586,588-593,598-599,602,604,606,613-614,617,621,623,626,628-631,634-638,640-644,646,648-651,653-655,658,662-671,676-677,680,687,689,692-693,696,700,706,708,711,714-715,719,724,726,728,731,734-735,737-740,744,748-749,751,753-755,757,759-760,762,764-766,768-770,775-777,780-781,783,786-790,794,797,801,803-804,806-807,809,811-812,814-816,818,823,825-826,828-830,832-833,837,839-842,844-847,852,855-857,859,861,863-866,868-872,875-876,879,881,883,885-889,892-893,896-899,901,903-910,915,917,919-920,923-926,928,930,932-939,943-948,954,957,959,961-964,967,969,972-975,977-981,987,989,991-994,999,1001,1003-1004,1007-1009,1011,1013,1015-1018,1021-1022,1024-1025,1027,1029-1030,1032-1038,1042-1043,1047-1048,1050-1051,1059-1060,1063-1064,1066,1068-1075,1079,1083-1084,1088-1092,1097-1098,1100 +src/DescriptorsCommand.cc 602 107 17% 56,62-67,72,74-78,80-84,86,88,91-92,95,97-98,101,103-104,107-113,116,119,122,169-171,175,189-193,233-244,254,268-270,274,289-296,298,310-313,318,323-327,343,351,353-358,361-364,367,370-371,373-377,380,383,385-386,389-391,393-394,396-397,400-401,403-405,411,415,417,419,421-422,425,427-430,436-437,440,442-443,445,447-448,451,454,456,458,461,463-468,470-474,476,479,482-483,486-487,498,501,504,506-508,516,520,522,525,527-530,533-538,540-544,546,549,551,553,556,559-560,562,564,566-571,574,576-578,581-582,584,586,588-589,591,593,595-597,599,601-606,611-612,615,617,619,626-627,630,634,636,639,641-644,647-651,653-657,659,661-664,666-668,671,675-684,689-690,693,700,702,705-706,709,713,719,721,724,727-728,732,737,739,741,744,747-748,750-753,757,761-762,764,766-768,770,772-773,775,777-779,781-783,788-790,793-794,796,799-803,807,810,814,816-817,819-820,822,824-825,827-829,831,836,838-839,841-843,845-846,850,852-855,857-860,865,868-870,872,874,876-879,881-885,888-889,892,894,896,898-902,905-906,909-912,914,916-923,928,930,932-933,936-939,941,943,945-952,956-961,967,970,972,974-977,980,982,985-988,990-994,1000,1002,1004-1007,1012,1014,1016-1017,1020-1022,1024,1026,1028-1031,1034-1035,1037-1038,1040,1042-1043,1045-1051,1055-1056,1060-1061,1063-1064,1072-1073,1076-1077,1079,1081-1088,1092,1096-1097,1101-1105,1110-1111,1113 src/DescriptorsManager.cc 24 19 79% 49-50,57-58,73 src/ExceptionsCommand.cc 6 0 0% 35-40 src/ImageCommand.cc 322 157 48% 55,59,63,65,67-69,71,73-76,78,81,86,88-89,97,99,106,109,111-112,114-115,117-118,120-121,124,151,162-163,174-175,177,182-185,195-196,198,203-206,221-229,231-233,246-247,257-267,269-270,272-273,278,286,297,304,308,311,313,315,337,339-340,343-348,350,352,374-376,379-381,385-388,394,396,403-406,420,427,433-436,440-441,452-455,458-463,468-470,481-484,489-493,498-499,501-502,504-508,511,513-517,520-523,526-527,530,532,537 @@ -25,7 +25,7 @@ src/PMGDQueryHandler.cc 623 517 83% 82-84,166-167, src/QueryHandlerBase.cc 32 6 18% 26-29,35-36,38,42-43,45,47-48,52,56-58,60-62,64-66,68-69,72-73 src/QueryHandlerExample.cc 33 18 54% 65-67,75-78,84-85,89-92,94-95 src/QueryHandlerNeo4j.cc 139 0 0% 53,55-56,58,60-62,64-65,67,70-76,80-81,83-87,91,93,95-100,104-108,111-115,119-126,129-132,134-136,139-147,149-153,159,162,169,172-175,177-179,181,184-187,189-190,192,194,197,199,201-204,207-208,210,212-213,216,218,222-223,225,229,231-232,235,237-240,243-247,250-254,256-257,261-268,271-274,277 -src/QueryHandlerPMGD.cc 344 226 65% 102-104,112-115,130-131,135-139,142-146,150-157,160-163,165-167,176-178,182-184,202-204,209-211,226-232,236-238,255,257-266,295-297,343-345,347-349,352-353,355-358,381-382,384-385,394,400-412,414-416,423-431,468,470,525-526,528-529 +src/QueryHandlerPMGD.cc 344 226 65% 108-110,118-121,136-137,141-145,148-152,156-163,166-169,171-173,182-184,188-190,208-210,215-217,232-238,242-244,261,263-272,301-303,349-351,353-355,358-359,361-364,387-388,390-391,400,406-418,420-422,429-437,474,476,531-532,534-535 src/QueryMessage.cc 12 0 0% 37-39,42-43,45-46,48,51-54 src/RSCommand.cc 144 105 72% 65-67,73-74,98,100-101,103,110,131,134-138,141,172-174,176,178-181,188,262,285,287-289,291-297,301 src/SearchExpression.cc 99 38 38% 59,132-133,135,137-139,143,146,148-153,157,160,168-170,177,180-181,183-185,188,192-195,197,201,217-222,224-225,227,235-240,243,247-249,252-256,263,276,284-285 @@ -57,5 +57,5 @@ utils/src/comm/Exception.cc 6 0 0% 35-40 utils/src/stats/SystemStats.cc 250 249 99% 453 utils/src/timers/TimerMap.cc 82 75 91% 126,151,153,155-158 ------------------------------------------------------------------------------ -TOTAL 10068 6488 64% +TOTAL 10076 6488 64% ------------------------------------------------------------------------------ diff --git a/.github/coverage/cpp.develop.coverage_value.txt b/.github/coverage/cpp.develop.coverage_value.txt index 246ac8fe..7136165a 100644 --- a/.github/coverage/cpp.develop.coverage_value.txt +++ b/.github/coverage/cpp.develop.coverage_value.txt @@ -1 +1 @@ -64.4418 +64.3906 diff --git a/src/DescriptorsCommand.cc b/src/DescriptorsCommand.cc index 3757be9c..df60d6de 100644 --- a/src/DescriptorsCommand.cc +++ b/src/DescriptorsCommand.cc @@ -57,14 +57,15 @@ std::string DescriptorsCommand::get_set_path(PMGDQuery &query_tx, const std::string &set_name, int &dim) { - // Check cache for descriptor set, if its found set dimensions and return path, - //otherwise we go forward and query PMGD to locate the descriptor set + // Check cache for descriptor set, if its found set dimensions and return + // path, + // otherwise we go forward and query PMGD to locate the descriptor set auto element = _desc_set_locator.find(set_name); std::string mapped_path; if (element != _desc_set_locator.end()) { - mapped_path = element->second; - dim = _desc_set_dims[set_name]; - return mapped_path; + mapped_path = element->second; + dim = _desc_set_dims[set_name]; + return mapped_path; } // Will issue a read-only transaction to check diff --git a/src/QueryHandlerPMGD.cc b/src/QueryHandlerPMGD.cc index 12a78a58..fc1d4b07 100644 --- a/src/QueryHandlerPMGD.cc +++ b/src/QueryHandlerPMGD.cc @@ -59,11 +59,11 @@ using namespace VDMS; std::unordered_map QueryHandlerPMGD::_rs_cmds; -//Static globals for use in looking up descriptor set locations, defined in RSCommand.h +// Static globals for use in looking up descriptor set locations, defined in +// RSCommand.h tbb::concurrent_unordered_map - RSCommand::_desc_set_locator; -tbb::concurrent_unordered_map - RSCommand::_desc_set_dims; + RSCommand::_desc_set_locator; +tbb::concurrent_unordered_map RSCommand::_desc_set_dims; void QueryHandlerPMGD::init() { DescriptorsManager::init(); diff --git a/src/RSCommand.h b/src/RSCommand.h index dc834100..cb4cb169 100644 --- a/src/RSCommand.h +++ b/src/RSCommand.h @@ -30,11 +30,11 @@ */ #pragma once +#include "tbb/concurrent_unordered_map.h" #include #include #include #include -#include "tbb/concurrent_unordered_map.h" #include "PMGDQuery.h" #include "queryMessage.pb.h" @@ -50,7 +50,8 @@ class RSCommand { const std::string _cmd_name; std::map _valid_params_map; - static tbb::concurrent_unordered_map _desc_set_locator; + static tbb::concurrent_unordered_map + _desc_set_locator; static tbb::concurrent_unordered_map _desc_set_dims; template From e502e340f2c781f812e5770ddf2ed64067181456 Mon Sep 17 00:00:00 2001 From: sys_vdms Date: Fri, 26 Jul 2024 19:11:49 +0000 Subject: [PATCH 4/7] Automated updates: Format and/or coverage --- .github/coverage/cpp.develop.coverage_report.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/coverage/cpp.develop.coverage_report.txt b/.github/coverage/cpp.develop.coverage_report.txt index 1514549b..c5102f7b 100644 --- a/.github/coverage/cpp.develop.coverage_report.txt +++ b/.github/coverage/cpp.develop.coverage_report.txt @@ -11,7 +11,7 @@ src/BackendNeo4j.cc 121 0 0% 4,6-17,20,24,2 src/BlobCommand.cc 87 66 75% 76,130-132,136-139,145,147,165,186-189,192-196,202 src/BoundingBoxCommand.cc 180 4 2% 45,49,51,53-54,56-59,62,64-67,70-73,76,83,87,90-91,93-97,101,103,105,114,118,122-123,125-132,137-138,140-144,147-150,152,154-160,162-165,167-169,171-173,176-177,179-181,183-184,186-187,190,193,196-197,199,201-204,206-210,213,215-219,222-223,225-227,229-237,240-244,246,251-256,259-261,263,265-266,268,270,272-274,276-277,281-283,286,288,292-294,296,298,300-303,307-308,310-313,316-319,321-326,329-330,335,338-339,341 src/CommunicationManager.cc 46 0 0% 42-43,46-47,49-50,52-54,57,61-66,68-71,73-81,84,86-88,93,96-97,100-101,105,107-108,110,113-116 -src/DescriptorsCommand.cc 602 107 17% 56,62-67,72,74-78,80-84,86,88,91-92,95,97-98,101,103-104,107-113,116,119,122,169-171,175,189-193,233-244,254,268-270,274,289-296,298,310-313,318,323-327,343,351,353-358,361-364,367,370-371,373-377,380,383,385-386,389-391,393-394,396-397,400-401,403-405,411,415,417,419,421-422,425,427-430,436-437,440,442-443,445,447-448,451,454,456,458,461,463-468,470-474,476,479,482-483,486-487,498,501,504,506-508,516,520,522,525,527-530,533-538,540-544,546,549,551,553,556,559-560,562,564,566-571,574,576-578,581-582,584,586,588-589,591,593,595-597,599,601-606,611-612,615,617,619,626-627,630,634,636,639,641-644,647-651,653-657,659,661-664,666-668,671,675-684,689-690,693,700,702,705-706,709,713,719,721,724,727-728,732,737,739,741,744,747-748,750-753,757,761-762,764,766-768,770,772-773,775,777-779,781-783,788-790,793-794,796,799-803,807,810,814,816-817,819-820,822,824-825,827-829,831,836,838-839,841-843,845-846,850,852-855,857-860,865,868-870,872,874,876-879,881-885,888-889,892,894,896,898-902,905-906,909-912,914,916-923,928,930,932-933,936-939,941,943,945-952,956-961,967,970,972,974-977,980,982,985-988,990-994,1000,1002,1004-1007,1012,1014,1016-1017,1020-1022,1024,1026,1028-1031,1034-1035,1037-1038,1040,1042-1043,1045-1051,1055-1056,1060-1061,1063-1064,1072-1073,1076-1077,1079,1081-1088,1092,1096-1097,1101-1105,1110-1111,1113 +src/DescriptorsCommand.cc 602 107 17% 56,63-68,73,75-79,81-85,87,89,92-93,96,98-99,102,104-105,108-114,117,120,123,170-172,176,190-194,234-245,255,269-271,275,290-297,299,311-314,319,324-328,344,352,354-359,362-365,368,371-372,374-378,381,384,386-387,390-392,394-395,397-398,401-402,404-406,412,416,418,420,422-423,426,428-431,437-438,441,443-444,446,448-449,452,455,457,459,462,464-469,471-475,477,480,483-484,487-488,499,502,505,507-509,517,521,523,526,528-531,534-539,541-545,547,550,552,554,557,560-561,563,565,567-572,575,577-579,582-583,585,587,589-590,592,594,596-598,600,602-607,612-613,616,618,620,627-628,631,635,637,640,642-645,648-652,654-658,660,662-665,667-669,672,676-685,690-691,694,701,703,706-707,710,714,720,722,725,728-729,733,738,740,742,745,748-749,751-754,758,762-763,765,767-769,771,773-774,776,778-780,782-784,789-791,794-795,797,800-804,808,811,815,817-818,820-821,823,825-826,828-830,832,837,839-840,842-844,846-847,851,853-856,858-861,866,869-871,873,875,877-880,882-886,889-890,893,895,897,899-903,906-907,910-913,915,917-924,929,931,933-934,937-940,942,944,946-953,957-962,968,971,973,975-978,981,983,986-989,991-995,1001,1003,1005-1008,1013,1015,1017-1018,1021-1023,1025,1027,1029-1032,1035-1036,1038-1039,1041,1043-1044,1046-1052,1056-1057,1061-1062,1064-1065,1073-1074,1077-1078,1080,1082-1089,1093,1097-1098,1102-1106,1111-1112,1114 src/DescriptorsManager.cc 24 19 79% 49-50,57-58,73 src/ExceptionsCommand.cc 6 0 0% 35-40 src/ImageCommand.cc 322 157 48% 55,59,63,65,67-69,71,73-76,78,81,86,88-89,97,99,106,109,111-112,114-115,117-118,120-121,124,151,162-163,174-175,177,182-185,195-196,198,203-206,221-229,231-233,246-247,257-267,269-270,272-273,278,286,297,304,308,311,313,315,337,339-340,343-348,350,352,374-376,379-381,385-388,394,396,403-406,420,427,433-436,440-441,452-455,458-463,468-470,481-484,489-493,498-499,501-502,504-508,511,513-517,520-523,526-527,530,532,537 From 643831c7d35f2ebe1c8eb3d592ecb6a3b3b2744d Mon Sep 17 00:00:00 2001 From: Ian Adams Date: Mon, 29 Jul 2024 09:50:33 -0700 Subject: [PATCH 5/7] relocating cache map to subclass for clarity --- src/DescriptorsCommand.h | 4 ++++ src/QueryHandlerPMGD.cc | 6 +++--- src/RSCommand.h | 4 ---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/DescriptorsCommand.h b/src/DescriptorsCommand.h index cab1fdca..1027d596 100644 --- a/src/DescriptorsCommand.h +++ b/src/DescriptorsCommand.h @@ -58,6 +58,10 @@ class DescriptorsCommand : public RSCommand { // for this data structure in tbb tbb::concurrent_unordered_map _cache_map; + static tbb::concurrent_unordered_map + _desc_set_locator; + static tbb::concurrent_unordered_map _desc_set_dims; + // Will return the path to the set and the dimensions std::string get_set_path(PMGDQuery &query_tx, const std::string &set, int &dim); diff --git a/src/QueryHandlerPMGD.cc b/src/QueryHandlerPMGD.cc index fc1d4b07..da2cf2b5 100644 --- a/src/QueryHandlerPMGD.cc +++ b/src/QueryHandlerPMGD.cc @@ -60,10 +60,10 @@ using namespace VDMS; std::unordered_map QueryHandlerPMGD::_rs_cmds; // Static globals for use in looking up descriptor set locations, defined in -// RSCommand.h +// DescriptorCommand.h tbb::concurrent_unordered_map - RSCommand::_desc_set_locator; -tbb::concurrent_unordered_map RSCommand::_desc_set_dims; + DescriptorsCommand::_desc_set_locator; +tbb::concurrent_unordered_map DescriptorsCommand::_desc_set_dims; void QueryHandlerPMGD::init() { DescriptorsManager::init(); diff --git a/src/RSCommand.h b/src/RSCommand.h index cb4cb169..827010c0 100644 --- a/src/RSCommand.h +++ b/src/RSCommand.h @@ -50,10 +50,6 @@ class RSCommand { const std::string _cmd_name; std::map _valid_params_map; - static tbb::concurrent_unordered_map - _desc_set_locator; - static tbb::concurrent_unordered_map _desc_set_dims; - template T get_value(const Json::Value &json, const std::string &key, T def = T()); From 0c4fec7f7d2dc8cba86d83a8ffbfca8de4a4f705 Mon Sep 17 00:00:00 2001 From: sys_vdms Date: Mon, 29 Jul 2024 18:13:31 +0000 Subject: [PATCH 6/7] Automated updates: Format and/or coverage --- src/DescriptorsCommand.h | 2 +- src/QueryHandlerPMGD.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/DescriptorsCommand.h b/src/DescriptorsCommand.h index 1027d596..9ad6e6ab 100644 --- a/src/DescriptorsCommand.h +++ b/src/DescriptorsCommand.h @@ -59,7 +59,7 @@ class DescriptorsCommand : public RSCommand { tbb::concurrent_unordered_map _cache_map; static tbb::concurrent_unordered_map - _desc_set_locator; + _desc_set_locator; static tbb::concurrent_unordered_map _desc_set_dims; // Will return the path to the set and the dimensions diff --git a/src/QueryHandlerPMGD.cc b/src/QueryHandlerPMGD.cc index da2cf2b5..66a1cfb6 100644 --- a/src/QueryHandlerPMGD.cc +++ b/src/QueryHandlerPMGD.cc @@ -63,7 +63,8 @@ std::unordered_map QueryHandlerPMGD::_rs_cmds; // DescriptorCommand.h tbb::concurrent_unordered_map DescriptorsCommand::_desc_set_locator; -tbb::concurrent_unordered_map DescriptorsCommand::_desc_set_dims; +tbb::concurrent_unordered_map + DescriptorsCommand::_desc_set_dims; void QueryHandlerPMGD::init() { DescriptorsManager::init(); From ec1b3b25049150a06c9507bc2806c67647ecda4d Mon Sep 17 00:00:00 2001 From: sys_vdms Date: Mon, 29 Jul 2024 19:39:04 +0000 Subject: [PATCH 7/7] Automated updates: Format and/or coverage --- .github/coverage/cpp.develop.coverage_report.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/coverage/cpp.develop.coverage_report.txt b/.github/coverage/cpp.develop.coverage_report.txt index c5102f7b..672a7da5 100644 --- a/.github/coverage/cpp.develop.coverage_report.txt +++ b/.github/coverage/cpp.develop.coverage_report.txt @@ -25,7 +25,7 @@ src/PMGDQueryHandler.cc 623 517 83% 82-84,166-167, src/QueryHandlerBase.cc 32 6 18% 26-29,35-36,38,42-43,45,47-48,52,56-58,60-62,64-66,68-69,72-73 src/QueryHandlerExample.cc 33 18 54% 65-67,75-78,84-85,89-92,94-95 src/QueryHandlerNeo4j.cc 139 0 0% 53,55-56,58,60-62,64-65,67,70-76,80-81,83-87,91,93,95-100,104-108,111-115,119-126,129-132,134-136,139-147,149-153,159,162,169,172-175,177-179,181,184-187,189-190,192,194,197,199,201-204,207-208,210,212-213,216,218,222-223,225,229,231-232,235,237-240,243-247,250-254,256-257,261-268,271-274,277 -src/QueryHandlerPMGD.cc 344 226 65% 108-110,118-121,136-137,141-145,148-152,156-163,166-169,171-173,182-184,188-190,208-210,215-217,232-238,242-244,261,263-272,301-303,349-351,353-355,358-359,361-364,387-388,390-391,400,406-418,420-422,429-437,474,476,531-532,534-535 +src/QueryHandlerPMGD.cc 344 226 65% 109-111,119-122,137-138,142-146,149-153,157-164,167-170,172-174,183-185,189-191,209-211,216-218,233-239,243-245,262,264-273,302-304,350-352,354-356,359-360,362-365,388-389,391-392,401,407-419,421-423,430-438,475,477,532-533,535-536 src/QueryMessage.cc 12 0 0% 37-39,42-43,45-46,48,51-54 src/RSCommand.cc 144 105 72% 65-67,73-74,98,100-101,103,110,131,134-138,141,172-174,176,178-181,188,262,285,287-289,291-297,301 src/SearchExpression.cc 99 38 38% 59,132-133,135,137-139,143,146,148-153,157,160,168-170,177,180-181,183-185,188,192-195,197,201,217-222,224-225,227,235-240,243,247-249,252-256,263,276,284-285