Copilot commented on code in PR #17403: URL: https://github.com/apache/pinot/pull/17403#discussion_r2636316015
########## pinot-broker/src/test/java/org/apache/pinot/broker/api/resources/PinotBrokerDebugTest.java: ########## @@ -0,0 +1,110 @@ +/** + * 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.pinot.broker.api.resources; + +import java.lang.reflect.Field; +import java.util.Collections; +import java.util.List; +import javax.ws.rs.core.HttpHeaders; +import org.apache.pinot.broker.routing.BrokerRoutingManager; +import org.apache.pinot.common.request.BrokerRequest; +import org.apache.pinot.core.routing.RoutingTable; +import org.mockito.ArgumentCaptor; +import org.testng.annotations.Test; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + + +public class PinotBrokerDebugTest { + + @Test + public void testGetRoutingTableUsesSameRequestIdForOfflineAndRealtime() + throws Exception { + BrokerRoutingManager routingManager = mock(BrokerRoutingManager.class); + when(routingManager.getRoutingTable(any(BrokerRequest.class), anyLong())) + .thenReturn(new RoutingTable(Collections.emptyMap(), Collections.emptyList(), 0)); + + PinotBrokerDebug brokerDebug = new PinotBrokerDebug(); + Field routingManagerField = PinotBrokerDebug.class.getDeclaredField("_routingManager"); + routingManagerField.setAccessible(true); + routingManagerField.set(brokerDebug, routingManager); + + brokerDebug.getRoutingTable("testTable", (HttpHeaders) null); + + ArgumentCaptor<Long> requestIdCaptor = ArgumentCaptor.forClass(Long.class); + verify(routingManager, times(2)).getRoutingTable(any(BrokerRequest.class), requestIdCaptor.capture()); + List<Long> requestIds = requestIdCaptor.getAllValues(); + assertEquals(requestIds.size(), 2); + assertEquals(requestIds.get(0), requestIds.get(1)); + } + + @Test + public void testGetRoutingTableForRealtimeOnlyRawTableDoesNotSkewRequestId() + throws Exception { + BrokerRoutingManager routingManager = mock(BrokerRoutingManager.class); + when(routingManager.getRoutingTable(any(BrokerRequest.class), anyLong())).thenAnswer(invocation -> { + BrokerRequest brokerRequest = invocation.getArgument(0); + String tableNameWithType = brokerRequest.getQuerySource().getTableName(); + if (tableNameWithType.endsWith("_REALTIME")) { + return new RoutingTable(Collections.emptyMap(), Collections.emptyList(), 0); + } + return null; + }); + + PinotBrokerDebug brokerDebug = new PinotBrokerDebug(); + Field routingManagerField = PinotBrokerDebug.class.getDeclaredField("_routingManager"); + routingManagerField.setAccessible(true); + routingManagerField.set(brokerDebug, routingManager); + + brokerDebug.getRoutingTable("testTable", (HttpHeaders) null); + brokerDebug.getRoutingTable("testTable", (HttpHeaders) null); + + ArgumentCaptor<BrokerRequest> brokerRequestCaptor = ArgumentCaptor.forClass(BrokerRequest.class); + ArgumentCaptor<Long> requestIdCaptor = ArgumentCaptor.forClass(Long.class); + verify(routingManager, times(4)).getRoutingTable(brokerRequestCaptor.capture(), requestIdCaptor.capture()); + List<BrokerRequest> brokerRequests = brokerRequestCaptor.getAllValues(); + List<Long> requestIds = requestIdCaptor.getAllValues(); + + assertEquals(brokerRequests.size(), 4); + assertEquals(requestIds.size(), 4); + + Long firstRealtimeRequestId = null; + Long secondRealtimeRequestId = null; + for (int i = 0; i < brokerRequests.size(); i++) { + if (brokerRequests.get(i).getQuerySource().getTableName().endsWith("_REALTIME")) { + if (firstRealtimeRequestId == null) { + firstRealtimeRequestId = requestIds.get(i); + } else { + secondRealtimeRequestId = requestIds.get(i); + } + } + } + + assertTrue(firstRealtimeRequestId != null); + assertTrue(secondRealtimeRequestId != null); + assertEquals((long) secondRealtimeRequestId, firstRealtimeRequestId + 1); Review Comment: Use `assertEquals(secondRealtimeRequestId, Long.valueOf(firstRealtimeRequestId + 1))` instead of casting to avoid primitive/wrapper confusion. Alternatively, use `assertEquals(secondRealtimeRequestId.longValue(), firstRealtimeRequestId + 1L)` for clearer intent. ```suggestion assertEquals(secondRealtimeRequestId.longValue(), firstRealtimeRequestId + 1L); ``` ########## pinot-broker/src/test/java/org/apache/pinot/broker/api/resources/PinotBrokerDebugTest.java: ########## @@ -0,0 +1,110 @@ +/** + * 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.pinot.broker.api.resources; + +import java.lang.reflect.Field; +import java.util.Collections; +import java.util.List; +import javax.ws.rs.core.HttpHeaders; +import org.apache.pinot.broker.routing.BrokerRoutingManager; +import org.apache.pinot.common.request.BrokerRequest; +import org.apache.pinot.core.routing.RoutingTable; +import org.mockito.ArgumentCaptor; +import org.testng.annotations.Test; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + + +public class PinotBrokerDebugTest { + + @Test + public void testGetRoutingTableUsesSameRequestIdForOfflineAndRealtime() + throws Exception { + BrokerRoutingManager routingManager = mock(BrokerRoutingManager.class); + when(routingManager.getRoutingTable(any(BrokerRequest.class), anyLong())) + .thenReturn(new RoutingTable(Collections.emptyMap(), Collections.emptyList(), 0)); + + PinotBrokerDebug brokerDebug = new PinotBrokerDebug(); + Field routingManagerField = PinotBrokerDebug.class.getDeclaredField("_routingManager"); + routingManagerField.setAccessible(true); + routingManagerField.set(brokerDebug, routingManager); + + brokerDebug.getRoutingTable("testTable", (HttpHeaders) null); + + ArgumentCaptor<Long> requestIdCaptor = ArgumentCaptor.forClass(Long.class); + verify(routingManager, times(2)).getRoutingTable(any(BrokerRequest.class), requestIdCaptor.capture()); + List<Long> requestIds = requestIdCaptor.getAllValues(); + assertEquals(requestIds.size(), 2); + assertEquals(requestIds.get(0), requestIds.get(1)); + } + + @Test + public void testGetRoutingTableForRealtimeOnlyRawTableDoesNotSkewRequestId() + throws Exception { + BrokerRoutingManager routingManager = mock(BrokerRoutingManager.class); + when(routingManager.getRoutingTable(any(BrokerRequest.class), anyLong())).thenAnswer(invocation -> { + BrokerRequest brokerRequest = invocation.getArgument(0); + String tableNameWithType = brokerRequest.getQuerySource().getTableName(); + if (tableNameWithType.endsWith("_REALTIME")) { + return new RoutingTable(Collections.emptyMap(), Collections.emptyList(), 0); + } + return null; + }); + + PinotBrokerDebug brokerDebug = new PinotBrokerDebug(); + Field routingManagerField = PinotBrokerDebug.class.getDeclaredField("_routingManager"); + routingManagerField.setAccessible(true); + routingManagerField.set(brokerDebug, routingManager); + + brokerDebug.getRoutingTable("testTable", (HttpHeaders) null); + brokerDebug.getRoutingTable("testTable", (HttpHeaders) null); + + ArgumentCaptor<BrokerRequest> brokerRequestCaptor = ArgumentCaptor.forClass(BrokerRequest.class); + ArgumentCaptor<Long> requestIdCaptor = ArgumentCaptor.forClass(Long.class); + verify(routingManager, times(4)).getRoutingTable(brokerRequestCaptor.capture(), requestIdCaptor.capture()); + List<BrokerRequest> brokerRequests = brokerRequestCaptor.getAllValues(); + List<Long> requestIds = requestIdCaptor.getAllValues(); + + assertEquals(brokerRequests.size(), 4); + assertEquals(requestIds.size(), 4); + + Long firstRealtimeRequestId = null; + Long secondRealtimeRequestId = null; + for (int i = 0; i < brokerRequests.size(); i++) { + if (brokerRequests.get(i).getQuerySource().getTableName().endsWith("_REALTIME")) { + if (firstRealtimeRequestId == null) { + firstRealtimeRequestId = requestIds.get(i); + } else { + secondRealtimeRequestId = requestIds.get(i); + } + } + } + + assertTrue(firstRealtimeRequestId != null); + assertTrue(secondRealtimeRequestId != null); Review Comment: Replace `assertTrue(variable != null)` with `assertNotNull(variable)` for more idiomatic null checks. This provides clearer error messages and follows TestNG best practices. -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
