Skip to content

feat(c/driver_manager): polyfill numeric options for 1.0 drivers #4774

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
lidavidm merged 2 commits into from
Oct 5, 2026
+294 −2
Merged

feat(c/driver_manager): polyfill numeric options for 1.0 drivers #4774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a776ad6
feat(c/driver-manager): polyfill numeric options for 1.0 drivers
emecii Sep 10, 2026
2022a37
chore(c/driver-manager): remove redundant numeric option comment
emecii Sep 21, 2026
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
64 changes: 63 additions & 1 deletion c/driver_manager/adbc_driver_manager_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
#include <cassert>
#include <cerrno>
#include <cstring>
#include <iomanip>
#include <limits>
#include <locale>
#include <sstream>
#include <string>
#include <unordered_map>
#include <utility>
Expand Down Expand Up @@ -404,6 +408,52 @@ AdbcStatusCode StatementSetOptionDouble(struct AdbcStatement* statement, const c
return ADBC_STATUS_NOT_IMPLEMENTED;
}

template <typename Object, typename Value, typename Setter>
AdbcStatusCode SetNumericOptionAsString(Object* object, const char* key, Value value,
struct AdbcError* error, Setter setter) {
std::ostringstream text;
text.imbue(std::locale::classic());
text << std::setprecision(std::numeric_limits<double>::max_digits10) << value;
return setter(object, key, text.str().c_str(), error);
}

AdbcStatusCode DatabaseSetOptionIntLegacy(AdbcDatabase* database, const char* key,
int64_t value, AdbcError* error) {
return SetNumericOptionAsString(database, key, value, error,
database->private_driver->DatabaseSetOption);
}

AdbcStatusCode DatabaseSetOptionDoubleLegacy(AdbcDatabase* database, const char* key,
double value, AdbcError* error) {
return SetNumericOptionAsString(database, key, value, error,
database->private_driver->DatabaseSetOption);
}

AdbcStatusCode ConnectionSetOptionIntLegacy(AdbcConnection* connection, const char* key,
int64_t value, AdbcError* error) {
return SetNumericOptionAsString(connection, key, value, error,
connection->private_driver->ConnectionSetOption);
}

AdbcStatusCode ConnectionSetOptionDoubleLegacy(AdbcConnection* connection,
const char* key, double value,
AdbcError* error) {
return SetNumericOptionAsString(connection, key, value, error,
connection->private_driver->ConnectionSetOption);
}

AdbcStatusCode StatementSetOptionIntLegacy(AdbcStatement* statement, const char* key,
int64_t value, AdbcError* error) {
return SetNumericOptionAsString(statement, key, value, error,
statement->private_driver->StatementSetOption);
}

AdbcStatusCode StatementSetOptionDoubleLegacy(AdbcStatement* statement, const char* key,
double value, AdbcError* error) {
return SetNumericOptionAsString(statement, key, value, error,
statement->private_driver->StatementSetOption);
}

