diff --git a/cpp/src/arrow/flight/ArrowFlightTestingConfig.cmake.in b/cpp/src/arrow/flight/ArrowFlightTestingConfig.cmake.in index f072b2603e375..3c043b05a6bd5 100644 --- a/cpp/src/arrow/flight/ArrowFlightTestingConfig.cmake.in +++ b/cpp/src/arrow/flight/ArrowFlightTestingConfig.cmake.in @@ -32,7 +32,7 @@ find_dependency(ArrowTesting) include("${CMAKE_CURRENT_LIST_DIR}/ArrowFlightTestingTargets.cmake") -arrow_keep_backward_compatibility(ArrowFlightTetsing arrow_flight_testing) +arrow_keep_backward_compatibility(ArrowFlightTesting arrow_flight_testing) check_required_components(ArrowFlightTesting) diff --git a/cpp/src/arrow/flight/client.h b/cpp/src/arrow/flight/client.h index e26a821359781..1df71d2029f74 100644 --- a/cpp/src/arrow/flight/client.h +++ b/cpp/src/arrow/flight/client.h @@ -299,7 +299,7 @@ class ARROW_FLIGHT_EXPORT FlightClient { /// \brief Request and poll a long running query /// \param[in] options Per-RPC options /// \param[in] descriptor the dataset request or a descriptor returned by a - /// prioir PollFlightInfo call + /// prior PollFlightInfo call /// \return Arrow result with the PollInfo describing the status of /// the requested query arrow::Result> PollFlightInfo( diff --git a/cpp/src/arrow/flight/cookie_internal.h b/cpp/src/arrow/flight/cookie_internal.h index 84647a1c94ca3..62c0390c585b3 100644 --- a/cpp/src/arrow/flight/cookie_internal.h +++ b/cpp/src/arrow/flight/cookie_internal.h @@ -35,14 +35,14 @@ namespace flight { namespace internal { /// \brief Case insensitive comparator for use by cookie caching map. Cookies are not -/// case sensitive. +/// case-sensitive. class ARROW_FLIGHT_EXPORT CaseInsensitiveComparator { public: bool operator()(const std::string& t1, const std::string& t2) const; }; /// \brief Case insensitive hasher for use by cookie caching map. Cookies are not -/// case sensitive. +/// case-sensitive. class ARROW_FLIGHT_EXPORT CaseInsensitiveHash { public: size_t operator()(const std::string& key) const; diff --git a/cpp/src/arrow/flight/flight_internals_test.cc b/cpp/src/arrow/flight/flight_internals_test.cc index 5feb310fc14a2..522973bec7231 100644 --- a/cpp/src/arrow/flight/flight_internals_test.cc +++ b/cpp/src/arrow/flight/flight_internals_test.cc @@ -562,7 +562,7 @@ class TestCookieParsing : public ::testing::Test { EXPECT_EQ(cookie_as_string, cookie.AsCookieString()); } - void VerifyCookieDateConverson(std::string date, const std::string& converted_date) { + void VerifyCookieDateConversion(std::string date, const std::string& converted_date) { internal::Cookie::ConvertCookieDate(&date); EXPECT_EQ(converted_date, date); } @@ -646,21 +646,21 @@ TEST_F(TestCookieParsing, ToString) { } TEST_F(TestCookieParsing, DateConversion) { - VerifyCookieDateConverson("Mon, 01 jan 2038 22:15:36 GMT;", "01 01 2038 22:15:36"); - VerifyCookieDateConverson("TUE, 10 Feb 2038 22:15:36 GMT", "10 02 2038 22:15:36"); - VerifyCookieDateConverson("WED, 20 MAr 2038 22:15:36 GMT;", "20 03 2038 22:15:36"); - VerifyCookieDateConverson("thu, 15 APR 2038 22:15:36 GMT", "15 04 2038 22:15:36"); - VerifyCookieDateConverson("Fri, 30 mAY 2038 22:15:36 GMT;", "30 05 2038 22:15:36"); - VerifyCookieDateConverson("Sat, 03 juN 2038 22:15:36 GMT", "03 06 2038 22:15:36"); - VerifyCookieDateConverson("Sun, 01 JuL 2038 22:15:36 GMT;", "01 07 2038 22:15:36"); - VerifyCookieDateConverson("Fri, 06 aUg 2038 22:15:36 GMT", "06 08 2038 22:15:36"); - VerifyCookieDateConverson("Fri, 01 SEP 2038 22:15:36 GMT;", "01 09 2038 22:15:36"); - VerifyCookieDateConverson("Fri, 01 OCT 2038 22:15:36 GMT", "01 10 2038 22:15:36"); - VerifyCookieDateConverson("Fri, 01 Nov 2038 22:15:36 GMT;", "01 11 2038 22:15:36"); - VerifyCookieDateConverson("Fri, 01 deC 2038 22:15:36 GMT", "01 12 2038 22:15:36"); - VerifyCookieDateConverson("", ""); - VerifyCookieDateConverson("Fri, 01 INVALID 2038 22:15:36 GMT;", - "01 INVALID 2038 22:15:36"); + VerifyCookieDateConversion("Mon, 01 jan 2038 22:15:36 GMT;", "01 01 2038 22:15:36"); + VerifyCookieDateConversion("TUE, 10 Feb 2038 22:15:36 GMT", "10 02 2038 22:15:36"); + VerifyCookieDateConversion("WED, 20 MAr 2038 22:15:36 GMT;", "20 03 2038 22:15:36"); + VerifyCookieDateConversion("thu, 15 APR 2038 22:15:36 GMT", "15 04 2038 22:15:36"); + VerifyCookieDateConversion("Fri, 30 mAY 2038 22:15:36 GMT;", "30 05 2038 22:15:36"); + VerifyCookieDateConversion("Sat, 03 juN 2038 22:15:36 GMT", "03 06 2038 22:15:36"); + VerifyCookieDateConversion("Sun, 01 JuL 2038 22:15:36 GMT;", "01 07 2038 22:15:36"); + VerifyCookieDateConversion("Fri, 06 aUg 2038 22:15:36 GMT", "06 08 2038 22:15:36"); + VerifyCookieDateConversion("Fri, 01 SEP 2038 22:15:36 GMT;", "01 09 2038 22:15:36"); + VerifyCookieDateConversion("Fri, 01 OCT 2038 22:15:36 GMT", "01 10 2038 22:15:36"); + VerifyCookieDateConversion("Fri, 01 Nov 2038 22:15:36 GMT;", "01 11 2038 22:15:36"); + VerifyCookieDateConversion("Fri, 01 deC 2038 22:15:36 GMT", "01 12 2038 22:15:36"); + VerifyCookieDateConversion("", ""); + VerifyCookieDateConversion("Fri, 01 INVALID 2038 22:15:36 GMT;", + "01 INVALID 2038 22:15:36"); } TEST_F(TestCookieParsing, ParseCookieAttribute) { diff --git a/cpp/src/arrow/flight/flight_test.cc b/cpp/src/arrow/flight/flight_test.cc index 020fb7b24efc3..55cc938870f85 100644 --- a/cpp/src/arrow/flight/flight_test.cc +++ b/cpp/src/arrow/flight/flight_test.cc @@ -453,7 +453,7 @@ class TestTls : public ::testing::Test { // get initialized. // https://github.com/grpc/grpc/issues/13856 // https://github.com/grpc/grpc/issues/20311 - // In general, gRPC on MacOS struggles with TLS (both in the sense + // In general, gRPC on macOS struggles with TLS (both in the sense // of thread-locals and encryption) grpc_init(); diff --git a/cpp/src/arrow/flight/integration_tests/test_integration_server.cc b/cpp/src/arrow/flight/integration_tests/test_integration_server.cc index 6f31b82d1a9f4..b301955db8f58 100644 --- a/cpp/src/arrow/flight/integration_tests/test_integration_server.cc +++ b/cpp/src/arrow/flight/integration_tests/test_integration_server.cc @@ -40,7 +40,7 @@ #include "arrow/flight/test_util.h" DEFINE_int32(port, 31337, "Server port to listen on"); -DEFINE_string(scenario, "", "Integration test senario to run"); +DEFINE_string(scenario, "", "Integration test scenario to run"); namespace arrow { namespace flight { diff --git a/cpp/src/arrow/flight/server.h b/cpp/src/arrow/flight/server.h index 6eba90c53a754..ffcffe12e3c78 100644 --- a/cpp/src/arrow/flight/server.h +++ b/cpp/src/arrow/flight/server.h @@ -226,7 +226,7 @@ class ARROW_FLIGHT_EXPORT FlightServerBase { /// \brief Shut down the server, blocking until current requests finish. /// /// Can be called from a signal handler or another thread while Serve() - /// blocks. Optionally a deadline can be set. Once the the deadline expires + /// blocks. Optionally a deadline can be set. Once the deadline expires /// server will wait until remaining running calls complete. /// /// Should only be called once. @@ -262,7 +262,7 @@ class ARROW_FLIGHT_EXPORT FlightServerBase { /// \brief Retrieve the current status of the target query /// \param[in] context The call context. /// \param[in] request the dataset request or a descriptor returned by a - /// prioir PollFlightInfo call + /// prior PollFlightInfo call /// \param[out] info the returned retry info provider /// \return Status virtual Status PollFlightInfo(const ServerCallContext& context, diff --git a/cpp/src/arrow/flight/sql/example/sqlite_server.cc b/cpp/src/arrow/flight/sql/example/sqlite_server.cc index 5e1043713295f..20b234e90ad3b 100644 --- a/cpp/src/arrow/flight/sql/example/sqlite_server.cc +++ b/cpp/src/arrow/flight/sql/example/sqlite_server.cc @@ -598,7 +598,7 @@ class SQLiteFlightSqlServer::Impl { const ServerCallContext& context, const GetPrimaryKeys& command) { std::stringstream table_query; - // The field key_name can not be recovered by the sqlite, so it is being set + // The field key_name cannot be recovered by the sqlite, so it is being set // to null following the same pattern for catalog_name and schema_name. table_query << "SELECT null as catalog_name, null as schema_name, table_name, " "name as column_name, pk as key_sequence, null as key_name\n" diff --git a/cpp/src/arrow/flight/sql/example/sqlite_statement.cc b/cpp/src/arrow/flight/sql/example/sqlite_statement.cc index 2363925660028..0305a1fa6b475 100644 --- a/cpp/src/arrow/flight/sql/example/sqlite_statement.cc +++ b/cpp/src/arrow/flight/sql/example/sqlite_statement.cc @@ -130,7 +130,7 @@ arrow::Result> SqliteStatement::GetSchema() const { if (column_decltype != NULLPTR) { ARROW_ASSIGN_OR_RAISE(data_type, GetArrowType(column_decltype)); } else { - // If it can not determine the actual column type, return a dense_union type + // If it cannot determine the actual column type, return a dense_union type // covering any type SQLite supports. data_type = GetUnknownColumnDataType(); } diff --git a/cpp/src/arrow/flight/sql/example/sqlite_type_info.h b/cpp/src/arrow/flight/sql/example/sqlite_type_info.h index a104626c0f4eb..f26ddc31e7f37 100644 --- a/cpp/src/arrow/flight/sql/example/sqlite_type_info.h +++ b/cpp/src/arrow/flight/sql/example/sqlite_type_info.h @@ -24,11 +24,11 @@ namespace flight { namespace sql { namespace example { -/// \brief Gets the harded-coded type info from Sqlite for all data types. +/// \brief Gets the hard-coded type info from Sqlite for all data types. /// \return A record batch. arrow::Result> DoGetTypeInfoResult(); -/// \brief Gets the harded-coded type info from Sqlite filtering +/// \brief Gets the hard-coded type info from Sqlite filtering /// for a specific data type. /// \return A record batch. arrow::Result> DoGetTypeInfoResult(int data_type_filter); diff --git a/cpp/src/arrow/flight/sql/server.h b/cpp/src/arrow/flight/sql/server.h index 360677c078c81..24f0aa2bd48cf 100644 --- a/cpp/src/arrow/flight/sql/server.h +++ b/cpp/src/arrow/flight/sql/server.h @@ -590,7 +590,7 @@ class ARROW_FLIGHT_SQL_EXPORT FlightSqlServerBase : public FlightServerBase { /// \brief Commit/rollback a transaction. /// \param[in] context The call context. - /// \param[in] request The tranaction. + /// \param[in] request The transaction. virtual Status EndTransaction(const ServerCallContext& context, const ActionEndTransactionRequest& request); diff --git a/cpp/src/arrow/flight/sql/types.h b/cpp/src/arrow/flight/sql/types.h index 293b1d5579ec0..b41488b68f232 100644 --- a/cpp/src/arrow/flight/sql/types.h +++ b/cpp/src/arrow/flight/sql/types.h @@ -535,7 +535,7 @@ struct ARROW_FLIGHT_SQL_EXPORT SqlInfoOptions { /// allowed for a column name. SQL_MAX_COLUMN_NAME_LENGTH = 543, - /// Retrieves a int64 value representing the the maximum number of columns + /// Retrieves a int64 value representing the maximum number of columns /// allowed in a GROUP BY clause. SQL_MAX_COLUMNS_IN_GROUP_BY = 544, @@ -846,7 +846,7 @@ struct ARROW_FLIGHT_SQL_EXPORT SqlInfoOptions { /// The level of support for Flight SQL transaction RPCs. enum SqlSupportedTransaction { - /// Unknown/not indicated/no supoprt + /// Unknown/not indicated/no support SQL_SUPPORTED_TRANSACTION_NONE = 0, /// Transactions, but not savepoints. SQL_SUPPORTED_TRANSACTION_TRANSACTION = 1, diff --git a/cpp/src/arrow/flight/types.h b/cpp/src/arrow/flight/types.h index 40a0787d14a7a..2342c758273a3 100644 --- a/cpp/src/arrow/flight/types.h +++ b/cpp/src/arrow/flight/types.h @@ -575,7 +575,7 @@ struct ARROW_FLIGHT_EXPORT SchemaResult { std::string raw_schema_; }; -/// \brief The access coordinates for retireval of a dataset, returned by +/// \brief The access coordinates for retrieval of a dataset, returned by /// GetFlightInfo class ARROW_FLIGHT_EXPORT FlightInfo { public: @@ -604,7 +604,7 @@ class ARROW_FLIGHT_EXPORT FlightInfo { /// bookkeeping /// \param[in,out] dictionary_memo for dictionary bookkeeping, will /// be modified - /// \return Arrrow result with the reconstructed Schema + /// \return Arrow result with the reconstructed Schema arrow::Result> GetSchema( ipc::DictionaryMemo* dictionary_memo) const; diff --git a/csharp/examples/FlightClientExample/Program.cs b/csharp/examples/FlightClientExample/Program.cs index f0cf6e1e862ee..8a3c170da68dc 100644 --- a/csharp/examples/FlightClientExample/Program.cs +++ b/csharp/examples/FlightClientExample/Program.cs @@ -81,7 +81,7 @@ public static async Task Main(string[] args) Console.WriteLine($"Read batch from flight server: \n {batch}") ; } - // See available comands on this server + // See available commands on this server var action_stream = client.ListActions(); Console.WriteLine("Actions:"); while (await action_stream.ResponseStream.MoveNext()) diff --git a/csharp/src/Apache.Arrow.Flight/FlightRecordBatchStreamReader.cs b/csharp/src/Apache.Arrow.Flight/FlightRecordBatchStreamReader.cs index 588127537dfeb..d21fb25f5c946 100644 --- a/csharp/src/Apache.Arrow.Flight/FlightRecordBatchStreamReader.cs +++ b/csharp/src/Apache.Arrow.Flight/FlightRecordBatchStreamReader.cs @@ -38,11 +38,11 @@ public abstract class FlightRecordBatchStreamReader : IAsyncStreamReader flightDataStream) { - _arrowReaderImplementation = new RecordBatcReaderImplementation(flightDataStream); + _arrowReaderImplementation = new RecordBatchReaderImplementation(flightDataStream); } public ValueTask Schema => _arrowReaderImplementation.ReadSchema(); @@ -53,7 +53,7 @@ internal ValueTask GetFlightDescriptor() } /// - /// Get the application metadata from the latest recieved record batch + /// Get the application metadata from the latest received record batch /// public IReadOnlyList ApplicationMetadata => _arrowReaderImplementation.ApplicationMetadata; diff --git a/csharp/src/Apache.Arrow.Flight/Internal/RecordBatcReaderImplementation.cs b/csharp/src/Apache.Arrow.Flight/Internal/RecordBatchReaderImplementation.cs similarity index 96% rename from csharp/src/Apache.Arrow.Flight/Internal/RecordBatcReaderImplementation.cs rename to csharp/src/Apache.Arrow.Flight/Internal/RecordBatchReaderImplementation.cs index 10d4d731eb9f7..be844ea58e404 100644 --- a/csharp/src/Apache.Arrow.Flight/Internal/RecordBatcReaderImplementation.cs +++ b/csharp/src/Apache.Arrow.Flight/Internal/RecordBatchReaderImplementation.cs @@ -25,13 +25,13 @@ namespace Apache.Arrow.Flight.Internal { - internal class RecordBatcReaderImplementation : ArrowReaderImplementation + internal class RecordBatchReaderImplementation : ArrowReaderImplementation { private readonly IAsyncStreamReader _flightDataStream; private FlightDescriptor _flightDescriptor; private readonly List _applicationMetadatas; - public RecordBatcReaderImplementation(IAsyncStreamReader streamReader) + public RecordBatchReaderImplementation(IAsyncStreamReader streamReader) { _flightDataStream = streamReader; _applicationMetadatas = new List(); diff --git a/csharp/src/Apache.Arrow.Flight/Internal/StreamReader.cs b/csharp/src/Apache.Arrow.Flight/Internal/StreamReader.cs index a2c3db3d340ce..b07509d9ac324 100644 --- a/csharp/src/Apache.Arrow.Flight/Internal/StreamReader.cs +++ b/csharp/src/Apache.Arrow.Flight/Internal/StreamReader.cs @@ -27,7 +27,7 @@ namespace Apache.Arrow.Flight.Internal /// This is a helper class that allows conversions from gRPC types to the Arrow types. /// It maintains the stream so data can be read as soon as possible. /// - /// In paramter from gRPC + /// In parameter from gRPC /// The arrow type returned internal class StreamReader : IAsyncStreamReader { diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-sql-glib-doc.doc-base b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-sql-glib-doc.doc-base index 74a9056ca78f4..5569fa83ed5c5 100644 --- a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-sql-glib-doc.doc-base +++ b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-sql-glib-doc.doc-base @@ -1,7 +1,7 @@ Document: arrow-flight-sql-glib Title: Apache Arrow Flight SQL GLib Reference Manual Author: The Apache Software Foundation -Abstract: Apache Arrow Flight SQL GLib provides a client-server framework to intract with SQL databases using Apache Arrow in-memory format and Apache Arrow Flight. +Abstract: Apache Arrow Flight SQL GLib provides a client-server framework to interact with SQL databases using Apache Arrow in-memory format and Apache Arrow Flight. Section: Programming Format: HTML diff --git a/docs/source/format/Flight.rst b/docs/source/format/Flight.rst index bea1c8f5e51de..73ca848b5e996 100644 --- a/docs/source/format/Flight.rst +++ b/docs/source/format/Flight.rst @@ -103,7 +103,7 @@ A client that wishes to download the data would: different endpoints may be interleaved to allow parallel fetches. Note that since some clients may ignore ``FlightInfo.ordered``, if - ordering is important and client support can not be ensured, + ordering is important and client support cannot be ensured, servers should return a single endpoint. The response also contains other metadata, like the schema, and diff --git a/format/FlightSql.proto b/format/FlightSql.proto index 3c9a719f1275f..9b5968e5306f0 100644 --- a/format/FlightSql.proto +++ b/format/FlightSql.proto @@ -551,7 +551,7 @@ enum SqlInfo { // Retrieves a int64 value representing the maximum number of characters allowed for a column name. SQL_MAX_COLUMN_NAME_LENGTH = 543; - // Retrieves a int64 value representing the the maximum number of columns allowed in a GROUP BY clause. + // Retrieves a int64 value representing the maximum number of columns allowed in a GROUP BY clause. SQL_MAX_COLUMNS_IN_GROUP_BY = 544; // Retrieves a int64 value representing the maximum number of columns allowed in an index. @@ -943,7 +943,7 @@ enum SqlSupportsConvert { /** * The JDBC/ODBC-defined type of any object. - * All the values here are the sames as in the JDBC and ODBC specs. + * All the values here are the same as in the JDBC and ODBC specs. */ enum XdbcDataType { XDBC_UNKNOWN_TYPE = 0; @@ -1023,14 +1023,14 @@ enum Nullable { NULLABILITY_NULLABLE = 1; /** - * Indicates that nullability of the fields can not be determined. + * Indicates that nullability of the fields cannot be determined. */ NULLABILITY_UNKNOWN = 2; } enum Searchable { /** - * Indicates that column can not be used in a WHERE clause. + * Indicates that column cannot be used in a WHERE clause. */ SEARCHABLE_NONE = 0; @@ -1196,7 +1196,7 @@ message CommandGetDbSchemas { * - ARROW:FLIGHT:SQL:PRECISION - Column precision/size * - ARROW:FLIGHT:SQL:SCALE - Column scale/decimal digits if applicable * - ARROW:FLIGHT:SQL:IS_AUTO_INCREMENT - "1" indicates if the column is auto incremented, "0" otherwise. - * - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case sensitive, "0" otherwise. + * - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case-sensitive, "0" otherwise. * - ARROW:FLIGHT:SQL:IS_READ_ONLY - "1" indicates if the column is read only, "0" otherwise. * - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise. * The returned data should be ordered by catalog_name, db_schema_name, table_name, then table_type, followed by table_schema if requested. @@ -1676,7 +1676,7 @@ message ActionEndSavepointRequest { * - ARROW:FLIGHT:SQL:PRECISION - Column precision/size * - ARROW:FLIGHT:SQL:SCALE - Column scale/decimal digits if applicable * - ARROW:FLIGHT:SQL:IS_AUTO_INCREMENT - "1" indicates if the column is auto incremented, "0" otherwise. - * - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case sensitive, "0" otherwise. + * - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case-sensitive, "0" otherwise. * - ARROW:FLIGHT:SQL:IS_READ_ONLY - "1" indicates if the column is read only, "0" otherwise. * - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise. * - GetFlightInfo: execute the query. @@ -1702,7 +1702,7 @@ message CommandStatementQuery { * - ARROW:FLIGHT:SQL:PRECISION - Column precision/size * - ARROW:FLIGHT:SQL:SCALE - Column scale/decimal digits if applicable * - ARROW:FLIGHT:SQL:IS_AUTO_INCREMENT - "1" indicates if the column is auto incremented, "0" otherwise. - * - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case sensitive, "0" otherwise. + * - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case-sensitive, "0" otherwise. * - ARROW:FLIGHT:SQL:IS_READ_ONLY - "1" indicates if the column is read only, "0" otherwise. * - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise. * - GetFlightInfo: execute the query. @@ -1740,7 +1740,7 @@ message TicketStatementQuery { * - ARROW:FLIGHT:SQL:PRECISION - Column precision/size * - ARROW:FLIGHT:SQL:SCALE - Column scale/decimal digits if applicable * - ARROW:FLIGHT:SQL:IS_AUTO_INCREMENT - "1" indicates if the column is auto incremented, "0" otherwise. - * - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case sensitive, "0" otherwise. + * - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case-sensitive, "0" otherwise. * - ARROW:FLIGHT:SQL:IS_READ_ONLY - "1" indicates if the column is read only, "0" otherwise. * - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise. * - DoPut: bind parameter values. All of the bound parameter sets will be executed as a single atomic execution. @@ -1755,7 +1755,7 @@ message CommandPreparedStatementQuery { /* * Represents a SQL update query. Used in the command member of FlightDescriptor - * for the the RPC call DoPut to cause the server to execute the included SQL update. + * for the RPC call DoPut to cause the server to execute the included SQL update. */ message CommandStatementUpdate { option (experimental) = true; @@ -1768,7 +1768,7 @@ message CommandStatementUpdate { /* * Represents a SQL update query. Used in the command member of FlightDescriptor - * for the the RPC call DoPut to cause the server to execute the included + * for the RPC call DoPut to cause the server to execute the included * prepared statement handle as an update. */ message CommandPreparedStatementUpdate { diff --git a/python/pyarrow/_flight.pyx b/python/pyarrow/_flight.pyx index 8fe9465a13d9c..a2ff045f256ac 100644 --- a/python/pyarrow/_flight.pyx +++ b/python/pyarrow/_flight.pyx @@ -2664,7 +2664,7 @@ cdef class TracingServerMiddlewareFactory(ServerMiddlewareFactory): cdef class ServerMiddleware(_Weakrefable): """Server-side middleware for a call, instantiated per RPC. - Methods here should be fast and must be infalliable: they should + Methods here should be fast and must be infallible: they should not raise exceptions or stall indefinitely. """ diff --git a/python/pyarrow/tests/test_flight.py b/python/pyarrow/tests/test_flight.py index bf15ad0bc4d65..9553dc2507225 100644 --- a/python/pyarrow/tests/test_flight.py +++ b/python/pyarrow/tests/test_flight.py @@ -577,7 +577,7 @@ def is_valid(self, token): def case_insensitive_header_lookup(headers, lookup_key): """Lookup the value of given key in the given headers. - The key lookup is case insensitive. + The key lookup is case-insensitive. """ for key in headers: if key.lower() == lookup_key.lower(): diff --git a/swift/ArrowFlight/Sources/ArrowFlight/FlightClient.swift b/swift/ArrowFlight/Sources/ArrowFlight/FlightClient.swift index ca505869ec774..7a572ceca5bd6 100644 --- a/swift/ArrowFlight/Sources/ArrowFlight/FlightClient.swift +++ b/swift/ArrowFlight/Sources/ArrowFlight/FlightClient.swift @@ -48,17 +48,17 @@ public class FlightClient { private func writeBatches( _ requestStream: GRPCAsyncRequestStreamWriter, descriptor: FlightDescriptor, - recordBatchs: [RecordBatch] + recordBatches: [RecordBatch] ) async throws { let writer = ArrowWriter() - switch writer.toMessage(recordBatchs[0].schema) { + switch writer.toMessage(recordBatches[0].schema) { case .success(let schemaData): try await requestStream.send( FlightData( schemaData, dataBody: Data(), flightDescriptor: descriptor).toProtocol()) - for recordBatch in recordBatchs { + for recordBatch in recordBatches { switch writer.toMessage(recordBatch) { case .success(let data): try await requestStream.send( @@ -122,14 +122,14 @@ public class FlightClient { public func doPut( _ descriptor: FlightDescriptor, - recordBatchs: [RecordBatch], + recordBatches: [RecordBatch], closure: (FlightPutResult) throws -> Void) async throws { - if recordBatchs.isEmpty { + if recordBatches.isEmpty { throw ArrowFlightError.emptyCollection } let putCall = client.makeDoPutCall() - try await writeBatches(putCall.requestStream, descriptor: descriptor, recordBatchs: recordBatchs) + try await writeBatches(putCall.requestStream, descriptor: descriptor, recordBatches: recordBatches) var closureCalled = false for try await response in putCall.responseStream { try closure(FlightPutResult(response)) @@ -158,20 +158,20 @@ public class FlightClient { public func doExchange( _ descriptor: FlightDescriptor, - recordBatchs: [RecordBatch], + recordBatches: [RecordBatch], closure: (ArrowReader.ArrowReaderResult) throws -> Void) async throws { - if recordBatchs.isEmpty { + if recordBatches.isEmpty { throw ArrowFlightError.emptyCollection } let exchangeCall = client.makeDoExchangeCall() - try await writeBatches(exchangeCall.requestStream, descriptor: descriptor, recordBatchs: recordBatchs) + try await writeBatches(exchangeCall.requestStream, descriptor: descriptor, recordBatches: recordBatches) try closure(try await readMessages(exchangeCall.responseStream)) } - public func doExchange(fligthData: FlightData, closure: (FlightData) throws -> Void) async throws { + public func doExchange(flightData: FlightData, closure: (FlightData) throws -> Void) async throws { let exchangeCall = client.makeDoExchangeCall() - try await exchangeCall.requestStream.send(fligthData.toProtocol()) + try await exchangeCall.requestStream.send(flightData.toProtocol()) exchangeCall.requestStream.finish() for try await response in exchangeCall.responseStream { try closure(FlightData(response)) diff --git a/swift/ArrowFlight/Sources/ArrowFlight/FlightSql.pb.swift b/swift/ArrowFlight/Sources/ArrowFlight/FlightSql.pb.swift index 238092266904b..18b839fcbc0cc 100644 --- a/swift/ArrowFlight/Sources/ArrowFlight/FlightSql.pb.swift +++ b/swift/ArrowFlight/Sources/ArrowFlight/FlightSql.pb.swift @@ -476,7 +476,7 @@ enum Arrow_Flight_Protocol_Sql_SqlInfo: SwiftProtobuf.Enum { /// Retrieves a int64 value representing the maximum number of characters allowed for a column name. case sqlMaxColumnNameLength // = 543 - /// Retrieves a int64 value representing the the maximum number of columns allowed in a GROUP BY clause. + /// Retrieves a int64 value representing the maximum number of columns allowed in a GROUP BY clause. case sqlMaxColumnsInGroupBy // = 544 /// Retrieves a int64 value representing the maximum number of columns allowed in an index. @@ -1816,7 +1816,7 @@ extension Arrow_Flight_Protocol_Sql_SqlSupportsConvert: CaseIterable { ///* /// The JDBC/ODBC-defined type of any object. -/// All the values here are the sames as in the JDBC and ODBC specs. +/// All the values here are the same as in the JDBC and ODBC specs. enum Arrow_Flight_Protocol_Sql_XdbcDataType: SwiftProtobuf.Enum { typealias RawValue = Int case xdbcUnknownType // = 0 @@ -2104,7 +2104,7 @@ enum Arrow_Flight_Protocol_Sql_Nullable: SwiftProtobuf.Enum { case nullabilityNullable // = 1 ///* - /// Indicates that nullability of the fields can not be determined. + /// Indicates that nullability of the fields cannot be determined. case nullabilityUnknown // = 2 case UNRECOGNIZED(Int) @@ -2149,7 +2149,7 @@ enum Arrow_Flight_Protocol_Sql_Searchable: SwiftProtobuf.Enum { typealias RawValue = Int ///* - /// Indicates that column can not be used in a WHERE clause. + /// Indicates that column cannot be used in a WHERE clause. case none // = 0 ///* @@ -2489,7 +2489,7 @@ struct Arrow_Flight_Protocol_Sql_CommandGetDbSchemas { /// - ARROW:FLIGHT:SQL:PRECISION - Column precision/size /// - ARROW:FLIGHT:SQL:SCALE - Column scale/decimal digits if applicable /// - ARROW:FLIGHT:SQL:IS_AUTO_INCREMENT - "1" indicates if the column is auto incremented, "0" otherwise. -/// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case sensitive, "0" otherwise. +/// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case-sensitive, "0" otherwise. /// - ARROW:FLIGHT:SQL:IS_READ_ONLY - "1" indicates if the column is read only, "0" otherwise. /// - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise. /// The returned data should be ordered by catalog_name, db_schema_name, table_name, then table_type, followed by table_schema if requested. @@ -3249,7 +3249,7 @@ extension Arrow_Flight_Protocol_Sql_ActionEndSavepointRequest.EndSavepoint: Case /// - ARROW:FLIGHT:SQL:PRECISION - Column precision/size /// - ARROW:FLIGHT:SQL:SCALE - Column scale/decimal digits if applicable /// - ARROW:FLIGHT:SQL:IS_AUTO_INCREMENT - "1" indicates if the column is auto incremented, "0" otherwise. -/// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case sensitive, "0" otherwise. +/// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case-sensitive, "0" otherwise. /// - ARROW:FLIGHT:SQL:IS_READ_ONLY - "1" indicates if the column is read only, "0" otherwise. /// - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise. /// - GetFlightInfo: execute the query. @@ -3290,7 +3290,7 @@ struct Arrow_Flight_Protocol_Sql_CommandStatementQuery { /// - ARROW:FLIGHT:SQL:PRECISION - Column precision/size /// - ARROW:FLIGHT:SQL:SCALE - Column scale/decimal digits if applicable /// - ARROW:FLIGHT:SQL:IS_AUTO_INCREMENT - "1" indicates if the column is auto incremented, "0" otherwise. -/// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case sensitive, "0" otherwise. +/// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case-sensitive, "0" otherwise. /// - ARROW:FLIGHT:SQL:IS_READ_ONLY - "1" indicates if the column is read only, "0" otherwise. /// - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise. /// - GetFlightInfo: execute the query. @@ -3356,7 +3356,7 @@ struct Arrow_Flight_Protocol_Sql_TicketStatementQuery { /// - ARROW:FLIGHT:SQL:PRECISION - Column precision/size /// - ARROW:FLIGHT:SQL:SCALE - Column scale/decimal digits if applicable /// - ARROW:FLIGHT:SQL:IS_AUTO_INCREMENT - "1" indicates if the column is auto incremented, "0" otherwise. -/// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case sensitive, "0" otherwise. +/// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case-sensitive, "0" otherwise. /// - ARROW:FLIGHT:SQL:IS_READ_ONLY - "1" indicates if the column is read only, "0" otherwise. /// - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise. /// - DoPut: bind parameter values. All of the bound parameter sets will be executed as a single atomic execution. @@ -3376,7 +3376,7 @@ struct Arrow_Flight_Protocol_Sql_CommandPreparedStatementQuery { /// /// Represents a SQL update query. Used in the command member of FlightDescriptor -/// for the the RPC call DoPut to cause the server to execute the included SQL update. +/// for the RPC call DoPut to cause the server to execute the included SQL update. struct Arrow_Flight_Protocol_Sql_CommandStatementUpdate { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for @@ -3404,7 +3404,7 @@ struct Arrow_Flight_Protocol_Sql_CommandStatementUpdate { /// /// Represents a SQL update query. Used in the command member of FlightDescriptor -/// for the the RPC call DoPut to cause the server to execute the included +/// for the RPC call DoPut to cause the server to execute the included /// prepared statement handle as an update. struct Arrow_Flight_Protocol_Sql_CommandPreparedStatementUpdate { // SwiftProtobuf.Message conformance is added in an extension below. See the @@ -3611,7 +3611,7 @@ extension Arrow_Flight_Protocol_Sql_ActionCancelQueryResult.CancelResult: @unche // MARK: - Extension Properties -// Swift Extensions on the exteneded Messages to add easy access to the declared +// Swift Extensions on the extended Messages to add easy access to the declared // extension fields. The names are based on the extension field name from the proto // declaration. To avoid naming collisions, the names are prefixed with the name of // the scope where the extend directive occurs. diff --git a/swift/ArrowFlight/Tests/ArrowFlightTests/FlightTest.swift b/swift/ArrowFlight/Tests/ArrowFlightTests/FlightTest.swift index db33dfc38734a..8097388c7fde1 100644 --- a/swift/ArrowFlight/Tests/ArrowFlightTests/FlightTest.swift +++ b/swift/ArrowFlight/Tests/ArrowFlightTests/FlightTest.swift @@ -278,7 +278,7 @@ public class FlightClientTester { let descriptor = FlightDescriptor(cmd: cmd.data(using: .utf8)!) let rb = try makeRecordBatch() var numCall = 0 - try await client?.doPut(descriptor, recordBatchs: [rb], closure: { _ in + try await client?.doPut(descriptor, recordBatches: [rb], closure: { _ in numCall += 1 }) @@ -289,7 +289,7 @@ public class FlightClientTester { let descriptor = FlightDescriptor(cmd: "flight_ticket".data(using: .utf8)!) let rb = try makeRecordBatch() var numCall = 0 - try await client?.doExchange(descriptor, recordBatchs: [rb], closure: { result in + try await client?.doExchange(descriptor, recordBatches: [rb], closure: { result in numCall += 1 XCTAssertEqual(result.schema?.fields.count, 3) XCTAssertEqual(result.batches[0].length, 4)