Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into try-evict
Browse files Browse the repository at this point in the history
  • Loading branch information
stephanie-wang committed Mar 5, 2020
2 parents a32ab9b + 367cd2e commit 2f38969
Show file tree
Hide file tree
Showing 289 changed files with 13,105 additions and 3,187 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ HDFS=2.9.2
SPARK=master
DOTNET=2.1
R=3.6
ARROW_R_DEV=TRUE
# These correspond to images on Docker Hub that contain R, e.g. rhub/ubuntu-gcc-release:latest
R_ORG=rhub
R_IMAGE=ubuntu-gcc-release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKERHUB_USER }} \
-p ${{ secrets.DOCKERHUB_TOKEN }}
docker-compose push ubuntu-cpp
docker-compose push ubuntu-cpp-sanitizer
macos:
name: AMD64 MacOS 10.15 C++
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,15 @@ on:
jobs:

ubuntu:
name: AMD64 Ubuntu 18.04 Python 3
name: AMD64 Ubuntu ${{ matrix.ubuntu }} Python 3
runs-on: ubuntu-latest
if: github.event_name == 'push'
strategy:
fail-fast: false
matrix:
ubuntu: [16.04, 18.04]
env:
UBUNTU: 18.04
UBUNTU: ${{ matrix.ubuntu }}
steps:
- name: Checkout Arrow
uses: actions/checkout@v1
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ jobs:
strategy:
fail-fast: false
matrix:
ubuntu: [18.04]
ubuntu:
- 16.04
- 18.04
env:
UBUNTU: ${{ matrix.ubuntu }}
steps:
Expand Down Expand Up @@ -71,6 +73,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKERHUB_USER }} \
-p ${{ secrets.DOCKERHUB_TOKEN }}
docker-compose push ubuntu-c-glib
docker-compose push ubuntu-ruby
macos:
Expand Down
4 changes: 3 additions & 1 deletion c_glib/arrow-cuda-glib/cuda.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ garrow_cuda_context_finalize(GObject *object)
{
auto priv = GARROW_CUDA_CONTEXT_GET_PRIVATE(object);

priv->context = nullptr;
priv->context.~shared_ptr();

G_OBJECT_CLASS(garrow_cuda_context_parent_class)->finalize(object);
}
Expand Down Expand Up @@ -214,6 +214,8 @@ garrow_cuda_context_get_property(GObject *object,
static void
garrow_cuda_context_init(GArrowCUDAContext *object)
{
auto priv = GARROW_CUDA_CONTEXT_GET_PRIVATE(object);
new(&priv->context) std::shared_ptr<arrow::cuda::CudaContext>;
}

static void
Expand Down
39 changes: 10 additions & 29 deletions c_glib/arrow-glib/array-builder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GArrowArrayBuilder,
static void
garrow_array_builder_finalize(GObject *object)
{
GArrowArrayBuilderPrivate *priv;

priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(object);
auto priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(object);

if (priv->have_ownership) {
delete priv->array_builder;
Expand All @@ -356,9 +354,7 @@ garrow_array_builder_set_property(GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GArrowArrayBuilderPrivate *priv;

priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(object);
auto priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(object);

switch (prop_id) {
case PROP_ARRAY_BUILDER:
Expand Down Expand Up @@ -387,9 +383,7 @@ garrow_array_builder_get_property(GObject *object,
static void
garrow_array_builder_init(GArrowArrayBuilder *builder)
{
GArrowArrayBuilderPrivate *priv;

priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(builder);
auto priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(builder);
priv->have_ownership = TRUE;
}

Expand Down Expand Up @@ -438,9 +432,7 @@ garrow_array_builder_new(const std::shared_ptr<arrow::DataType> &type,
void
garrow_array_builder_release_ownership(GArrowArrayBuilder *builder)
{
GArrowArrayBuilderPrivate *priv;

priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(builder);
auto priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(builder);
priv->have_ownership = FALSE;
}

Expand Down Expand Up @@ -3938,9 +3930,7 @@ G_DEFINE_TYPE_WITH_PRIVATE(GArrowListArrayBuilder,
static void
garrow_list_array_builder_dispose(GObject *object)
{
GArrowListArrayBuilderPrivate *priv;

priv = GARROW_LIST_ARRAY_BUILDER_GET_PRIVATE(object);
auto priv = GARROW_LIST_ARRAY_BUILDER_GET_PRIVATE(object);

if (priv->value_builder) {
g_object_unref(priv->value_builder);
Expand Down Expand Up @@ -4130,9 +4120,7 @@ garrow_list_array_builder_append_null(GArrowListArrayBuilder *builder,
GArrowArrayBuilder *
garrow_list_array_builder_get_value_builder(GArrowListArrayBuilder *builder)
{
GArrowListArrayBuilderPrivate *priv;

priv = GARROW_LIST_ARRAY_BUILDER_GET_PRIVATE(builder);
auto priv = GARROW_LIST_ARRAY_BUILDER_GET_PRIVATE(builder);
if (!priv->value_builder) {
auto arrow_builder =
static_cast<arrow::ListBuilder *>(
Expand Down Expand Up @@ -4301,12 +4289,9 @@ G_DEFINE_TYPE_WITH_PRIVATE(GArrowStructArrayBuilder,
static void
garrow_struct_array_builder_dispose(GObject *object)
{
GArrowStructArrayBuilderPrivate *priv;
GList *node;

priv = GARROW_STRUCT_ARRAY_BUILDER_GET_PRIVATE(object);
auto priv = GARROW_STRUCT_ARRAY_BUILDER_GET_PRIVATE(object);

for (node = priv->field_builders; node; node = g_list_next(node)) {
for (auto node = priv->field_builders; node; node = g_list_next(node)) {
auto field_builder = static_cast<GArrowArrayBuilder *>(node->data);
GArrowArrayBuilderPrivate *field_builder_priv;

Expand Down Expand Up @@ -4468,9 +4453,7 @@ garrow_struct_array_builder_get_field_builder(GArrowStructArrayBuilder *builder,
GList *
garrow_struct_array_builder_get_field_builders(GArrowStructArrayBuilder *builder)
{
GArrowStructArrayBuilderPrivate *priv;

priv = GARROW_STRUCT_ARRAY_BUILDER_GET_PRIVATE(builder);
auto priv = GARROW_STRUCT_ARRAY_BUILDER_GET_PRIVATE(builder);
if (!priv->field_builders) {
auto arrow_struct_builder =
static_cast<arrow::StructBuilder *>(
Expand Down Expand Up @@ -4949,8 +4932,6 @@ garrow_array_builder_new_raw(arrow::ArrayBuilder *arrow_builder,
arrow::ArrayBuilder *
garrow_array_builder_get_raw(GArrowArrayBuilder *builder)
{
GArrowArrayBuilderPrivate *priv;

priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(builder);
auto priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(builder);
return priv->array_builder;
}
4 changes: 3 additions & 1 deletion c_glib/arrow-glib/basic-array.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ garrow_array_finalize(GObject *object)
{
auto priv = GARROW_ARRAY_GET_PRIVATE(object);

priv->array = nullptr;
priv->array.~shared_ptr();

G_OBJECT_CLASS(garrow_array_parent_class)->finalize(object);
}
Expand Down Expand Up @@ -272,6 +272,8 @@ garrow_array_get_property(GObject *object,
static void
garrow_array_init(GArrowArray *object)
{
auto priv = GARROW_ARRAY_GET_PRIVATE(object);
new(&priv->array) std::shared_ptr<arrow::Array>;
}

static void
Expand Down
16 changes: 6 additions & 10 deletions c_glib/arrow-glib/basic-data-type.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,9 @@ G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GArrowDataType,
static void
garrow_data_type_finalize(GObject *object)
{
GArrowDataTypePrivate *priv;
auto priv = GARROW_DATA_TYPE_GET_PRIVATE(object);

priv = GARROW_DATA_TYPE_GET_PRIVATE(object);

priv->data_type = nullptr;
priv->data_type.~shared_ptr();

G_OBJECT_CLASS(garrow_data_type_parent_class)->finalize(object);
}
Expand All @@ -133,9 +131,7 @@ garrow_data_type_set_property(GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GArrowDataTypePrivate *priv;

priv = GARROW_DATA_TYPE_GET_PRIVATE(object);
auto priv = GARROW_DATA_TYPE_GET_PRIVATE(object);

switch (prop_id) {
case PROP_DATA_TYPE:
Expand Down Expand Up @@ -164,6 +160,8 @@ garrow_data_type_get_property(GObject *object,
static void
garrow_data_type_init(GArrowDataType *object)
{
auto priv = GARROW_DATA_TYPE_GET_PRIVATE(object);
new(&priv->data_type) std::shared_ptr<arrow::DataType>;
}

static void
Expand Down Expand Up @@ -1408,8 +1406,6 @@ garrow_data_type_new_raw(std::shared_ptr<arrow::DataType> *arrow_data_type)
std::shared_ptr<arrow::DataType>
garrow_data_type_get_raw(GArrowDataType *data_type)
{
GArrowDataTypePrivate *priv;

priv = GARROW_DATA_TYPE_GET_PRIVATE(data_type);
auto priv = GARROW_DATA_TYPE_GET_PRIVATE(data_type);
return priv->data_type;
}
4 changes: 3 additions & 1 deletion c_glib/arrow-glib/buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ garrow_buffer_finalize(GObject *object)
{
auto priv = GARROW_BUFFER_GET_PRIVATE(object);

priv->buffer = nullptr;
priv->buffer.~shared_ptr();

G_OBJECT_CLASS(garrow_buffer_parent_class)->finalize(object);
}
Expand Down Expand Up @@ -126,6 +126,8 @@ garrow_buffer_get_property(GObject *object,
static void
garrow_buffer_init(GArrowBuffer *object)
{
auto priv = GARROW_BUFFER_GET_PRIVATE(object);
new(&priv->buffer) std::shared_ptr<arrow::Buffer>;
}

static void
Expand Down
16 changes: 6 additions & 10 deletions c_glib/arrow-glib/chunked-array.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,9 @@ G_DEFINE_TYPE_WITH_PRIVATE(GArrowChunkedArray,
static void
garrow_chunked_array_finalize(GObject *object)
{
GArrowChunkedArrayPrivate *priv;
auto priv = GARROW_CHUNKED_ARRAY_GET_PRIVATE(object);

priv = GARROW_CHUNKED_ARRAY_GET_PRIVATE(object);

priv->chunked_array = nullptr;
priv->chunked_array.~shared_ptr();

G_OBJECT_CLASS(garrow_chunked_array_parent_class)->finalize(object);
}
Expand All @@ -75,9 +73,7 @@ garrow_chunked_array_set_property(GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GArrowChunkedArrayPrivate *priv;

priv = GARROW_CHUNKED_ARRAY_GET_PRIVATE(object);
auto priv = GARROW_CHUNKED_ARRAY_GET_PRIVATE(object);

switch (prop_id) {
case PROP_CHUNKED_ARRAY:
Expand Down Expand Up @@ -106,6 +102,8 @@ garrow_chunked_array_get_property(GObject *object,
static void
garrow_chunked_array_init(GArrowChunkedArray *object)
{
auto priv = GARROW_CHUNKED_ARRAY_GET_PRIVATE(object);
new(&priv->chunked_array) std::shared_ptr<arrow::ChunkedArray>;
}

static void
Expand Down Expand Up @@ -354,8 +352,6 @@ garrow_chunked_array_new_raw(std::shared_ptr<arrow::ChunkedArray> *arrow_chunked
std::shared_ptr<arrow::ChunkedArray>
garrow_chunked_array_get_raw(GArrowChunkedArray *chunked_array)
{
GArrowChunkedArrayPrivate *priv;

priv = GARROW_CHUNKED_ARRAY_GET_PRIVATE(chunked_array);
auto priv = GARROW_CHUNKED_ARRAY_GET_PRIVATE(chunked_array);
return priv->chunked_array;
}
4 changes: 3 additions & 1 deletion c_glib/arrow-glib/decimal128.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ garrow_decimal128_finalize(GObject *object)
{
auto priv = GARROW_DECIMAL128_GET_PRIVATE(object);

priv->decimal128 = nullptr;
priv->decimal128.~shared_ptr();

G_OBJECT_CLASS(garrow_decimal128_parent_class)->finalize(object);
}
Expand All @@ -86,6 +86,8 @@ garrow_decimal128_set_property(GObject *object,
static void
garrow_decimal128_init(GArrowDecimal128 *object)
{
auto priv = GARROW_DECIMAL128_GET_PRIVATE(object);
new(&priv->decimal128) std::shared_ptr<arrow::Decimal128>;
}

static void
Expand Down
12 changes: 5 additions & 7 deletions c_glib/arrow-glib/field.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ garrow_field_finalize(GObject *object)
{
auto priv = GARROW_FIELD_GET_PRIVATE(object);

priv->field = nullptr;
priv->field.~shared_ptr();

G_OBJECT_CLASS(garrow_field_parent_class)->finalize(object);
}
Expand All @@ -83,9 +83,7 @@ garrow_field_set_property(GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GArrowFieldPrivate *priv;

priv = GARROW_FIELD_GET_PRIVATE(object);
auto priv = GARROW_FIELD_GET_PRIVATE(object);

switch (prop_id) {
case PROP_FIELD:
Expand All @@ -104,6 +102,8 @@ garrow_field_set_property(GObject *object,
static void
garrow_field_init(GArrowField *object)
{
auto priv = GARROW_FIELD_GET_PRIVATE(object);
new(&priv->field) std::shared_ptr<arrow::Field>;
}

static void
Expand Down Expand Up @@ -262,8 +262,6 @@ garrow_field_new_raw(std::shared_ptr<arrow::Field> *arrow_field,
std::shared_ptr<arrow::Field>
garrow_field_get_raw(GArrowField *field)
{
GArrowFieldPrivate *priv;

priv = GARROW_FIELD_GET_PRIVATE(field);
auto priv = GARROW_FIELD_GET_PRIVATE(field);
return priv->field;
}
4 changes: 3 additions & 1 deletion c_glib/arrow-glib/input-stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ garrow_input_stream_finalize(GObject *object)
{
auto priv = GARROW_INPUT_STREAM_GET_PRIVATE(object);

priv->input_stream = nullptr;
priv->input_stream.~shared_ptr();

G_OBJECT_CLASS(garrow_input_stream_parent_class)->finalize(object);
}
Expand Down Expand Up @@ -208,6 +208,8 @@ garrow_input_stream_close(GInputStream *stream,
static void
garrow_input_stream_init(GArrowInputStream *object)
{
auto priv = GARROW_INPUT_STREAM_GET_PRIVATE(object);
new(&priv->input_stream) std::shared_ptr<arrow::io::InputStream>;
}

static void
Expand Down
4 changes: 3 additions & 1 deletion c_glib/arrow-glib/output-stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ garrow_output_stream_finalize(GObject *object)
{
auto priv = GARROW_OUTPUT_STREAM_GET_PRIVATE(object);

priv->output_stream = nullptr;
priv->output_stream.~shared_ptr();

G_OBJECT_CLASS(garrow_output_stream_parent_class)->finalize(object);
}
Expand Down Expand Up @@ -153,6 +153,8 @@ garrow_output_stream_get_property(GObject *object,
static void
garrow_output_stream_init(GArrowOutputStream *object)
{
auto priv = GARROW_OUTPUT_STREAM_GET_PRIVATE(object);
new(&priv->output_stream) std::shared_ptr<arrow::io::OutputStream>;
}

static void
Expand Down
Loading

0 comments on commit 2f38969

Please sign in to comment.