Skip to content
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

Bump ADBC to v0.7 #9185

Merged
merged 6 commits into from
Oct 5, 2023
Merged

Bump ADBC to v0.7 #9185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2710e61
Updating ADBC to 0.7
pdet Oct 2, 2023
4246233
More on adbc new version
pdet Oct 2, 2023
ede8d7e
Check for too many parameters on adbc, move adbc tests to adbc folder
pdet Oct 3, 2023
5b3159e
ADBC is already defined in the parser
pdet Oct 3, 2023
8b2d3a5
grr
pdet Oct 3, 2023
e6bc865
grr
pdet Oct 4, 2023
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
23 changes: 18 additions & 5 deletions src/common/adbc/adbc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@
#include "duckdb/common/arrow/arrow_wrapper.hpp"
#include "duckdb/common/arrow/nanoarrow/nanoarrow.hpp"

#include "duckdb/main/capi/capi_internal.hpp"

#ifndef DUCKDB_AMALGAMATION
#include "duckdb/main/connection.hpp"
#endif

#include "duckdb/common/adbc/single_batch_array_stream.hpp"

#include "duckdb/common/adbc/options.h"
#include <string.h>
#include <stdlib.h>

Expand Down Expand Up @@ -50,9 +53,6 @@ duckdb_adbc::AdbcStatusCode duckdb_adbc_init(size_t count, struct duckdb_adbc::A
driver->StatementGetParameterSchema = duckdb_adbc::StatementGetParameterSchema;
driver->ConnectionGetTableSchema = duckdb_adbc::ConnectionGetTableSchema;
driver->StatementSetSubstraitPlan = duckdb_adbc::StatementSetSubstraitPlan;

driver->ConnectionGetInfo = duckdb_adbc::ConnectionGetInfo;
driver->StatementGetParameterSchema = duckdb_adbc::StatementGetParameterSchema;
return ADBC_STATUS_OK;
}

Expand Down Expand Up @@ -395,8 +395,8 @@ static AdbcInfoCode ConvertToInfoCode(uint32_t info_code) {
}
}

AdbcStatusCode ConnectionGetInfo(struct AdbcConnection *connection, uint32_t *info_codes, size_t info_codes_length,
struct ArrowArrayStream *out, struct AdbcError *error) {
AdbcStatusCode ConnectionGetInfo(struct AdbcConnection *connection, const uint32_t *info_codes,
size_t info_codes_length, struct ArrowArrayStream *out, struct AdbcError *error) {
if (!connection) {
SetError(error, "Missing connection object");
return ADBC_STATUS_INVALID_ARGUMENT;
Expand Down Expand Up @@ -765,6 +765,9 @@ AdbcStatusCode StatementExecuteQuery(struct AdbcStatement *statement, struct Arr
return ADBC_STATUS_INVALID_ARGUMENT;
}
duckdb::unique_ptr<duckdb::DataChunk> chunk;
auto prepared_statement_params =
reinterpret_cast<duckdb::PreparedStatementWrapper *>(wrapper->statement)->statement->n_param;

while ((chunk = result->Fetch()) != nullptr) {
if (chunk->size() == 0) {
SetError(error, "Please provide a non-empty chunk to be bound");
Expand All @@ -775,6 +778,10 @@ AdbcStatusCode StatementExecuteQuery(struct AdbcStatement *statement, struct Arr
SetError(error, "Binding multiple rows at once is not supported yet");
return ADBC_STATUS_NOT_IMPLEMENTED;
}
if (chunk->ColumnCount() > prepared_statement_params) {
SetError(error, "Input data has more column than prepared statement has parameters");
return ADBC_STATUS_INVALID_ARGUMENT;
}
duckdb_clear_bindings(wrapper->statement);
for (idx_t col_idx = 0; col_idx < chunk->ColumnCount(); col_idx++) {
auto val = chunk->GetValue(col_idx, 0);
Expand Down Expand Up @@ -922,6 +929,12 @@ AdbcStatusCode StatementSetOption(struct AdbcStatement *statement, const char *k
wrapper->ingestion_table_name = strdup(value);
return ADBC_STATUS_OK;
}
if (strcmp(key, ADBC_INGEST_OPTION_TEMPORARY) == 0) {
if (strcmp(value, "false") == 0) {
return ADBC_STATUS_NOT_IMPLEMENTED;
}
return ADBC_STATUS_OK;
}
if (strcmp(key, ADBC_INGEST_OPTION_MODE) == 0) {
if (strcmp(value, ADBC_INGEST_OPTION_MODE_CREATE) == 0) {
wrapper->ingestion_mode = IngestionMode::CREATE;
Expand Down
Loading