Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
717cfc7
call_function() internally unbox to the right R6 class
romainfrancois Sep 24, 2020
eb92a97
no need for result_class at all actually
romainfrancois Sep 24, 2020
60faf23
Update r/src/arrow_cpp11.h
romainfrancois Sep 25, 2020
1bcb72d
Update r/src/arrow_cpp11.h
romainfrancois Sep 25, 2020
d08c54d
match_arrow.ChunkedArray() is the same as match_arrow.Array()
romainfrancois Sep 25, 2020
9b43ba3
Ops.ChunkedArray <- Ops.Array
romainfrancois Sep 25, 2020
bec386e
started to skip using shared_ptr() R function by making the R6 object…
romainfrancois Sep 25, 2020
888daf9
forward declare classes instead of include api.h
romainfrancois Sep 25, 2020
3e0f501
simplify R6_HANDLE macro
romainfrancois Oct 6, 2020
bea74ba
rebase
romainfrancois Oct 6, 2020
351c199
using experimental cpp11::r6
romainfrancois Oct 7, 2020
5b9e2b9
- shared_ptr on the R side
romainfrancois Oct 8, 2020
d2f598e
You don't need a ; after a } [readability/braces] [4]
romainfrancois Oct 9, 2020
ff20e20
dispatch FileSystem
romainfrancois Oct 9, 2020
17acc8b
replace only (undocumented) use of glue with paste0()
romainfrancois Oct 9, 2020
992f6f3
finish rebase
romainfrancois Oct 28, 2020
43a99d1
attempt to release memory early
romainfrancois Oct 9, 2020
2ed53a6
simplify default invalidate() and use super$invalidate() where needed
romainfrancois Oct 28, 2020
5639d3d
Update r/R/filesystem.R
romainfrancois Oct 29, 2020
0bd9dc7
Clean up rebase
nealrichardson Oct 29, 2020
5173591
Final(?) cleanups
nealrichardson Oct 29, 2020
bed4adf
lint
nealrichardson Oct 29, 2020
2f57f6b
remove DataType$children() and DataType$num_children()
romainfrancois Oct 30, 2020
28982a7
lint after rebase
romainfrancois Oct 30, 2020
9f731c6
automatic shared_ptr<> -> R6
romainfrancois Nov 2, 2020
ac96d76
simplified to_r_list() for the most used case
romainfrancois Nov 2, 2020
65eae80
Update r/src/arrow_cpp11.h
romainfrancois Nov 10, 2020
2009403
Update r/src/arrow_cpp11.h
romainfrancois Nov 10, 2020
ea30dab
back to returning the real class, std::shared_ptr<...> instead of the…
romainfrancois Nov 10, 2020
799fecc
remove R6 catch-all class
romainfrancois Nov 10, 2020
03e05c0
remove unnecessary declarations
romainfrancois Nov 10, 2020
17b0ef6
DEFAULT_R6_CLASS_NAME(fs::S3FileSystem, "S3FileSystem")
romainfrancois Nov 10, 2020
4c462c9
add an explicit check for an R6 class definition
bkietz Nov 10, 2020
e88fb82
refactor r6_class_name to a trait struct
bkietz Nov 10, 2020
6a3632a
some diff scrubbing
bkietz Nov 10, 2020
ae60ba1
amend return types
bkietz Nov 10, 2020
8ffe1b8
one last test
bkietz Nov 10, 2020
1895b9a
More forward declarations in C++
bkietz Nov 11, 2020
2074be0
delete arrow_exports.h
bkietz Nov 11, 2020
1de18f1
also forward declare compression and c abi classes
bkietz Nov 11, 2020
c444282
adjust for msvc
bkietz Nov 11, 2020
9ef91fb
parquet: more explicit ::arrow
bkietz Nov 11, 2020
2c3dd42
parquet: more explicit ::arrow
bkietz Nov 11, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cpp/src/arrow/compute/type_fwd.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ struct Datum;

