Skip to content

Commit

Permalink
Zero arrays for now
Browse files Browse the repository at this point in the history
  • Loading branch information
xhochy committed Jan 6, 2017
1 parent 831399d commit d3ce3bf
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions cpp/src/arrow/builder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,8 @@ Status PrimitiveBuilder<T>::Init(int32_t capacity) {

int64_t nbytes = TypeTraits<T>::bytes_required(capacity);
RETURN_NOT_OK(data_->Resize(nbytes));
#ifdef ARROW_VALGRIND
// TODO(emkornfield) valgrind complains without this
memset(data_->mutable_data(), 0, nbytes);
#endif

raw_data_ = reinterpret_cast<value_type*>(data_->mutable_data());
return Status::OK();
Expand All @@ -154,16 +152,12 @@ Status PrimitiveBuilder<T>::Resize(int32_t capacity) {
RETURN_NOT_OK(Init(capacity));
} else {
RETURN_NOT_OK(ArrayBuilder::Resize(capacity));
#ifdef ARROW_VALGRIND
const int64_t old_bytes = data_->size();
#endif
const int64_t new_bytes = TypeTraits<T>::bytes_required(capacity);
RETURN_NOT_OK(data_->Resize(new_bytes));
raw_data_ = reinterpret_cast<value_type*>(data_->mutable_data());
#ifdef ARROW_VALGRIND
// TODO(emkornfield) valgrind complains without this
memset(data_->mutable_data() + old_bytes, 0, new_bytes - old_bytes);
#endif
}
return Status::OK();
}
Expand Down

0 comments on commit d3ce3bf

Please sign in to comment.