From b7b22b65db5149c3c3581a82c45a40f101e5970c Mon Sep 17 00:00:00 2001
From: amber-create <48005258@qq.com>
Date: Tue, 23 Apr 2024 19:11:59 +0800
Subject: [PATCH] [Doc] update csv to textfile in Hive catalog doc (#44610)

(cherry picked from commit 38f703bdbe4fa27afea8a33162fff19135495c75)

# Conflicts:
#	docs/en/data_source/catalog/hive_catalog.md
#	docs/zh/data_source/catalog/hive_catalog.md
---
 docs/en/data_source/catalog/hive_catalog.md | 10 +++++++++-
 docs/zh/data_source/catalog/hive_catalog.md | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/en/data_source/catalog/hive_catalog.md b/docs/en/data_source/catalog/hive_catalog.md
index ca7aafb890765..39a4f07173658 100644
--- a/docs/en/data_source/catalog/hive_catalog.md
+++ b/docs/en/data_source/catalog/hive_catalog.md
@@ -20,14 +20,22 @@ To ensure successful SQL workloads on your Hive cluster, your StarRocks cluster
 
 ## Usage notes
 
+<<<<<<< HEAD
 - The file formats of Hive that StarRocks supports are Parquet, ORC, and CSV:
+=======
+- The file formats of Hive that StarRocks supports are Parquet, ORC, Textfile, Avro, RCFile, and SequenceFile:
+>>>>>>> 38f703bdbe ([Doc] update csv to textfile in Hive catalog doc (#44610))
 
   - Parquet files support the following compression formats: SNAPPY, LZ4, ZSTD, GZIP, and NO_COMPRESSION. From v3.1.5 onwards, Parquet files also support the LZO compression format.
   - ORC files support the following compression formats: ZLIB, SNAPPY, LZO, LZ4, ZSTD, and NO_COMPRESSION.
-  - CSV files support the LZO compression format from v3.1.5 onwards.
+  - Textfile files support the LZO compression format from v3.1.5 onwards.
 
+<<<<<<< HEAD
 - The data types of Hive that StarRocks does not support are INTERVAL, BINARY, and UNION. Additionally, StarRocks does not support the MAP and STRUCT data types for CSV-formatted Hive tables.
 - You can only use Hive catalogs to query data. You cannot use Hive catalogs to drop, delete, or insert data into your Hive cluster.
+=======
+- The data types of Hive that StarRocks does not support are INTERVAL, BINARY, and UNION. Additionally, StarRocks does not support the MAP and STRUCT data types for Textfile-formatted Hive tables.
+>>>>>>> 38f703bdbe ([Doc] update csv to textfile in Hive catalog doc (#44610))
 
 ## Integration preparations
 
diff --git a/docs/zh/data_source/catalog/hive_catalog.md b/docs/zh/data_source/catalog/hive_catalog.md
index 6d096380bb140..1c7f6d8a147bd 100644
--- a/docs/zh/data_source/catalog/hive_catalog.md
+++ b/docs/zh/data_source/catalog/hive_catalog.md
@@ -20,14 +20,22 @@ StarRocks 从 2.3 版本开始支持 Hive Catalog。另外从 3.1 版本起，
 
 ## 使用说明
 
+<<<<<<< HEAD
 - StarRocks 查询 Hive 数据时，支持 Parquet、ORC 和 CSV 三种文件格式，其中：
+=======
+- StarRocks 查询 Hive 数据时，支持 Parquet、ORC、Textfile、Avro、RCFile、SequenceFile 文件格式，其中：
+>>>>>>> 38f703bdbe ([Doc] update csv to textfile in Hive catalog doc (#44610))
 
   - Parquet 文件支持 SNAPPY、LZ4、ZSTD、GZIP 和 NO_COMPRESSION 压缩格式。自 v3.1.5 起，Parquet 文件还支持 LZO 压缩格式。
   - ORC 文件支持 ZLIB、SNAPPY、LZO、LZ4、ZSTD 和 NO_COMPRESSION 压缩格式。
-  - CSV 文件从 v3.1.5 起支持 LZO 压缩格式。
+  - Textfile 文件从 v3.1.5 起支持 LZO 压缩格式。
 
+<<<<<<< HEAD
 - StarRocks 查询 Hive 数据时，不支持 INTERVAL、BINARY 和 UNION 三种数据类型。此外，对于 CSV 格式的 Hive 表，StarRocks 不支持 MAP、STRUCT 数据类型。
 - Hive Catalog 仅支持查询 Hive 数据，不支持针对 Hive 的写/删操作。
+=======
+- StarRocks 查询 Hive 数据时，不支持 INTERVAL、BINARY 和 UNION 三种数据类型。此外，对于 Textfile 格式的 Hive 表，StarRocks 不支持 MAP、STRUCT 数据类型。
+>>>>>>> 38f703bdbe ([Doc] update csv to textfile in Hive catalog doc (#44610))
 
 ## 准备工作