Skip to content

GH-47500: [C++] Add QualifierAlignment to clang-format options #47501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pitrou merged 1 commit into from
Sep 15, 2025
Merged

GH-47500: [C++] Add QualifierAlignment to clang-format options #47501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ ColumnLimit: 90
DerivePointerAlignment: false
IncludeBlocks: Preserve
IndentPPDirectives: AfterHash
QualifierAlignment: Left
2 changes: 1 addition & 1 deletion cpp/examples/parquet/low_level_api/encryption_reader_writer_all_crypto_options.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ void InteropTestReadEncryptedParquetFiles(std::string root_path) {
for (unsigned example_id = 0; example_id < vector_of_decryption_configurations.size();
++example_id) {
PrintDecryptionConfiguration(example_id + 1);
for (auto const& file : files_in_directory) {
for (const auto& file : files_in_directory) {
std::string exception_msg = "";
if (!FileNameEndsWith(file, "parquet.encrypted")) // Skip non encrypted files
continue;
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/array/builder_nested.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ template class BaseListViewBuilder<LargeListViewType>;
// MapBuilder

MapBuilder::MapBuilder(MemoryPool* pool, const std::shared_ptr<ArrayBuilder>& key_builder,
std::shared_ptr<ArrayBuilder> const& item_builder,
const std::shared_ptr<ArrayBuilder>& item_builder,
const std::shared_ptr<DataType>& type)
: ArrayBuilder(pool), key_builder_(key_builder), item_builder_(item_builder) {
auto map_type = internal::checked_cast<const MapType*>(type.get());
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/arrow/array/builder_nested.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class VarLengthListLikeBuilder : public ArrayBuilder {
/// Use this constructor to incrementally build the value array along with offsets and
/// null bitmap.
VarLengthListLikeBuilder(MemoryPool* pool,
std::shared_ptr<ArrayBuilder> const& value_builder,
const std::shared_ptr<ArrayBuilder>& value_builder,
const std::shared_ptr<DataType>& type,
int64_t alignment = kDefaultBufferAlignment)
: ArrayBuilder(pool, alignment),
Expand All @@ -60,7 +60,7 @@ class VarLengthListLikeBuilder : public ArrayBuilder {
value_field_(type->field(0)->WithType(NULLPTR)) {}

VarLengthListLikeBuilder(MemoryPool* pool,
std::shared_ptr<ArrayBuilder> const& value_builder,
const std::shared_ptr<ArrayBuilder>& value_builder,
int64_t alignment = kDefaultBufferAlignment)
: VarLengthListLikeBuilder(pool, value_builder,
std::make_shared<TYPE>(value_builder->type()),
Expand Down Expand Up @@ -647,13 +647,13 @@ class ARROW_EXPORT FixedSizeListBuilder : public ArrayBuilder {
/// Use this constructor to define the built array's type explicitly. If value_builder
/// has indeterminate type, this builder will also.
FixedSizeListBuilder(MemoryPool* pool,
std::shared_ptr<ArrayBuilder> const& value_builder,
const std::shared_ptr<ArrayBuilder>& value_builder,
int32_t list_size);

/// Use this constructor to infer the built array's type. If value_builder has
/// indeterminate type, this builder will also.
FixedSizeListBuilder(MemoryPool* pool,
std::shared_ptr<ArrayBuilder> const& value_builder,
const std::shared_ptr<ArrayBuilder>& value_builder,
const std::shared_ptr<DataType>& type);

Status Resize(int64_t capacity) override;
Expand Down
18 changes: 9 additions & 9 deletions cpp/src/arrow/compute/api_aggregate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class ExecContext;
class ARROW_EXPORT ScalarAggregateOptions : public FunctionOptions {
public:
explicit ScalarAggregateOptions(bool skip_nulls = true, uint32_t min_count = 1);
static constexpr char const kTypeName[] = "ScalarAggregateOptions";
static constexpr const char kTypeName[] = "ScalarAggregateOptions";
static ScalarAggregateOptions Defaults() { return ScalarAggregateOptions{}; }

/// If true (the default), null values are ignored. Otherwise, if any value is null,
Expand All @@ -72,7 +72,7 @@ class ARROW_EXPORT CountOptions : public FunctionOptions {
ALL,
};
explicit CountOptions(CountMode mode = CountMode::ONLY_VALID);
static constexpr char const kTypeName[] = "CountOptions";
static constexpr const char kTypeName[] = "CountOptions";
static CountOptions Defaults() { return CountOptions{}; }

CountMode mode;
Expand All @@ -85,7 +85,7 @@ class ARROW_EXPORT CountOptions : public FunctionOptions {
class ARROW_EXPORT ModeOptions : public FunctionOptions {
public:
explicit ModeOptions(int64_t n = 1, bool skip_nulls = true, uint32_t min_count = 0);
static constexpr char const kTypeName[] = "ModeOptions";
static constexpr const char kTypeName[] = "ModeOptions";
static ModeOptions Defaults() { return ModeOptions{}; }

int64_t n = 1;
Expand All @@ -103,7 +103,7 @@ class ARROW_EXPORT ModeOptions : public FunctionOptions {
class ARROW_EXPORT VarianceOptions : public FunctionOptions {
public:
explicit VarianceOptions(int ddof = 0, bool skip_nulls = true, uint32_t min_count = 0);
static constexpr char const kTypeName[] = "VarianceOptions";
static constexpr const char kTypeName[] = "VarianceOptions";
static VarianceOptions Defaults() { return VarianceOptions{}; }

int ddof = 0;
Expand All @@ -119,7 +119,7 @@ class ARROW_EXPORT SkewOptions : public FunctionOptions {
public:
explicit SkewOptions(bool skip_nulls = true, bool biased = true,
uint32_t min_count = 0);
static constexpr char const kTypeName[] = "SkewOptions";
static constexpr const char kTypeName[] = "SkewOptions";
static SkewOptions Defaults() { return SkewOptions{}; }

/// If true (the default), null values are ignored. Otherwise, if any value is null,
Expand Down Expand Up @@ -154,7 +154,7 @@ class ARROW_EXPORT QuantileOptions : public FunctionOptions {
enum Interpolation interpolation = LINEAR,
bool skip_nulls = true, uint32_t min_count = 0);

static constexpr char const kTypeName[] = "QuantileOptions";
static constexpr const char kTypeName[] = "QuantileOptions";
static QuantileOptions Defaults() { return QuantileOptions{}; }

/// probability level of quantile must be between 0 and 1 inclusive
Expand All @@ -178,7 +178,7 @@ class ARROW_EXPORT TDigestOptions : public FunctionOptions {
explicit TDigestOptions(std::vector<double> q, uint32_t delta = 100,
uint32_t buffer_size = 500, bool skip_nulls = true,
uint32_t min_count = 0);
static constexpr char const kTypeName[] = "TDigestOptions";
static constexpr const char kTypeName[] = "TDigestOptions";
static TDigestOptions Defaults() { return TDigestOptions{}; }

/// probability level of quantile must be between 0 and 1 inclusive
Expand Down Expand Up @@ -268,7 +268,7 @@ class ARROW_EXPORT PivotWiderOptions : public FunctionOptions {
UnexpectedKeyBehavior unexpected_key_behavior = kIgnore);
// Default constructor for serialization
PivotWiderOptions();
static constexpr char const kTypeName[] = "PivotWiderOptions";
static constexpr const char kTypeName[] = "PivotWiderOptions";
static PivotWiderOptions Defaults() { return PivotWiderOptions{}; }

/// The values expected in the pivot key column
Expand All @@ -283,7 +283,7 @@ class ARROW_EXPORT IndexOptions : public FunctionOptions {
explicit IndexOptions(std::shared_ptr<Scalar> value);
// Default constructor for serialization
IndexOptions();
static constexpr char const kTypeName[] = "IndexOptions";
static constexpr const char kTypeName[] = "IndexOptions";

std::shared_ptr<Scalar> value;
};
Expand Down
Loading
Loading