You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2023/08/04 01:47:29 UTC
[doris] branch master updated: [refactor](reader) move reader from vec/exec/scan to vec/exec/format (#22371)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 1ed1b69485 [refactor](reader) move reader from vec/exec/scan to vec/exec/format (#22371)
1ed1b69485 is described below
commit 1ed1b69485e033d2b351407c73650baf289bcd49
Author: Mingyu Chen <mo...@163.com>
AuthorDate: Fri Aug 4 09:47:20 2023 +0800
[refactor](reader) move reader from vec/exec/scan to vec/exec/format (#22371)
This readers should be in vec/exec/format
---
be/src/service/internal_service.cpp | 2 +-
be/src/vec/exec/{scan => format/avro}/avro_jni_reader.cpp | 0
be/src/vec/exec/{scan => format/avro}/avro_jni_reader.h | 0
be/src/vec/exec/{scan => format}/jni_reader.cpp | 0
be/src/vec/exec/{scan => format}/jni_reader.h | 0
be/src/vec/exec/{scan => format/table}/hudi_jni_reader.cpp | 0
be/src/vec/exec/{scan => format/table}/hudi_jni_reader.h | 0
be/src/vec/exec/{scan => format/table}/max_compute_jni_reader.cpp | 0
be/src/vec/exec/{scan => format/table}/max_compute_jni_reader.h | 0
be/src/vec/exec/{scan => format/table}/paimon_reader.cpp | 0
be/src/vec/exec/{scan => format/table}/paimon_reader.h | 0
be/src/vec/exec/scan/vfile_scanner.cpp | 8 ++++----
12 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/be/src/service/internal_service.cpp b/be/src/service/internal_service.cpp
index 821e937fca..cf46ac1b29 100644
--- a/be/src/service/internal_service.cpp
+++ b/be/src/service/internal_service.cpp
@@ -110,12 +110,12 @@
#include "vec/core/block.h"
#include "vec/core/column_with_type_and_name.h"
#include "vec/data_types/data_type.h"
+#include "vec/exec/format/avro//avro_jni_reader.h"
#include "vec/exec/format/csv/csv_reader.h"
#include "vec/exec/format/generic_reader.h"
#include "vec/exec/format/json/new_json_reader.h"
#include "vec/exec/format/orc/vorc_reader.h"
#include "vec/exec/format/parquet/vparquet_reader.h"
-#include "vec/exec/scan/avro_jni_reader.h"
#include "vec/jsonb/serialize.h"
#include "vec/runtime/vdata_stream_mgr.h"
diff --git a/be/src/vec/exec/scan/avro_jni_reader.cpp b/be/src/vec/exec/format/avro/avro_jni_reader.cpp
similarity index 100%
rename from be/src/vec/exec/scan/avro_jni_reader.cpp
rename to be/src/vec/exec/format/avro/avro_jni_reader.cpp
diff --git a/be/src/vec/exec/scan/avro_jni_reader.h b/be/src/vec/exec/format/avro/avro_jni_reader.h
similarity index 100%
rename from be/src/vec/exec/scan/avro_jni_reader.h
rename to be/src/vec/exec/format/avro/avro_jni_reader.h
diff --git a/be/src/vec/exec/scan/jni_reader.cpp b/be/src/vec/exec/format/jni_reader.cpp
similarity index 100%
rename from be/src/vec/exec/scan/jni_reader.cpp
rename to be/src/vec/exec/format/jni_reader.cpp
diff --git a/be/src/vec/exec/scan/jni_reader.h b/be/src/vec/exec/format/jni_reader.h
similarity index 100%
rename from be/src/vec/exec/scan/jni_reader.h
rename to be/src/vec/exec/format/jni_reader.h
diff --git a/be/src/vec/exec/scan/hudi_jni_reader.cpp b/be/src/vec/exec/format/table/hudi_jni_reader.cpp
similarity index 100%
rename from be/src/vec/exec/scan/hudi_jni_reader.cpp
rename to be/src/vec/exec/format/table/hudi_jni_reader.cpp
diff --git a/be/src/vec/exec/scan/hudi_jni_reader.h b/be/src/vec/exec/format/table/hudi_jni_reader.h
similarity index 100%
rename from be/src/vec/exec/scan/hudi_jni_reader.h
rename to be/src/vec/exec/format/table/hudi_jni_reader.h
diff --git a/be/src/vec/exec/scan/max_compute_jni_reader.cpp b/be/src/vec/exec/format/table/max_compute_jni_reader.cpp
similarity index 100%
rename from be/src/vec/exec/scan/max_compute_jni_reader.cpp
rename to be/src/vec/exec/format/table/max_compute_jni_reader.cpp
diff --git a/be/src/vec/exec/scan/max_compute_jni_reader.h b/be/src/vec/exec/format/table/max_compute_jni_reader.h
similarity index 100%
rename from be/src/vec/exec/scan/max_compute_jni_reader.h
rename to be/src/vec/exec/format/table/max_compute_jni_reader.h
diff --git a/be/src/vec/exec/scan/paimon_reader.cpp b/be/src/vec/exec/format/table/paimon_reader.cpp
similarity index 100%
rename from be/src/vec/exec/scan/paimon_reader.cpp
rename to be/src/vec/exec/format/table/paimon_reader.cpp
diff --git a/be/src/vec/exec/scan/paimon_reader.h b/be/src/vec/exec/format/table/paimon_reader.h
similarity index 100%
rename from be/src/vec/exec/scan/paimon_reader.h
rename to be/src/vec/exec/format/table/paimon_reader.h
diff --git a/be/src/vec/exec/scan/vfile_scanner.cpp b/be/src/vec/exec/scan/vfile_scanner.cpp
index e30d7640ed..12fe34b4e9 100644
--- a/be/src/vec/exec/scan/vfile_scanner.cpp
+++ b/be/src/vec/exec/scan/vfile_scanner.cpp
@@ -55,17 +55,17 @@
#include "vec/data_types/data_type_nullable.h"
#include "vec/data_types/data_type_number.h"
#include "vec/data_types/data_type_string.h"
+#include "vec/exec/format/avro/avro_jni_reader.h"
#include "vec/exec/format/csv/csv_reader.h"
#include "vec/exec/format/json/new_json_reader.h"
#include "vec/exec/format/orc/vorc_reader.h"
#include "vec/exec/format/parquet/vparquet_reader.h"
+#include "vec/exec/format/table/hudi_jni_reader.h"
#include "vec/exec/format/table/iceberg_reader.h"
+#include "vec/exec/format/table/max_compute_jni_reader.h"
+#include "vec/exec/format/table/paimon_reader.h"
#include "vec/exec/format/table/transactional_hive_reader.h"
-#include "vec/exec/scan/avro_jni_reader.h"
-#include "vec/exec/scan/hudi_jni_reader.h"
-#include "vec/exec/scan/max_compute_jni_reader.h"
#include "vec/exec/scan/new_file_scan_node.h"
-#include "vec/exec/scan/paimon_reader.h"
#include "vec/exec/scan/vscan_node.h"
#include "vec/exprs/vexpr.h"
#include "vec/exprs/vexpr_context.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org