WL#15440 MySQL REST Service - postfix

weigon · dahlerlend · commit 432d47e53f8c · 2025-03-14T11:09:16.000+01:00
enabled etag related tests on solaris

Change-Id: I43fdb18c80a9f900d601b7508bcba48c0d0a6a9e
diff --git a/mysql-test/suite/router/t/authentication_multiple_services.test b/mysql-test/suite/router/t/authentication_multiple_services.test
@@ -1,4 +1,4 @@
-# Main objevtive of this test is verification that session created by
+# Main objective of this test is verification that session created by
 # one auth-app may be used with its services
 #
 # 1. Verify that authentication endpoints are created and avaiable
@@ -7,10 +7,6 @@
 # 2. Verifiy that session can be shared by multiple services
 #
 
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 --source ../include/mrs/is_mrs_schema_v3_or_v4.inc
 
diff --git a/mysql-test/suite/router/t/detect_adds_db_object.test b/mysql-test/suite/router/t/detect_adds_db_object.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 # Set the router-id, to generate statistics
diff --git a/mysql-test/suite/router/t/detect_changes_db_object.test b/mysql-test/suite/router/t/detect_changes_db_object.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 # Set the router-id, to generate statistics
diff --git a/mysql-test/suite/router/t/document_etags.test b/mysql-test/suite/router/t/document_etags.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 # we fiddle with metadata version view here so we want single view name
diff --git a/mysql-test/suite/router/t/field_filters.test b/mysql-test/suite/router/t/field_filters.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/metadata_cluster_basic.test b/mysql-test/suite/router/t/metadata_cluster_basic.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 --source include/have_group_replication_plugin.inc
 
diff --git a/mysql-test/suite/router/t/metadata_cluster_basic_single_primary.test b/mysql-test/suite/router/t/metadata_cluster_basic_single_primary.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 --source include/have_group_replication_plugin.inc
 
diff --git a/mysql-test/suite/router/t/metadata_cluster_basic_single_primary_sync_gtid.test b/mysql-test/suite/router/t/metadata_cluster_basic_single_primary_sync_gtid.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 --source include/have_group_replication_plugin.inc
 
diff --git a/mysql-test/suite/router/t/metadata_cluster_basic_single_primary_sync_gtid_embed.test b/mysql-test/suite/router/t/metadata_cluster_basic_single_primary_sync_gtid_embed.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 --source include/have_group_replication_plugin.inc
 
diff --git a/mysql-test/suite/router/t/metadata_gtid.test b/mysql-test/suite/router/t/metadata_gtid.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 --source include/have_group_replication_plugin.inc
 
diff --git a/mysql-test/suite/router/t/options_include_links_table_feed.test b/mysql-test/suite/router/t/options_include_links_table_feed.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/passthrough_db_user.test b/mysql-test/suite/router/t/passthrough_db_user.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 # Tests that services that have the passthroughDbUser option set will execute
 # SQL for DB endpoints as that user.
 
diff --git a/mysql-test/suite/router/t/reference_table.test b/mysql-test/suite/router/t/reference_table.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/response_cache.test b/mysql-test/suite/router/t/response_cache.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --source ../include/mrs/is_mrs_schema_v3_or_v4.inc
diff --git a/mysql-test/suite/router/t/response_cache_table_update.test b/mysql-test/suite/router/t/response_cache_table_update.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/role_privileges.test b/mysql-test/suite/router/t/role_privileges.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 --source ../include/mrs/is_mrs_schema_v3_or_v4.inc
 
diff --git a/mysql-test/suite/router/t/search_mapping.test b/mysql-test/suite/router/t/search_mapping.test
@@ -1,10 +1,6 @@
 # Verify mapping functionality between field-names and column-names.
 #
 
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/table_create_access.test b/mysql-test/suite/router/t/table_create_access.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/table_feed_pk_matching.test b/mysql-test/suite/router/t/table_feed_pk_matching.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/table_filter_object.test b/mysql-test/suite/router/t/table_filter_object.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/table_offset_limit.test b/mysql-test/suite/router/t/table_offset_limit.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/table_read_access.test b/mysql-test/suite/router/t/table_read_access.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/table_type_bigints.test b/mysql-test/suite/router/t/table_type_bigints.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/table_type_date.test b/mysql-test/suite/router/t/table_type_date.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/table_type_datetime_and_timestamp.test b/mysql-test/suite/router/t/table_type_datetime_and_timestamp.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 --let $extra_mrs_router_id=1
 
