This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 4841cdaf9f GH-38979: [C++] Fix spelling (#38980)
4841cdaf9f is described below
commit 4841cdaf9f336bdcbe31aff02ebc32e218ab84db
Author: Josh Soref <[email protected]>
AuthorDate: Sun Dec 10 07:16:18 2023 -0500
GH-38979: [C++] Fix spelling (#38980)
### Rationale for this change
### What changes are included in this PR?
Spelling fixes to cpp/src/
### Are these changes tested?
### Are there any user-facing changes?
* Closes: #38979
Authored-by: Josh Soref <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
cpp/src/arrow/adapters/orc/adapter.h | 6 +++---
cpp/src/arrow/c/bridge_test.cc | 4 ++--
cpp/src/arrow/chunked_array_test.cc | 2 +-
.../arrow/compute/kernels/vector_selection_filter_internal.cc | 2 +-
cpp/src/arrow/csv/lexing_internal.h | 2 +-
cpp/src/arrow/csv/reader.cc | 2 +-
cpp/src/arrow/csv/writer_benchmark.cc | 2 +-
cpp/src/arrow/engine/substrait/extended_expression_internal.cc | 2 +-
cpp/src/arrow/engine/substrait/extension_set.h | 2 +-
cpp/src/arrow/engine/substrait/options.cc | 2 +-
cpp/src/arrow/engine/substrait/serde_test.cc | 8 ++++----
cpp/src/arrow/engine/substrait/visibility.h | 2 +-
cpp/src/arrow/extension/fixed_shape_tensor_test.cc | 4 ++--
cpp/src/arrow/field_ref_test.cc | 2 +-
cpp/src/arrow/integration/json_integration.h | 2 +-
cpp/src/arrow/io/file_benchmark.cc | 2 +-
cpp/src/arrow/io/interfaces.h | 2 +-
cpp/src/arrow/ipc/metadata_internal.cc | 2 +-
cpp/src/arrow/ipc/read_write_test.cc | 10 +++++-----
cpp/src/arrow/ipc/reader.h | 2 +-
cpp/src/arrow/json/converter_test.cc | 2 +-
cpp/src/arrow/json/reader.h | 2 +-
cpp/src/arrow/table_test.cc | 6 +++---
cpp/src/arrow/testing/util.cc | 2 +-
cpp/src/arrow/type_test.cc | 2 +-
cpp/src/generated/Schema_generated.h | 2 +-
cpp/src/skyhook/CMakeLists.txt | 2 +-
cpp/src/skyhook/protocol/rados_protocol.h | 2 +-
cpp/src/skyhook/protocol/skyhook_protocol.h | 2 +-
29 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/cpp/src/arrow/adapters/orc/adapter.h
b/cpp/src/arrow/adapters/orc/adapter.h
index 013be78600..4ffff81f35 100644
--- a/cpp/src/arrow/adapters/orc/adapter.h
+++ b/cpp/src/arrow/adapters/orc/adapter.h
@@ -138,7 +138,7 @@ class ARROW_EXPORT ORCFileReader {
/// \brief Get a stripe level record batch iterator.
///
/// Each record batch will have up to `batch_size` rows.
- /// NextStripeReader serves as a fine grained alternative to ReadStripe
+ /// NextStripeReader serves as a fine-grained alternative to ReadStripe
/// which may cause OOM issues by loading the whole stripe into memory.
///
/// Note this will only read rows for the current stripe, not the entire
@@ -151,7 +151,7 @@ class ARROW_EXPORT ORCFileReader {
/// \brief Get a stripe level record batch iterator.
///
/// Each record batch will have up to `batch_size` rows.
- /// NextStripeReader serves as a fine grained alternative to ReadStripe
+ /// NextStripeReader serves as a fine-grained alternative to ReadStripe
/// which may cause OOM issues by loading the whole stripe into memory.
///
/// Note this will only read rows for the current stripe, not the entire
@@ -256,7 +256,7 @@ class ARROW_EXPORT ORCFileReader {
int64_t GetFileLength();
/// \brief Get the serialized file tail.
- /// Usefull if another reader of the same file wants to avoid
re-reading
+ /// Useful if another reader of the same file wants to avoid
re-reading
/// the file tail. See ReadOptions.SetSerializedFileTail().
///
/// \return a string of bytes with the file tail
diff --git a/cpp/src/arrow/c/bridge_test.cc b/cpp/src/arrow/c/bridge_test.cc
index 326c67f5ec..58bbc9282c 100644
--- a/cpp/src/arrow/c/bridge_test.cc
+++ b/cpp/src/arrow/c/bridge_test.cc
@@ -3131,7 +3131,7 @@ TEST_F(TestArrayImport, RunEndEncodedWithOffset) {
REEFromJSON(ree_type, "[-2.0, -2.0, -2.0, -2.0, 3.0,
3.0, 3.0]"));
CheckImport(expected);
- // Ofsset in parent
+ // Offset in parent
FillPrimitive(AddChild(), 5, 0, 0, run_ends_buffers5);
FillPrimitive(AddChild(), 5, 0, 0, primitive_buffers_no_nulls5);
FillRunEndEncoded(5, 2);
@@ -3383,7 +3383,7 @@ TEST_F(TestArrayImport, ListError) {
}
TEST_F(TestArrayImport, ListViewNoError) {
- // Unlike with lists, importing a length-0 list-view with all buffers
ommitted is
+ // Unlike with lists, importing a length-0 list-view with all buffers
omitted is
// not an error. List-views don't need an extra offset value, so an empty
offsets
// buffer is valid in this case.
diff --git a/cpp/src/arrow/chunked_array_test.cc
b/cpp/src/arrow/chunked_array_test.cc
index 46dccaf3c6..6ca52ab46c 100644
--- a/cpp/src/arrow/chunked_array_test.cc
+++ b/cpp/src/arrow/chunked_array_test.cc
@@ -228,7 +228,7 @@ TEST_F(TestChunkedArray, Validate) {
random::RandomArrayGenerator gen(0);
- // Valid if non-empty and ommitted type
+ // Valid if non-empty and omitted type
ArrayVector arrays = {gen.Int64(50, 0, 100, 0.1), gen.Int64(50, 0, 100,
0.1)};
auto chunks_with_no_type = std::make_shared<ChunkedArray>(arrays, nullptr);
ASSERT_OK(chunks_with_no_type->ValidateFull());
diff --git a/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc
b/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc
index 4a5e579fb1..a25b04ae4f 100644
--- a/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc
+++ b/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc
@@ -171,7 +171,7 @@ class PrimitiveFilterImpl {
}
if (out_arr->buffers[0] != nullptr) {
- // May not be allocated if neither filter nor values contains nulls
+ // May be unallocated if neither filter nor values contain nulls
out_is_valid_ = out_arr->buffers[0]->mutable_data();
}
out_data_ = reinterpret_cast<T*>(out_arr->buffers[1]->mutable_data());
diff --git a/cpp/src/arrow/csv/lexing_internal.h
b/cpp/src/arrow/csv/lexing_internal.h
index 357c5716d5..b1da12750a 100644
--- a/cpp/src/arrow/csv/lexing_internal.h
+++ b/cpp/src/arrow/csv/lexing_internal.h
@@ -71,7 +71,7 @@ class BaseBloomFilter {
// For example 'b' (ASCII value 98) will set/test bit #34 in the filter.
// If the bit is set in the filter, the given character *may* be part
// of the matched characters. If the bit is unset in the filter,
- // the the given character *cannot* be part of the matched characters.
+ // the given character *cannot* be part of the matched characters.
FilterType CharFilter(uint8_t c) const {
return static_cast<FilterType>(1) << (c & kCharMask);
}
diff --git a/cpp/src/arrow/csv/reader.cc b/cpp/src/arrow/csv/reader.cc
index 30fc0bc6ac..332fad054f 100644
--- a/cpp/src/arrow/csv/reader.cc
+++ b/cpp/src/arrow/csv/reader.cc
@@ -389,7 +389,7 @@ namespace {
// The parsed batch contains a list of offsets for each of the columns so that
columns
// can be individually scanned
//
-// This operator is not re-entrant
+// This operator is not reentrant
class BlockParsingOperator {
public:
BlockParsingOperator(io::IOContext io_context, ParseOptions parse_options,
diff --git a/cpp/src/arrow/csv/writer_benchmark.cc
b/cpp/src/arrow/csv/writer_benchmark.cc
index 9bbba7ebd7..54c0f50613 100644
--- a/cpp/src/arrow/csv/writer_benchmark.cc
+++ b/cpp/src/arrow/csv/writer_benchmark.cc
@@ -109,7 +109,7 @@ void BenchmarkWriteCsv(benchmark::State& state, const
WriteOptions& options,
state.counters["null_percent"] = static_cast<double>(state.range(0));
}
-// Exercies UnQuotedColumnPopulator with integer
+// Exercises UnQuotedColumnPopulator with integer
void WriteCsvNumeric(benchmark::State& state) {
auto batch = MakeIntTestBatch(kCsvRows, kCsvCols, state.range(0));
BenchmarkWriteCsv(state, WriteOptions::Defaults(), *batch);
diff --git a/cpp/src/arrow/engine/substrait/extended_expression_internal.cc
b/cpp/src/arrow/engine/substrait/extended_expression_internal.cc
index a6401e1d0b..225901c910 100644
--- a/cpp/src/arrow/engine/substrait/extended_expression_internal.cc
+++ b/cpp/src/arrow/engine/substrait/extended_expression_internal.cc
@@ -85,7 +85,7 @@ Result<NamedExpression> ExpressionFromProto(
// expression which is not redundant.
//
// For example, if the base schema is [struct<foo:i32>, i32] and the
expression is
- // field(0) the the extended expression output names might be ["foo",
"my_expression"].
+ // field(0) the extended expression output names might be ["foo",
"my_expression"].
// The "foo" is redundant but we can verify it matches and reject if it does
not.
//
// The one exception is struct literals which have no field names. For
example, if
diff --git a/cpp/src/arrow/engine/substrait/extension_set.h
b/cpp/src/arrow/engine/substrait/extension_set.h
index d9c0af081a..0a50296044 100644
--- a/cpp/src/arrow/engine/substrait/extension_set.h
+++ b/cpp/src/arrow/engine/substrait/extension_set.h
@@ -86,7 +86,7 @@ struct ARROW_ENGINE_EXPORT IdHashEq {
/// \brief Owning storage for ids
///
/// Substrait plans may reuse URIs and names in many places. For convenience
-/// and performance Substarit ids are typically passed around as views. As we
+/// and performance Substrait ids are typically passed around as views. As we
/// convert a plan from Substrait to Arrow we need to copy these strings out of
/// the Substrait buffer and into owned storage. This class serves as that
owned
/// storage.
diff --git a/cpp/src/arrow/engine/substrait/options.cc
b/cpp/src/arrow/engine/substrait/options.cc
index 4813750767..f8e7173386 100644
--- a/cpp/src/arrow/engine/substrait/options.cc
+++ b/cpp/src/arrow/engine/substrait/options.cc
@@ -81,7 +81,7 @@ class DefaultExtensionProvider : public BaseExtensionProvider
{
rel.UnpackTo(&seg_agg_rel);
return MakeSegmentedAggregateRel(conv_opts, inputs, seg_agg_rel,
ext_set);
}
- return Status::NotImplemented("Unrecognized extension in Susbstrait plan:
",
+ return Status::NotImplemented("Unrecognized extension in Substrait plan: ",
rel.DebugString());
}
diff --git a/cpp/src/arrow/engine/substrait/serde_test.cc
b/cpp/src/arrow/engine/substrait/serde_test.cc
index 2e72ae70ed..1e771ccdd2 100644
--- a/cpp/src/arrow/engine/substrait/serde_test.cc
+++ b/cpp/src/arrow/engine/substrait/serde_test.cc
@@ -1334,7 +1334,7 @@ TEST(Substrait, GetRecordBatchReader) {
ASSERT_OK_AND_ASSIGN(auto reader, ExecuteSerializedPlan(*buf));
ASSERT_OK_AND_ASSIGN(auto table,
Table::FromRecordBatchReader(reader.get()));
// Note: assuming the binary.parquet file contains fixed amount of records
- // in case of a test failure, re-evalaute the content in the file
+ // in case of a test failure, re-evaluate the content in the file
EXPECT_EQ(table->num_rows(), 12);
});
}
@@ -4223,7 +4223,7 @@ TEST(Substrait, ReadRelWithGlobFiles) {
}
}]
})"));
- // To avoid unnecessar metadata columns being included in the final result
+ // To avoid unnecessary metadata columns being included in the final result
std::vector<int> include_columns = {0, 1, 2};
compute::SortOptions options({compute::SortKey("A",
compute::SortOrder::Ascending)});
CheckRoundTripResult(std::move(expected_table), buf,
std::move(include_columns),
@@ -6108,7 +6108,7 @@ TEST(Substrait, ExtendedExpressionSerialization) {
TEST(Substrait, ExtendedExpressionInvalidPlans) {
// The schema defines the type as {"x", "y"} but output_names has {"a", "y"}
- constexpr std::string_view kBadOuptutNames = R"(
+ constexpr std::string_view kBadOutputNames = R"(
{
"referredExpr":[
{
@@ -6159,7 +6159,7 @@ TEST(Substrait, ExtendedExpressionInvalidPlans) {
)";
ASSERT_OK_AND_ASSIGN(
- auto buf, internal::SubstraitFromJSON("ExtendedExpression",
kBadOuptutNames));
+ auto buf, internal::SubstraitFromJSON("ExtendedExpression",
kBadOutputNames));
ASSERT_THAT(DeserializeExpressions(*buf),
Raises(StatusCode::Invalid, testing::HasSubstr("Ambiguous
plan")));
diff --git a/cpp/src/arrow/engine/substrait/visibility.h
b/cpp/src/arrow/engine/substrait/visibility.h
index cfd0db2747..d81d202ee6 100644
--- a/cpp/src/arrow/engine/substrait/visibility.h
+++ b/cpp/src/arrow/engine/substrait/visibility.h
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-// TODO(westonpace): Once we have a propert engine module this file
+// TODO(westonpace): Once we have a proper engine module this file
// should be renamed arrow/engine/visibility.h
// This API is EXPERIMENTAL.
diff --git a/cpp/src/arrow/extension/fixed_shape_tensor_test.cc
b/cpp/src/arrow/extension/fixed_shape_tensor_test.cc
index b8be1edc49..2b8e703d3c 100644
--- a/cpp/src/arrow/extension/fixed_shape_tensor_test.cc
+++ b/cpp/src/arrow/extension/fixed_shape_tensor_test.cc
@@ -194,7 +194,7 @@ TEST_F(TestExtensionType, MetadataSerializationRoundtrip) {
"Invalid dim_names");
}
-TEST_F(TestExtensionType, RoudtripBatch) {
+TEST_F(TestExtensionType, RoundtripBatch) {
auto exact_ext_type =
internal::checked_pointer_cast<FixedShapeTensorType>(ext_type_);
std::vector<std::shared_ptr<Buffer>> buffers = {nullptr,
Buffer::Wrap(values_)};
@@ -383,7 +383,7 @@ TEST_F(TestExtensionType, SliceTensor) {
ASSERT_EQ(sliced->length(), partial->length());
}
-TEST_F(TestExtensionType, RoudtripBatchFromTensor) {
+TEST_F(TestExtensionType, RoundtripBatchFromTensor) {
auto exact_ext_type =
internal::checked_pointer_cast<FixedShapeTensorType>(ext_type_);
ASSERT_OK_AND_ASSIGN(auto tensor, Tensor::Make(value_type_,
Buffer::Wrap(values_),
shape_, {}, {"n", "x", "y"}));
diff --git a/cpp/src/arrow/field_ref_test.cc b/cpp/src/arrow/field_ref_test.cc
index 10e2564ed1..0cb2da4f70 100644
--- a/cpp/src/arrow/field_ref_test.cc
+++ b/cpp/src/arrow/field_ref_test.cc
@@ -135,7 +135,7 @@ struct FieldPathTestCase {
out.schema = arrow::schema({out.v0.field, out.v1.field});
out.type = struct_(out.schema->fields());
- // Create null bitmaps for the struct fields independent of its childrens'
+ // Create null bitmaps for the struct fields independent of its children's
// bitmaps. For FieldPath::GetFlattened, parent/child bitmaps should be
combined
// - for FieldPath::Get, higher-level nulls are ignored.
auto bitmap1_1 = gen.NullBitmap(kNumRows, 0.15);
diff --git a/cpp/src/arrow/integration/json_integration.h
b/cpp/src/arrow/integration/json_integration.h
index 0284ef6c89..13abfae095 100644
--- a/cpp/src/arrow/integration/json_integration.h
+++ b/cpp/src/arrow/integration/json_integration.h
@@ -40,7 +40,7 @@ class ARROW_EXPORT IntegrationJsonWriter {
/// \brief Create a new JSON writer that writes to memory
///
/// \param[in] schema the schema of record batches
- /// \return the creater writer object
+ /// \return the creator writer object
static Result<std::unique_ptr<IntegrationJsonWriter>> Open(
const std::shared_ptr<Schema>& schema);
diff --git a/cpp/src/arrow/io/file_benchmark.cc
b/cpp/src/arrow/io/file_benchmark.cc
index 7fd10a0a0e..02ccfb6337 100644
--- a/cpp/src/arrow/io/file_benchmark.cc
+++ b/cpp/src/arrow/io/file_benchmark.cc
@@ -220,7 +220,7 @@ static void BenchmarkStreamingWrites(benchmark::State&
state,
// Benchmark writing to /dev/null
//
-// This situation is irrealistic as the kernel likely doesn't
+// This situation is unrealistic as the kernel likely doesn't
// copy the data at all, so we only measure small writes.
static void FileOutputStreamSmallWritesToNull(
diff --git a/cpp/src/arrow/io/interfaces.h b/cpp/src/arrow/io/interfaces.h
index d2a11b7b6d..b36c38c6d4 100644
--- a/cpp/src/arrow/io/interfaces.h
+++ b/cpp/src/arrow/io/interfaces.h
@@ -196,7 +196,7 @@ class ARROW_EXPORT Readable {
/// EXPERIMENTAL: The IOContext associated with this file.
///
/// By default, this is the same as default_io_context(), but it may be
- /// overriden by subclasses.
+ /// overridden by subclasses.
virtual const IOContext& io_context() const;
};
diff --git a/cpp/src/arrow/ipc/metadata_internal.cc
b/cpp/src/arrow/ipc/metadata_internal.cc
index 4f41edf8e1..4154b594d9 100644
--- a/cpp/src/arrow/ipc/metadata_internal.cc
+++ b/cpp/src/arrow/ipc/metadata_internal.cc
@@ -1423,7 +1423,7 @@ Status GetSchema(const void* opaque_schema,
DictionaryMemo* dictionary_memo,
std::shared_ptr<KeyValueMetadata> metadata;
RETURN_NOT_OK(internal::GetKeyValueMetadata(schema->custom_metadata(),
&metadata));
- // set endianess using the value in flatbuf schema
+ // set endianness using the value in flatbuf schema
auto endianness = schema->endianness() == flatbuf::Endianness::Little
? Endianness::Little
: Endianness::Big;
diff --git a/cpp/src/arrow/ipc/read_write_test.cc
b/cpp/src/arrow/ipc/read_write_test.cc
index 5c15cb912e..17c4c5636d 100644
--- a/cpp/src/arrow/ipc/read_write_test.cc
+++ b/cpp/src/arrow/ipc/read_write_test.cc
@@ -140,7 +140,7 @@ TEST_P(TestMessage, SerializeTo) {
output_length);
ASSERT_OK_AND_EQ(output_length, stream->Tell());
ASSERT_OK_AND_ASSIGN(auto buffer, stream->Finish());
- // chech whether length is written in little endian
+ // check whether length is written in little endian
auto buffer_ptr = buffer.get()->data();
ASSERT_EQ(output_length - body_length - prefix_size,
bit_util::FromLittleEndian(*(uint32_t*)(buffer_ptr + 4)));
@@ -363,7 +363,7 @@ TEST_F(TestSchemaMetadata,
MetadataVersionForwardCompatibility) {
std::string root;
ASSERT_OK(GetTestResourceRoot(&root));
- // schema_v6.arrow with currently non-existent MetadataVersion::V6
+ // schema_v6.arrow with currently nonexistent MetadataVersion::V6
std::stringstream schema_v6_path;
schema_v6_path << root << "/forward-compatibility/schema_v6.arrow";
@@ -520,7 +520,7 @@ class IpcTestFixture : public io::MemoryMapFixture, public
ExtensionTypesMixin {
};
TEST(MetadataVersion, ForwardsCompatCheck) {
- // Verify UBSAN is ok with casting out of range metdata version.
+ // Verify UBSAN is ok with casting out of range metadata version.
EXPECT_LT(flatbuf::MetadataVersion::MAX,
static_cast<flatbuf::MetadataVersion>(72));
}
@@ -3019,14 +3019,14 @@ TEST(TestRecordBatchFileReaderIo,
SkipTheFieldInTheMiddle) {
GetReadRecordBatchReadRanges({0, 2}, {1, 40});
}
-TEST(TestRecordBatchFileReaderIo, ReadTwoContinousFields) {
+TEST(TestRecordBatchFileReaderIo, ReadTwoContinuousFields) {
// read the int32 field and the int64 field
// + 5 int32: 5 * 4 bytes
// + 5 int64: 5 * 8 bytes
GetReadRecordBatchReadRanges({1, 2}, {20, 40});
}
-TEST(TestRecordBatchFileReaderIo, ReadTwoContinousFieldsWithIoMerged) {
+TEST(TestRecordBatchFileReaderIo, ReadTwoContinuousFieldsWithIoMerged) {
// change the array length to 64 so that bool field and int32 are continuous
without
// padding
// read the bool field and the int32 field since the bool field's aligned
offset
diff --git a/cpp/src/arrow/ipc/reader.h b/cpp/src/arrow/ipc/reader.h
index de46060940..888f59a627 100644
--- a/cpp/src/arrow/ipc/reader.h
+++ b/cpp/src/arrow/ipc/reader.h
@@ -258,7 +258,7 @@ class ARROW_EXPORT Listener {
virtual Status OnEOS();
/// \brief Called when a record batch is decoded and
- /// OnRecordBatchWithMetadataDecoded() isn't overrided.
+ /// OnRecordBatchWithMetadataDecoded() isn't overridden.
///
/// The default implementation just returns
/// arrow::Status::NotImplemented().
diff --git a/cpp/src/arrow/json/converter_test.cc
b/cpp/src/arrow/json/converter_test.cc
index cfc44c9997..fa85e704bc 100644
--- a/cpp/src/arrow/json/converter_test.cc
+++ b/cpp/src/arrow/json/converter_test.cc
@@ -39,7 +39,7 @@ Result<std::shared_ptr<Array>>
Convert(std::shared_ptr<DataType> type,
return converted;
}
-// bool, null are trivial pass throughs
+// bool, null are trivial pass-throughs
TEST(ConverterTest, Integers) {
for (auto int_type : {int8(), int16(), int32(), int64()}) {
diff --git a/cpp/src/arrow/json/reader.h b/cpp/src/arrow/json/reader.h
index 7776cb0b7d..b7849a83ba 100644
--- a/cpp/src/arrow/json/reader.h
+++ b/cpp/src/arrow/json/reader.h
@@ -79,7 +79,7 @@ class ARROW_EXPORT StreamingReader : public RecordBatchReader
{
/// threading is disabled, this will block until completion.
virtual Future<std::shared_ptr<RecordBatch>> ReadNextAsync() = 0;
- /// Get the number of bytes which have been succesfully converted to record
batches
+ /// Get the number of bytes which have been successfully converted to record
batches
/// and consumed
[[nodiscard]] virtual int64_t bytes_processed() const = 0;
diff --git a/cpp/src/arrow/table_test.cc b/cpp/src/arrow/table_test.cc
index 3949caa402..5f6905ce67 100644
--- a/cpp/src/arrow/table_test.cc
+++ b/cpp/src/arrow/table_test.cc
@@ -179,7 +179,7 @@ TEST_F(TestTable, Equals) {
other = Table::Make(schema_, other_columns);
ASSERT_FALSE(table_->Equals(*other));
- // Differring schema metadata
+ // Differing schema metadata
other_schema = schema_->WithMetadata(::arrow::key_value_metadata({"key"},
{"value"}));
other = Table::Make(other_schema, columns_);
ASSERT_TRUE(table_->Equals(*other));
@@ -635,8 +635,8 @@ TEST_F(TestTable, SelectColumns) {
ASSERT_OK_AND_ASSIGN(auto subset, table->SelectColumns({0, 2}));
ASSERT_OK(subset->ValidateFull());
- auto expexted_schema = ::arrow::schema({schema_->field(0),
schema_->field(2)});
- auto expected = Table::Make(expexted_schema, {table->column(0),
table->column(2)});
+ auto expected_schema = ::arrow::schema({schema_->field(0),
schema_->field(2)});
+ auto expected = Table::Make(expected_schema, {table->column(0),
table->column(2)});
ASSERT_TRUE(subset->Equals(*expected));
// Out of bounds indices
diff --git a/cpp/src/arrow/testing/util.cc b/cpp/src/arrow/testing/util.cc
index e8a782575e..36351fa859 100644
--- a/cpp/src/arrow/testing/util.cc
+++ b/cpp/src/arrow/testing/util.cc
@@ -198,7 +198,7 @@ std::string GetListenAddress() {
ss << "." << byte;
}
#else
- // On MacOS, only 127.0.0.1 is a valid loopback address by default.
+ // On macOS, only 127.0.0.1 is a valid loopback address by default.
ss << "127.0.0.1";
#endif
// Append port number
diff --git a/cpp/src/arrow/type_test.cc b/cpp/src/arrow/type_test.cc
index 009e557f82..22913f77fb 100644
--- a/cpp/src/arrow/type_test.cc
+++ b/cpp/src/arrow/type_test.cc
@@ -612,7 +612,7 @@ TEST_F(TestSchema, TestMetadataConstruction) {
AssertSchemaEqual(schema2, schema1);
AssertSchemaNotEqual(schema2, schema1, /*check_metadata=*/true);
- // Field has different metatadata
+ // Field has different metadata
AssertSchemaEqual(schema2, schema3);
AssertSchemaNotEqual(schema2, schema3, /*check_metadata=*/true);
diff --git a/cpp/src/generated/Schema_generated.h
b/cpp/src/generated/Schema_generated.h
index eeeeac68f0..12ee81e674 100644
--- a/cpp/src/generated/Schema_generated.h
+++ b/cpp/src/generated/Schema_generated.h
@@ -1725,7 +1725,7 @@ inline ::flatbuffers::Offset<Time> CreateTime(
/// no indication of how to map this information to a physical point in time.
/// Naive date-times must be handled with care because of this missing
/// information, and also because daylight saving time (DST) may make
-/// some values ambiguous or non-existent. A naive date-time may be
+/// some values ambiguous or nonexistent. A naive date-time may be
/// stored as a struct with Date and Time fields. However, it may also be
/// encoded into a Timestamp column with an empty timezone. The timestamp
/// values should be computed "as if" the timezone of the date-time values
diff --git a/cpp/src/skyhook/CMakeLists.txt b/cpp/src/skyhook/CMakeLists.txt
index 0019251bd6..67fddec135 100644
--- a/cpp/src/skyhook/CMakeLists.txt
+++ b/cpp/src/skyhook/CMakeLists.txt
@@ -12,7 +12,7 @@
# 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 limitationsn
+# specific language governing permissions and limitations
# under the License.
# add the client subdirectory
diff --git a/cpp/src/skyhook/protocol/rados_protocol.h
b/cpp/src/skyhook/protocol/rados_protocol.h
index 6a0b2ea006..52b0ed4a9b 100644
--- a/cpp/src/skyhook/protocol/rados_protocol.h
+++ b/cpp/src/skyhook/protocol/rados_protocol.h
@@ -44,7 +44,7 @@ class IoCtxInterface {
/// \param[in] cls the name of the object class.
/// \param[in] method the name of the object class method.
/// \param[in] in a bufferlist to send data to the object class method.
- /// \param[in] out a bufferlist to recieve data from the object class method.
+ /// \param[in] out a bufferlist to receive data from the object class method.
arrow::Status exec(const std::string& oid, const char* cls, const char*
method,
ceph::bufferlist& in, ceph::bufferlist& out);
/// \brief Execute POSIX stat on a RADOS object.
diff --git a/cpp/src/skyhook/protocol/skyhook_protocol.h
b/cpp/src/skyhook/protocol/skyhook_protocol.h
index 37dda8ad77..4097b4efa8 100644
--- a/cpp/src/skyhook/protocol/skyhook_protocol.h
+++ b/cpp/src/skyhook/protocol/skyhook_protocol.h
@@ -101,7 +101,7 @@ class SkyhookDirectObjectAccess {
}
/// Execute an object class method. It uses the `librados::exec` api to
- /// perform object clsass method calls on the storage node and
+ /// perform object class method calls on the storage node and
/// stores the result in an output bufferlist.
arrow::Status Exec(uint64_t inode, const std::string& fn, ceph::bufferlist&
in,
ceph::bufferlist& out) {
