功能增强：DuckDB 配置参数灵活化支持

weidqi · weidqi · commit cf4223265dd8 · 2025-11-19T15:36:28.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,7 @@
 *.out
 *.app
 
+trantor/
 build/
 cmake-build-debug/
 cmake-build-debug-visual-studio/
diff --git a/lib/src/ConfigLoader.cc b/lib/src/ConfigLoader.cc
@@ -572,6 +572,19 @@ static void loadDbClients(const Json::Value &dbClients)
         auto autoBatch = client.get("auto_batch", false).asBool();
 
         std::unordered_map<std::string, std::string> options;
+        // DuckDB使用config_options字段名（若存在则优先使用）[dq 2025-11-19]
+        if (type == "duckdb")
+        {
+            auto configOptions = client.get("config_options", Json::Value());
+            if (configOptions.isObject() && !configOptions.empty())
+            {
+                for (const auto &key : configOptions.getMemberNames())
+                {
+                    options[key] = configOptions[key].asString();
+                }
+            }
+        }
+        // PostgreSQL等使用connect_options
         if (connectOptions.isObject() && !connectOptions.empty())
         {
             for (const auto &key : connectOptions.getMemberNames())
diff --git a/lib/src/HttpAppFrameworkImpl.cc b/lib/src/HttpAppFrameworkImpl.cc
@@ -1002,7 +1002,8 @@ void HttpAppFrameworkImpl::addDbClient(
     }
     else if (dbType == "duckdb")
     {
-        addDbClient(orm::DuckdbConfig{connectionNum, filename, name, timeout});
+        // 传递配置选项到DuckdbConfig [dq 2025-11-19]
+        addDbClient(orm::DuckdbConfig{connectionNum, filename, name, timeout, std::move(options)});
     }
     else
     {
diff --git a/orm_lib/inc/drogon/orm/DbClient.h b/orm_lib/inc/drogon/orm/DbClient.h
@@ -132,6 +132,12 @@ class DROGON_EXPORT DbClient : public trantor::NonCopyable
         const std::string &connInfo,
         size_t connNum);
 
+    // DuckDB with config options support [dq 2025-11-19]
+    static std::shared_ptr<DbClient> newDuckDbClient(
+        const std::string &connInfo,
+        size_t connNum,
+        const std::unordered_map<std::string, std::string> &configOptions);
+
     /// Async and nonblocking method
     /**
      * @param sql is the SQL statement to be executed;
diff --git a/orm_lib/inc/drogon/orm/DbConfig.h b/orm_lib/inc/drogon/orm/DbConfig.h
@@ -65,6 +65,7 @@ struct DuckdbConfig
     std::string filename;
     std::string name;
     double timeout;
+    std::unordered_map<std::string, std::string> configOptions;  // DuckDB配置选项 [dq 2025-11-19]
 };
 
 using DbConfig = std::variant<PostgresConfig, MysqlConfig, Sqlite3Config, DuckdbConfig>;
diff --git a/orm_lib/src/DbClient.cc b/orm_lib/src/DbClient.cc
@@ -119,3 +119,25 @@ std::shared_ptr<DbClient> DbClient::newDuckDbClient(const std::string &connInfo,
     (void)(connNum);
 #endif
 }
+
+// DuckDB with config options support [dq 2025-11-19]
+std::shared_ptr<DbClient> DbClient::newDuckDbClient(
+    const std::string &connInfo,
+    size_t connNum,
+    const std::unordered_map<std::string, std::string> &configOptions)
+{
+#if USE_DUCKDB
+    auto client = std::make_shared<DbClientImpl>(connInfo,
+                                                 connNum,
+                                                 ClientType::DuckDB,
+                                                 configOptions);
+    client->init();
+    return client;
+#else
+    LOG_FATAL << "DuckDB is not supported!";
+    exit(1);
+    (void)(connInfo);
+    (void)(connNum);
+    (void)(configOptions);
+#endif
+}
diff --git a/orm_lib/src/DbClientImpl.cc b/orm_lib/src/DbClientImpl.cc
@@ -75,6 +75,29 @@ DbClientImpl::DbClientImpl(const std::string &connInfo,
     assert(connNum > 0);
 }
 
+// DuckDB配置构造函数实现 [dq 2025-11-19]
+DbClientImpl::DbClientImpl(const std::string &connInfo,
+                           size_t connNum,
+                           ClientType type,
+                           const std::unordered_map<std::string, std::string> &configOptions)
+    : numberOfConnections_(connNum),
+#if LIBPQ_SUPPORTS_BATCH_MODE
+      autoBatch_(false),
+#endif
+      configOptions_(configOptions),  // 存储配置选项
+      loops_(type == ClientType::Sqlite3 || type == ClientType::DuckDB
+                 ? 1
+                 : (connNum < std::thread::hardware_concurrency()
+                        ? connNum
+                        : std::thread::hardware_concurrency()),
+             "DbLoop")
+{
+    type_ = type;
+    connectionInfo_ = connInfo;
+    LOG_TRACE << "type=" << (int)type;
+    assert(connNum > 0);
+}
+
 void DbClientImpl::init()
 {
     // LOG_DEBUG << loops_.getLoopNum();
@@ -434,7 +457,8 @@ DbConnectionPtr DbClientImpl::newConnection(trantor::EventLoop *loop)
 #if USE_DUCKDB
         connPtr = std::make_shared<DuckdbConnection>(loop,
                                                      connectionInfo_,
-                                                     sharedMutexPtr_);
+                                                     sharedMutexPtr_,
+                                                     configOptions_);  // 传递配置选项 [dq 2025-11-19]
 #else
         return nullptr;
 #endif
diff --git a/orm_lib/src/DbClientImpl.h b/orm_lib/src/DbClientImpl.h
@@ -40,6 +40,12 @@ class DbClientImpl : public DbClient,
 #else
                  ClientType type);
 #endif
+    // DuckDB配置构造函数 [dq 2025-11-19]
+    DbClientImpl(const std::string &connInfo,
+                 size_t connNum,
+                 ClientType type,
+                 const std::unordered_map<std::string, std::string> &configOptions);
+
     ~DbClientImpl() noexcept override;
     void execSql(const char *sql,
                  size_t sqlLength,
@@ -74,6 +80,7 @@ class DbClientImpl : public DbClient,
 #if LIBPQ_SUPPORTS_BATCH_MODE
     bool autoBatch_{false};
 #endif
+    std::unordered_map<std::string, std::string> configOptions_;  // DuckDB配置选项 [dq 2025-11-19]
     DbConnectionPtr newConnection(trantor::EventLoop *loop);
 
     void makeTrans(
diff --git a/orm_lib/src/DbClientManager.cc b/orm_lib/src/DbClientManager.cc
@@ -144,9 +144,11 @@ void DbClientManager::createDbClients(
         else if (std::holds_alternative<DuckdbConfig>(dbInfo.config_))
         {
             auto &cfg = std::get<DuckdbConfig>(dbInfo.config_);
+            // 使用带配置选项的工厂方法 [dq 2025-11-19]
             dbClientsMap_[cfg.name] =
                 drogon::orm::DbClient::newDuckDbClient(dbInfo.connectionInfo_,
-                                                       cfg.connectionNumber);
+                                                       cfg.connectionNumber,
+                                                       cfg.configOptions);  // 传递配置选项
             if (cfg.timeout > 0.0)
             {
                 dbClientsMap_[cfg.name]->setTimeout(cfg.timeout);
diff --git a/orm_lib/src/duckdb_impl/DuckdbConnection.cc b/orm_lib/src/duckdb_impl/DuckdbConnection.cc
@@ -44,8 +44,12 @@ void DuckdbConnection::onError(
 DuckdbConnection::DuckdbConnection(
     trantor::EventLoop *loop,
     const std::string &connInfo,
-    const std::shared_ptr<SharedMutex> &sharedMutex)
-    : DbConnection(loop), sharedMutexPtr_(sharedMutex), connInfo_(connInfo)
+    const std::shared_ptr<SharedMutex> &sharedMutex,
+    const std::unordered_map<std::string, std::string> &configOptions)  // 新增配置参数支持 [dq 2025-11-19]
+    : DbConnection(loop),
+      sharedMutexPtr_(sharedMutex),
+      connInfo_(connInfo),
+      configOptions_(configOptions)  // 存储配置选项 [dq 2025-11-19]
 {
 }
 
@@ -74,17 +78,56 @@ void DuckdbConnection::init()
 
     loop_->runInLoop([this, filename = std::move(filename)]() {
         duckdb_database db;
+        duckdb_config config;
         duckdb_connection conn;
 
+        // create the configuration object
+        if (duckdb_create_config(&config) == DuckDBError) {
+            LOG_FATAL << "Failed to config DuckDB database: " << filename;
+            auto thisPtr = shared_from_this();
+            closeCallback_(thisPtr);
+            return;
+        }
+
+        // 应用配置选项（使用传入的配置，或使用默认值）[dq 2025-11-19]
+        // 定义默认值
+        std::unordered_map<std::string, std::string> defaultConfig = {
+            {"access_mode", "READ_WRITE"},
+            {"threads", "4"},  // 默认改为4以避免过度占用资源
+            {"max_memory", "4GB"},
+        };
+
+        // 合并用户配置和默认配置（用户配置优先）
+        for (const auto& [key, defaultValue] : defaultConfig) {
+            auto it = configOptions_.find(key);
+            const std::string& value = (it != configOptions_.end()) ? it->second : defaultValue;
+
+            if (duckdb_set_config(config, key.c_str(), value.c_str()) == DuckDBError) {
+                LOG_WARN << "Failed to set DuckDB config option: " << key << "=" << value;
+            }
+        }
+
+        // 应用其他用户自定义的配置选项
+        for (const auto& [key, value] : configOptions_) {
+            if (defaultConfig.find(key) == defaultConfig.end()) {
+                if (duckdb_set_config(config, key.c_str(), value.c_str()) == DuckDBError) {
+                    LOG_WARN << "Failed to set DuckDB config option: " << key << "=" << value;
+                }
+            }
+        }
+
         // 打开数据库
-        auto state = duckdb_open(filename.c_str(), &db);
+        //auto state = duckdb_open(filename.c_str(), &db);
+        auto state = duckdb_open_ext(filename.c_str(), &db, config, NULL);
         if (state == DuckDBError)
         {
             LOG_FATAL << "Failed to open DuckDB database: " << filename;
+            duckdb_destroy_config(&config);
             auto thisPtr = shared_from_this();
             closeCallback_(thisPtr);
             return;
         }
+        duckdb_destroy_config(&config);
 
         // 创建连接
         state = duckdb_connect(db, &conn);
diff --git a/orm_lib/src/duckdb_impl/DuckdbConnection.h b/orm_lib/src/duckdb_impl/DuckdbConnection.h
@@ -42,7 +42,8 @@ class DuckdbConnection : public DbConnection,
   public:
     DuckdbConnection(trantor::EventLoop *loop,
                      const std::string &connInfo,
-                     const std::shared_ptr<SharedMutex> &sharedMutex);
+                     const std::shared_ptr<SharedMutex> &sharedMutex,
+                     const std::unordered_map<std::string, std::string> &configOptions = {});  // 新增配置参数支持 [dq 2025-11-19]
 
     void init() override;
 
@@ -98,6 +99,7 @@ class DuckdbConnection : public DbConnection,
     std::set<std::string> stmts_;  // 维护SQL字符串的生命周期
 
     std::string connInfo_;
+    std::unordered_map<std::string, std::string> configOptions_;  // DuckDB配置选项 [dq 2025-11-19]
 };
 
 }  // namespace orm
diff --git a/orm_lib/src/duckdb_impl/changelog.md b/orm_lib/src/duckdb_impl/changelog.md
diff --git a/orm_lib/src/duckdb_impl/test/duck_test.cc b/orm_lib/src/duckdb_impl/test/duck_test.cc

Original file line number	Diff line number	Diff line change
`@@ -1002,7 +1002,8 @@ void HttpAppFrameworkImpl::addDbClient(`
`1002`	`1002`	`}`
`1003`	`1003`	`else if (dbType == "duckdb")`
`1004`	`1004`	`{`
`1005`		`- addDbClient(orm::DuckdbConfig{connectionNum, filename, name, timeout});`
	`1005`	`+ // 传递配置选项到DuckdbConfig [dq 2025-11-19]`
	`1006`	`+ addDbClient(orm::DuckdbConfig{connectionNum, filename, name, timeout, std::move(options)});`
`1006`	`1007`	`}`
`1007`	`1008`	`else`
`1008`	`1009`	`{`
Original file line number	Diff line number	Diff line change
`@@ -144,9 +144,11 @@ void DbClientManager::createDbClients(`
`144`	`144`	`else if (std::holds_alternative<DuckdbConfig>(dbInfo.config_))`
`145`	`145`	`{`
`146`	`146`	`auto &cfg = std::get<DuckdbConfig>(dbInfo.config_);`
	`147`	`+ // 使用带配置选项的工厂方法 [dq 2025-11-19]`
`147`	`148`	`dbClientsMap_[cfg.name] =`
`148`	`149`	`drogon::orm::DbClient::newDuckDbClient(dbInfo.connectionInfo_,`
`149`		`- cfg.connectionNumber);`
	`150`	`+ cfg.connectionNumber,`
	`151`	`+ cfg.configOptions); // 传递配置选项`
`150`	`152`	`if (cfg.timeout > 0.0)`
`151`	`153`	`{`
`152`	`154`	`dbClientsMap_[cfg.name]->setTimeout(cfg.timeout);`