fix: clang build for macos (#5862)

* fix: clang build for macos

* fix: linux build

* fix: revert helio revision

* fix: bump helio revision

Author: vyavdoshenko

.github/workflows/daily-builds.yml

@@ -69,7 +69,7 @@ jobs:
             -d '{"text": "'"${message}"'"}'
 
   build-macos:
-    runs-on: macos-14
+    runs-on: macos-15
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v5
@@ -99,15 +99,27 @@ jobs:
           which bison
           bison --version
 
-          gcc-12 --version
+          # Check system clang version
+          clang --version
+          clang++ --version
+
+          # Verify current macOS SDK
+          xcrun --show-sdk-path
 
           autoconf --help
           autoreconf --help
 
           echo "*************************** START BUILDING **************************************"
-          CC=gcc-12 CXX=g++-12 cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja -DWITH_UNWIND=OFF \
-            -DCMAKE_CXX_FLAGS="-Wl,-ld_classic" \
-            -DCMAKE_C_COMPILER="gcc-12" -DCMAKE_CXX_COMPILER="g++-12"
+          # Configure for using current macOS SDK
+          export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
+          echo "Using SDK: $SDKROOT"
+
+          # Use system clang/clang++ with macOS SDK
+          cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja \
+            -DCMAKE_C_COMPILER=clang \
+            -DCMAKE_CXX_COMPILER=clang++ \
+            -DCMAKE_OSX_SYSROOT="$SDKROOT" \
+            -DCMAKE_OSX_DEPLOYMENT_TARGET=15.0
 
           ninja src/all
 

helio

@@ -564,17 +564,21 @@ void BitCount(CmdArgList args, const CommandContext& cmd_cntx) {
   CmdArgParser parser(args);
   auto key = parser.Next<string_view>();
 
-  auto [start, end] = parser.HasNext()
-                          ? parser.Next<int64_t, int64_t>()
-                          : std::pair<int64_t, int64_t>{0, std::numeric_limits<int64_t>::max()};
+  std::pair<int64_t, int64_t> start_end;
+  if (parser.HasNext()) {
+    auto tuple_result = parser.Next<int64_t, int64_t>();
+    start_end = std::make_pair(std::get<0>(tuple_result), std::get<1>(tuple_result));
+  } else {
+    start_end = std::make_pair(0, std::numeric_limits<int64_t>::max());
+  }
 
   bool as_bit = parser.HasNext() ? parser.MapNext("BYTE", false, "BIT", true) : false;
   auto* builder = cmd_cntx.rb;
   if (!parser.Finalize()) {
     return builder->SendError(parser.TakeError().MakeReply());
   }
-  auto cb = [&, &start = start, &end = end](Transaction* t, EngineShard* shard) {
-    return CountBitsForValue(t->GetOpArgs(shard), key, start, end, as_bit);
+  auto cb = [&, start_end](Transaction* t, EngineShard* shard) {
+    return CountBitsForValue(t->GetOpArgs(shard), key, start_end.first, start_end.second, as_bit);
   };
   OpResult<std::size_t> res = cmd_cntx.tx->ScheduleSingleHopT(std::move(cb));
   HandleOpValueResult(res, builder);

src/server/bitops_family.cc

@@ -60,12 +60,12 @@ TEST_F(GeoFamilyTest, GeoAddOptions) {
   // update 1 + CH + XX
   EXPECT_EQ(1, CheckedInt({"geoadd", "Sicily", "CH", "XX", "10.361389", "38.115556", "Palermo"}));
   resp = Run({"geopos", "Sicily", "Palermo"});
-  EXPECT_THAT(resp, RespArray(ElementsAre("10.361386835575104", "38.1155563954963")));
+  EXPECT_THAT(resp, RespArray(ElementsAre(DoubleArg(10.361389), DoubleArg(38.115556))));
 
   // add 1 + CH + NX
   EXPECT_EQ(1, CheckedInt({"geoadd", "Sicily", "CH", "NX", "14.25", "37.066667", "Gela"}));
   resp = Run({"geopos", "Sicily", "Gela"});
-  EXPECT_THAT(resp, RespArray(ElementsAre("14.249999821186066", "37.06666596727141")));
+  EXPECT_THAT(resp, RespArray(ElementsAre(DoubleArg(14.25), DoubleArg(37.066667))));
 
   // add 1 + XX + NX
   resp = Run({"geoadd", "Sicily", "XX", "NX", "14.75", "36.933333", "Ragusa"});
@@ -209,11 +209,11 @@ TEST_F(GeoFamilyTest, GeoRadiusByMember) {
   EXPECT_THAT(
       resp,
       RespArray(ElementsAre(
-          RespArray(ElementsAre(
-              "Madrid", "0", RespArray(ElementsAre("3.7038007378578186", "40.416799319406216")))),
+          RespArray(ElementsAre("Madrid", DoubleArg(0),
+                                RespArray(ElementsAre(DoubleArg(3.703801), DoubleArg(40.416799))))),
           RespArray(
-              ElementsAre("Lisbon", "502.20769462704084",
-                          RespArray(ElementsAre("9.142698347568512", "38.736900197448534")))))));
+              ElementsAre("Lisbon", DoubleArg(502.207695),
+                          RespArray(ElementsAre(DoubleArg(9.142698), DoubleArg(38.736900))))))));
 
   EXPECT_EQ(
       2, CheckedInt({"GEORADIUSBYMEMBER", "Europe", "Madrid", "700", "KM", "STORE", "store_key"}));
@@ -226,7 +226,8 @@ TEST_F(GeoFamilyTest, GeoRadiusByMember) {
   EXPECT_EQ(2, CheckedInt({"GEORADIUSBYMEMBER", "Europe", "Madrid", "700", "KM", "STOREDIST",
                            "store_dist_key"}));
   resp = Run({"ZRANGE", "store_dist_key", "0", "-1", "WITHSCORES"});
-  EXPECT_THAT(resp, RespArray(ElementsAre("Madrid", "0", "Lisbon", "502.20769462704084")));
+  EXPECT_THAT(resp,
+              RespArray(ElementsAre("Madrid", DoubleArg(0), "Lisbon", DoubleArg(502.207695))));
 
   resp = Run(
       {"GEORADIUSBYMEMBER", "Europe", "Madrid", "900", "KM", "STORE", "store_key", "WITHCOORD"});
@@ -259,11 +260,11 @@ TEST_F(GeoFamilyTest, GeoRadiusByMemberRO) {
   EXPECT_THAT(
       resp,
       RespArray(ElementsAre(
-          RespArray(ElementsAre(
-              "Madrid", "0", RespArray(ElementsAre("3.7038007378578186", "40.416799319406216")))),
+          RespArray(ElementsAre("Madrid", DoubleArg(0),
+                                RespArray(ElementsAre(DoubleArg(3.703801), DoubleArg(40.416799))))),
           RespArray(
-              ElementsAre("Lisbon", "502.20769462704084",
-                          RespArray(ElementsAre("9.142698347568512", "38.736900197448534")))))));
+              ElementsAre("Lisbon", DoubleArg(502.207695),
+                          RespArray(ElementsAre(DoubleArg(9.142698), DoubleArg(38.736900))))))));
 
   // GEORADIUSBYMEMBER_RO should not accept arguments for storing (writing data)
   resp =

src/server/geo_family_test.cc

@@ -205,8 +205,10 @@ TEST_F(JsonFamilyMemoryTest, JsonShrinking) {
 
   // Jsoncons will allocate more memory for the new json that needed.
   // This is totally fine, because we will not call shrink_to_fit.
-  EXPECT_THAT(resp, IntArg(368));
-  EXPECT_GT(368, start_size);
+  // Different compilers may allocate different amounts, so check reasonable range
+  auto final_size = get<int64_t>(resp.u);
+  EXPECT_GT(final_size, start_size);      // Should be larger than initial
+  EXPECT_LT(final_size, start_size * 2);  // But not unreasonably large
 }
 
 }  // namespace dfly