feat: enhance the delete (#3301)

docs/en/reference/sql/dml/DELETE_STATEMENT.md

@@ -13,12 +13,16 @@ TableName ::=
 **Description**
 
 - `DELETE` statement will delete all data from the index of specific column value of online table.
-- The filter columns sepcified by `WHERE` must be an index column and the condition can only be `=`.
+- The filter columns sepcified by `WHERE` must be an index column. if it is a key column, only `=` can be used.
 
 ## Examples
 
 ```SQL
 DELETE FROM t1 WHERE col1 = 'aaaa';
 
-DELETE FROM t1 WHERE col1 = 'aaaa' and col2 = 'bbbb';
+DELETE FROM t1 WHERE col1 = 'aaaa' and ts_col = 1687145994000;
+
+DELETE FROM t1 WHERE col1 = 'aaaa' and ts_col > 1687059594000 and ts_col < 1687145994000;
+
+DELETE FROM t1 WHERE ts_col > 1687059594000 and ts_col < 1687145994000;
 ```

docs/zh/openmldb_sql/dml/DELETE_STATEMENT.md

@@ -12,13 +12,17 @@ TableName ::=
 
 **说明**
 
-- `DELETE` 语句删除在线表指定列的索引下面对应值的所有数据
-- `WHERE` 指定的筛选列必须是索引列并且只能是等于
+- `DELETE` 语句删除在线表满足指定条件的数据
+- `WHERE` 指定的筛选列必须是索引列。如果是key列只能用等于
 
 ## Examples
 
 ```SQL
 DELETE FROM t1 WHERE col1 = 'aaaa';
 
-DELETE FROM t1 WHERE col1 = 'aaaa' and col2 = 'bbbb';
+DELETE FROM t1 WHERE col1 = 'aaaa' and ts_col = 1687145994000;
+
+DELETE FROM t1 WHERE col1 = 'aaaa' and ts_col > 1687059594000 and ts_col < 1687145994000;
+
+DELETE FROM t1 WHERE ts_col > 1687059594000 and ts_col < 1687145994000;
 ```

src/base/status.h

@@ -87,6 +87,7 @@ enum ReturnCode {
     kProcedureNotFound = 158,
     kCreateFunctionFailed = 159,
     kExceedMaxMemory = 160,
+    kInvalidArgs = 161,
     kNameserverIsNotLeader = 300,
     kAutoFailoverIsEnabled = 301,
     kEndpointIsNotExist = 302,

src/client/tablet_client.cc

@@ -844,6 +844,31 @@ bool TabletClient::Delete(uint32_t tid, uint32_t pid, const std::string& pk, con
     return true;
 }
 
+base::Status TabletClient::Delete(uint32_t tid, uint32_t pid, const std::map<uint32_t, std::string>& index_val,
+        const std::optional<uint64_t> start_ts, const std::optional<uint64_t>& end_ts) {
+    ::openmldb::api::DeleteRequest request;
+    ::openmldb::api::GeneralResponse response;
+    request.set_tid(tid);
+    request.set_pid(pid);
+    for (const auto& kv : index_val) {
+        auto dimension = request.add_dimensions();
+        dimension->set_idx(kv.first);
+        dimension->set_key(kv.second);
+    }
+    if (start_ts.has_value()) {
+        request.set_ts(start_ts.value());
+    }
+    if (end_ts.has_value()) {
+        request.set_end_ts(end_ts.value());
+    }
+    bool ok = client_.SendRequest(&::openmldb::api::TabletServer_Stub::Delete, &request, &response,
+                                  FLAGS_request_timeout_ms, 1);
+    if (!ok || response.code() != 0) {
+        return {base::ReturnCode::kError, response.msg()};
+    }
+    return {};
+}
+
 bool TabletClient::ConnectZK() {
     ::openmldb::api::ConnectZKRequest request;
     ::openmldb::api::GeneralResponse response;

src/client/tablet_client.h

@@ -93,6 +93,9 @@ class TabletClient : public Client {
     bool Delete(uint32_t tid, uint32_t pid, const std::string& pk, const std::string& idx_name,
                 std::string& msg);  // NOLINT
 
+    base::Status Delete(uint32_t tid, uint32_t pid, const std::map<uint32_t, std::string>& index_val,
+            const std::optional<uint64_t> start_ts, const std::optional<uint64_t>& end_ts);
+
     bool Count(uint32_t tid, uint32_t pid, const std::string& pk, const std::string& idx_name, bool filter_expired_data,
                uint64_t& value, std::string& msg);  // NOLINT
 

src/cmd/sql_cmd_test.cc

@@ -944,7 +944,52 @@ TEST_P(DBSDKTest, DeployWithData) {
     ASSERT_TRUE(cs->GetNsClient()->DropDatabase("test2", msg));
 }
 
-TEST_P(DBSDKTest, Delete) {
+TEST_P(DBSDKTest, DeletetRange) {
+    auto cli = GetParam();
+    sr = cli->sr;
+    std::string db_name = "test2";
+    std::string table_name = "test1";
+    std::string ddl = "create table test1 (c1 string, c2 int, c3 bigint, INDEX(KEY=c1, ts=c3));";
+    ProcessSQLs(sr, {
+                        "set @@execute_mode = 'online'",
+                        absl::StrCat("create database ", db_name, ";"),
+                        absl::StrCat("use ", db_name, ";"),
+                        ddl,
+                    });
+    hybridse::sdk::Status status;
+    for (int i = 0; i < 10; i++) {
+        std::string key = absl::StrCat("key", i);
+        for (int j = 0; j < 10; j++) {
+            uint64_t ts = 1000 + j;
+            sr->ExecuteSQL(absl::StrCat("insert into ", table_name, " values ('", key, "', 11, ", ts, ");"), &status);
+        }
+    }
+
+    auto res = sr->ExecuteSQL(absl::StrCat("select * from ", table_name, ";"), &status);
+    ASSERT_EQ(res->Size(), 100);
+    ProcessSQLs(sr, {absl::StrCat("delete from ", table_name, " where c1 = 'key2';")});
+    res = sr->ExecuteSQL(absl::StrCat("select * from ", table_name, ";"), &status);
+    ASSERT_EQ(res->Size(), 90);
+    ProcessSQLs(sr, {absl::StrCat("delete from ", table_name, " where c1 = 'key3' and c3 = 1001;")});
+    res = sr->ExecuteSQL(absl::StrCat("select * from ", table_name, ";"), &status);
+    ASSERT_EQ(res->Size(), 89);
+    ProcessSQLs(sr, {absl::StrCat("delete from ", table_name, " where c1 = 'key4' and c3 > 1005;")});
+    res = sr->ExecuteSQL(absl::StrCat("select * from ", table_name, ";"), &status);
+    ASSERT_EQ(res->Size(), 85);
+    ProcessSQLs(sr, {absl::StrCat("delete from ", table_name, " where c1 = 'key4' and c3 > 1002 and c3 < 1006;")});
+    res = sr->ExecuteSQL(absl::StrCat("select * from ", table_name, ";"), &status);
+    ASSERT_EQ(res->Size(), 82);
+    ProcessSQLs(sr, {absl::StrCat("delete from ", table_name, " where c3 > 1007;")});
+    res = sr->ExecuteSQL(absl::StrCat("select * from ", table_name, ";"), &status);
+    ASSERT_EQ(res->Size(), 66);
+    ProcessSQLs(sr, {
+                        absl::StrCat("use ", db_name, ";"),
+                        absl::StrCat("drop table ", table_name),
+                        absl::StrCat("drop database ", db_name),
+                    });
+}
+
+TEST_P(DBSDKTest, SQLDeletetRow) {
     auto cli = GetParam();
     sr = cli->sr;
     std::string db_name = "test2";

src/codec/field_codec.h

@@ -24,7 +24,6 @@
 #include <vector>
 
 #include "base/endianconv.h"
-#include "base/glog_wrapper.h"
 #include "base/strings.h"
 #include "boost/lexical_cast.hpp"
 #include "proto/type.pb.h"

src/proto/tablet.proto

@@ -206,6 +206,9 @@ message DeleteRequest {
     optional uint32 pid = 2;
     optional string key = 3;
     optional string idx_name = 4;
+    repeated Dimension dimensions = 5;
+    optional uint64 ts = 6;
+    optional uint64 end_ts = 7;
 }
 
 message ExecuteGcRequest {
@@ -398,6 +401,7 @@ message LogEntry {
     repeated Dimension dimensions = 6;
     optional MethodType method_type = 7;
     repeated TSDimension ts_dimensions = 8 [deprecated = true];
+    optional uint64 end_ts = 9;  // only for range delete: [ts, end_ts)
 }
 
 message AppendEntriesRequest {