namespace compute {

struct CastOptions;

class ExecContext;
class KernelContext;

Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/csv/options.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <unordered_map>
#include <vector>

#include "arrow/csv/type_fwd.h"
#include "arrow/util/visibility.h"

namespace arrow {
Expand Down
27 changes: 27 additions & 0 deletions cpp/src/arrow/csv/type_fwd.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

namespace arrow {
namespace csv {

class TableReader;
struct ConvertOptions;
struct ReadOptions;
struct ParseOptions;

} // namespace csv
} // namespace arrow
6 changes: 5 additions & 1 deletion cpp/src/arrow/dataset/type_fwd.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ class ExecContext;
namespace dataset {

class Dataset;
class DatasetFactory;
using DatasetVector = std::vector<std::shared_ptr<Dataset>>;

class UnionDataset;
class DatasetFactory;
class UnionDatasetFactory;

class Fragment;
using FragmentIterator = Iterator<std::shared_ptr<Fragment>>;
Expand All @@ -51,6 +52,7 @@ class FileFragment;
class FileWriter;
class FileWriteOptions;
class FileSystemDataset;
class FileSystemDatasetFactory;
struct FileSystemDatasetWriteOptions;

class InMemoryDataset;
Expand All @@ -77,6 +79,8 @@ const std::shared_ptr<Expression>& scalar(bool);
class Partitioning;
class PartitioningFactory;
class PartitioningOrFactory;
class DirectoryPartitioning;
class HivePartitioning;

struct ScanContext;

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/ipc/feather.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ struct ARROW_EXPORT WriteProperties {
Compression::type compression = Compression::UNCOMPRESSED;

/// Compressor-specific compression level
int compression_level = Compression::kUseDefaultCompressionLevel;
int compression_level = ::arrow::util::kUseDefaultCompressionLevel;
};

ARROW_EXPORT
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/json/options.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <cstdint>
#include <memory>

#include "arrow/json/type_fwd.h"
#include "arrow/util/visibility.h"

namespace arrow {
Expand Down
26 changes: 26 additions & 0 deletions cpp/src/arrow/json/type_fwd.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

namespace arrow {
namespace json {

class TableReader;
struct ReadOptions;
struct ParseOptions;

} // namespace json
} // namespace arrow
22 changes: 2 additions & 20 deletions cpp/src/arrow/util/compression.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,13 @@

#include "arrow/result.h"
#include "arrow/status.h"
#include "arrow/util/type_fwd.h"
#include "arrow/util/visibility.h"

namespace arrow {

struct Compression {
/// \brief Compression algorithm
enum type {
UNCOMPRESSED,
SNAPPY,
GZIP,
BROTLI,
ZSTD,
LZ4,
LZ4_FRAME,
LZO,
BZ2,
LZ4_HADOOP
};

static constexpr int kUseDefaultCompressionLevel = std::numeric_limits<int>::min();
};

namespace util {

constexpr int kUseDefaultCompressionLevel = Compression::kUseDefaultCompressionLevel;
constexpr int kUseDefaultCompressionLevel = std::numeric_limits<int>::min();

/// \brief Streaming compressor interface
///
Expand Down
25 changes: 25 additions & 0 deletions cpp/src/arrow/util/type_fwd.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,36 @@ namespace arrow {
template <typename T>
class Future;

class TimestampParser;

namespace internal {

class Executor;
class TaskGroup;
class ThreadPool;

} // namespace internal

struct Compression {
/// \brief Compression algorithm
enum type {
UNCOMPRESSED,
SNAPPY,
GZIP,
BROTLI,
ZSTD,
LZ4,
LZ4_FRAME,
LZO,
BZ2,
LZ4_HADOOP
};
};

namespace util {
class Compressor;
class Decompressor;
class Codec;
} // namespace util

} // namespace arrow
2 changes: 1 addition & 1 deletion cpp/src/parquet/arrow/generate_fuzz_corpus.cc
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,4 @@ int Main(int argc, char** argv) {

} // namespace arrow

int main(int argc, char** argv) { return arrow::Main(argc, argv); }
int main(int argc, char** argv) { return ::arrow::Main(argc, argv); }
4 changes: 2 additions & 2 deletions cpp/src/parquet/arrow/schema_internal.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include "arrow/type.h"

using ArrowType = arrow::DataType;
using ArrowTypeId = arrow::Type;
using ArrowType = ::arrow::DataType;
using ArrowTypeId = ::arrow::Type;
using ParquetType = parquet::Type;

namespace parquet {
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/parquet/column_writer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@ class TypedColumnWriterImpl : public ColumnWriterImpl, public TypedColumnWriter<
if (maybe_parent_nulls) {
ARROW_ASSIGN_OR_RAISE(
bits_buffer_,
arrow::AllocateResizableBuffer(
::arrow::AllocateResizableBuffer(
BitUtil::BytesForBits(properties_->write_batch_size()), ctx->memory_pool));
bits_buffer_->ZeroPadding();
}
Expand Down Expand Up @@ -1304,7 +1304,7 @@ class TypedColumnWriterImpl : public ColumnWriterImpl, public TypedColumnWriter<

Result<std::shared_ptr<Array>> MaybeReplaceValidity(std::shared_ptr<Array> array,
int64_t new_null_count,
arrow::MemoryPool* memory_pool) {
::arrow::MemoryPool* memory_pool) {
if (bits_buffer_ == nullptr) {
return array;
}
Expand All @@ -1320,7 +1320,7 @@ class TypedColumnWriterImpl : public ColumnWriterImpl, public TypedColumnWriter<
RETURN_NOT_OK(::arrow::VisitArrayInline(*array, &slicer));
buffers[1] = slicer.buffer_;
}
return arrow::MakeArray(std::make_shared<ArrayData>(
return ::arrow::MakeArray(std::make_shared<ArrayData>(
array->type(), array->length(), std::move(buffers), new_null_count));
}

Expand Down Expand Up @@ -1462,7 +1462,7 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
auto WriteIndicesChunk = [&](int64_t offset, int64_t batch_size) {
int64_t batch_num_values = 0;
int64_t batch_num_spaced_values = 0;
int64_t null_count = arrow::kUnknownNullCount;
int64_t null_count = ::arrow::kUnknownNullCount;
// Bits is not null for nullable values. At this point in the code we can't determine
// if the leaf array has the same null values as any parents it might have had so we
// need to recompute it from def levels.
Expand Down
Loading