diff --git a/gensrc/thrift/AgentService.thrift b/gensrc/thrift/AgentService.thrift index e7a8b3ae27..0f909918d5 100644 --- a/gensrc/thrift/AgentService.thrift +++ b/gensrc/thrift/AgentService.thrift @@ -152,6 +152,12 @@ enum TAlterTabletType { MIGRATION = 3 } +struct TAlterMaterializedViewParam { + 1: required string column_name + 2: optional string origin_column_name + 3: optional Exprs.TExpr mv_expr +} + // This v2 request will replace the old TAlterTabletReq. // TAlterTabletReq should be deprecated after new alter job process merged. struct TAlterTabletReqV2 { @@ -182,12 +188,6 @@ struct TAlterInvertedIndexReq { 10: optional i64 expiration } -struct TAlterMaterializedViewParam { - 1: required string column_name - 2: optional string origin_column_name - 3: optional Exprs.TExpr mv_expr -} - struct TStorageMigrationReqV2 { 1: optional Types.TTabletId base_tablet_id 2: optional Types.TTabletId new_tablet_id diff --git a/gensrc/thrift/Descriptors.thrift b/gensrc/thrift/Descriptors.thrift index 0c5d04e7a6..284c728b8d 100644 --- a/gensrc/thrift/Descriptors.thrift +++ b/gensrc/thrift/Descriptors.thrift @@ -187,6 +187,15 @@ struct TOlapTablePartitionParam { 7: optional list partition_columns } +struct TOlapTableIndex { + 1: optional string index_name + 2: optional list columns + 3: optional TIndexType index_type + 4: optional string comment + 5: optional i64 index_id + 6: optional map properties +} + struct TOlapTableIndexSchema { 1: required i64 id 2: required list columns @@ -210,15 +219,6 @@ struct TOlapTableSchemaParam { 9: optional list partial_update_input_columns } -struct TOlapTableIndex { - 1: optional string index_name - 2: optional list columns - 3: optional TIndexType index_type - 4: optional string comment - 5: optional i64 index_id - 6: optional map properties -} - struct TTabletLocation { 1: required i64 tablet_id 2: required list node_ids diff --git a/thirdparty/patches/mysql-5.7.18-boost.patch b/thirdparty/patches/mysql-5.7.18-boost.patch deleted file mode 100644 index e3f761332e..0000000000 --- a/thirdparty/patches/mysql-5.7.18-boost.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- cmake/boost.cmake -+++ cmake/boost.cmake -@@ -31,7 +31,7 @@ - # we assume that the correct version (see below) - # is installed on the compile host in the standard location. - --SET(BOOST_PACKAGE_NAME "boost_1_73_0") -+SET(BOOST_PACKAGE_NAME "boost_1_59_0") - SET(BOOST_TARBALL "${BOOST_PACKAGE_NAME}.tar.gz") - SET(BOOST_DOWNLOAD_URL - "http://sourceforge.net/projects/boost/files/boost/1.59.0/${BOOST_TARBALL}" -@@ -262,7 +262,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10) - COULD_NOT_FIND_BOOST() - ENDIF() - --IF(NOT BOOST_MINOR_VERSION EQUAL 73) -+IF(NOT BOOST_MINOR_VERSION EQUAL 59) - MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} " - "we need 59" - ) diff --git a/thirdparty/patches/mysql-5.7.18.patch b/thirdparty/patches/mysql-5.7.18.patch deleted file mode 100644 index 149248d1cf..0000000000 --- a/thirdparty/patches/mysql-5.7.18.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- cmd-line-utils/libedit/terminal.c.orig 2017-05-24 19:02:28.440144595 -0700 -+++ cmd-line-utils/libedit/terminal.c 2017-05-24 19:03:03.552146135 -0700 -@@ -866,7 +866,7 @@ - terminal_set(EditLine *el, const char *term) - { - int i; -- char buf[TC_BUFSIZE]; -+ // char buf[TC_BUFSIZE]; - char *area; - const struct termcapstr *t; - sigset_t oset, nset; -@@ -876,7 +876,8 @@ - (void) sigaddset(&nset, SIGWINCH); - (void) sigprocmask(SIG_BLOCK, &nset, &oset); - -- area = buf; -+ // area = buf; -+ area = NULL; - - - if (term == NULL) diff --git a/thirdparty/patches/rocksdb-5.14.2.patch b/thirdparty/patches/rocksdb-5.14.2.patch index 27f9bcbe86..972105e4e1 100644 --- a/thirdparty/patches/rocksdb-5.14.2.patch +++ b/thirdparty/patches/rocksdb-5.14.2.patch @@ -9,3 +9,88 @@ std::queue buffer_; bool eof_; }; +diff --git a/include/rocksdb/metadata.h b/include/rocksdb/metadata.h +--- a/include/rocksdb/metadata.h ++++ b/include/rocksdb/metadata.h +@@ -15,42 +15,6 @@ + + namespace rocksdb { + struct ColumnFamilyMetaData; +-struct LevelMetaData; +-struct SstFileMetaData; +- +-// The metadata that describes a column family. +-struct ColumnFamilyMetaData { +- ColumnFamilyMetaData() : size(0), file_count(0), name("") {} +- ColumnFamilyMetaData(const std::string& _name, uint64_t _size, +- const std::vector&& _levels) : +- size(_size), name(_name), levels(_levels) {} +- +- // The size of this column family in bytes, which is equal to the sum of +- // the file size of its "levels". +- uint64_t size; +- // The number of files in this column family. +- size_t file_count; +- // The name of the column family. +- std::string name; +- // The metadata of all levels in this column family. +- std::vector levels; +-}; +- +-// The metadata that describes a level. +-struct LevelMetaData { +- LevelMetaData(int _level, uint64_t _size, +- const std::vector&& _files) : +- level(_level), size(_size), +- files(_files) {} +- +- // The level which this meta data describes. +- const int level; +- // The size of this level in bytes, which is equal to the sum of +- // the file size of its "files". +- const uint64_t size; +- // The metadata of all sst files in this level. +- const std::vector files; +-}; + + // The metadata that describes a SST file. + struct SstFileMetaData { +@@ -100,4 +64,38 @@ struct LiveFileMetaData : SstFileMetaData { + std::string column_family_name; // Name of the column family + int level; // Level at which this file resides. + }; ++ ++// The metadata that describes a level. ++struct LevelMetaData { ++ LevelMetaData(int _level, uint64_t _size, ++ const std::vector&& _files) : ++ level(_level), size(_size), ++ files(_files) {} ++ ++ // The level which this meta data describes. ++ const int level; ++ // The size of this level in bytes, which is equal to the sum of ++ // the file size of its "files". ++ const uint64_t size; ++ // The metadata of all sst files in this level. ++ const std::vector files; ++}; ++ ++// The metadata that describes a column family. ++struct ColumnFamilyMetaData { ++ ColumnFamilyMetaData() : size(0), file_count(0), name("") {} ++ ColumnFamilyMetaData(const std::string& _name, uint64_t _size, ++ const std::vector&& _levels) : ++ size(_size), name(_name), levels(_levels) {} ++ ++ // The size of this column family in bytes, which is equal to the sum of ++ // the file size of its "levels". ++ uint64_t size; ++ // The number of files in this column family. ++ size_t file_count; ++ // The name of the column family. ++ std::string name; ++ // The metadata of all levels in this column family. ++ std::vector levels; ++}; + } // namespace rocksdb