fix conflict (#54455)

Signed-off-by: xiangguangyxg <[email protected]>
StarRocks · Dec 27, 2024 · 0b1bb66 · 0b1bb66
1 parent 366efb3
commit 0b1bb66
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 20 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/task/CreateReplicaTask.java b/fe/fe-core/src/main/java/com/starrocks/task/CreateReplicaTask.java
@@ -84,11 +84,7 @@ public enum RecoverySource {
     private boolean createSchemaFile = true;
     private boolean enableTabletCreationOptimization = false;
     private final TTabletSchema tabletSchema;
-<<<<<<< HEAD
-=======
     private long gtid = 0;
-    private long timeoutMs = -1;
->>>>>>> f977337f8 ([Feature] Support restoring from a cluster snapshot for shared-data mode (part 3, introduce gtid for tablet metadata) (#54326))
 
     private CreateReplicaTask(Builder builder) {
         super(null, builder.getNodeId(), TTaskType.CREATE, builder.getDbId(), builder.getTableId(),

diff --git a/fe/fe-core/src/main/java/com/starrocks/task/TabletTaskExecutor.java b/fe/fe-core/src/main/java/com/starrocks/task/TabletTaskExecutor.java
@@ -124,14 +124,7 @@ public static void buildPartitionsConcurrently(long dbId, OlapTable table, List<
         int numIndexes = partitions.stream().mapToInt(
                 partition -> partition.getMaterializedIndices(MaterializedIndex.IndexExtState.VISIBLE).size()).sum();
         int maxTimeout = numIndexes * Config.max_create_table_timeout_second;
-<<<<<<< HEAD
-        boolean enableTabletCreationOptimization = table.isCloudNativeTableOrMaterializedView()
-                && Config.lake_enable_tablet_creation_optimization;
-        if (enableTabletCreationOptimization) {
-=======
-        long maxWaitTimeSeconds = Math.min(timeout, maxTimeout);
         if (option.isEnableTabletCreationOptimization()) {
->>>>>>> f977337f8 ([Feature] Support restoring from a cluster snapshot for shared-data mode (part 3, introduce gtid for tablet metadata) (#54326))
             numReplicas = numIndexes;
         }
         MarkedCountDownLatch<Long, Long> countDownLatch = new MarkedCountDownLatch<>(numReplicas);

diff --git a/gensrc/proto/lake_types.proto b/gensrc/proto/lake_types.proto
@@ -234,10 +234,6 @@ message TxnInfoPB {
     optional bool combined_txn_log = 3;
     optional TxnTypePB txn_type = 4;
     optional bool force_publish = 5; // only used for compaction
-<<<<<<< HEAD
-=======
-    optional bool rebuild_pindex = 6;
     optional int64 gtid = 7 [default=0];
->>>>>>> f977337f8 ([Feature] Support restoring from a cluster snapshot for shared-data mode (part 3, introduce gtid for tablet metadata) (#54326))
 };
 
diff --git a/gensrc/thrift/AgentService.thrift b/gensrc/thrift/AgentService.thrift
@@ -118,13 +118,8 @@ struct TCreateTabletReq {
     21: optional i32 compression_level = -1;
     // Whether or not use shared tablet initial metadata.
     22: optional bool enable_tablet_creation_optimization = false;
-<<<<<<< HEAD
-=======
-    // The timeout FE will wait for the tablet to be created.
-    23: optional i64 timeout_ms = -1;
     // Global transaction id
     24: optional i64 gtid = 0;
->>>>>>> f977337f8 ([Feature] Support restoring from a cluster snapshot for shared-data mode (part 3, introduce gtid for tablet metadata) (#54326))
 }
 
 struct TDropTabletReq {