Merge branch 'master' into ttl-lru-evict

be/cmake/thirdparty.cmake

@@ -81,7 +81,6 @@ if (USE_JEMALLOC)
 else()
     add_thirdparty(tcmalloc WHOLELIBPATH ${GPERFTOOLS_HOME}/lib/libtcmalloc.a NOTADD)
 endif()
-add_thirdparty(jemalloc_arrow LIBNAME "lib/libjemalloc_arrow.a")
 
 if (WITH_MYSQL)
     add_thirdparty(mysql LIBNAME "lib/libmysqlclient.a")

be/src/util/disk_info_mac.cpp

@@ -61,7 +61,7 @@ void DiskInfo::get_device_names() {
     std::sort(std::begin(mount_infos), std::end(mount_infos),
               [](const auto& info, const auto& other) {
                   const auto& mount_point = info.second;
-                  const auto& other_mount_point = info.second;
+                  const auto& other_mount_point = other.second;
                   return mount_point < other_mount_point;
               });
 

cloud/cmake/thirdparty.cmake

@@ -55,13 +55,16 @@ add_thirdparty(glog)
 add_thirdparty(gflags)
 add_thirdparty(backtrace)
 add_thirdparty(pprof WHOLELIBPATH ${GPERFTOOLS_HOME}/lib/libprofiler.a)
-add_thirdparty(tcmalloc WHOLELIBPATH ${GPERFTOOLS_HOME}/lib/libtcmalloc.a NOTADD)
 add_thirdparty(protobuf)
 add_thirdparty(thrift)
 add_thirdparty(crypto)
 add_thirdparty(openssl LIBNAME "lib/libssl.a")
 add_thirdparty(jemalloc LIBNAME "lib/libjemalloc_doris.a")
-add_thirdparty(jemalloc_arrow LIBNAME "lib/libjemalloc_arrow.a")
+if (USE_JEMALLOC)
+    add_thirdparty(jemalloc LIBNAME "lib/libjemalloc_doris.a")
+else()
+    add_thirdparty(tcmalloc WHOLELIBPATH ${GPERFTOOLS_HOME}/lib/libtcmalloc.a NOTADD)
+endif()
 add_thirdparty(leveldb) # Required by brpc
 add_thirdparty(brpc LIB64)
 add_thirdparty(rocksdb) # For local storage mocking

fe/fe-core/src/main/java/org/apache/doris/analysis/CreateJobStmt.java

@@ -128,6 +128,7 @@ public void analyze(Analyzer analyzer) throws UserException {
         if (null != onceJobStartTimestamp) {
             if (onceJobStartTimestamp.equalsIgnoreCase(CURRENT_TIMESTAMP_STRING)) {
                 jobExecutionConfiguration.setImmediate(true);
+                timerDefinition.setStartTimeMs(System.currentTimeMillis());
             } else {
                 timerDefinition.setStartTimeMs(TimeUtils.timeStringToLong(onceJobStartTimestamp));
             }
@@ -149,6 +150,8 @@ public void analyze(Analyzer analyzer) throws UserException {
         if (null != startsTimeStamp) {
             if (startsTimeStamp.equalsIgnoreCase(CURRENT_TIMESTAMP_STRING)) {
                 jobExecutionConfiguration.setImmediate(true);
+                //To avoid immediate re-scheduling, set the start time of the timer 100ms before the current time.
+                timerDefinition.setStartTimeMs(System.currentTimeMillis());
             } else {
                 timerDefinition.setStartTimeMs(TimeUtils.timeStringToLong(startsTimeStamp));
             }

fe/fe-core/src/main/java/org/apache/doris/job/base/JobExecutionConfiguration.java

@@ -57,9 +57,7 @@ public void checkParams() {
         if (executeType == JobExecuteType.INSTANT || executeType == JobExecuteType.MANUAL) {
             return;
         }
-
-        checkTimerDefinition(immediate);
-
+        checkTimerDefinition();
         if (executeType == JobExecuteType.ONE_TIME) {
             validateStartTimeMs();
             return;
@@ -80,12 +78,12 @@ public void checkParams() {
         }
     }
 
-    private void checkTimerDefinition(boolean immediate) {
+    private void checkTimerDefinition() {
         if (timerDefinition == null) {
             throw new IllegalArgumentException(
                     "timerDefinition cannot be null when executeType is not instant or manual");
         }
-        timerDefinition.checkParams(immediate);
+        timerDefinition.checkParams();
     }
 
     private void validateStartTimeMs() {

fe/fe-core/src/main/java/org/apache/doris/job/base/TimerDefinition.java

@@ -38,13 +38,7 @@ public class TimerDefinition {
     private Long latestSchedulerTimeMs;
 
 
-    public void checkParams(boolean immediate) {
-        if (null != startTimeMs && immediate) {
-            throw new IllegalArgumentException("startTimeMs must be null when immediate is true");
-        }
-        if (null == startTimeMs && immediate) {
-            startTimeMs = System.currentTimeMillis();
-        }
+    public void checkParams() {
         if (null == startTimeMs) {
             startTimeMs = System.currentTimeMillis() + intervalUnit.getIntervalMs(interval);
         }

fe/fe-core/src/main/java/org/apache/doris/job/scheduler/JobScheduler.java

@@ -124,6 +124,10 @@ public void scheduleOneJob(T job) throws JobException {
                 schedulerInstantJob(job, TaskType.SCHEDULED, null);
             }
         }
+        if (job.getJobConfig().isImmediate() && JobExecuteType.ONE_TIME.equals(job.getJobConfig().getExecuteType())) {
+            schedulerInstantJob(job, TaskType.SCHEDULED, null);
+            return;
+        }
         //RECURRING job and  immediate is true
         if (job.getJobConfig().isImmediate()) {
             job.getJobConfig().getTimerDefinition().setLatestSchedulerTimeMs(System.currentTimeMillis());

fe/fe-core/src/test/java/org/apache/doris/job/base/JobExecutionConfigurationTest.java

@@ -75,8 +75,8 @@ public void testImmediate() {
         JobExecutionConfiguration configuration = new JobExecutionConfiguration();
         configuration.setExecuteType(JobExecuteType.ONE_TIME);
         configuration.setImmediate(true);
-        configuration.setImmediate(true);
         TimerDefinition timerDefinition = new TimerDefinition();
+        timerDefinition.setStartTimeMs(0L);
         configuration.setTimerDefinition(timerDefinition);
         configuration.checkParams();
     }