Skip to content

Commit dda37df

Browse files
alinaliBQalinaliBQ
committed
cpplint lint fix
1 parent 1691897 commit dda37df

File tree

57 files changed

+972
-726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+972
-726
lines changed

‎cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/binary_array_accessor.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
namespace driver {
2525
namespace flight_sql {
2626

27-
using namespace arrow;
28-
using namespace odbcabstraction;
27+
using arrow::BinaryArray;
28+
using odbcabstraction::RowStatus;
2929

3030
namespace {
3131

@@ -71,7 +71,8 @@ BinaryArrayFlightSqlAccessor<TARGET_TYPE>::BinaryArrayFlightSqlAccessor(Array* a
7171
BinaryArrayFlightSqlAccessor<TARGET_TYPE>>(array) {}
7272

7373
template <>
74-
RowStatus BinaryArrayFlightSqlAccessor<CDataType_BINARY>::MoveSingleCell_impl(
74+
RowStatus
75+
BinaryArrayFlightSqlAccessor<odbcabstraction::CDataType_BINARY>::MoveSingleCell_impl(
7576
ColumnBinding* binding, int64_t arrow_row, int64_t i, int64_t& value_offset,
7677
bool update_value_offset, odbcabstraction::Diagnostics& diagnostics) {
7778
return MoveSingleCellToBinaryBuffer(binding, this->GetArray(), arrow_row, i,

‎cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/binary_array_accessor.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
namespace driver {
2525
namespace flight_sql {
2626

27-
using namespace arrow;
28-
using namespace odbcabstraction;
27+
using arrow::BinaryArray;
28+
using odbcabstraction::RowStatus;
2929

3030
template <CDataType TARGET_TYPE>
3131
class BinaryArrayFlightSqlAccessor

‎cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/binary_array_accessor_test.cc‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,24 @@
2323
namespace driver {
2424
namespace flight_sql {
2525

26-
using namespace arrow;
27-
using namespace odbcabstraction;
26+
using arrow::BinaryType;
27+
using odbcabstraction::OdbcVersion;
28+
29+
using arrow::ArrayFromVector;
2830

2931
TEST(BinaryArrayAccessor, Test_CDataType_BINARY_Basic) {
3032
std::vector<std::string> values = {"foo", "barx", "baz123"};
3133
std::shared_ptr<Array> array;
3234
ArrayFromVector<BinaryType, std::string>(values, &array);
3335

34-
BinaryArrayFlightSqlAccessor<CDataType_BINARY> accessor(array.get());
36+
BinaryArrayFlightSqlAccessor<odbcabstraction::CDataType_BINARY> accessor(array.get());
3537

3638
size_t max_strlen = 64;
3739
std::vector<char> buffer(values.size() * max_strlen);
3840
std::vector<ssize_t> strlen_buffer(values.size());
3941

40-
ColumnBinding binding(CDataType_BINARY, 0, 0, buffer.data(), max_strlen,
41-
strlen_buffer.data());
42+
ColumnBinding binding(odbcabstraction::CDataType_BINARY, 0, 0, buffer.data(),
43+
max_strlen, strlen_buffer.data());
4244

4345
int64_t value_offset = 0;
4446
odbcabstraction::Diagnostics diagnostics("Foo", "Foo", OdbcVersion::V_3);
@@ -61,14 +63,14 @@ TEST(BinaryArrayAccessor, Test_CDataType_BINARY_Truncation) {
6163
std::shared_ptr<Array> array;
6264
ArrayFromVector<BinaryType, std::string>(values, &array);
6365

64-
BinaryArrayFlightSqlAccessor<CDataType_BINARY> accessor(array.get());
66+
BinaryArrayFlightSqlAccessor<odbcabstraction::CDataType_BINARY> accessor(array.get());
6567

6668
size_t max_strlen = 8;
6769
std::vector<char> buffer(values.size() * max_strlen);
6870
std::vector<ssize_t> strlen_buffer(values.size());
6971

70-
ColumnBinding binding(CDataType_BINARY, 0, 0, buffer.data(), max_strlen,
71-
strlen_buffer.data());
72+
ColumnBinding binding(odbcabstraction::CDataType_BINARY, 0, 0, buffer.data(),
73+
max_strlen, strlen_buffer.data());
7274

7375
std::stringstream ss;
7476
int64_t value_offset = 0;

‎cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/boolean_array_accessor.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
namespace driver {
2121
namespace flight_sql {
2222

23-
using namespace arrow;
24-
using namespace odbcabstraction;
23+
using arrow::BooleanArray;
24+
using odbcabstraction::RowStatus;
2525

2626
template <CDataType TARGET_TYPE>
2727
BooleanArrayFlightSqlAccessor<TARGET_TYPE>::BooleanArrayFlightSqlAccessor(Array* array)

‎cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/boolean_array_accessor.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
namespace driver {
2626
namespace flight_sql {
2727

28-
using namespace arrow;
29-
using namespace odbcabstraction;
28+
using arrow::BooleanArray;
29+
using odbcabstraction::RowStatus;
3030

3131
template <CDataType TARGET_TYPE>
3232
class BooleanArrayFlightSqlAccessor

‎cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/boolean_array_accessor_test.cc‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,23 @@
2222
namespace driver {
2323
namespace flight_sql {
2424

25-
using namespace arrow;
26-
using namespace odbcabstraction;
25+
using arrow::BooleanType;
26+
using odbcabstraction::OdbcVersion;
27+
28+
using arrow::ArrayFromVector;
2729

2830
TEST(BooleanArrayFlightSqlAccessor, Test_BooleanArray_CDataType_BIT) {
2931
const std::vector<bool> values = {true, false, true};
3032
std::shared_ptr<Array> array;
3133
ArrayFromVector<BooleanType>(values, &array);
3234

33-
BooleanArrayFlightSqlAccessor<CDataType_BIT> accessor(array.get());
35+
BooleanArrayFlightSqlAccessor<odbcabstraction::CDataType_BIT> accessor(array.get());
3436

3537
std::vector<char> buffer(values.size());
3638
std::vector<ssize_t> strlen_buffer(values.size());
3739

38-
ColumnBinding binding(CDataType_BIT, 0, 0, buffer.data(), 0, strlen_buffer.data());
40+
ColumnBinding binding(odbcabstraction::CDataType_BIT, 0, 0, buffer.data(), 0,
41+
strlen_buffer.data());
3942

4043
int64_t value_offset = 0;
4144
odbcabstraction::Diagnostics diagnostics("Foo", "Foo", OdbcVersion::V_3);

‎cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/common.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
namespace driver {
2929
namespace flight_sql {
3030

31-
using namespace arrow;
32-
using namespace odbcabstraction;
33-
3431
template <typename ARRAY_TYPE>
3532
inline size_t CopyFromArrayValuesToBinding(ARRAY_TYPE* array, ColumnBinding* binding,
3633
int64_t starting_row, int64_t cells) {
@@ -40,7 +37,7 @@ inline size_t CopyFromArrayValuesToBinding(ARRAY_TYPE* array, ColumnBinding* bin
4037
for (int64_t i = 0; i < cells; ++i) {
4138
int64_t current_row = starting_row + i;
4239
if (array->IsNull(current_row)) {
43-
binding->strlen_buffer[i] = NULL_DATA;
40+
binding->strlen_buffer[i] = odbcabstraction::NULL_DATA;
4441
} else {
4542
binding->strlen_buffer[i] = element_size;
4643
}

‎cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/date_array_accessor.cc‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
#include "arrow/compute/api.h"
2121
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/calendar_utils.h"
2222

23-
using namespace arrow;
23+
using arrow::Date32Array;
24+
using arrow::Date64Array;
2425

2526
namespace {
2627
template <typename T>
@@ -33,22 +34,25 @@ int64_t convertDate(typename T::value_type value) {
3334
/// \return the converted value in seconds.
3435
template <>
3536
int64_t convertDate<Date64Array>(int64_t value) {
36-
return value / driver::flight_sql::MILLI_TO_SECONDS_DIVISOR;
37+
return value / driver::odbcabstraction::MILLI_TO_SECONDS_DIVISOR;
3738
}
3839

3940
/// Converts the value from the array, which is in days, to seconds.
4041
/// \param value the value extracted from the array in days.
4142
/// \return the converted value in seconds.
4243
template <>
4344
int64_t convertDate<Date32Array>(int32_t value) {
44-
return value * driver::flight_sql::DAYS_TO_SECONDS_MULTIPLIER;
45+
return value * driver::odbcabstraction::DAYS_TO_SECONDS_MULTIPLIER;
4546
}
4647
} // namespace
4748

4849
namespace driver {
4950
namespace flight_sql {
5051

51-
using namespace odbcabstraction;
52+
using odbcabstraction::DATE_STRUCT;
53+
using odbcabstraction::RowStatus;
54+
55+
using odbcabstraction::GetTimeForSecondsSinceEpoch;
5256

5357
template <CDataType TARGET_TYPE, typename ARROW_ARRAY>
5458
DateArrayFlightSqlAccessor<TARGET_TYPE, ARROW_ARRAY>::DateArrayFlightSqlAccessor(

‎cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/date_array_accessor.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
namespace driver {
2525
namespace flight_sql {
2626

27-
using namespace arrow;
28-
using namespace odbcabstraction;
27+
using arrow::Array;
28+
using odbcabstraction::RowStatus;
2929

3030
template <CDataType TARGET_TYPE, typename ARROW_ARRAY>
3131
class DateArrayFlightSqlAccessor

‎cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/date_array_accessor_test.cc‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,33 @@
2424
namespace driver {
2525
namespace flight_sql {
2626

27-
using namespace arrow;
28-
using namespace odbcabstraction;
27+
using arrow::Date32Array;
28+
using arrow::Date32Type;
29+
using arrow::Date64Array;
30+
using arrow::Date64Type;
31+
using arrow::NumericArray;
32+
33+
using odbcabstraction::DATE_STRUCT;
34+
using odbcabstraction::OdbcVersion;
35+
using odbcabstraction::tagDATE_STRUCT;
36+
37+
using arrow::ArrayFromVector;
38+
using odbcabstraction::GetTimeForSecondsSinceEpoch;
2939

3040
TEST(DateArrayAccessor, Test_Date32Array_CDataType_DATE) {
3141
std::vector<int32_t> values = {7589, 12320, 18980, 19095};
3242

3343
std::shared_ptr<Array> array;
3444
ArrayFromVector<Date32Type, int32_t>(values, &array);
3545

36-
DateArrayFlightSqlAccessor<CDataType_DATE, Date32Array> accessor(
46+
DateArrayFlightSqlAccessor<odbcabstraction::CDataType_DATE, Date32Array> accessor(
3747
dynamic_cast<NumericArray<Date32Type>*>(array.get()));
3848

3949
std::vector<tagDATE_STRUCT> buffer(values.size());
4050
std::vector<ssize_t> strlen_buffer(values.size());
4151

42-
ColumnBinding binding(CDataType_DATE, 0, 0, buffer.data(), 0, strlen_buffer.data());
52+
ColumnBinding binding(odbcabstraction::CDataType_DATE, 0, 0, buffer.data(), 0,
53+
strlen_buffer.data());
4354

4455
int64_t value_offset = 0;
4556
odbcabstraction::Diagnostics diagnostics("Foo", "Foo", OdbcVersion::V_3);
@@ -66,13 +77,14 @@ TEST(DateArrayAccessor, Test_Date64Array_CDataType_DATE) {
6677
std::shared_ptr<Array> array;
6778
ArrayFromVector<Date64Type, int64_t>(values, &array);
6879

69-
DateArrayFlightSqlAccessor<CDataType_DATE, Date64Array> accessor(
80+
DateArrayFlightSqlAccessor<odbcabstraction::CDataType_DATE, Date64Array> accessor(
7081
dynamic_cast<NumericArray<Date64Type>*>(array.get()));
7182

7283
std::vector<tagDATE_STRUCT> buffer(values.size());
7384
std::vector<ssize_t> strlen_buffer(values.size());
7485

75-
ColumnBinding binding(CDataType_DATE, 0, 0, buffer.data(), 0, strlen_buffer.data());
86+
ColumnBinding binding(odbcabstraction::CDataType_DATE, 0, 0, buffer.data(), 0,
87+
strlen_buffer.data());
7688

7789
int64_t value_offset = 0;
7890
odbcabstraction::Diagnostics diagnostics("Foo", "Foo", OdbcVersion::V_3);

0 commit comments

Comments
 (0)