fix: fix deploy (#3503)

Author: dl239

src/client/ns_client.cc

@@ -612,18 +612,26 @@ bool NsClient::UpdateTableAliveStatus(const std::string& endpoint, std::string&
 
 bool NsClient::UpdateTTL(const std::string& name, const ::openmldb::type::TTLType& type, uint64_t abs_ttl,
                          uint64_t lat_ttl, const std::string& index_name, std::string& msg) {
+    return UpdateTTL(GetDb(), name, type, abs_ttl, lat_ttl, index_name, msg);
+}
+
+bool NsClient::UpdateTTL(const std::string& db, const std::string& name, const ::openmldb::type::TTLType& type,
+        uint64_t abs_ttl, uint64_t lat_ttl, const std::string& index_name, std::string& msg) {
     ::openmldb::nameserver::UpdateTTLRequest request;
     ::openmldb::nameserver::UpdateTTLResponse response;
     request.set_name(name);
-    request.set_db(GetDb());
+    if (db.empty()) {
+        request.set_db(GetDb());
+    } else {
+        request.set_db(db);
+    }
     ::openmldb::common::TTLSt* ttl_desc = request.mutable_ttl_desc();
     ttl_desc->set_ttl_type(type);
     ttl_desc->set_abs_ttl(abs_ttl);
     ttl_desc->set_lat_ttl(lat_ttl);
     if (!index_name.empty()) {
         request.set_index_name(index_name);
     }
-    request.set_db(GetDb());
     bool ok = client_.SendRequest(&::openmldb::nameserver::NameServer_Stub::UpdateTTL, &request, &response,
                                   FLAGS_request_timeout_ms, 1);
     msg = response.msg();

src/client/ns_client.h

@@ -193,6 +193,9 @@ class NsClient : public Client {
     bool UpdateTTL(const std::string& name, const ::openmldb::type::TTLType& type, uint64_t abs_ttl, uint64_t lat_ttl,
                    const std::string& ts_name, std::string& msg);  // NOLINT
 
+    bool UpdateTTL(const std::string& db, const std::string& name, const ::openmldb::type::TTLType& type,
+            uint64_t abs_ttl, uint64_t lat_ttl, const std::string& ts_name, std::string& msg);  // NOLINT
+
     bool AddReplicaClusterByNs(const std::string& alias, const std::string& name, uint64_t term,
                                std::string& msg);  // NOLINT
 

src/sdk/sql_cluster_router.cc

@@ -3798,8 +3798,8 @@ hybridse::sdk::Status SQLClusterRouter::GetNewIndex(const TableInfoMap& table_ma
                         // update ttl
                         auto ns_ptr = cluster_sdk_->GetNsClient();
                         std::string err;
-                        if (!ns_ptr->UpdateTTL(table_name, result.ttl_type(), result.abs_ttl(), result.lat_ttl(),
-                                               old_column_key.index_name(), err)) {
+                        if (!ns_ptr->UpdateTTL(db_name, table_name, result.ttl_type(),
+                                    result.abs_ttl(), result.lat_ttl(), old_column_key.index_name(), err)) {
                             return {StatusCode::kCmdError, "update ttl failed"};
                         }
                     }

src/sdk/sql_cluster_test.cc

@@ -646,6 +646,40 @@ TEST_F(SQLSDKQueryTest, GetTabletClient) {
     ASSERT_TRUE(router->DropDB(db, &status));
 }
 
+TEST_F(SQLClusterTest, DeployWithMultiDB) {
+    SQLRouterOptions sql_opt;
+    sql_opt.zk_cluster = mc_->GetZkCluster();
+    sql_opt.zk_path = mc_->GetZkPath();
+    auto router = NewClusterSQLRouter(sql_opt);
+    SetOnlineMode(router);
+    ASSERT_TRUE(router != nullptr);
+    std::string base_table = "test" + GenRand();
+    std::string db1 = "db1";
+    std::string db2 = "db2";
+    ::hybridse::sdk::Status status;
+    ASSERT_TRUE(router->ExecuteDDL(db1, "drop table if exists db1.t1;", &status));
+    ASSERT_TRUE(router->ExecuteDDL(db2, "drop table if exists db2.t1;", &status));
+    ASSERT_TRUE(router->ExecuteDDL(db1, "drop database if exists db1;", &status));
+    ASSERT_TRUE(router->ExecuteDDL(db2, "drop database if exists db2;", &status));
+    ASSERT_TRUE(router->CreateDB(db1, &status));
+    ASSERT_TRUE(router->CreateDB(db2, &status));
+    std::string sql1 = "create table db1.t1 (c1 string, c2 int, c3 bigint, c4 timestamp, index(key=c1, ts=c4));";
+    std::string sql2 = "create table db2.t1 (c1 string, c2 int, c3 bigint, c4 timestamp, index(key=c1, ts=c3));";
+    ASSERT_TRUE(router->ExecuteDDL(db1, sql1, &status));
+    ASSERT_TRUE(router->ExecuteDDL(db2, sql2, &status));
+    ASSERT_TRUE(router->ExecuteDDL(db1, "use " + db1 + ";", &status));
+    std::string sql = "deploy demo select db1.t1.c1,db1.t1.c2,db2.t1.c3,db2.t1.c4 from db1.t1 "
+        "last join db2.t1 ORDER BY db2.t1.c3 on db1.t1.c1=db2.t1.c1;";
+    ASSERT_TRUE(router->RefreshCatalog());
+    router->ExecuteSQL(sql, &status);
+    ASSERT_TRUE(status.IsOK());
+    ASSERT_TRUE(router->ExecuteDDL(db1, "drop deployment demo;", &status));
+    ASSERT_TRUE(router->ExecuteDDL(db1, "drop table t1;", &status));
+    ASSERT_TRUE(router->ExecuteDDL(db2, "drop table t1;", &status));
+    ASSERT_TRUE(router->DropDB(db1, &status));
+    ASSERT_TRUE(router->DropDB(db2, &status));
+}
+
 TEST_F(SQLClusterTest, CreatePreAggrTable) {
     SQLRouterOptions sql_opt;
     sql_opt.zk_cluster = mc_->GetZkCluster();