det101 commented on code in PR #17037: URL: https://github.com/apache/dolphinscheduler/pull/17037#discussion_r1990642902
########## dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/queue/ComparableEntry.java: ########## @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.dolphinscheduler.server.master.runner.queue; + +import static com.google.common.base.Preconditions.checkNotNull; + +import org.apache.dolphinscheduler.server.master.engine.task.runnable.ITaskExecutionRunnable; + +import java.util.Objects; + +import lombok.Getter; + +import org.jetbrains.annotations.NotNull; + +@Getter +public class ComparableEntry implements Comparable<ComparableEntry> { + + // Pass it to the workerGroup queue without participating in the comparison + private final long delayTimeMills; + + private final ITaskExecutionRunnable data; + + public ComparableEntry(long delayTimeMills, ITaskExecutionRunnable data) { + this.delayTimeMills = delayTimeMills; + this.data = checkNotNull(data, "data is null"); + } + + @Override + public int compareTo(@NotNull ComparableEntry other) { + int priortyCompareResult = data.compareTo(other.data); + if (priortyCompareResult != 0) { + return priortyCompareResult; + } + return Long.compare(delayTimeMills, other.delayTimeMills); + } Review Comment: Thank you for pointing out the error. It has been changed to a logic consistent with the design ########## dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/queue/ComparableEntry.java: ########## @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.dolphinscheduler.server.master.runner.queue; + +import static com.google.common.base.Preconditions.checkNotNull; + +import org.apache.dolphinscheduler.server.master.engine.task.runnable.ITaskExecutionRunnable; + +import java.util.Objects; + +import lombok.Getter; + +import org.jetbrains.annotations.NotNull; + +@Getter +public class ComparableEntry implements Comparable<ComparableEntry> { Review Comment: This suggestion clarifies the ability to compare and contrast, and the changes have been made. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
