server: split ttl handler into new package

server/BUILD.bazel

@@ -51,6 +51,7 @@ go_library(
         "//privilege/privileges",
         "//privilege/privileges/ldap",
         "//server/err",
+        "//server/handler/ttlhandler",
         "//server/internal",
         "//server/internal/column",
         "//server/internal/dump",
@@ -75,7 +76,6 @@ go_library(
         "//table",
         "//table/tables",
         "//tablecodec",
-        "//ttl/client",
         "//types",
         "//util",
         "//util/arena",

server/handler/BUILD.bazel

@@ -0,0 +1,12 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "handler",
+    srcs = ["util.go"],
+    importpath = "github.com/pingcap/tidb/server/handler",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//parser/terror",
+        "@com_github_pingcap_errors//:errors",
+    ],
+)

server/handler/ttlhandler/BUILD.bazel

@@ -0,0 +1,19 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "ttlhandler",
+    srcs = ["ttl.go"],
+    importpath = "github.com/pingcap/tidb/server/handler/ttlhandler",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//kv",
+        "//server/handler",
+        "//session",
+        "//ttl/client",
+        "//util/logutil",
+        "@com_github_gorilla_mux//:mux",
+        "@com_github_pingcap_errors//:errors",
+        "@com_github_pingcap_log//:log",
+        "@org_uber_go_zap//:zap",
+    ],
+)

server/handler/ttlhandler/ttl.go

@@ -0,0 +1,59 @@
+package ttlhandler
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/gorilla/mux"
+	"github.com/pingcap/errors"
+	"github.com/pingcap/log"
+	"github.com/pingcap/tidb/kv"
+	"github.com/pingcap/tidb/server/handler"
+	"github.com/pingcap/tidb/session"
+	ttlcient "github.com/pingcap/tidb/ttl/client"
+	"github.com/pingcap/tidb/util/logutil"
+	"go.uber.org/zap"
+)
+
+// TTLJobTriggerHandler is used to trigger a TTL job manually
+type TTLJobTriggerHandler struct {
+	store kv.Storage
+}
+
+// NewTTLJobTriggerHandler returns a new TTLJobTriggerHandler
+func NewTTLJobTriggerHandler(store kv.Storage) *TTLJobTriggerHandler {
+	return &TTLJobTriggerHandler{store: store}
+}
+
+// ServeHTTP handles request of triger a ttl job
+func (h TTLJobTriggerHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	if req.Method != http.MethodPost {
+		handler.WriteError(w, errors.Errorf("This api only support POST method"))
+		return
+	}
+
+	params := mux.Vars(req)
+	dbName := strings.ToLower(params["db"])
+	tableName := strings.ToLower(params["table"])
+
+	ctx := req.Context()
+	dom, err := session.GetDomain(h.store)
+	if err != nil {
+		log.Error("failed to get session domain", zap.Error(err))
+		handler.WriteError(w, err)
+		return
+	}
+
+	cli := dom.TTLJobManager().GetCommandCli()
+	resp, err := ttlcient.TriggerNewTTLJob(ctx, cli, dbName, tableName)
+	if err != nil {
+		log.Error("failed to trigger new TTL job", zap.Error(err))
+		handler.WriteError(w, err)
+		return
+	}
+	handler.WriteData(w, resp)
+	logutil.Logger(ctx).Info("trigger TTL job manually successfully",
+		zap.String("dbName", dbName),
+		zap.String("tableName", tableName),
+		zap.Any("response", resp))
+}

server/handler/util.go

