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.

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

URL Flock function #14

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion chsql/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ include_directories(
../duckdb/third_party/mbedtls
../duckdb/third_party/mbedtls/include
../duckdb/third_party/brotli/include)
set(EXTENSION_SOURCES src/chsql_extension.cpp)
set(EXTENSION_SOURCES src/chsql_extension.cpp src/duck_flock.cpp)
build_static_extension(${TARGET_NAME} ${EXTENSION_SOURCES})
build_loadable_extension(${TARGET_NAME} " " ${EXTENSION_SOURCES})
# Link OpenSSL in both the static library as the loadable extension
Expand Down
4 changes: 3 additions & 1 deletion chsql/src/chsql_extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ static void LoadInternal(DatabaseInstance &instance) {
ExtensionUtil::RegisterFunction(instance, chsql_openssl_version_scalar_function);

// Macros
for (idx_t index = 0; chsql_macros[index].name != nullptr; index++) {
for (idx_t index = 0; chsql_macros[index].name != nullptr; index++) {
auto info = DefaultFunctionGenerator::CreateInternalMacroInfo(chsql_macros[index]);
ExtensionUtil::RegisterFunction(instance, *info);
}
Expand All @@ -226,6 +226,8 @@ static void LoadInternal(DatabaseInstance &instance) {
ExtensionUtil::RegisterFunction(instance, *table_info);
}
ExtensionUtil::RegisterFunction(instance, ReadParquetOrderedFunction());
// Flock
ExtensionUtil::RegisterFunction(instance, DuckFlockTableFunction());
}

void ChsqlExtension::Load(DuckDB &db) {
Expand Down
136 changes: 136 additions & 0 deletions chsql/src/duck_flock.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
#ifndef DUCK_FLOCK_H
#define DUCK_FLOCK_H
#include "chsql_extension.hpp"

namespace duckdb {
struct DuckFlockData : FunctionData {
vector<unique_ptr<Connection>> conn;
vector<unique_ptr<QueryResult>> results;
unique_ptr<FunctionData> Copy() const override {
throw std::runtime_error("not implemented");
}
bool Equals(const FunctionData &other) const override {
throw std::runtime_error("not implemented");
};
};

unique_ptr<FunctionData> DuckFlockBind(ClientContext &context, TableFunctionBindInput &input,
vector<LogicalType> &return_types, vector<string> &names) {
auto data = make_uniq<DuckFlockData>();

// Check for NULL input parameters
if (input.inputs.empty() || input.inputs.size() < 2) {
throw std::runtime_error("url_flock: missing required parameters");
}
if (input.inputs[0].IsNull() || input.inputs[1].IsNull()) {
throw std::runtime_error("url_flock: NULL parameters are not allowed");
}

auto strQuery = input.inputs[0].GetValue<string>();
if (strQuery.empty()) {
throw std::runtime_error("url_flock: empty query string");
}

auto &raw_flock = ListValue::GetChildren(input.inputs[1]);
if (raw_flock.empty()) {
throw std::runtime_error("url_flock: empty flock list");
}

bool has_valid_result = false;
// Process each connection
for (auto &duck : raw_flock) {
if (duck.IsNull() || duck.ToString().empty()) {
continue;
}

try {
auto conn = make_uniq<Connection>(*context.db);
if (!conn) {
continue;
}

auto settingResult = conn->Query("SET autoload_known_extensions=1;SET autoinstall_known_extensions=1;");
if (settingResult->HasError()) {
continue;
}

auto req = conn->Prepare("SELECT * FROM read_json($2 || '/?default_format=JSONEachRow&query=' || url_encode($1::VARCHAR))");
if (req->HasError()) {
continue;
}

auto queryResult = req->Execute(strQuery.c_str(), duck.ToString());
if (!queryResult || queryResult->HasError()) {
continue;
}

// Store the first valid result's types and names
if (!has_valid_result) {
return_types.clear();
copy(queryResult->types.begin(), queryResult->types.end(), back_inserter(return_types));
names.clear();
copy(queryResult->names.begin(), queryResult->names.end(), back_inserter(names));

if (return_types.empty()) {
throw std::runtime_error("url_flock: query must return at least one column");
}
has_valid_result = true;
}

data->conn.push_back(std::move(conn));
data->results.push_back(std::move(queryResult));
} catch (const std::exception &e) {
continue;
}
}

// Verify we have at least one valid result
if (!has_valid_result || data->results.empty()) {
throw std::runtime_error("url_flock: invalid or no results");
}

return std::move(data);
}

void DuckFlockImplementation(ClientContext &context, TableFunctionInput &data_p,
DataChunk &output) {
auto &data = data_p.bind_data->Cast<DuckFlockData>();

if (data.results.empty()) {
return;
}

for (const auto &res : data.results) {
if (!res) {
continue;
}

ErrorData error_data;
unique_ptr<DataChunk> data_chunk = make_uniq<DataChunk>();

try {
if (res->TryFetch(data_chunk, error_data)) {
if (data_chunk && !data_chunk->size() == 0) {

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_amd64, x86_64, x64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_amd64, x86_64, x64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_threads, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_threads, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_arm64, arm64, arm64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_arm64, arm64, arm64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_eh, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_eh, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_eh, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_eh, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_mvp, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_mvp, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_arm64, arm64, arm64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_arm64, arm64, arm64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_threads, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_threads, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_mvp, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_mvp, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_amd64, x86_64, x64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_amd64, x86_64, x64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_amd64, x86_64, x64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_amd64, x86_64, x64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_threads, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_mvp, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_eh, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_arm64, arm64, arm64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_arm64, arm64, arm64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_arm64, arm64, arm64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_arm64, arm64, arm64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_amd64, x86_64, x64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_amd64, x86_64, x64-osx)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_eh, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_eh, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_mvp, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]

Check warning on line 113 in chsql/src/duck_flock.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_threads, wasm32-emscripten)

logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]
output.Append(*data_chunk);
return;
}
}
} catch (...) {
continue;
}
}
}

TableFunction DuckFlockTableFunction() {
TableFunction f(
"url_flock",
{LogicalType::VARCHAR, LogicalType::LIST(LogicalType::VARCHAR)},
DuckFlockImplementation,
DuckFlockBind,
nullptr,
nullptr
);
return f;
}
}
#endif
3 changes: 3 additions & 0 deletions chsql/src/include/chsql_extension.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ class ChsqlExtension : public Extension {
};
duckdb::TableFunction ReadParquetOrderedFunction();
static void RegisterSillyBTreeStore(DatabaseInstance &instance);

TableFunction DuckFlockTableFunction();

} // namespace duckdb
Loading