diff --git a/mysql-test/suite/router/t/table_type_geometry.test b/mysql-test/suite/router/t/table_type_geometry.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/table_type_vector.test b/mysql-test/suite/router/t/table_type_vector.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/table_update_access.test b/mysql-test/suite/router/t/table_update_access.test
@@ -1,7 +1,3 @@
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/mysql-test/suite/router/t/url_host.test b/mysql-test/suite/router/t/url_host.test
@@ -9,10 +9,6 @@
 # is honoured as expected.
 #
 
-# This test stores etags in the result file. The result etag is different on
-# Solaris so we disable it until this is further investigated.
---source include/not_solaris.inc
-
 --source include/have_router.inc
 
 --let $extra_mrs_router_id=1
diff --git a/router/src/mysql_rest_service/src/mrs/database/helper/object_checksum.cc b/router/src/mysql_rest_service/src/mrs/database/helper/object_checksum.cc
@@ -23,6 +23,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include <bit>  // bit_cast
 #include <list>
 #include <memory>
 #include <optional>
@@ -38,6 +39,7 @@
 #include "helper/digester/sha256_digest.h"
 #include "helper/json/rapid_json_to_text.h"
 #include "mrs/database/helper/object_checksum.h"
+#include "mysql/harness/stdx/bit.h"  // byteswap
 
 namespace mrs {
 namespace database {
@@ -523,6 +525,11 @@ struct ChecksumHandler
   bool Int(int i) {
     rapidjson::Value value;
     value.Set(i);
+
+    if constexpr (std::endian::native == std::endian::big) {
+      i = stdx::byteswap(i);
+    }
+
     push_value(std::move(value),
                {reinterpret_cast<const char *>(&i), sizeof(i)});
     return true;
@@ -531,6 +538,11 @@ struct ChecksumHandler
   bool Uint(unsigned u) {
     rapidjson::Value value;
     value.Set(u);
+
+    if constexpr (std::endian::native == std::endian::big) {
+      u = stdx::byteswap(u);
+    }
+
     push_value(std::move(value),
                {reinterpret_cast<const char *>(&u), sizeof(u)});
     return true;
@@ -539,6 +551,11 @@ struct ChecksumHandler
   bool Int64(int64_t i) {
     rapidjson::Value value;
     value.Set(i);
+
+    if constexpr (std::endian::native == std::endian::big) {
+      i = stdx::byteswap(i);
+    }
+
     push_value(std::move(value),
                {reinterpret_cast<const char *>(&i), sizeof(i)});
     return true;
@@ -547,6 +564,11 @@ struct ChecksumHandler
   bool Uint64(uint64_t u) {
     rapidjson::Value value;
     value.Set(u);
+
+    if constexpr (std::endian::native == std::endian::big) {
+      u = stdx::byteswap(u);
+    }
+
     push_value(std::move(value),
                {reinterpret_cast<const char *>(&u), sizeof(u)});
     return true;
@@ -555,6 +577,11 @@ struct ChecksumHandler
   bool Double(double d) {
     rapidjson::Value value;
     value.Set(d);
+
+    if constexpr (std::endian::native == std::endian::big) {
+      d = std::bit_cast<double>(stdx::byteswap(std::bit_cast<uint64_t>(d)));
+    }
+
     push_value(std::move(value),
                {reinterpret_cast<const char *>(&d), sizeof(d)});
     return true;
diff --git a/router/src/mysql_rest_service/tests/test_object_checksum.cc b/router/src/mysql_rest_service/tests/test_object_checksum.cc
@@ -52,10 +52,6 @@ class TestDigest : public helper::interface::Digester {
   std::string updates_;
 };
 
-// TODO: remove once we figure out why the etags computed on Solaris are
-// different than on other platforms
-#ifndef __sun
-
 TEST(ObjectChecksum, plain) {
   auto root = JsonMappingBuilder("mrstestdb", "actor")
                   .field("field1")
@@ -525,5 +521,3 @@ TEST(ObjectChecksum, column_filter) {
         << doc;
   }
 }
-
-#endif

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Main objevtive of this test is verification that session created by`
	`1`	`+# Main objective of this test is verification that session created by`
`2`	`2`	`# one auth-app may be used with its services`
`3`	`3`	`#`
`4`	`4`	`# 1. Verify that authentication endpoints are created and avaiable`
`@@ -7,10 +7,6 @@`
`7`	`7`	`# 2. Verifiy that session can be shared by multiple services`
`8`	`8`	`#`
`9`	`9`
`10`		`-# This test stores etags in the result file. The result etag is different on`
`11`		`-# Solaris so we disable it until this is further investigated.`
`12`		`---source include/not_solaris.inc`
`13`		`-`
`14`	`10`	`--source include/have_router.inc`
`15`	`11`	`--source ../include/mrs/is_mrs_schema_v3_or_v4.inc`
`16`	`12`