This is an automated email from the ASF dual-hosted git repository.

morrysnow pushed a change to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git


    from 8a6c93d150f branch-3.1: [fix](nereids) stop merge project when 
generating huge expression #55293 (#55519)
     add 1a2ca1c2428 [feature](tde) add interface for table-level encryption 
#54995 (#55025)

No new revisions were added by this update.

Summary of changes:
 be/src/cloud/cloud_tablet.cpp                      |   2 +
 be/src/cloud/pb_convert.cpp                        |  12 +++++
 be/src/io/CMakeLists.txt                           |   7 +++
 .../src/io/fs/encrypted_fs_factory.cpp             |  27 ++++++-----
 .../fs/encrypted_fs_factory.h}                     |  18 ++++----
 be/src/io/fs/file_writer.h                         |   1 +
 be/src/olap/delta_writer_v2.cpp                    |   1 +
 be/src/olap/rowset/rowset_meta.cpp                 |  43 +++++++++++++----
 be/src/olap/rowset/rowset_meta.h                   |   4 ++
 be/src/olap/rowset/rowset_writer_context.h         |  51 +++++++++++++++------
 be/src/olap/tablet.cpp                             |   2 +
 be/src/olap/tablet_meta.cpp                        |  24 +++++++++-
 be/src/olap/tablet_meta.h                          |   8 +++-
 be/src/olap/task/index_builder.cpp                 |   2 +-
 be/src/olap/wal/wal_reader.cpp                     |  26 +++++++++--
 be/src/olap/wal/wal_writer.cpp                     |  50 ++++++++++++++++++--
 be/src/olap/wal/wal_writer.h                       |   7 ++-
 be/src/runtime/exec_env.h                          |   3 ++
 be/src/util/url_coding.cpp                         |   9 ++--
 be/src/vec/sink/writer/vwal_writer.cpp             |  13 ++++--
 be/src/vec/sink/writer/vwal_writer.h               |   5 +-
 be/test/olap/wal/wal_reader_writer_test.cpp        |   6 +--
 build.sh                                           |   6 +++
 .../main/java/org/apache/doris/common/Config.java  |  29 ++++++++++++
 .../org/apache/doris/alter/CloudRollupJobV2.java   |   2 +-
 .../apache/doris/alter/CloudSchemaChangeJobV2.java |   2 +-
 .../java/org/apache/doris/alter/RollupJobV2.java   |   2 +-
 .../org/apache/doris/alter/SchemaChangeJobV2.java  |   2 +-
 .../java/org/apache/doris/backup/RestoreJob.java   |   2 +-
 .../java/org/apache/doris/catalog/OlapTable.java   |  16 +++++++
 .../org/apache/doris/catalog/TableProperty.java    |  26 ++++++++++-
 .../apache/doris/cloud/backup/CloudRestoreJob.java |   2 +-
 .../cloud/datasource/CloudInternalCatalog.java     |   8 ++--
 .../apache/doris/common/util/PropertyAnalyzer.java |  32 +++++++++++++
 .../apache/doris/datasource/InternalCatalog.java   |  13 +++++-
 .../org/apache/doris/master/ReportHandler.java     |   2 +-
 .../apache/doris/service/FrontendServiceImpl.java  |  45 ++++++++++++++++++
 .../org/apache/doris/task/CreateReplicaTask.java   |   7 ++-
 .../java/org/apache/doris/task/AgentTaskTest.java  |   3 +-
 gensrc/proto/olap_file.proto                       |   2 +
 gensrc/thrift/AgentService.thrift                  |   1 +
 gensrc/thrift/FrontendService.thrift               |   2 +
 .../data/query_p0/system/test_table_properties.out | Bin 16747 -> 17179 bytes
 43 files changed, 439 insertions(+), 86 deletions(-)
 copy regression-test/suites/query_p0/show/test_show_catalogs.groovy => 
be/src/io/fs/encrypted_fs_factory.cpp (63%)
 copy be/src/{http/action/pprof_actions.h => io/fs/encrypted_fs_factory.h} (76%)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to