@@ -0,0 +1,70 @@
+package handler
+
+import (
+	"encoding/json"
+	"net/http"
+	"strings"
+
+	"github.com/pingcap/errors"
+	"github.com/pingcap/tidb/parser/terror"
+)
+
+const (
+	DBName             = "db"
+	HexKey             = "hexKey"
+	IndexName          = "index"
+	Handle             = "handle"
+	RegionID           = "regionID"
+	StartTS            = "startTS"
+	TableName          = "table"
+	TableID            = "tableID"
+	ColumnID           = "colID"
+	ColumnTp           = "colTp"
+	ColumnFlag         = "colFlag"
+	ColumnLen          = "colLen"
+	RowBin             = "rowBin"
+	Snapshot           = "snapshot"
+	FileName           = "filename"
+	DumpPartitionStats = "dumpPartitionStats"
+	Begin              = "begin"
+	End                = "end"
+)
+
+const (
+	HeaderContentType = "Content-Type"
+	ContentTypeJSON   = "application/json"
+)
+
+func WriteError(w http.ResponseWriter, err error) {
+	w.WriteHeader(http.StatusBadRequest)
+	_, err = w.Write([]byte(err.Error()))
+	terror.Log(errors.Trace(err))
+}
+
+func WriteData(w http.ResponseWriter, data interface{}) {
+	js, err := json.MarshalIndent(data, "", " ")
+	if err != nil {
+		WriteError(w, err)
+		return
+	}
+	// write response
+	w.Header().Set(HeaderContentType, ContentTypeJSON)
+	w.WriteHeader(http.StatusOK)
+	_, err = w.Write(js)
+	terror.Log(errors.Trace(err))
+}
+
+// ExtractTableAndPartitionName extracts table name and partition name from a string.
+func ExtractTableAndPartitionName(str string) (string, string) {
+	// extract table name and partition name from this "table(partition)":
+	// A sane person would not let the the table name or partition name contain '('.
+	start := strings.IndexByte(str, '(')
+	if start == -1 {
+		return str, ""
+	}
+	end := strings.IndexByte(str, ')')
+	if end == -1 {
+		return str, ""
+	}
+	return str[:start], str[start+1 : end]
+}

server/http_handler.go

@@ -58,7 +58,6 @@ import (
 	"github.com/pingcap/tidb/table"
 	"github.com/pingcap/tidb/table/tables"
 	"github.com/pingcap/tidb/tablecodec"
-	ttlcient "github.com/pingcap/tidb/ttl/client"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util"
 	"github.com/pingcap/tidb/util/codec"
@@ -2235,38 +2234,3 @@ func (h labelHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 
 	writeData(w, config.GetGlobalConfig().Labels)
 }
-
-// ttlJobTriggerHandler is used to trigger a TTL job manually
-type ttlJobTriggerHandler struct {
-	store kv.Storage
-}
-
-// ServeHTTP handles request of triger a ttl job
-func (h ttlJobTriggerHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	if req.Method != http.MethodPost {
-		writeError(w, errors.Errorf("This api only support POST method"))
-		return
-	}
-
-	params := mux.Vars(req)
-	dbName := strings.ToLower(params["db"])
-	tableName := strings.ToLower(params["table"])
-
-	ctx := req.Context()
-	dom, err := session.GetDomain(h.store)
-	if err != nil {
-		log.Error("failed to get session domain", zap.Error(err))
-		writeError(w, err)
-		return
-	}
-
-	cli := dom.TTLJobManager().GetCommandCli()
-	resp, err := ttlcient.TriggerNewTTLJob(ctx, cli, dbName, tableName)
-	if err != nil {
-		log.Error("failed to trigger new TTL job", zap.Error(err))
-		writeError(w, err)
-		return
-	}
-	writeData(w, resp)
-	logutil.Logger(ctx).Info("trigger TTL job manually successfully", zap.String("dbName", dbName), zap.String("tableName", tableName), zap.Any("response", resp))
-}

server/http_status.go

@@ -44,6 +44,7 @@ import (
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/parser/mysql"
 	"github.com/pingcap/tidb/parser/terror"
+	"github.com/pingcap/tidb/server/handler/ttlhandler"
 	util2 "github.com/pingcap/tidb/server/internal/util"
 	"github.com/pingcap/tidb/store"
 	"github.com/pingcap/tidb/util"
@@ -420,7 +421,7 @@ func (s *Server) startHTTPServer() {
 	router.Handle("/test/ddl/hook", &ddlHookHandler{tikvHandlerTool.Store.(kv.Storage)})
 
 	// ttlJobTriggerHandler is enabled only for tests, so we can accelerate the schedule of TTL job
-	router.Handle("/test/ttl/trigger/{db}/{table}", &ttlJobTriggerHandler{tikvHandlerTool.Store.(kv.Storage)})
+	router.Handle("/test/ttl/trigger/{db}/{table}", ttlhandler.NewTTLJobTriggerHandler(tikvHandlerTool.Store.(kv.Storage)))
 
 	var (
 		httpRouterPage bytes.Buffer