WL#15440 MySQL REST Service (MRS) - Umbrella WL

Andrzej Religa · dahlerlend · commit 591ff500b866 · 2025-03-14T11:09:23.000+01:00
Bug#37324555 MRS JSON options uses different naming convention for its fields

Used camel-case for
    /gtid/cache/refresh_rate
    /gtid/cache/refresh_when_increases_by

Change-Id: Ida7b9f8c8505477b7f2206dc668779fe4917355d
diff --git a/mysql-test/suite/router/include/test/authentication_mrs.inc b/mysql-test/suite/router/include/test/authentication_mrs.inc
@@ -77,7 +77,6 @@ if (!$test_scram)
 
 --let $mrs_add_service_path="/svc1"
 --let $mrs_add_host_name=""
---let $mrs_add_service_options='{"cache_ttl":15,"logging":{"exceptions":true, "request":{"headers":true, "body":true}, "response":{"headers":true, "body":true}}}'
 --source ../mrs/service/add.inc
 
 --let $mrs_add_schema=basic_schema
@@ -132,7 +131,6 @@ if ($test_second_handler)
 --echo # I.2
 --let $mrs_add_service_path="/svc2"
 --let $mrs_add_host_name=""
---let $mrs_add_service_options='{"cache_ttl":15,"logging":{"exceptions":true, "request":{"headers":true, "body":true}, "response":{"headers":true, "body":true}}}'
 --source ../mrs/service/add.inc
 
 --let $mrs_add_schema=basic_schema
diff --git a/router/src/mysql_rest_service/src/mrs/gtid_manager.h b/router/src/mysql_rest_service/src/mrs/gtid_manager.h
@@ -212,9 +212,9 @@ class GtidManager {
       using std::to_string;
       if (key == "gtid.cache.enable") {
         result_.enable = to_bool(vt);
-      } else if (key == "gtid.cache.refresh_rate") {
+      } else if (key == "gtid.cache.refreshRate") {
         result_.d = std::chrono::seconds{to_uint(vt)};
-      } else if (key == "gtid.cache.refresh_when_increases_by") {
+      } else if (key == "gtid.cache.refreshWhenIncreasesBy") {
         result_.refresh_after = to_uint(vt);
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -212,9 +212,9 @@ class GtidManager {`
`212`	`212`	`using std::to_string;`
`213`	`213`	`if (key == "gtid.cache.enable") {`
`214`	`214`	`result_.enable = to_bool(vt);`
`215`		`- } else if (key == "gtid.cache.refresh_rate") {`
	`215`	`+ } else if (key == "gtid.cache.refreshRate") {`
`216`	`216`	`result_.d = std::chrono::seconds{to_uint(vt)};`
`217`		`- } else if (key == "gtid.cache.refresh_when_increases_by") {`
	`217`	`+ } else if (key == "gtid.cache.refreshWhenIncreasesBy") {`
`218`	`218`	`result_.refresh_after = to_uint(vt);`
`219`	`219`	`}`
`220`	`220`	`}`