lidavidm commented on code in PR #47703:
URL: https://github.com/apache/arrow/pull/47703#discussion_r2409191555
##########
cpp/src/arrow/flight/sql/odbc/odbc_impl/accessors/main.h:
##########
Review Comment:
What is this file actually used for? I don't see it included anywhere
##########
cpp/src/arrow/flight/sql/odbc/odbc_impl/ui/dsn_configuration_window.cc:
##########
@@ -15,26 +15,28 @@
// specific language governing permissions and limitations
// under the License.
-#include
"arrow/flight/sql/odbc/flight_sql/include/flight_sql/ui/dsn_configuration_window.h"
-#include "arrow/flight/sql/odbc/flight_sql/flight_sql_connection.h"
+#include "arrow/flight/sql/odbc/odbc_impl/ui/dsn_configuration_window.h"
+
+#include "arrow/flight/sql/odbc/odbc_impl/flight_sql_connection.h"
+#include "arrow/flight/sql/odbc/odbc_impl/util.h"
#include <Shlwapi.h>
#include <Windowsx.h>
-#include
<arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/utils.h>
#include <commctrl.h>
#include <commdlg.h>
#include <sql.h>
#include <sstream>
-#include
"arrow/flight/sql/odbc/flight_sql/include/flight_sql/ui/add_property_window.h"
+#include "arrow/flight/sql/odbc/odbc_impl/ui/add_property_window.h"
#define COMMON_TAB 0
#define ADVANCED_TAB 1
namespace {
-std::string TestConnection(const driver::flight_sql::config::Configuration&
config) {
- std::unique_ptr<driver::flight_sql::FlightSqlConnection> flight_sql_conn(
- new
driver::flight_sql::FlightSqlConnection(driver::odbcabstraction::V_3));
+std::string TestConnection(
+ const arrow::flight::sql::odbc::config::Configuration& config) {
+ std::unique_ptr<arrow::flight::sql::odbc::FlightSqlConnection>
flight_sql_conn(
+ new
arrow::flight::sql::odbc::FlightSqlConnection(arrow::flight::sql::odbc::V_3));
Review Comment:
Same here; just nest the anonymous namespace under the arrow one and then
you can avoid these long names
##########
cpp/src/arrow/flight/sql/odbc/odbc_impl/accessors/date_array_accessor.cc:
##########
@@ -33,25 +35,19 @@ int64_t convertDate(typename T::value_type value) {
/// \return the converted value in seconds.
template <>
int64_t convertDate<Date64Array>(int64_t value) {
- return value / driver::odbcabstraction::MILLI_TO_SECONDS_DIVISOR;
+ return value / arrow::flight::sql::odbc::MILLI_TO_SECONDS_DIVISOR;
Review Comment:
You could nest the anonymous namespace under the `arrow::flight::sql::odbc`
one and avoid the namespacing here. (Also, it should be `ConvertDate`.)
##########
cpp/src/arrow/flight/sql/odbc/odbc_impl/accessors/binary_array_accessor_test.cc:
##########
@@ -15,35 +15,32 @@
// specific language governing permissions and limitations
// under the License.
-#include "arrow/flight/sql/odbc/flight_sql/accessors/binary_array_accessor.h"
+#include "arrow/flight/sql/odbc/odbc_impl/accessors/binary_array_accessor.h"
#include "arrow/testing/builder.h"
#include "arrow/testing/gtest_util.h"
#include "gtest/gtest.h"
-namespace driver {
-namespace flight_sql {
-
-using arrow::BinaryType;
-using odbcabstraction::OdbcVersion;
+namespace arrow::flight::sql::odbc {
using arrow::ArrayFromVector;
+using arrow::BinaryType;
Review Comment:
These `using` statements should be unnecessary now that you're under an
`arrow::` namespace.
##########
cpp/src/arrow/flight/sql/odbc/odbc_impl/accessors/binary_array_accessor_test.cc:
##########
@@ -15,35 +15,32 @@
// specific language governing permissions and limitations
// under the License.
-#include "arrow/flight/sql/odbc/flight_sql/accessors/binary_array_accessor.h"
+#include "arrow/flight/sql/odbc/odbc_impl/accessors/binary_array_accessor.h"
#include "arrow/testing/builder.h"
#include "arrow/testing/gtest_util.h"
#include "gtest/gtest.h"
-namespace driver {
-namespace flight_sql {
-
-using arrow::BinaryType;
-using odbcabstraction::OdbcVersion;
+namespace arrow::flight::sql::odbc {
using arrow::ArrayFromVector;
+using arrow::BinaryType;
Review Comment:
(This appears to apply to many of the files in this PR so I won't point it
out every time.)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
