fix conflicts

Signed-off-by: silverbullet233 <[email protected]>
StarRocks · Sep 20, 2024 · 4d575ab · 4d575ab
1 parent 1160e1f
commit 4d575ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/be/src/exec/olap_scan_node.cpp b/be/src/exec/olap_scan_node.cpp
@@ -749,17 +749,11 @@ StatusOr<TabletSharedPtr> OlapScanNode::get_tablet(const TInternalScanRange* sca
 StatusOr<std::vector<RowsetSharedPtr>> OlapScanNode::capture_tablet_rowsets(const TabletSharedPtr& tablet,
                                                                             const TInternalScanRange* scan_range) {
     std::vector<RowsetSharedPtr> rowsets;
-    if (scan_range->__isset.gtid) {
-        std::shared_lock l(tablet->get_header_lock());
-        RETURN_IF_ERROR(tablet->capture_consistent_rowsets(scan_range->gtid, &rowsets));
-        Rowset::acquire_readers(rowsets);
-    } else {
-        int64_t version = strtoul(scan_range->version.c_str(), nullptr, 10);
-        // Capture row sets of this version tablet.
-        std::shared_lock l(tablet->get_header_lock());
-        RETURN_IF_ERROR(tablet->capture_consistent_rowsets(Version(0, version), &rowsets));
-        Rowset::acquire_readers(rowsets);
-    }
+    int64_t version = strtoul(scan_range->version.c_str(), nullptr, 10);
+    // Capture row sets of this version tablet.
+    std::shared_lock l(tablet->get_header_lock());
+    RETURN_IF_ERROR(tablet->capture_consistent_rowsets(Version(0, version), &rowsets));
+    Rowset::acquire_readers(rowsets);
     return rowsets;
 }
 

diff --git a/be/src/exec/pipeline/scan/olap_scan_context.cpp b/be/src/exec/pipeline/scan/olap_scan_context.cpp
@@ -85,21 +85,11 @@ Status OlapScanContext::capture_tablet_rowsets(const std::vector<TInternalScanRa
     for (int i = 0; i < olap_scan_ranges.size(); ++i) {
         auto* scan_range = olap_scan_ranges[i];
 
-        int64_t version = strtoul(scan_range->version.c_str(), nullptr, 10);
         ASSIGN_OR_RETURN(TabletSharedPtr tablet, OlapScanNode::get_tablet(scan_range));
         ASSIGN_OR_RETURN(tablet_rowsets[i], OlapScanNode::capture_tablet_rowsets(tablet, scan_range));
 
-<<<<<<< HEAD
-        // Capture row sets of this version tablet.
-        {
-            std::shared_lock l(tablet->get_header_lock());
-            RETURN_IF_ERROR(tablet->capture_consistent_rowsets(Version(0, version), &_tablet_rowsets[i]));
-            Rowset::acquire_readers(_tablet_rowsets[i]);
-        }
-=======
         VLOG(1) << "capture tablet rowsets: " << tablet->full_name() << ", rowsets: " << tablet_rowsets[i].size()
-                << ", version: " << scan_range->version << ", gtid: " << scan_range->gtid;
->>>>>>> d7ad29e758 ([Enhancement] support phased schedule (#47868))
+                << ", version: " << scan_range->version;
 
         _tablets[i] = std::move(tablet);
     }

diff --git a/fe/fe-core/src/main/java/com/starrocks/qe/QeProcessorImpl.java b/fe/fe-core/src/main/java/com/starrocks/qe/QeProcessorImpl.java
@@ -39,11 +39,8 @@
 import com.google.common.collect.Maps;
 import com.starrocks.catalog.MvId;
 import com.starrocks.common.Config;
-<<<<<<< HEAD
 import com.starrocks.common.Pair;
-=======
 import com.starrocks.common.Status;
->>>>>>> d7ad29e758 ([Enhancement] support phased schedule (#47868))
 import com.starrocks.common.UserException;
 import com.starrocks.common.util.DebugUtil;
 import com.starrocks.memory.MemoryTrackable;