apacheGH-38090: [C++][Emscripten] json: Suppress shorten-64-to-32 war…

…nings We need explicit cast to use `int64_t` for `size_t` on Emscripten. Explicit casts.
kou · Oct 7, 2023 · 0c2274d · 0c2274d
1 parent 3697bcd
commit 0c2274d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/cpp/src/arrow/json/chunked_builder.cc b/cpp/src/arrow/json/chunked_builder.cc
@@ -90,7 +90,7 @@ class TypedChunkedArrayBuilder
       std::shared_ptr<Array> converted;
       RETURN_NOT_OK(self->converter_->Convert(unconverted, &converted));
       std::unique_lock<std::mutex> lock(self->mutex_);
-      self->chunks_[block_index] = std::move(converted);
+      self->chunks_[static_cast<size_t>(block_index)] = std::move(converted);
       return Status::OK();
     });
   }
@@ -114,8 +114,8 @@ class InferringChunkedArrayBuilder
       unconverted_.resize(chunks_.size(), nullptr);
       unconverted_fields_.resize(chunks_.size(), nullptr);
     }
-    unconverted_[block_index] = unconverted;
-    unconverted_fields_[block_index] = unconverted_field;
+    unconverted_[static_cast<size_t>(block_index)] = unconverted;
+    unconverted_fields_[static_cast<size_t>(block_index)] = unconverted_field;
     lock.unlock();
     ScheduleConvertChunk(block_index);
   }
@@ -224,8 +224,8 @@ class ChunkedListArrayBuilder : public ChunkedArrayBuilder {
     DCHECK_EQ(unconverted->type_id(), Type::LIST);
     const auto& list_array = checked_cast<const ListArray&>(*unconverted);
 
-    null_bitmap_chunks_[block_index] = unconverted->null_bitmap();
-    offset_chunks_[block_index] = list_array.value_offsets();
+    null_bitmap_chunks_[static_cast<size_t>(block_index)] = unconverted->null_bitmap();
+    offset_chunks_[static_cast<size_t>(block_index)] = list_array.value_offsets();
 
     value_builder_->Insert(block_index, list_array.list_type()->value_field(),
                            list_array.values());
@@ -255,13 +255,14 @@ class ChunkedListArrayBuilder : public ChunkedArrayBuilder {
   Status InsertNull(int64_t block_index, int64_t length) {
     value_builder_->Insert(block_index, value_field_, std::make_shared<NullArray>(0));
 
-    ARROW_ASSIGN_OR_RAISE(null_bitmap_chunks_[block_index],
+    ARROW_ASSIGN_OR_RAISE(null_bitmap_chunks_[static_cast<size_t>(block_index)],
                           AllocateEmptyBitmap(length, pool_));
 
     int64_t offsets_length = (length + 1) * sizeof(int32_t);
-    ARROW_ASSIGN_OR_RAISE(offset_chunks_[block_index],
+    ARROW_ASSIGN_OR_RAISE(offset_chunks_[static_cast<size_t>(block_index)],
                           AllocateBuffer(offsets_length, pool_));
-    std::memset(offset_chunks_[block_index]->mutable_data(), 0, offsets_length);
+    std::memset(offset_chunks_[static_cast<size_t>(block_index)]->mutable_data(), 0,
+                static_cast<size_t>(offsets_length));
 
     return Status::OK();
   }
@@ -297,15 +298,17 @@ class ChunkedStructArrayBuilder : public ChunkedArrayBuilder {
       chunk_lengths_.resize(null_bitmap_chunks_.size(), -1);
       child_absent_.resize(null_bitmap_chunks_.size(), std::vector<bool>(0));
     }
-    null_bitmap_chunks_[block_index] = unconverted->null_bitmap();
-    chunk_lengths_[block_index] = unconverted->length();
+    null_bitmap_chunks_[static_cast<size_t>(block_index)] = unconverted->null_bitmap();
+    chunk_lengths_[static_cast<size_t>(block_index)] = unconverted->length();
 
     if (unconverted->type_id() == Type::NA) {
       auto maybe_buffer = AllocateBitmap(unconverted->length(), pool_);
       if (maybe_buffer.ok()) {
-        null_bitmap_chunks_[block_index] = *std::move(maybe_buffer);
-        std::memset(null_bitmap_chunks_[block_index]->mutable_data(), 0,
-                    null_bitmap_chunks_[block_index]->size());
+        null_bitmap_chunks_[static_cast<size_t>(block_index)] = *std::move(maybe_buffer);
+        std::memset(null_bitmap_chunks_[static_cast<size_t>(block_index)]->mutable_data(),
+                    0,
+                    static_cast<size_t>(
+                        null_bitmap_chunks_[static_cast<size_t>(block_index)]->size()));
       } else {
         Status st = maybe_buffer.status();
         task_group_->Append([st] { return st; });
@@ -419,8 +422,9 @@ class ChunkedStructArrayBuilder : public ChunkedArrayBuilder {
       child_builders_[it->second]->Insert(block_index, unconverted_field,
                                           unconverted.field(i));
 
-      child_absent_[block_index].resize(child_builders_.size(), true);
-      child_absent_[block_index][it->second] = false;
+      child_absent_[static_cast<size_t>(block_index)].resize(child_builders_.size(),
+                                                             true);
+      child_absent_[static_cast<size_t>(block_index)][it->second] = false;
     }
 
     return Status::OK();

diff --git a/cpp/src/arrow/json/parser.cc b/cpp/src/arrow/json/parser.cc
@@ -795,7 +795,8 @@ class HandlerBase : public BlockParser,
   template <typename Handler>
   Status DoParse(Handler& handler, const std::shared_ptr<Buffer>& json) {
     RETURN_NOT_OK(ReserveScalarStorage(json->size()));
-    rj::MemoryStream ms(reinterpret_cast<const char*>(json->data()), json->size());
+    rj::MemoryStream ms(reinterpret_cast<const char*>(json->data()),
+                        static_cast<size_t>(json->size()));
     using InputStream = rj::EncodedInputStream<rj::UTF8<>, rj::MemoryStream>;
     return DoParse(handler, InputStream(ms), static_cast<size_t>(json->size()));
   }