AdbcStatusCode StatementSetSqlQuery(struct AdbcStatement*, const char*,
struct AdbcError* error) {
SetError(error, "AdbcStatementSetSqlQuery not implemented");
Expand Down Expand Up @@ -1475,10 +1525,14 @@ AdbcStatusCode AdbcLoadDriverFromInitFunc(AdbcDriverInitFunc init_func, int vers
// succession with the underlying driver until we find one that's
// accepted.
AdbcStatusCode result = ADBC_STATUS_NOT_IMPLEMENTED;
int negotiated_version = version;
for (const int try_version : kSupportedVersions) {
if (try_version > version) continue;
result = init_func(try_version, raw_driver, error);
if (result != ADBC_STATUS_NOT_IMPLEMENTED) break;
if (result != ADBC_STATUS_NOT_IMPLEMENTED) {
negotiated_version = try_version;
break;
}
}
if (result != ADBC_STATUS_OK) {
return result;
Expand Down Expand Up @@ -1517,6 +1571,14 @@ AdbcStatusCode AdbcLoadDriverFromInitFunc(AdbcDriverInitFunc init_func, int vers
}
if (version >= ADBC_VERSION_1_1_0) {
auto* driver = reinterpret_cast<struct AdbcDriver*>(raw_driver);
if (negotiated_version == ADBC_VERSION_1_0_0) {
driver->DatabaseSetOptionInt = DatabaseSetOptionIntLegacy;
driver->DatabaseSetOptionDouble = DatabaseSetOptionDoubleLegacy;
driver->ConnectionSetOptionInt = ConnectionSetOptionIntLegacy;
driver->ConnectionSetOptionDouble = ConnectionSetOptionDoubleLegacy;
driver->StatementSetOptionInt = StatementSetOptionIntLegacy;
driver->StatementSetOptionDouble = StatementSetOptionDoubleLegacy;
}
FILL_DEFAULT(driver, ErrorGetDetailCount);
FILL_DEFAULT(driver, ErrorGetDetail);
FILL_DEFAULT(driver, ErrorFromArrayStream);
Expand Down
168 changes: 168 additions & 0 deletions c/driver_manager/adbc_version_100_compatibility_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>

#include <cmath>
#include <limits>
#include <locale>
#include <memory>
#include <string>
#include <vector>

#include "adbc_version_100.h"
#include "arrow-adbc/adbc.h"
Expand All @@ -30,11 +35,66 @@ namespace adbc {
using adbc_validation::IsOkStatus;
using adbc_validation::IsStatus;

std::vector<std::string> option_values;
AdbcStatusCode option_status = ADBC_STATUS_OK;

template <typename Object>
AdbcStatusCode CaptureOption(Object*, const char* key, const char* value, AdbcError*) {
EXPECT_STREQ(key, "option");
option_values.emplace_back(value);
return option_status;
}

AdbcStatusCode LegacyOptionDriverInit(int version, void* raw_driver, AdbcError* error) {
auto status = Version100DriverInit(version, raw_driver, error);
if (status != ADBC_STATUS_OK) return status;

auto* driver = static_cast<AdbcDriver*>(raw_driver);
driver->DatabaseSetOption = CaptureOption<AdbcDatabase>;
driver->ConnectionSetOption = CaptureOption<AdbcConnection>;
driver->StatementSetOption = CaptureOption<AdbcStatement>;
return ADBC_STATUS_OK;
}

AdbcStatusCode Version110OptionDriverInit(int, void* raw_driver, AdbcError* error) {
return LegacyOptionDriverInit(ADBC_VERSION_1_0_0, raw_driver, error);
}

AdbcStatusCode NativeStatementSetOptionInt(AdbcStatement*, const char*, int64_t,
AdbcError*) {
return ADBC_STATUS_CANCELLED;
}

AdbcStatusCode Version110NativeOptionDriverInit(int version, void* raw_driver,
AdbcError* error) {
auto status = Version110OptionDriverInit(version, raw_driver, error);
static_cast<AdbcDriver*>(raw_driver)->StatementSetOptionInt =
NativeStatementSetOptionInt;
return status;
}

struct CommaDecimal : std::numpunct<char> {
char do_decimal_point() const override { return ','; }
};

class ScopedCommaLocale {
public:
ScopedCommaLocale() : previous_(std::locale()) {
std::locale::global(std::locale(previous_, new CommaDecimal));

@lidavidm lidavidm Sep 21, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't we gonna leak a CommaDecimal instance?

@emecii emecii Sep 21, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::locale owns the facet: std::numpunct defaults to refs = 0, so the last locale referencing it deletes it (C++ lifetime rules). Restoring previous_ releases the comma locale. A destructor-counting probe confirmed cleanup, including exception unwinding and a retained locale copy; no ownership change is needed.

AI-generated reply (OpenAI Codex).

}
~ScopedCommaLocale() { std::locale::global(previous_); }

private:
std::locale previous_;
};

class AdbcVersion : public ::testing::Test {
public:
void SetUp() override {
std::memset(&driver, 0, sizeof(driver));
std::memset(&error, 0, sizeof(error));
option_values.clear();
option_status = ADBC_STATUS_OK;
}

void TearDown() override {
Expand Down Expand Up @@ -105,6 +165,114 @@ TEST_F(AdbcVersion, OldDriverNewManager) {
EXPECT_NE(driver.StatementSetOptionDouble, nullptr);
}

TEST_F(AdbcVersion, OldDriverNumericSetters) {
ASSERT_THAT(AdbcLoadDriverFromInitFunc(&LegacyOptionDriverInit, ADBC_VERSION_1_1_0,
&driver, &error),
IsOkStatus(&error));

AdbcDatabase database = {nullptr, &driver};
AdbcConnection connection = {nullptr, &driver};
AdbcStatement statement = {nullptr, &driver};
ASSERT_THAT(driver.DatabaseNew(&database, &error), IsOkStatus(&error));
ASSERT_THAT(driver.ConnectionNew(&connection, &error), IsOkStatus(&error));
ASSERT_THAT(driver.StatementNew(&connection, &statement, &error), IsOkStatus(&error));

ScopedCommaLocale locale;
for (int64_t value : {std::numeric_limits<int64_t>::min(), int64_t{0},
std::numeric_limits<int64_t>::max()}) {
ASSERT_THAT(AdbcDatabaseSetOptionInt(&database, "option", value, &error),
IsOkStatus(&error));
ASSERT_THAT(AdbcConnectionSetOptionInt(&connection, "option", value, &error),
IsOkStatus(&error));
ASSERT_THAT(AdbcStatementSetOptionInt(&statement, "option", value, &error),
IsOkStatus(&error));
for (size_t i = option_values.size() - 3; i < option_values.size(); ++i) {
EXPECT_EQ(std::to_string(value), option_values[i]);
}
}

for (double value : {1.2345678901234567, 1e-12, -0.0, 1e200}) {
ASSERT_THAT(AdbcDatabaseSetOptionDouble(&database, "option", value, &error),
IsOkStatus(&error));
ASSERT_THAT(AdbcConnectionSetOptionDouble(&connection, "option", value, &error),
IsOkStatus(&error));
ASSERT_THAT(AdbcStatementSetOptionDouble(&statement, "option", value, &error),
IsOkStatus(&error));
for (size_t i = option_values.size() - 3; i < option_values.size(); ++i) {
EXPECT_EQ(std::string::npos, option_values[i].find(','));
EXPECT_EQ(value, std::stod(option_values[i]));
EXPECT_EQ(std::signbit(value), std::signbit(std::stod(option_values[i])));
}
}

EXPECT_THAT(driver.StatementRelease(&statement, &error), IsOkStatus(&error));
EXPECT_THAT(driver.ConnectionRelease(&connection, &error), IsOkStatus(&error));
EXPECT_THAT(driver.DatabaseRelease(&database, &error), IsOkStatus(&error));
}

TEST_F(AdbcVersion, OldDriverQueuedOptionsAndErrorStatus) {
AdbcDatabase database = {};
AdbcConnection connection = {};
AdbcStatement statement = {};
ASSERT_THAT(AdbcDatabaseNew(&database, &error), IsOkStatus(&error));
ASSERT_THAT(
AdbcDriverManagerDatabaseSetInitFunc(&database, LegacyOptionDriverInit, &error),
IsOkStatus(&error));
ASSERT_THAT(AdbcDatabaseSetOptionInt(&database, "option", 42, &error),
IsOkStatus(&error));
ASSERT_THAT(AdbcDatabaseInit(&database, &error), IsOkStatus(&error));
ASSERT_THAT(AdbcConnectionNew(&connection, &error), IsOkStatus(&error));
ASSERT_THAT(AdbcConnectionSetOptionDouble(&connection, "option", 1e-12, &error),
IsOkStatus(&error));
ASSERT_THAT(AdbcConnectionInit(&connection, &database, &error), IsOkStatus(&error));
ASSERT_THAT(AdbcStatementNew(&connection, &statement, &error), IsOkStatus(&error));

option_status = ADBC_STATUS_INVALID_ARGUMENT;
EXPECT_THAT(AdbcStatementSetOptionInt(&statement, "option", 1, &error),
IsStatus(option_status, &error));
ASSERT_EQ(3U, option_values.size());
EXPECT_EQ("42", option_values[0]);
EXPECT_EQ(1e-12, std::stod(option_values[1]));
EXPECT_EQ("1", option_values[2]);

option_status = ADBC_STATUS_OK;
EXPECT_THAT(AdbcStatementRelease(&statement, &error), IsOkStatus(&error));
EXPECT_THAT(AdbcConnectionRelease(&connection, &error), IsOkStatus(&error));
EXPECT_THAT(AdbcDatabaseRelease(&database, &error), IsOkStatus(&error));
}

TEST_F(AdbcVersion, Version110DriverDoesNotUseFallback) {
ASSERT_THAT(AdbcLoadDriverFromInitFunc(&Version110OptionDriverInit, ADBC_VERSION_1_1_0,
&driver, &error),
IsOkStatus(&error));
AdbcStatement statement = {nullptr, &driver};
EXPECT_THAT(AdbcStatementSetOptionInt(&statement, "option", 1, &error),
IsStatus(ADBC_STATUS_NOT_IMPLEMENTED, &error));
EXPECT_TRUE(option_values.empty());
}

TEST_F(AdbcVersion, OldDriverBytesRemainUnsupported) {
ASSERT_THAT(AdbcLoadDriverFromInitFunc(&LegacyOptionDriverInit, ADBC_VERSION_1_1_0,
&driver, &error),
IsOkStatus(&error));
AdbcStatement statement = {nullptr, &driver};
const uint8_t value[] = {'a', 0, 'b'};
EXPECT_THAT(
AdbcStatementSetOptionBytes(&statement, "option", value, sizeof(value), &error),
IsStatus(ADBC_STATUS_NOT_IMPLEMENTED, &error));
EXPECT_TRUE(option_values.empty());
}

TEST_F(AdbcVersion, Version110NativeNumericSetterIsPreserved) {
ASSERT_THAT(AdbcLoadDriverFromInitFunc(&Version110NativeOptionDriverInit,
ADBC_VERSION_1_1_0, &driver, &error),
IsOkStatus(&error));
AdbcStatement statement = {nullptr, &driver};
EXPECT_THAT(AdbcStatementSetOptionInt(&statement, "option", 1, &error),
IsStatus(ADBC_STATUS_CANCELLED, &error));
EXPECT_TRUE(option_values.empty());
}

// N.B. see postgresql_test.cc for backwards compatibility test of AdbcError
// N.B. see postgresql_test.cc for backwards compatibility test of AdbcDriver

Expand Down
64 changes: 63 additions & 1 deletion go/adbc/drivermgr/adbc_driver_manager_api.cc
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading