feat(sql router): new interface

SQLTODAG(string) -> DAG {name, sql, producers[]}

hybridse/include/sdk/base.h

@@ -20,7 +20,6 @@
 #include <stdint.h>
 
 #include <memory>
-#include <ostream>
 #include <string>
 #include <unordered_map>
 #include <vector>

java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/DAG.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2023 OpenMLDB authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com._4paradigm.openmldb.sdk;
+
+import java.util.ArrayList;
+
+public class DAG {
+    public DAG(String name, String sql, ArrayList<DAG> producers) {
+        this.name = name;
+        this.sql = sql;
+        this.producers = producers;
+    }
+
+    public String name;
+    public String sql;
+    public ArrayList<DAG> producers;
+}

java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/SqlExecutor.java

@@ -84,5 +84,7 @@ PreparedStatement getBatchRequestPreparedStmt(String db, String sql,
 
     List<String> getTableNames(String db);
 
+    DAG SQLToDAG(String sql) throws SQLException;
+
     void close();
 }

java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/impl/SqlClusterExecutor.java

@@ -664,4 +664,30 @@ public boolean updateOfflineTableInfo(NS.TableInfo info) {
     public boolean refreshCatalog() {
         return sqlRouter.RefreshCatalog();
     }
+
+    @Override
+    public DAG SQLToDAG(String sql) throws SQLException {
+        Status status = new Status();
+        final com._4paradigm.openmldb.DAG dag = sqlRouter.SQLToDAG(sql, status);
+
+        try {
+            if (status.getCode() != 0) {
+                throw new SQLException(status.ToString());
+            }
+            return convertDAG(dag);
+        } finally {
+            dag.delete();
+            status.delete();
+        }
+    }
+
+    private static DAG convertDAG(com._4paradigm.openmldb.DAG dag) {
+        ArrayList<DAG> convertedProducers = new ArrayList<>();
+        for (com._4paradigm.openmldb.DAG producer : dag.getProducers()) {
+            final DAG converted = convertDAG(producer);
+            convertedProducers.add(converted);
+        }
+
+        return new DAG(dag.getName(), dag.getSql(), convertedProducers);
+    }
 }

java/openmldb-jdbc/src/test/java/com/_4paradigm/openmldb/jdbc/SQLRouterSmokeTest.java

@@ -21,6 +21,7 @@
 import com._4paradigm.openmldb.common.Pair;
 import com._4paradigm.openmldb.proto.NS;
 import com._4paradigm.openmldb.sdk.Column;
+import com._4paradigm.openmldb.sdk.DAG;
 import com._4paradigm.openmldb.sdk.Schema;
 import com._4paradigm.openmldb.sdk.SdkOption;
 import com._4paradigm.openmldb.sdk.SqlExecutor;
@@ -858,4 +859,60 @@ public void testMergeSQL() throws SQLException {
                 + "(select db.main.id as merge_id_3, db.main.c1 as merge_c1_3, sum(c2) over w1 from main window w1 as (union (select \"\" as id, * from t1) partition by c1 order by c2 rows between unbounded preceding and current row)) as out3 "
                 + "on out0.merge_id_0 = out3.merge_id_3 and out0.merge_c1_0 = out3.merge_c1_3;");
     }
+
+    @Test(dataProvider = "executor")
+    public void testSQLToDag(SqlExecutor router) throws SQLException {
+        String sql = " WITH q1 as (WITH q3 as (select * from t1 LIMIT 10), q4 as (select * from t2) select * from q3 left join q4 on q3.id = q4.id),"
+                +
+                "q2 as (select * from t3)" +
+                "select * from q1 last join q2 on q1.id = q2.id";
+
+        DAG dag = router.SQLToDAG(sql);
+
+        Assert.assertEquals(dag.name, "");
+        Assert.assertEquals(dag.sql, "SELECT\n" +
+                "  *\n" +
+                "FROM\n" +
+                "  q1\n" +
+                "  LAST JOIN\n" +
+                "  q2\n" +
+                "  ON q1.id = q2.id\n");
+        Assert.assertEquals(dag.producers.size(), 2);
+
+        DAG input1 = dag.producers.get(0);
+        Assert.assertEquals(input1.name, "q1");
+        Assert.assertEquals(input1.sql, "SELECT\n" +
+                "  *\n" +
+                "FROM\n" +
+                "  q3\n" +
+                "  LEFT JOIN\n" +
+                "  q4\n" +
+                "  ON q3.id = q4.id\n");
+        Assert.assertEquals(2, input1.producers.size());
+
+        DAG input2 = dag.producers.get(1);
+        Assert.assertEquals(input2.name, "q2");
+        Assert.assertEquals(input2.sql, "SELECT\n" +
+                "  *\n" +
+                "FROM\n" +
+                "  t3\n");
+        Assert.assertEquals(input2.producers.size(), 0);
+
+        DAG q1In1 = input1.producers.get(0);
+        Assert.assertEquals(q1In1.producers.size(), 0);
+        Assert.assertEquals(q1In1.name, "q3");
+        Assert.assertEquals(q1In1.sql, "SELECT\n" +
+                "  *\n" +
+                "FROM\n" +
+                "  t1\n" +
+                "LIMIT 10\n");
+
+        DAG q1In2 = input1.producers.get(1);
+        Assert.assertEquals(q1In2.producers.size(), 0);
+        Assert.assertEquals(q1In2.name, "q4");
+        Assert.assertEquals(q1In2.sql, "SELECT\n" +
+                "  *\n" +
+                "FROM\n" +
+                "  t2\n");
+    }
 }

src/sdk/sql_router.cc

@@ -15,11 +15,17 @@
  */
 
 #include "sdk/sql_router.h"
+
 #include <map>
+
+#include "absl/strings/substitute.h"
 #include "base/ddl_parser.h"
 #include "glog/logging.h"
 #include "schema/schema_adapter.h"
 #include "sdk/sql_cluster_router.h"
+#include "zetasql/parser/parser.h"
+#include "zetasql/public/error_helpers.h"
+#include "zetasql/public/error_location.pb.h"
 
 namespace openmldb::sdk {
 
@@ -274,4 +280,81 @@ std::vector<std::pair<std::string, std::string>> GetDependentTables(
     return tables;
 }
 
+std::shared_ptr<DAG> QueryToDAG(const zetasql::ASTQuery* query, absl::string_view name) {
+    std::vector<std::shared_ptr<DAG>> producers;
+    if (query->with_clause() != nullptr) {
+        for (auto with_entry : query->with_clause()->with()) {
+            producers.push_back(QueryToDAG(with_entry->query(), with_entry->alias()->GetAsStringView()));
+        }
+    }
+
+    // SQL without WITH clause
+    std::string sql =  zetasql::Unparse(query->query_expr());
+    if (query->order_by() != nullptr) {
+        absl::StrAppend(&sql, zetasql::Unparse(query->order_by()));
+    }
+    if (query->limit_offset() != nullptr) {
+        absl::StrAppend(&sql, zetasql::Unparse(query->limit_offset()));
+    }
+
+    return std::make_shared<DAG>(name, sql, producers);
+}
+
+std::shared_ptr<DAG> SQLRouter::SQLToDAG(const std::string& sql, hybridse::sdk::Status* status) {
+    std::unique_ptr<zetasql::ParserOutput> parser_output;
+    zetasql::ParserOptions parser_opts;
+    zetasql::LanguageOptions language_opts;
+    language_opts.EnableLanguageFeature(zetasql::FEATURE_V_1_3_COLUMN_DEFAULT_VALUE);
+    parser_opts.set_language_options(&language_opts);
+    auto zetasql_status = zetasql::ParseStatement(sql, parser_opts, &parser_output);
+    zetasql::ErrorLocation location;
+    if (!zetasql_status.ok()) {
+        zetasql::ErrorLocation location;
+        GetErrorLocation(zetasql_status, &location);
+        status->msg = zetasql::FormatError(zetasql_status);
+        status->code = hybridse::common::kSyntaxError;
+        return {};
+    }
+
+    auto stmt = parser_output->statement();
+    if (stmt == nullptr) {
+        status->msg = "not a statement";
+        status->code = hybridse::common::kSyntaxError;
+        return {};
+    }
+
+    if (stmt->node_kind() != zetasql::AST_QUERY_STATEMENT) {
+        status->msg = "not a query";
+        status->code = hybridse::common::kSyntaxError;
+        return {};
+    }
+
+    auto const query_stmt = stmt->GetAsOrNull<zetasql::ASTQueryStatement>();
+    if (query_stmt == nullptr) {
+        status->msg = "not a query";
+        status->code = hybridse::common::kSyntaxError;
+        return {};
+    }
+
+    status->code = hybridse::common::kOk;
+    return QueryToDAG(query_stmt->query(), "");
+}
+
+bool DAG::operator==(const DAG& rhs) const noexcept {
+    return name == rhs.name && sql == rhs.sql &&
+           absl::c_equal(producers, rhs.producers,
+                         [](const std::shared_ptr<DAG>& left, const std::shared_ptr<DAG>& right) {
+                             return left != nullptr && right != nullptr && *left == *right;
+                         });
+}
+
+std::ostream& operator<<(std::ostream& os, const DAG& obj) { return os << obj.DebugString(); }
+
+std::string DAG::DebugString() const {
+    return absl::Substitute("{$0, $1, [$2]}", name, sql,
+                            absl::StrJoin(producers, ",", [](std::string* out, const std::shared_ptr<DAG>& e) {
+                                absl::StrAppend(out, (e == nullptr ? "" : e->DebugString()));
+                            }));
+}
+
 }  // namespace openmldb::sdk

src/sdk/sql_router.h

@@ -80,6 +80,22 @@ class ExplainInfo {
     virtual const std::string& GetRequestDbName() = 0;
 };
 
+struct DAG {
+    DAG(absl::string_view name, absl::string_view sql) : name(name), sql(sql) {}
+    DAG(absl::string_view name, absl::string_view sql, const std::vector<std::shared_ptr<DAG>>& producers)
+        : name(name), sql(sql), producers(producers) {}
+
+    std::string name;
+    std::string sql;
+    std::vector<std::shared_ptr<DAG>> producers;
+
+    bool operator==(const DAG& op) const noexcept;
+
+    std::string DebugString() const;
+
+    friend std::ostream& operator<<(std::ostream& os, const DAG& obj);
+};
+
 class QueryFuture {
  public:
     QueryFuture() {}
@@ -234,6 +250,8 @@ class SQLRouter {
     virtual bool IsOnlineMode() = 0;
 
     virtual std::string GetDatabase() = 0;
+
+    std::shared_ptr<DAG> SQLToDAG(const std::string& sql, hybridse::sdk::Status* status);
 };
 
 std::shared_ptr<SQLRouter> NewClusterSQLRouter(const SQLRouterOptions& options);

src/sdk/sql_router_sdk.i

@@ -69,6 +69,7 @@
 %template(VectorUint32) std::vector<uint32_t>;
 %template(VectorString) std::vector<std::string>;
 
+%shared_ptr(openmldb::sdk::DAG);
 %{
 #include "sdk/sql_router.h"
 #include "sdk/result_set.h"
@@ -117,3 +118,5 @@ using openmldb::sdk::DefaultValueContainer;
 
 %template(DBTable) std::pair<std::string, std::string>;
 %template(DBTableVector) std::vector<std::pair<std::string, std::string>>;
+
+%template(DAGPtrVector) std::vector<std::shared_ptr<openmldb::sdk::DAG>>;

src/sdk/sql_router_test.cc

@@ -1226,6 +1226,67 @@ TEST_F(SQLRouterTest, DDLParseMethodsCombineIndex) {
         ddl_list.at(0));
 }
 
+TEST_F(SQLRouterTest, SQLToDAG) {
+    auto sql = R"(WITH q1 as (
+        WITH q3 as (select * from t1 ORDER BY ts),
+        q4 as (select * from t2 LIMIT 10)
+
+        select * from q3 left join q4 on q3.key = q4.key
+        ),
+        q2 as (select * from t3)
+
+        select * from q1 last join q2 on q1.id = q2.id)";
+
+
+    hybridse::sdk::Status status;
+    auto dag = router_->SQLToDAG(sql, &status);
+    ASSERT_TRUE(status.IsOK());
+
+    std::string_view q3 = R"(SELECT
+  *
+FROM
+  t1
+ORDER BY ts
+)";
+    std::string_view q4 = R"(SELECT
+  *
+FROM
+  t2
+LIMIT 10
+)";
+    std::string_view q2 = R"(SELECT
+  *
+FROM
+  t3
+)";
+    std::string_view q1 = R"(SELECT
+  *
+FROM
+  q3
+  LEFT JOIN
+  q4
+  ON q3.key = q4.key
+)";
+    std::string_view q = R"(SELECT
+  *
+FROM
+  q1
+  LAST JOIN
+  q2
+  ON q1.id = q2.id
+)";
+
+    std::shared_ptr<DAG> dag_q3 = std::make_shared<DAG>("q3", q3);
+    std::shared_ptr<DAG> dag_q4 = std::make_shared<DAG>("q4", q4);
+
+    std::shared_ptr<DAG> dag_q1 = std::make_shared<DAG>("q1", q1, std::vector<std::shared_ptr<DAG>>({dag_q3, dag_q4}));
+    std::shared_ptr<DAG> dag_q2 = std::make_shared<DAG>("q2", q2);
+
+    std::shared_ptr<DAG> expect = std::make_shared<DAG>("", q, std::vector<std::shared_ptr<DAG>>({dag_q1, dag_q2}));
+
+    EXPECT_EQ(*dag, *expect);
+}
+
 }  // namespace openmldb::sdk
 
 int main(int argc, char** argv) {