2

apache · Jan 1, 2024 · 50463bf · 50463bf
1 parent c7019d1
commit 50463bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/be/src/vec/exec/format/orc/vorc_reader.cpp b/be/src/vec/exec/format/orc/vorc_reader.cpp
@@ -361,11 +361,11 @@ void OrcReader::_init_orc_cols(const orc::Type& type, std::vector<std::string>&
                                std::vector<std::string>& orc_cols_lower_case,
                                std::unordered_map<std::string, const orc::Type*>& type_map,
                                bool* is_hive1_orc) {
-    bool hive1_orc = false;
+    bool hive1_orc = true;
     for (int i = 0; i < type.getSubtypeCount(); ++i) {
         orc_cols.emplace_back(type.getFieldName(i));
         auto filed_name_lower_case = _get_field_name_lower_case(&type, i);
-        if (!hive1_orc) {
+        if (hive1_orc) {
             hive1_orc = _is_hive1_col_name(filed_name_lower_case);
         }
         auto filed_name_lower_case_copy = filed_name_lower_case;

diff --git a/be/src/vec/exec/format/orc/vorc_reader.h b/be/src/vec/exec/format/orc/vorc_reader.h
@@ -485,7 +485,10 @@ class OrcReader : public GenericReader {
     void set_remaining_rows(int64_t rows) { _remaining_rows = rows; }
 
     // check if the given name is like _col0, _col1, ...
-    bool inline _is_hive1_col_name(const std::string& name) {
+    static bool inline _is_hive1_col_name(const std::string& name) {
+        if (name.size() <= 4) {
+            return false;
+        }
         if (name.substr(0, 4) != "_col") {
             return false;
         }