.

linkedin · Dec 12, 2024 · 0d994df · 0d994df
1 parent d0cc14d
commit 0d994df
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 24 deletions.
diff --git a/...venice-common/src/main/java/com/linkedin/venice/controllerapi/ControllerApiConstants.java b/...venice-common/src/main/java/com/linkedin/venice/controllerapi/ControllerApiConstants.java
@@ -255,5 +255,4 @@ public class ControllerApiConstants {
   public static final String TARGET_SWAP_REGION = "target_swap_region";
   public static final String TARGET_SWAP_REGION_WAIT_TIME = "target_swap_region_wait_time";
   public static final String IS_DAVINCI_HEARTBEAT_REPORTED = "is_davinci_heartbeat_reported";
-  public static final String REAL_TIME_TOPIC_NAME = "real_time_topic_name";
 }
diff --git a/...venice-common/src/main/java/com/linkedin/venice/controllerapi/UpdateStoreQueryParams.java b/...venice-common/src/main/java/com/linkedin/venice/controllerapi/UpdateStoreQueryParams.java
@@ -770,13 +770,6 @@ public UpdateStoreQueryParams setIsDavinciHeartbeatReported(boolean isReported)
 
   public Optional<Boolean> getIsDavinciHeartbeatReported() {
     return getBoolean(IS_DAVINCI_HEARTBEAT_REPORTED);
-
-  public UpdateStoreQueryParams setRealTimeTopicName(String realTimeTopicName) {
-    return putString(REAL_TIME_TOPIC_NAME, realTimeTopicName);
-  }
-
-  public Optional<String> getRealTimeTopicName() {
-    return getInteger(REAL_TIME_TOPIC_NAME);
   }
 
   // ***************** above this line are getters and setters *****************

diff --git a/...e-common/src/main/java/com/linkedin/venice/serialization/avro/AvroProtocolDefinition.java b/...e-common/src/main/java/com/linkedin/venice/serialization/avro/AvroProtocolDefinition.java
@@ -72,7 +72,7 @@ public enum AvroProtocolDefinition {
    *
    * TODO: Move AdminOperation to venice-common module so that we can properly reference it here.
    */
-  ADMIN_OPERATION(85, SpecificData.get().getSchema(ByteBuffer.class), "AdminOperation"),
+  ADMIN_OPERATION(84, SpecificData.get().getSchema(ByteBuffer.class), "AdminOperation"),
 
   /**
    * Single chunk of a large multi-chunk value. Just a bunch of bytes.

diff --git a/...ices/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceHelixAdmin.java b/...ices/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceHelixAdmin.java
@@ -4842,7 +4842,6 @@ private void internalUpdateStore(String clusterName, String storeName, UpdateSto
     Optional<String> targetSwapRegion = params.getTargetSwapRegion();
     Optional<Integer> targetSwapRegionWaitTime = params.getTargetRegionSwapWaitTime();
     Optional<Boolean> isDavinciHeartbeatReported = params.getIsDavinciHeartbeatReported();
-    Optional<String> realTimeTopicName = params.getRealTimeTopicName();
 
     final Optional<HybridStoreConfig> newHybridStoreConfig;
     if (hybridRewindSeconds.isPresent() || hybridOffsetLagThreshold.isPresent() || hybridTimeLagThreshold.isPresent()
@@ -5150,9 +5149,12 @@ private void internalUpdateStore(String clusterName, String storeName, UpdateSto
       isDavinciHeartbeatReported.ifPresent(aBool -> storeMetadataUpdate(clusterName, storeName, store -> {
         store.setIsDavinciHeartbeatReported(aBool);
         return store;
+      }));
+
       realTimeTopicName.ifPresent(aString -> storeMetadataUpdate(clusterName, storeName, store -> {
         ensureRealTimeTopicIsReady(clusterName, pubSubTopicRepository.getTopic(aString));
-        store.setRealTimeTopicName(aString);
+        store.getHybridStoreConfig().setRealTimeTopicName(aString);
+        return store;
       }));
 
       LOGGER.info("Finished updating store: {} in cluster: {}", storeName, clusterName);

diff --git a/services/venice-controller/src/main/resources/avro/AdminOperation/v83/AdminOperation.avsc b/services/venice-controller/src/main/resources/avro/AdminOperation/v83/AdminOperation.avsc
@@ -289,12 +289,8 @@
                       "type": "int",
                       "doc": "Policy that will be used during buffer replay. rewindTimeInSeconds defines the delta. 0 => REWIND_FROM_EOP (replay from 'EOP - rewindTimeInSeconds'), 1 => REWIND_FROM_SOP (replay from 'SOP - rewindTimeInSeconds')",
                       "default": 0
-<<<<<<< HEAD
                     },
                     {"name": "realTimeTopicName", "type": "string", "default": "", "doc": "Name of the real time topic this store/version uses"}
-=======
-                    }
->>>>>>> 6d947e9d0 (.)
                   ]
                 }
               ],
@@ -664,15 +660,6 @@
               "doc": "How many producers will be used for the nearline producer in Server to improve producing throughput",
               "type": "int",
               "default": 1
-<<<<<<< HEAD
-=======
-            },
-            {
-              "name": "realTimeTopicName",
-              "doc": "Name of the new real time topic, if you want to change partition count or something else. DO NOT RUN THIS, FEATURE IS UNDER DEVELOPMENT!",
-              "type": "string",
-              "default": ""
->>>>>>> 6d947e9d0 (.)
             }
           ]
         },