diff --git a/internal/venice-common/src/main/java/com/linkedin/venice/controllerapi/ControllerApiConstants.java b/internal/venice-common/src/main/java/com/linkedin/venice/controllerapi/ControllerApiConstants.java index f36b8c013a..1254ffe3d5 100644 --- a/internal/venice-common/src/main/java/com/linkedin/venice/controllerapi/ControllerApiConstants.java +++ b/internal/venice-common/src/main/java/com/linkedin/venice/controllerapi/ControllerApiConstants.java @@ -55,7 +55,6 @@ public class ControllerApiConstants { public static final String TIME_LAG_TO_GO_ONLINE = "time_lag_to_go_online"; public static final String DATA_REPLICATION_POLICY = "data_replication_policy"; public static final String BUFFER_REPLAY_POLICY = "buffer_replay_policy"; - public static final String REAL_TIME_TOPIC_NAME = "real_time_topic_name"; public static final String COMPRESSION_STRATEGY = "compression_strategy"; public static final String CLIENT_DECOMPRESSION_ENABLED = "client_decompression_enabled"; public static final String CHUNKING_ENABLED = "chunking_enabled"; diff --git a/internal/venice-common/src/main/java/com/linkedin/venice/controllerapi/UpdateStoreQueryParams.java b/internal/venice-common/src/main/java/com/linkedin/venice/controllerapi/UpdateStoreQueryParams.java index c4f3db6069..c69da3d7a6 100644 --- a/internal/venice-common/src/main/java/com/linkedin/venice/controllerapi/UpdateStoreQueryParams.java +++ b/internal/venice-common/src/main/java/com/linkedin/venice/controllerapi/UpdateStoreQueryParams.java @@ -46,7 +46,6 @@ import static com.linkedin.venice.controllerapi.ControllerApiConstants.PUSH_STREAM_SOURCE_ADDRESS; import static com.linkedin.venice.controllerapi.ControllerApiConstants.READ_COMPUTATION_ENABLED; import static com.linkedin.venice.controllerapi.ControllerApiConstants.READ_QUOTA_IN_CU; -import static com.linkedin.venice.controllerapi.ControllerApiConstants.REAL_TIME_TOPIC_NAME; import static com.linkedin.venice.controllerapi.ControllerApiConstants.REGIONS_FILTER; import static com.linkedin.venice.controllerapi.ControllerApiConstants.REGULAR_VERSION_ETL_ENABLED; import static com.linkedin.venice.controllerapi.ControllerApiConstants.REPLICATE_ALL_CONFIGS; @@ -365,14 +364,6 @@ public Optional getHybridBufferReplayPolicy() { return Optional.ofNullable(params.get(BUFFER_REPLAY_POLICY)).map(BufferReplayPolicy::valueOf); } - public UpdateStoreQueryParams setRealTimeTopicName(String realTimeTopicName) { - return putString(REAL_TIME_TOPIC_NAME, realTimeTopicName); - } - - public Optional getRealTimeTopicName() { - return getString(REAL_TIME_TOPIC_NAME); - } - public UpdateStoreQueryParams setAccessControlled(boolean accessControlled) { return putBoolean(ACCESS_CONTROLLED, accessControlled); } diff --git a/internal/venice-common/src/main/java/com/linkedin/venice/meta/HybridStoreConfig.java b/internal/venice-common/src/main/java/com/linkedin/venice/meta/HybridStoreConfig.java index 6961460e61..061098317f 100644 --- a/internal/venice-common/src/main/java/com/linkedin/venice/meta/HybridStoreConfig.java +++ b/internal/venice-common/src/main/java/com/linkedin/venice/meta/HybridStoreConfig.java @@ -26,9 +26,5 @@ public interface HybridStoreConfig extends DataModelBackedStructure versions, - int currentVersionNumber, - HybridStoreConfig hybridStoreConfig) { - if (currentVersionNumber < 1) { - return composeRealTimeTopic(storeName); - } - - Optional currentVersion = - versions.stream().filter(version -> version.getNumber() == currentVersionNumber).findFirst(); - if (currentVersion.isPresent() && currentVersion.get().isHybrid()) { - String realTimeTopicName = currentVersion.get().getHybridStoreConfig().getRealTimeTopicName(); - if (Strings.isNotBlank(realTimeTopicName)) { - return realTimeTopicName; - } - } - - if (hybridStoreConfig != null) { - String realTimeTopicName = hybridStoreConfig.getRealTimeTopicName(); - return getRealTimeTopicNameIfEmpty(realTimeTopicName, storeName); - } - - Set realTimeTopicNames = new HashSet<>(); - - for (Version version: versions) { - try { - if (version.isHybrid()) { - String realTimeTopicName = version.getHybridStoreConfig().getRealTimeTopicName(); - if (Strings.isNotBlank(realTimeTopicName)) { - realTimeTopicNames.add(realTimeTopicName); - } - } - } catch (VeniceException e) { - // just try another version - } - } - - if (realTimeTopicNames.size() > 1) { - LOGGER.warn( - "Store " + storeName + " and current version are not hybrid, yet " + realTimeTopicNames.size() - + " older versions are using real time topics. Will return one of them."); - } - - if (!realTimeTopicNames.isEmpty()) { - return realTimeTopicNames.iterator().next(); - } - - return composeRealTimeTopic(storeName); - } - - private static String getRealTimeTopicNameIfEmpty(String realTimeTopicName, String storeName) { - return Strings.isBlank(realTimeTopicName) ? composeRealTimeTopic(storeName) : realTimeTopicName; - } - private static class TimeUnitInfo { String suffix; int multiplier; diff --git a/internal/venice-common/src/test/java/com/linkedin/venice/utils/UtilsTest.java b/internal/venice-common/src/test/java/com/linkedin/venice/utils/UtilsTest.java index f04f6369b4..79f2fca4d5 100644 --- a/internal/venice-common/src/test/java/com/linkedin/venice/utils/UtilsTest.java +++ b/internal/venice-common/src/test/java/com/linkedin/venice/utils/UtilsTest.java @@ -1,23 +1,16 @@ package com.linkedin.venice.utils; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.Assert.expectThrows; import static org.testng.Assert.fail; import com.linkedin.venice.exceptions.VeniceException; -import com.linkedin.venice.meta.HybridStoreConfig; -import com.linkedin.venice.meta.Store; -import com.linkedin.venice.meta.StoreInfo; -import com.linkedin.venice.meta.Version; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -26,7 +19,6 @@ import java.util.TreeMap; import org.testng.Assert; import org.testng.annotations.Test; -import org.testng.collections.Lists; /** @@ -237,111 +229,4 @@ public void testResolveKafkaUrlForSepTopic() { Assert.assertEquals(Utils.resolveKafkaUrlForSepTopic(originalKafkaUrlForSep), originalKafkaUrl); Assert.assertEquals(Utils.resolveKafkaUrlForSepTopic(originalKafkaUrl), originalKafkaUrl); } - - @Test - void testGetRealTimeTopicNameWithStore() { - Store mockStore = mock(Store.class); - List mockVersions = Collections.singletonList(mock(Version.class)); - HybridStoreConfig mockHybridConfig = mock(HybridStoreConfig.class); - - when(mockStore.getName()).thenReturn("TestStore"); - when(mockStore.getVersions()).thenReturn(mockVersions); - when(mockStore.getCurrentVersion()).thenReturn(1); - when(mockStore.getHybridStoreConfig()).thenReturn(mockHybridConfig); - - when(mockHybridConfig.getRealTimeTopicName()).thenReturn("RealTimeTopic"); - - String result = Utils.getRealTimeTopicName(mockStore); - assertEquals("RealTimeTopic", result); - } - - @Test - void testGetRealTimeTopicNameWithStoreInfo() { - StoreInfo mockStoreInfo = mock(StoreInfo.class); - List mockVersions = Collections.singletonList(mock(Version.class)); - HybridStoreConfig mockHybridConfig = mock(HybridStoreConfig.class); - - when(mockStoreInfo.getName()).thenReturn("TestStore"); - when(mockStoreInfo.getVersions()).thenReturn(mockVersions); - when(mockStoreInfo.getCurrentVersion()).thenReturn(1); - when(mockStoreInfo.getHybridStoreConfig()).thenReturn(mockHybridConfig); - - when(mockHybridConfig.getRealTimeTopicName()).thenReturn("RealTimeTopic"); - - String result = Utils.getRealTimeTopicName(mockStoreInfo); - assertEquals("RealTimeTopic", result); - } - - @Test - void testGetRealTimeTopicNameWithHybridConfig() { - HybridStoreConfig mockHybridConfig = mock(HybridStoreConfig.class); - - when(mockHybridConfig.getRealTimeTopicName()).thenReturn("RealTimeTopic"); - String result = Utils.getRealTimeTopicName("TestStore", Collections.EMPTY_LIST, 1, mockHybridConfig); - - assertEquals("RealTimeTopic", result); - } - - @Test - void testGetRealTimeTopicNameWithoutHybridConfig() { - String result = Utils.getRealTimeTopicName("TestStore", Collections.EMPTY_LIST, 0, null); - assertEquals("TestStore" + Version.REAL_TIME_TOPIC_SUFFIX, result); - } - - @Test - void testGetRealTimeTopicNameWithConflictingVersions() { - Version mockVersion1 = mock(Version.class); - Version mockVersion2 = mock(Version.class); - HybridStoreConfig mockConfig1 = mock(HybridStoreConfig.class); - HybridStoreConfig mockConfig2 = mock(HybridStoreConfig.class); - - when(mockVersion1.isHybrid()).thenReturn(true); - when(mockVersion2.isHybrid()).thenReturn(true); - when(mockVersion1.getHybridStoreConfig()).thenReturn(mockConfig1); - when(mockVersion2.getHybridStoreConfig()).thenReturn(mockConfig2); - when(mockConfig1.getRealTimeTopicName()).thenReturn("RealTimeTopic1"); - when(mockConfig2.getRealTimeTopicName()).thenReturn("RealTimeTopic2"); - - String result = Utils.getRealTimeTopicName("TestStore", Lists.newArrayList(mockVersion1, mockVersion2), 1, null); - assertTrue(result.equals("RealTimeTopic1") || result.equals("RealTimeTopic2")); - } - - @Test - void testGetRealTimeTopicNameWithExceptionHandling() { - Version mockVersion1 = mock(Version.class); - Version mockVersion2 = mock(Version.class); - - when(mockVersion1.isHybrid()).thenReturn(true); - when(mockVersion1.getHybridStoreConfig()).thenThrow(new VeniceException("Test Exception")); - - when(mockVersion2.isHybrid()).thenReturn(false); - - String result = Utils.getRealTimeTopicName("TestStore", Lists.newArrayList(mockVersion1, mockVersion2), 1, null); - assertEquals("TestStore" + Version.REAL_TIME_TOPIC_SUFFIX, result); - } - - @Test - void testGetRealTimeTopicNameWithVersion() { - Version mockVersion = mock(Version.class); - HybridStoreConfig mockHybridConfig = mock(HybridStoreConfig.class); - - when(mockVersion.getHybridStoreConfig()).thenReturn(mockHybridConfig); - when(mockVersion.getStoreName()).thenReturn("TestStore"); - when(mockHybridConfig.getRealTimeTopicName()).thenReturn("RealTimeTopic"); - - String result = Utils.getRealTimeTopicName(mockVersion); - assertEquals("RealTimeTopic", result); - } - - @Test - void testGetRealTimeTopicNameWithNonHybridVersion() { - // Mocking the Version object - Version mockVersion = mock(Version.class); - - // Mock setup to trigger the exception path - when(mockVersion.getHybridStoreConfig()).thenReturn(null); - when(mockVersion.getStoreName()).thenReturn("TestStore"); - String result = Utils.getRealTimeTopicName(mockVersion); - assertEquals("TestStore" + Version.REAL_TIME_TOPIC_SUFFIX, result); - } } diff --git a/services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceHelixAdmin.java b/services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceHelixAdmin.java index 8631be7452..344403feac 100644 --- a/services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceHelixAdmin.java +++ b/services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceHelixAdmin.java @@ -9,7 +9,6 @@ import static com.linkedin.venice.controller.UserSystemStoreLifeCycleHelper.AUTO_META_SYSTEM_STORE_PUSH_ID_PREFIX; import static com.linkedin.venice.meta.HybridStoreConfigImpl.DEFAULT_HYBRID_OFFSET_LAG_THRESHOLD; import static com.linkedin.venice.meta.HybridStoreConfigImpl.DEFAULT_HYBRID_TIME_LAG_THRESHOLD; -import static com.linkedin.venice.meta.HybridStoreConfigImpl.DEFAULT_REAL_TIME_TOPIC_NAME; import static com.linkedin.venice.meta.HybridStoreConfigImpl.DEFAULT_REWIND_TIME_IN_SECONDS; import static com.linkedin.venice.meta.Store.NON_EXISTING_VERSION; import static com.linkedin.venice.meta.Version.PushType; @@ -4780,7 +4779,6 @@ private void internalUpdateStore(String clusterName, String storeName, UpdateSto Optional hybridTimeLagThreshold = params.getHybridTimeLagThreshold(); Optional hybridDataReplicationPolicy = params.getHybridDataReplicationPolicy(); Optional hybridBufferReplayPolicy = params.getHybridBufferReplayPolicy(); - Optional realTimeTopicName = params.getRealTimeTopicName(); Optional accessControlled = params.getAccessControlled(); Optional compressionStrategy = params.getCompressionStrategy(); Optional clientDecompressionEnabled = params.getClientDecompressionEnabled(); @@ -4833,8 +4831,7 @@ private void internalUpdateStore(String clusterName, String storeName, UpdateSto hybridOffsetLagThreshold, hybridTimeLagThreshold, hybridDataReplicationPolicy, - hybridBufferReplayPolicy, - realTimeTopicName); + hybridBufferReplayPolicy); newHybridStoreConfig = Optional.ofNullable(hybridConfig); } else { newHybridStoreConfig = Optional.empty(); @@ -5181,8 +5178,7 @@ private void enableHybridModeOrUpdateSettings(String clusterName, String storeNa hybridStoreConfig.getOffsetLagThresholdToGoOnline(), hybridStoreConfig.getProducerTimestampLagThresholdToGoOnlineInSeconds(), DataReplicationPolicy.NON_AGGREGATE, - hybridStoreConfig.getBufferReplayPolicy(), - hybridStoreConfig.getRealTimeTopicName())); + hybridStoreConfig.getBufferReplayPolicy())); } return store; }); @@ -5244,8 +5240,7 @@ protected static HybridStoreConfig mergeNewSettingsIntoOldHybridStoreConfig( Optional hybridOffsetLagThreshold, Optional hybridTimeLagThreshold, Optional hybridDataReplicationPolicy, - Optional bufferReplayPolicy, - Optional realTimeTopicName) { + Optional bufferReplayPolicy) { if (!hybridRewindSeconds.isPresent() && !hybridOffsetLagThreshold.isPresent() && !oldStore.isHybrid()) { return null; // For the nullable union in the avro record } @@ -5263,8 +5258,7 @@ protected static HybridStoreConfig mergeNewSettingsIntoOldHybridStoreConfig( hybridDataReplicationPolicy.isPresent() ? hybridDataReplicationPolicy.get() : oldHybridConfig.getDataReplicationPolicy(), - bufferReplayPolicy.isPresent() ? bufferReplayPolicy.get() : oldHybridConfig.getBufferReplayPolicy(), - realTimeTopicName.orElseGet(oldHybridConfig::getRealTimeTopicName)); + bufferReplayPolicy.isPresent() ? bufferReplayPolicy.get() : oldHybridConfig.getBufferReplayPolicy()); } else { // switching a non-hybrid store to hybrid; must specify: // 1. rewind time @@ -5282,8 +5276,7 @@ protected static HybridStoreConfig mergeNewSettingsIntoOldHybridStoreConfig( hybridOffsetLagThreshold.orElse(DEFAULT_HYBRID_OFFSET_LAG_THRESHOLD), hybridTimeLagThreshold.orElse(DEFAULT_HYBRID_TIME_LAG_THRESHOLD), hybridDataReplicationPolicy.orElse(DataReplicationPolicy.NON_AGGREGATE), - bufferReplayPolicy.orElse(BufferReplayPolicy.REWIND_FROM_EOP), - realTimeTopicName.orElse(DEFAULT_REAL_TIME_TOPIC_NAME)); + bufferReplayPolicy.orElse(BufferReplayPolicy.REWIND_FROM_EOP)); } if (mergedHybridStoreConfig.getRewindTimeInSeconds() > 0 && mergedHybridStoreConfig.getOffsetLagThresholdToGoOnline() < 0 @@ -7850,8 +7843,7 @@ boolean isHybrid(HybridStoreConfigRecord hybridStoreConfigRecord) { hybridStoreConfigRecord.offsetLagThresholdToGoOnline, hybridStoreConfigRecord.producerTimestampLagThresholdToGoOnlineInSeconds, DataReplicationPolicy.valueOf(hybridStoreConfigRecord.dataReplicationPolicy), - BufferReplayPolicy.valueOf(hybridStoreConfigRecord.bufferReplayPolicy), - hybridStoreConfigRecord.realTimeTopicName.toString()); + BufferReplayPolicy.valueOf(hybridStoreConfigRecord.bufferReplayPolicy)); } return isHybrid(hybridStoreConfig); } diff --git a/services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceParentHelixAdmin.java b/services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceParentHelixAdmin.java index 09ebbdab6d..a5ab3978a4 100644 --- a/services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceParentHelixAdmin.java +++ b/services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceParentHelixAdmin.java @@ -47,7 +47,6 @@ import static com.linkedin.venice.controllerapi.ControllerApiConstants.PUSH_STREAM_SOURCE_ADDRESS; import static com.linkedin.venice.controllerapi.ControllerApiConstants.READ_COMPUTATION_ENABLED; import static com.linkedin.venice.controllerapi.ControllerApiConstants.READ_QUOTA_IN_CU; -import static com.linkedin.venice.controllerapi.ControllerApiConstants.REAL_TIME_TOPIC_NAME; import static com.linkedin.venice.controllerapi.ControllerApiConstants.REGULAR_VERSION_ETL_ENABLED; import static com.linkedin.venice.controllerapi.ControllerApiConstants.REPLICATION_FACTOR; import static com.linkedin.venice.controllerapi.ControllerApiConstants.REPLICATION_METADATA_PROTOCOL_VERSION_ID; @@ -66,7 +65,6 @@ import static com.linkedin.venice.controllerapi.ControllerApiConstants.WRITE_COMPUTATION_ENABLED; import static com.linkedin.venice.meta.HybridStoreConfigImpl.DEFAULT_HYBRID_OFFSET_LAG_THRESHOLD; import static com.linkedin.venice.meta.HybridStoreConfigImpl.DEFAULT_HYBRID_TIME_LAG_THRESHOLD; -import static com.linkedin.venice.meta.HybridStoreConfigImpl.DEFAULT_REAL_TIME_TOPIC_NAME; import static com.linkedin.venice.meta.HybridStoreConfigImpl.DEFAULT_REWIND_TIME_IN_SECONDS; import static com.linkedin.venice.meta.Version.VERSION_SEPARATOR; import static com.linkedin.venice.meta.VersionStatus.ONLINE; @@ -2238,7 +2236,6 @@ public void updateStore(String clusterName, String storeName, UpdateStoreQueryPa Optional hybridTimeLagThreshold = params.getHybridTimeLagThreshold(); Optional hybridDataReplicationPolicy = params.getHybridDataReplicationPolicy(); Optional hybridBufferReplayPolicy = params.getHybridBufferReplayPolicy(); - Optional realTimeTopicName = params.getRealTimeTopicName(); Optional accessControlled = params.getAccessControlled(); Optional compressionStrategy = params.getCompressionStrategy(); Optional clientDecompressionEnabled = params.getClientDecompressionEnabled(); @@ -2424,15 +2421,13 @@ public void updateStore(String clusterName, String storeName, UpdateStoreQueryPa hybridTimeLagThreshold.map(addToUpdatedConfigList(updatedConfigsList, TIME_LAG_TO_GO_ONLINE)); hybridDataReplicationPolicy.map(addToUpdatedConfigList(updatedConfigsList, DATA_REPLICATION_POLICY)); hybridBufferReplayPolicy.map(addToUpdatedConfigList(updatedConfigsList, BUFFER_REPLAY_POLICY)); - realTimeTopicName.map(addToUpdatedConfigList(updatedConfigsList, REAL_TIME_TOPIC_NAME)); HybridStoreConfig updatedHybridStoreConfig = VeniceHelixAdmin.mergeNewSettingsIntoOldHybridStoreConfig( currStore, hybridRewindSeconds, hybridOffsetLagThreshold, hybridTimeLagThreshold, hybridDataReplicationPolicy, - hybridBufferReplayPolicy, - realTimeTopicName); + hybridBufferReplayPolicy); // Get VeniceControllerClusterConfig for the cluster VeniceControllerClusterConfig controllerConfig = @@ -2507,7 +2502,6 @@ public void updateStore(String clusterName, String storeName, UpdateStoreQueryPa updatedHybridStoreConfig.getProducerTimestampLagThresholdToGoOnlineInSeconds(); hybridStoreConfigRecord.dataReplicationPolicy = updatedHybridStoreConfig.getDataReplicationPolicy().getValue(); hybridStoreConfigRecord.bufferReplayPolicy = updatedHybridStoreConfig.getBufferReplayPolicy().getValue(); - hybridStoreConfigRecord.realTimeTopicName = updatedHybridStoreConfig.getRealTimeTopicName(); setStore.hybridStoreConfig = hybridStoreConfigRecord; } @@ -2528,7 +2522,6 @@ public void updateStore(String clusterName, String storeName, UpdateStoreQueryPa updatedConfigsList.add(DATA_REPLICATION_POLICY); hybridStoreConfigRecord.bufferReplayPolicy = BufferReplayPolicy.REWIND_FROM_EOP.getValue(); updatedConfigsList.add(BUFFER_REPLAY_POLICY); - hybridStoreConfigRecord.realTimeTopicName = DEFAULT_REAL_TIME_TOPIC_NAME; setStore.hybridStoreConfig = hybridStoreConfigRecord; } diff --git a/services/venice-controller/src/test/java/com/linkedin/venice/controller/TestVeniceHelixAdminWithoutCluster.java b/services/venice-controller/src/test/java/com/linkedin/venice/controller/TestVeniceHelixAdminWithoutCluster.java index 230c41db31..9275758a4c 100644 --- a/services/venice-controller/src/test/java/com/linkedin/venice/controller/TestVeniceHelixAdminWithoutCluster.java +++ b/services/venice-controller/src/test/java/com/linkedin/venice/controller/TestVeniceHelixAdminWithoutCluster.java @@ -48,14 +48,12 @@ public void canMergeNewHybridConfigValuesToOldStore() { Optional timeLag = Optional.of(300L); Optional dataReplicationPolicy = Optional.of(DataReplicationPolicy.AGGREGATE); Optional bufferReplayPolicy = Optional.of(BufferReplayPolicy.REWIND_FROM_EOP); - Optional realTimeTopicName = Optional.of("storeName_rt"); HybridStoreConfig hybridStoreConfig = VeniceHelixAdmin.mergeNewSettingsIntoOldHybridStoreConfig( store, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), - Optional.empty(), Optional.empty()); Assert.assertNull( hybridStoreConfig, @@ -67,8 +65,7 @@ public void canMergeNewHybridConfigValuesToOldStore() { lagOffset, timeLag, dataReplicationPolicy, - bufferReplayPolicy, - realTimeTopicName); + bufferReplayPolicy); Assert.assertNotNull(hybridStoreConfig, "specifying rewind and lagOffset should generate a valid hybrid config"); Assert.assertEquals(hybridStoreConfig.getRewindTimeInSeconds(), 123L); Assert.assertEquals(hybridStoreConfig.getOffsetLagThresholdToGoOnline(), 1500L); @@ -82,7 +79,6 @@ public void canMergeNewHybridConfigValuesToOldStore() { lagOffset, Optional.empty(), Optional.empty(), - Optional.empty(), Optional.empty()); Assert.assertNotNull(hybridStoreConfig, "specifying rewind and lagOffset should generate a valid hybrid config"); Assert.assertEquals(hybridStoreConfig.getRewindTimeInSeconds(), 123L); diff --git a/services/venice-controller/src/test/java/com/linkedin/venice/controller/kafka/consumer/AdminConsumptionTaskTest.java b/services/venice-controller/src/test/java/com/linkedin/venice/controller/kafka/consumer/AdminConsumptionTaskTest.java index be38cb0311..70a8200fb0 100644 --- a/services/venice-controller/src/test/java/com/linkedin/venice/controller/kafka/consumer/AdminConsumptionTaskTest.java +++ b/services/venice-controller/src/test/java/com/linkedin/venice/controller/kafka/consumer/AdminConsumptionTaskTest.java @@ -18,7 +18,6 @@ import static com.linkedin.venice.controllerapi.ControllerApiConstants.TIME_LAG_TO_GO_ONLINE; import static com.linkedin.venice.controllerapi.ControllerApiConstants.VERSION; import static com.linkedin.venice.controllerapi.ControllerApiConstants.WRITE_COMPUTATION_ENABLED; -import static com.linkedin.venice.meta.HybridStoreConfigImpl.DEFAULT_REAL_TIME_TOPIC_NAME; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.anyDouble; @@ -932,7 +931,6 @@ public void testSetStore(boolean replicateAllConfigs) throws Exception { hybridConfig.offsetLagThresholdToGoOnline = 1000L; hybridConfig.producerTimestampLagThresholdToGoOnlineInSeconds = 300L; hybridConfig.dataReplicationPolicy = DataReplicationPolicy.AGGREGATE.getValue(); - hybridConfig.realTimeTopicName = DEFAULT_REAL_TIME_TOPIC_NAME; setStore.hybridStoreConfig = hybridConfig; ETLStoreConfigRecord etlStoreConfig = new ETLStoreConfigRecord();