From 96191fdbbb0967501d934fdd77e8943784be78ff Mon Sep 17 00:00:00 2001
From: rahul-iyer <iyer.rahul100@gmail.com>
Date: Sat, 4 Jul 2026 10:27:23 -0700
Subject: [PATCH] Cache ADBC Arrow logical type metadata

---
 adbc/src/connector/adbc_connector.cpp       | 16 ++++++++++++++++
 adbc/src/function/adbc_scan.cpp             |  5 ++++-
 adbc/src/include/connector/adbc_connector.h |  2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/adbc/src/connector/adbc_connector.cpp b/adbc/src/connector/adbc_connector.cpp
index 138dd18..ac4125b 100644
--- a/adbc/src/connector/adbc_connector.cpp
+++ b/adbc/src/connector/adbc_connector.cpp
@@ -27,6 +27,21 @@ static std::vector<std::string> splitCommaSeparated(const std::string& input) {
     return result;
 }
 
+static std::vector<std::optional<common::ArrowLogicalTypeInfo>> resolveColumnLogicalTypeInfos(
+    const ArrowSchemaWrapper& schema) {
+    std::vector<std::optional<common::ArrowLogicalTypeInfo>> result;
+    if (schema.n_children <= 0 || schema.children == nullptr) {
+        return result;
+    }
+    result.reserve(static_cast<size_t>(schema.n_children));
+    for (int64_t i = 0; i < schema.n_children; ++i) {
+        result.push_back(schema.children[i] == nullptr ?
+                             std::nullopt :
+                             common::tryGetArrowLogicalTypeInfo(schema.children[i]));
+    }
+    return result;
+}
+
 ADBCQueryResult::~ADBCQueryResult() {
     if (stream.release) {
         stream.release(&stream);
@@ -200,6 +215,7 @@ std::unique_ptr<ADBCQueryResult> ADBCConnector::executeQuery(const std::string&
         throw common::RuntimeException{
             std::format("ArrowArrayStream.get_schema failed: {}", streamError)};
     }
+    result->logicalTypeInfos = resolveColumnLogicalTypeInfos(result->schema);
     // Fully consume the ADBC stream before returning control to the execution engine. Some drivers
     // keep query state pending while the stream is open, and later catalog calls can close it.
     while (true) {
diff --git a/adbc/src/function/adbc_scan.cpp b/adbc/src/function/adbc_scan.cpp
index aebe33f..9739a70 100644
--- a/adbc/src/function/adbc_scan.cpp
+++ b/adbc/src/function/adbc_scan.cpp
@@ -102,8 +102,11 @@ common::offset_t ADBCScanFunction::tableFunc(const function::TableFuncInput& inp
         auto srcOffset = localState->array.children[i]->offset + localState->offset;
         common::ArrowNullMaskTree mask(schema.children[i], localState->array.children[i], srcOffset,
             count);
+        const auto* logicalTypeInfo = i < sharedState->queryResult->logicalTypeInfos.size() ?
+                                          &sharedState->queryResult->logicalTypeInfos[i] :
+                                          nullptr;
         common::ArrowConverter::fromArrowArray(schema.children[i], localState->array.children[i],
-            output.dataChunk.getValueVectorMutable(i), &mask, srcOffset, 0, count);
+            output.dataChunk.getValueVectorMutable(i), &mask, srcOffset, 0, count, logicalTypeInfo);
     }
     localState->offset += count;
     return count;
diff --git a/adbc/src/include/connector/adbc_connector.h b/adbc/src/include/connector/adbc_connector.h
index 5117109..f312a11 100644
--- a/adbc/src/include/connector/adbc_connector.h
+++ b/adbc/src/include/connector/adbc_connector.h
@@ -5,6 +5,7 @@
 
 #include "binder/bound_attach_info.h"
 #include "common/arrow/arrow.h"
+#include "common/arrow/arrow_schema_metadata.h"
 #include "common/types/types.h"
 
 #if __has_include(<arrow-adbc/adbc.h>) && __has_include(<arrow-adbc/adbc_driver_manager.h>)
@@ -33,6 +34,7 @@ struct ADBCQueryResult {
     AdbcStatement statement{};
     ArrowArrayStream stream{};
     ArrowSchemaWrapper schema{};
+    std::vector<std::optional<common::ArrowLogicalTypeInfo>> logicalTypeInfos;
     std::vector<ArrowArrayWrapper> arrays;
     uint64_t nextArrayIdx = 0;
     bool connectionInitialized = false;