This is an automated cherry-pick of pingcap#39395

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

statistics/handle/update.go

@@ -46,7 +46,6 @@ import (
 	"github.com/pingcap/tidb/util/ranger"
 	"github.com/pingcap/tidb/util/sqlexec"
 	"github.com/pingcap/tidb/util/timeutil"
-	"github.com/tikv/client-go/v2/oracle"
 	"go.uber.org/atomic"
 	"go.uber.org/zap"
 )
@@ -963,9 +962,13 @@ func TableAnalyzed(tbl *statistics.Table) bool {
 func NeedAnalyzeTable(tbl *statistics.Table, limit time.Duration, autoAnalyzeRatio float64) (bool, string) {
 	analyzed := TableAnalyzed(tbl)
 	if !analyzed {
+<<<<<<< HEAD
 		t := time.Unix(0, oracle.ExtractPhysical(tbl.Version)*int64(time.Millisecond))
 		dur := time.Since(t)
 		return dur >= limit, fmt.Sprintf("table unanalyzed, time since last updated %v", dur)
+=======
+		return true, "table unanalyzed"
+>>>>>>> ddfa6db728 (statistics: remove 1min no write check for unanalyzed table in auto analyze (#39395))
 	}
 	// Auto analyze is disabled.
 	if autoAnalyzeRatio == 0 {

statistics/handle/update_test.go

@@ -1532,8 +1532,8 @@ func (s *testStatsSuite) TestNeedAnalyzeTable(c *C) {
 			tbl:    &statistics.Table{Version: oracle.GoTimeToTS(time.Now())},
 			limit:  time.Hour,
 			ratio:  0,
-			result: false,
-			reason: "",
+			result: true,
+			reason: "table unanalyzed",
 		},
 		// table was already analyzed but auto analyze is disabled
 		{