divijvaidya commented on code in PR #13954: URL: https://github.com/apache/kafka/pull/13954#discussion_r1254190666
########## server-common/src/test/java/org/apache/kafka/server/util/timer/MockTimer.java: ########## @@ -0,0 +1,86 @@ +/* + * 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.kafka.server.util.timer; + +import org.apache.kafka.server.util.MockTime; + +import java.util.Comparator; +import java.util.PriorityQueue; + +public class MockTimer implements Timer { + private final PriorityQueue<TimerTaskEntry> taskQueue = new PriorityQueue<>( + Comparator.comparingLong(entry -> entry.expirationMs) + ); + + public final MockTime time; + + public MockTimer() { + this(new MockTime()); + } + + public MockTimer(MockTime time) { + this.time = time; + } + + @Override + public void add(TimerTask timerTask) { + if (timerTask.delayMs <= 0) { + timerTask.run(); + } else { + synchronized (taskQueue) { + taskQueue.add(new TimerTaskEntry(timerTask, timerTask.delayMs + time.milliseconds())); Review Comment: please check the return value for `add()`. If false, you might want to handle it appropriately. I know that scala code also didn't do it so it would be ok if you create a JIRA for it. ########## server-common/src/test/java/org/apache/kafka/server/util/timer/MockTimer.java: ########## @@ -0,0 +1,86 @@ +/* + * 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.kafka.server.util.timer; + +import org.apache.kafka.server.util.MockTime; + +import java.util.Comparator; +import java.util.PriorityQueue; + +public class MockTimer implements Timer { + private final PriorityQueue<TimerTaskEntry> taskQueue = new PriorityQueue<>( + Comparator.comparingLong(entry -> entry.expirationMs) + ); + + public final MockTime time; Review Comment: should this be private? If it is public for testing, please add a comment. `// visible for testing` ########## server-common/src/test/java/org/apache/kafka/server/util/timer/MockTimer.java: ########## @@ -0,0 +1,86 @@ +/* + * 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.kafka.server.util.timer; + +import org.apache.kafka.server.util.MockTime; + +import java.util.Comparator; +import java.util.PriorityQueue; + +public class MockTimer implements Timer { + private final PriorityQueue<TimerTaskEntry> taskQueue = new PriorityQueue<>( + Comparator.comparingLong(entry -> entry.expirationMs) + ); + + public final MockTime time; + + public MockTimer() { + this(new MockTime()); + } + + public MockTimer(MockTime time) { + this.time = time; + } + + @Override + public void add(TimerTask timerTask) { + if (timerTask.delayMs <= 0) { + timerTask.run(); + } else { + synchronized (taskQueue) { + taskQueue.add(new TimerTaskEntry(timerTask, timerTask.delayMs + time.milliseconds())); + } + } + } + + @Override + public boolean advanceClock(long timeoutMs) throws InterruptedException { + time.sleep(timeoutMs); + + final long now = time.milliseconds(); + boolean executed = false; + boolean hasMore = true; + + while (hasMore) { + hasMore = false; + TimerTaskEntry taskEntry = null; + + synchronized (taskQueue) { + if (!taskQueue.isEmpty() && now > taskQueue.peek().expirationMs) { + taskEntry = taskQueue.poll(); + hasMore = !taskQueue.isEmpty(); + } + } + + if (taskEntry != null) { + if (!taskEntry.cancelled()) { + taskEntry.timerTask.run(); + executed = true; + } + } + } + + return executed; + } + + public int size() { + return taskQueue.size(); + } + + @Override + public void close() throws Exception {} Review Comment: `Timer.java` doesn't have a close method. What am I missing here? -- 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]
