From db26057119fc6114dbab152a43a5f6985a4528be Mon Sep 17 00:00:00 2001 From: Ian Adams Date: Thu, 3 Oct 2024 15:36:49 -0700 Subject: [PATCH 1/5] connection pool bug fix --- src/QueryHandlerNeo4j.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/QueryHandlerNeo4j.cc b/src/QueryHandlerNeo4j.cc index ee7f4465..5e36ed0f 100644 --- a/src/QueryHandlerNeo4j.cc +++ b/src/QueryHandlerNeo4j.cc @@ -221,9 +221,10 @@ void QueryHandlerNeo4j::process_query(protobufs::queryMessage &proto_query, // errors on response construction if (error == false) { neoconn_pool->commit_tx(tx); - } else { - neoconn_pool->put_conn(conn); } + + neoconn_pool->put_conn(conn); + } int QueryHandlerNeo4j::parse_commands( From b0814b9d6e4bf9c3fa8949db9e7c5cfaba8f60f3 Mon Sep 17 00:00:00 2001 From: sys_vdms Date: Thu, 3 Oct 2024 23:53:45 +0000 Subject: [PATCH 2/5] Automated updates: Format and/or coverage --- .github/coverage/cpp.develop.coverage_report.txt | 2 +- src/QueryHandlerNeo4j.cc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/coverage/cpp.develop.coverage_report.txt b/.github/coverage/cpp.develop.coverage_report.txt index b5d9c600..4b5102a3 100644 --- a/.github/coverage/cpp.develop.coverage_report.txt +++ b/.github/coverage/cpp.develop.coverage_report.txt @@ -24,7 +24,7 @@ src/PMGDQuery.cc 466 366 78% 89-92,94-96,12 src/PMGDQueryHandler.cc 645 535 82% 82-84,166-167,169-170,194-197,208-209,230,279,281,285,290,292,320-321,338,340,344,346,397-398,400,402-407,409,411,463-464,478-479,488,490,496,498,524-526,537,566,605,607,612-613,649,651-655,677-679,681-686,688,720,729-730,737,741-743,745,748,751,815,822,850,870-876,878-879,881,883,895-896,915-917,921-922,965,1012-1013,1015-1017,1038,1050,1052-1053 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/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,226,230,232-233,236,238-241,244-248,251-255,257-258,262-269,272-275,278 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,263,265-274,303-305,352-354,356-358,361-362,364-367,390-391,393-394,403,410-422,424-426,433-441,478,480,535-536,538-539 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 diff --git a/src/QueryHandlerNeo4j.cc b/src/QueryHandlerNeo4j.cc index 5e36ed0f..02ce100f 100644 --- a/src/QueryHandlerNeo4j.cc +++ b/src/QueryHandlerNeo4j.cc @@ -222,9 +222,8 @@ void QueryHandlerNeo4j::process_query(protobufs::queryMessage &proto_query, if (error == false) { neoconn_pool->commit_tx(tx); } - - neoconn_pool->put_conn(conn); + neoconn_pool->put_conn(conn); } int QueryHandlerNeo4j::parse_commands( From 52bd135f083a4964c7f6b4f97c22d2336d127121 Mon Sep 17 00:00:00 2001 From: sys_vdms Date: Fri, 4 Oct 2024 23:51:54 +0000 Subject: [PATCH 3/5] 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 4b5102a3..968491b2 100644 --- a/.github/coverage/cpp.develop.coverage_report.txt +++ b/.github/coverage/cpp.develop.coverage_report.txt @@ -24,7 +24,7 @@ src/PMGDQuery.cc 466 366 78% 89-92,94-96,12 src/PMGDQueryHandler.cc 645 535 82% 82-84,166-167,169-170,194-197,208-209,230,279,281,285,290,292,320-321,338,340,344,346,397-398,400,402-407,409,411,463-464,478-479,488,490,496,498,524-526,537,566,605,607,612-613,649,651-655,677-679,681-686,688,720,729-730,737,741-743,745,748,751,815,822,850,870-876,878-879,881,883,895-896,915-917,921-922,965,1012-1013,1015-1017,1038,1050,1052-1053 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,226,230,232-233,236,238-241,244-248,251-255,257-258,262-269,272-275,278 +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,226,229,231-232,235,237-240,243-247,250-254,256-257,261-268,271-274,277 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,263,265-274,303-305,352-354,356-358,361-362,364-367,390-391,393-394,403,410-422,424-426,433-441,478,480,535-536,538-539 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 From 6f1093c5f036c09cd19bb9f95b4c41dc72656e86 Mon Sep 17 00:00:00 2001 From: sys_vdms Date: Sat, 5 Oct 2024 01:12:52 +0000 Subject: [PATCH 4/5] Automated updates: Format and/or coverage --- .github/coverage/cpp.develop.coverage_report.txt | 4 ++-- .github/coverage/cpp.develop.coverage_value.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/coverage/cpp.develop.coverage_report.txt b/.github/coverage/cpp.develop.coverage_report.txt index 968491b2..bf8da885 100644 --- a/.github/coverage/cpp.develop.coverage_report.txt +++ b/.github/coverage/cpp.develop.coverage_report.txt @@ -4,7 +4,7 @@ Directory: .. ------------------------------------------------------------------------------ File Lines Exec Cover Missing ------------------------------------------------------------------------------ -client/cpp/CSVParserUtil.cpp 345 291 84% 37-45,48,50,239,241,264-265,269-270,286,292,304,313-314,317,323,331-332,335,345,351,363,368,373,379-387,389,425,435-437,474-476,478,503-506 +client/cpp/CSVParserUtil.cpp 345 290 84% 37-45,48,50,239,241,264-265,269-270,286,292,304,313-314,317,323,331-332,335,345,351,363,368,373,379-387,389,425,435-437,450,474-476,478,503-506 client/cpp/VDMSClient.cc 20 20 100% src/AutoDeleteNode.cc 9 8 88% 40 src/BackendNeo4j.cc 121 0 0% 4,6-17,20,24,29-41,46-47,52,55-58,61-62,64-70,73,78,82-83,85-86,89,92,95-96,98,102,104,106-109,111,114-116,118,122,131-132,138,140,142-144,147,150-152,155-159,161-175,178,182,184,186,195,197-200,204-205,207-208,211-215,220,224-226,228 @@ -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 10238 6537 63% +TOTAL 10238 6536 63% ------------------------------------------------------------------------------ diff --git a/.github/coverage/cpp.develop.coverage_value.txt b/.github/coverage/cpp.develop.coverage_value.txt index b82de924..d7ddadb2 100644 --- a/.github/coverage/cpp.develop.coverage_value.txt +++ b/.github/coverage/cpp.develop.coverage_value.txt @@ -1 +1 @@ -63.8504 +63.8406 From 410392a3fe6af6c11908b63afc63386e15162250 Mon Sep 17 00:00:00 2001 From: sys_vdms Date: Sat, 5 Oct 2024 02:30:59 +0000 Subject: [PATCH 5/5] Automated updates: Format and/or coverage --- .github/coverage/cpp.develop.coverage_report.txt | 4 ++-- .github/coverage/cpp.develop.coverage_value.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/coverage/cpp.develop.coverage_report.txt b/.github/coverage/cpp.develop.coverage_report.txt index bf8da885..968491b2 100644 --- a/.github/coverage/cpp.develop.coverage_report.txt +++ b/.github/coverage/cpp.develop.coverage_report.txt @@ -4,7 +4,7 @@ Directory: .. ------------------------------------------------------------------------------ File Lines Exec Cover Missing ------------------------------------------------------------------------------ -client/cpp/CSVParserUtil.cpp 345 290 84% 37-45,48,50,239,241,264-265,269-270,286,292,304,313-314,317,323,331-332,335,345,351,363,368,373,379-387,389,425,435-437,450,474-476,478,503-506 +client/cpp/CSVParserUtil.cpp 345 291 84% 37-45,48,50,239,241,264-265,269-270,286,292,304,313-314,317,323,331-332,335,345,351,363,368,373,379-387,389,425,435-437,474-476,478,503-506 client/cpp/VDMSClient.cc 20 20 100% src/AutoDeleteNode.cc 9 8 88% 40 src/BackendNeo4j.cc 121 0 0% 4,6-17,20,24,29-41,46-47,52,55-58,61-62,64-70,73,78,82-83,85-86,89,92,95-96,98,102,104,106-109,111,114-116,118,122,131-132,138,140,142-144,147,150-152,155-159,161-175,178,182,184,186,195,197-200,204-205,207-208,211-215,220,224-226,228 @@ -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 10238 6536 63% +TOTAL 10238 6537 63% ------------------------------------------------------------------------------ diff --git a/.github/coverage/cpp.develop.coverage_value.txt b/.github/coverage/cpp.develop.coverage_value.txt index d7ddadb2..b82de924 100644 --- a/.github/coverage/cpp.develop.coverage_value.txt +++ b/.github/coverage/cpp.develop.coverage_value.txt @@ -1 +1 @@ -63.8406 +63.8504