Skip to content

Commit c690480

Browse files
antonio2368antonio2368
authored
Merge branch 'master' into fix-cnf-new-analyzer
2 parents 1da5453 + dc91f6b commit c690480

File tree

13 files changed

+73
-92
lines changed

13 files changed

+73
-92
lines changed

‎base/glibc-compatibility/musl/logf.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ float logf(float x)
5353
tmp = ix - OFF;
5454
i = (tmp >> (23 - LOGF_TABLE_BITS)) % N;
5555
k = (int32_t)tmp >> 23; /* arithmetic shift */
56-
iz = ix - (tmp & 0x1ff << 23);
56+
iz = ix - (tmp & 0xff800000);
5757
invc = T[i].invc;
5858
logc = T[i].logc;
5959
z = (double_t)asfloat(iz);

‎cmake/linux/toolchain-riscv64.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
2121
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
2222
set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
2323

24-
set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=bfd")
24+
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=bfd")
2525

2626
# Currently, lld does not work with the error:
2727
# ld.lld: error: section size decrease is too large

‎contrib/boringssl-cmake/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "mips")
111111
set(ARCH "generic")
112112
elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le")
113113
set(ARCH "ppc64le")
114+
elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "riscv64")
115+
set(ARCH "riscv64")
114116
else()
115117
message(FATAL_ERROR "Unknown processor:" ${CMAKE_SYSTEM_PROCESSOR})
116118
endif()

‎docs/en/engines/table-engines/mergetree-family/replacingmergetree.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,17 @@ SELECT * FROM mySecondReplacingMT FINAL;
9090

9191
### is_deleted
9292

93-
`is_deleted` — Name of the column with the type of row: `1` is a “deleted“ row, `0` is a “state“ row.
93+
`is_deleted` — Name of a column used during a merge to determine whether the data in this row represents the state or is to be deleted; `1` is a “deleted“ row, `0` is a “state“ row.
9494

95-
Column data type — `Int8`.
95+
Column data type — `UInt8`.
9696

97-
Can only be enabled when `ver` is used.
98-
The row is deleted when use the `OPTIMIZE ... FINAL CLEANUP`, or `OPTIMIZE ... FINAL` if the engine settings `clean_deleted_rows` has been set to `Always`.
99-
No matter the operation on the data, the version must be increased. If two inserted rows have the same version number, the last inserted one is the one kept.
97+
:::note
98+
`is_deleted` can only be enabled when `ver` is used.
10099

100+
The row is deleted when `OPTIMIZE ... FINAL CLEANUP` or `OPTIMIZE ... FINAL` is used, or if the engine setting `clean_deleted_rows` has been set to `Always`.
101101

102+
No matter the operation on the data, the version must be increased. If two inserted rows have the same version number, the last inserted row is the one kept.
103+
:::
102104

103105
## Query clauses
104106

‎docs/en/operations/settings/settings.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,8 +1410,8 @@ and [enable_writes_to_query_cache](#enable-writes-to-query-cache) control in mor
14101410

14111411
Possible values:
14121412

1413-
- 0 - Yes
1414-
- 1 - No
1413+
- 0 - Disabled
1414+
- 1 - Enabled
14151415

14161416
Default value: `0`.
14171417

‎programs/client/Client.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,8 @@ bool Client::processWithFuzzing(const String & full_query)
862862
const auto * tmp_pos = text_2.c_str();
863863
const auto ast_3 = parseQuery(tmp_pos, tmp_pos + text_2.size(),
864864
false /* allow_multi_statements */);
865-
const auto text_3 = ast_3->formatForErrorMessage();
865+
const auto text_3 = ast_3 ? ast_3->formatForErrorMessage() : "";
866+
866867
if (text_3 != text_2)
867868
{
868869
fmt::print(stderr, "Found error: The query formatting is broken.\n");
@@ -877,7 +878,7 @@ bool Client::processWithFuzzing(const String & full_query)
877878
fmt::print(stderr, "Text-1 (AST-1 formatted):\n'{}'\n", query_to_execute);
878879
fmt::print(stderr, "AST-2 (Text-1 parsed):\n'{}'\n", ast_2->dumpTree());
879880
fmt::print(stderr, "Text-2 (AST-2 formatted):\n'{}'\n", text_2);
880-
fmt::print(stderr, "AST-3 (Text-2 parsed):\n'{}'\n", ast_3->dumpTree());
881+
fmt::print(stderr, "AST-3 (Text-2 parsed):\n'{}'\n", ast_3 ? ast_3->dumpTree() : "");
881882
fmt::print(stderr, "Text-3 (AST-3 formatted):\n'{}'\n", text_3);
882883
fmt::print(stderr, "Text-3 must be equal to Text-2, but it is not.\n");
883884

‎src/Common/ErrorCodes.cpp‎

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,14 @@
2929
M(13, SIZES_OF_COLUMNS_IN_TUPLE_DOESNT_MATCH) \
3030
M(15, DUPLICATE_COLUMN) \
3131
M(16, NO_SUCH_COLUMN_IN_TABLE) \
32-
M(17, DELIMITER_IN_STRING_LITERAL_DOESNT_MATCH) \
33-
M(18, CANNOT_INSERT_ELEMENT_INTO_CONSTANT_COLUMN) \
3432
M(19, SIZE_OF_FIXED_STRING_DOESNT_MATCH) \
3533
M(20, NUMBER_OF_COLUMNS_DOESNT_MATCH) \
36-
M(21, CANNOT_READ_ALL_DATA_FROM_TAB_SEPARATED_INPUT) \
37-
M(22, CANNOT_PARSE_ALL_VALUE_FROM_TAB_SEPARATED_INPUT) \
3834
M(23, CANNOT_READ_FROM_ISTREAM) \
3935
M(24, CANNOT_WRITE_TO_OSTREAM) \
4036
M(25, CANNOT_PARSE_ESCAPE_SEQUENCE) \
4137
M(26, CANNOT_PARSE_QUOTED_STRING) \
4238
M(27, CANNOT_PARSE_INPUT_ASSERTION_FAILED) \
4339
M(28, CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER) \
44-
M(29, CANNOT_PRINT_INTEGER) \
45-
M(30, CANNOT_READ_SIZE_OF_COMPRESSED_CHUNK) \
46-
M(31, CANNOT_READ_COMPRESSED_CHUNK) \
4740
M(32, ATTEMPT_TO_READ_AFTER_EOF) \
4841
M(33, CANNOT_READ_ALL_DATA) \
4942
M(34, TOO_MANY_ARGUMENTS_FOR_FUNCTION) \
@@ -57,7 +50,6 @@
5750
M(42, NUMBER_OF_ARGUMENTS_DOESNT_MATCH) \
5851
M(43, ILLEGAL_TYPE_OF_ARGUMENT) \
5952
M(44, ILLEGAL_COLUMN) \
60-
M(45, ILLEGAL_NUMBER_OF_RESULT_COLUMNS) \
6153
M(46, UNKNOWN_FUNCTION) \
6254
M(47, UNKNOWN_IDENTIFIER) \
6355
M(48, NOT_IMPLEMENTED) \
@@ -66,20 +58,14 @@
6658
M(51, EMPTY_LIST_OF_COLUMNS_QUERIED) \
6759
M(52, COLUMN_QUERIED_MORE_THAN_ONCE) \
6860
M(53, TYPE_MISMATCH) \
69-
M(54, STORAGE_DOESNT_ALLOW_PARAMETERS) \
7061
M(55, STORAGE_REQUIRES_PARAMETER) \
7162
M(56, UNKNOWN_STORAGE) \
7263
M(57, TABLE_ALREADY_EXISTS) \
7364
M(58, TABLE_METADATA_ALREADY_EXISTS) \
7465
M(59, ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER) \
7566
M(60, UNKNOWN_TABLE) \
76-
M(61, ONLY_FILTER_COLUMN_IN_BLOCK) \
7767
M(62, SYNTAX_ERROR) \
7868
M(63, UNKNOWN_AGGREGATE_FUNCTION) \
79-
M(64, CANNOT_READ_AGGREGATE_FUNCTION_FROM_TEXT) \
80-
M(65, CANNOT_WRITE_AGGREGATE_FUNCTION_AS_TEXT) \
81-
M(66, NOT_A_COLUMN) \
82-
M(67, ILLEGAL_KEY_OF_AGGREGATION) \
8369
M(68, CANNOT_GET_SIZE_OF_FIELD) \
8470
M(69, ARGUMENT_OUT_OF_BOUND) \
8571
M(70, CANNOT_CONVERT_TYPE) \
@@ -109,16 +95,11 @@
10995
M(94, CANNOT_MERGE_DIFFERENT_AGGREGATED_DATA_VARIANTS) \
11096
M(95, CANNOT_READ_FROM_SOCKET) \
11197
M(96, CANNOT_WRITE_TO_SOCKET) \
112-
M(97, CANNOT_READ_ALL_DATA_FROM_CHUNKED_INPUT) \
113-
M(98, CANNOT_WRITE_TO_EMPTY_BLOCK_OUTPUT_STREAM) \
11498
M(99, UNKNOWN_PACKET_FROM_CLIENT) \
11599
M(100, UNKNOWN_PACKET_FROM_SERVER) \
116100
M(101, UNEXPECTED_PACKET_FROM_CLIENT) \
117101
M(102, UNEXPECTED_PACKET_FROM_SERVER) \
118-
M(103, RECEIVED_DATA_FOR_WRONG_QUERY_ID) \
119102
M(104, TOO_SMALL_BUFFER_SIZE) \
120-
M(105, CANNOT_READ_HISTORY) \
121-
M(106, CANNOT_APPEND_HISTORY) \
122103
M(107, FILE_DOESNT_EXIST) \
123104
M(108, NO_DATA_TO_INSERT) \
124105
M(109, CANNOT_BLOCK_SIGNAL) \
@@ -137,7 +118,6 @@
137118
M(123, UNKNOWN_TYPE_OF_AST_NODE) \
138119
M(124, INCORRECT_ELEMENT_OF_SET) \
139120
M(125, INCORRECT_RESULT_OF_SCALAR_SUBQUERY) \
140-
M(126, CANNOT_GET_RETURN_TYPE) \
141121
M(127, ILLEGAL_INDEX) \
142122
M(128, TOO_LARGE_ARRAY_SIZE) \
143123
M(129, FUNCTION_IS_SPECIAL) \
@@ -149,30 +129,17 @@
149129
M(137, UNKNOWN_ELEMENT_IN_CONFIG) \
150130
M(138, EXCESSIVE_ELEMENT_IN_CONFIG) \
151131
M(139, NO_ELEMENTS_IN_CONFIG) \
152-
M(140, ALL_REQUESTED_COLUMNS_ARE_MISSING) \
153132
M(141, SAMPLING_NOT_SUPPORTED) \
154133
M(142, NOT_FOUND_NODE) \
155-
M(143, FOUND_MORE_THAN_ONE_NODE) \
156-
M(144, FIRST_DATE_IS_BIGGER_THAN_LAST_DATE) \
157134
M(145, UNKNOWN_OVERFLOW_MODE) \
158-
M(146, QUERY_SECTION_DOESNT_MAKE_SENSE) \
159-
M(147, NOT_FOUND_FUNCTION_ELEMENT_FOR_AGGREGATE) \
160-
M(148, NOT_FOUND_RELATION_ELEMENT_FOR_CONDITION) \
161-
M(149, NOT_FOUND_RHS_ELEMENT_FOR_CONDITION) \
162-
M(150, EMPTY_LIST_OF_ATTRIBUTES_PASSED) \
163-
M(151, INDEX_OF_COLUMN_IN_SORT_CLAUSE_IS_OUT_OF_RANGE) \
164135
M(152, UNKNOWN_DIRECTION_OF_SORTING) \
165136
M(153, ILLEGAL_DIVISION) \
166-
M(154, AGGREGATE_FUNCTION_NOT_APPLICABLE) \
167-
M(155, UNKNOWN_RELATION) \
168137
M(156, DICTIONARIES_WAS_NOT_LOADED) \
169-
M(157, ILLEGAL_OVERFLOW_MODE) \
170138
M(158, TOO_MANY_ROWS) \
171139
M(159, TIMEOUT_EXCEEDED) \
172140
M(160, TOO_SLOW) \
173141
M(161, TOO_MANY_COLUMNS) \
174142
M(162, TOO_DEEP_SUBQUERIES) \
175-
M(163, TOO_DEEP_PIPELINE) \
176143
M(164, READONLY) \
177144
M(165, TOO_MANY_TEMPORARY_COLUMNS) \
178145
M(166, TOO_MANY_TEMPORARY_NON_CONST_COLUMNS) \
@@ -183,36 +150,27 @@
183150
M(172, CANNOT_CREATE_DIRECTORY) \
184151
M(173, CANNOT_ALLOCATE_MEMORY) \
185152
M(174, CYCLIC_ALIASES) \
186-
M(176, CHUNK_NOT_FOUND) \
187-
M(177, DUPLICATE_CHUNK_NAME) \
188-
M(178, MULTIPLE_ALIASES_FOR_EXPRESSION) \
189153
M(179, MULTIPLE_EXPRESSIONS_FOR_ALIAS) \
190154
M(180, THERE_IS_NO_PROFILE) \
191155
M(181, ILLEGAL_FINAL) \
192156
M(182, ILLEGAL_PREWHERE) \
193157
M(183, UNEXPECTED_EXPRESSION) \
194158
M(184, ILLEGAL_AGGREGATION) \
195-
M(185, UNSUPPORTED_MYISAM_BLOCK_TYPE) \
196159
M(186, UNSUPPORTED_COLLATION_LOCALE) \
197160
M(187, COLLATION_COMPARISON_FAILED) \
198-
M(188, UNKNOWN_ACTION) \
199-
M(189, TABLE_MUST_NOT_BE_CREATED_MANUALLY) \
200161
M(190, SIZES_OF_ARRAYS_DONT_MATCH) \
201162
M(191, SET_SIZE_LIMIT_EXCEEDED) \
202163
M(192, UNKNOWN_USER) \
203164
M(193, WRONG_PASSWORD) \
204165
M(194, REQUIRED_PASSWORD) \
205166
M(195, IP_ADDRESS_NOT_ALLOWED) \
206167
M(196, UNKNOWN_ADDRESS_PATTERN_TYPE) \
207-
M(197, SERVER_REVISION_IS_TOO_OLD) \
208168
M(198, DNS_ERROR) \
209169
M(199, UNKNOWN_QUOTA) \
210-
M(200, QUOTA_DOESNT_ALLOW_KEYS) \
211170
M(201, QUOTA_EXCEEDED) \
212171
M(202, TOO_MANY_SIMULTANEOUS_QUERIES) \
213172
M(203, NO_FREE_CONNECTION) \
214173
M(204, CANNOT_FSYNC) \
215-
M(205, NESTED_TYPE_TOO_DEEP) \
216174
M(206, ALIAS_REQUIRED) \
217175
M(207, AMBIGUOUS_IDENTIFIER) \
218176
M(208, EMPTY_NESTED_TABLE) \
@@ -229,7 +187,6 @@
229187
M(219, DATABASE_NOT_EMPTY) \
230188
M(220, DUPLICATE_INTERSERVER_IO_ENDPOINT) \
231189
M(221, NO_SUCH_INTERSERVER_IO_ENDPOINT) \
232-
M(222, ADDING_REPLICA_TO_NON_EMPTY_TABLE) \
233190
M(223, UNEXPECTED_AST_STRUCTURE) \
234191
M(224, REPLICA_IS_ALREADY_ACTIVE) \
235192
M(225, NO_ZOOKEEPER) \
@@ -253,9 +210,7 @@
253210
M(243, NOT_ENOUGH_SPACE) \
254211
M(244, UNEXPECTED_ZOOKEEPER_ERROR) \
255212
M(246, CORRUPTED_DATA) \
256-
M(247, INCORRECT_MARK) \
257213
M(248, INVALID_PARTITION_VALUE) \
258-
M(250, NOT_ENOUGH_BLOCK_NUMBERS) \
259214
M(251, NO_SUCH_REPLICA) \
260215
M(252, TOO_MANY_PARTS) \
261216
M(253, REPLICA_ALREADY_EXISTS) \
@@ -271,8 +226,6 @@
271226
M(264, INCOMPATIBLE_TYPE_OF_JOIN) \
272227
M(265, NO_AVAILABLE_REPLICA) \
273228
M(266, MISMATCH_REPLICAS_DATA_SOURCES) \
274-
M(267, STORAGE_DOESNT_SUPPORT_PARALLEL_REPLICAS) \
275-
M(268, CPUID_ERROR) \
276229
M(269, INFINITE_LOOP) \
277230
M(270, CANNOT_COMPRESS) \
278231
M(271, CANNOT_DECOMPRESS) \
@@ -295,9 +248,7 @@
295248
M(290, LIMIT_EXCEEDED) \
296249
M(291, DATABASE_ACCESS_DENIED) \
297250
M(293, MONGODB_CANNOT_AUTHENTICATE) \
298-
M(294, INVALID_BLOCK_EXTRA_INFO) \
299251
M(295, RECEIVED_EMPTY_DATA) \
300-
M(296, NO_REMOTE_SHARD_FOUND) \
301252
M(297, SHARD_HAS_NO_CONNECTIONS) \
302253
M(298, CANNOT_PIPE) \
303254
M(299, CANNOT_FORK) \
@@ -311,28 +262,21 @@
311262
M(307, TOO_MANY_BYTES) \
312263
M(308, UNEXPECTED_NODE_IN_ZOOKEEPER) \
313264
M(309, FUNCTION_CANNOT_HAVE_PARAMETERS) \
314-
M(317, INVALID_SHARD_WEIGHT) \
315265
M(318, INVALID_CONFIG_PARAMETER) \
316266
M(319, UNKNOWN_STATUS_OF_INSERT) \
317267
M(321, VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE) \
318-
M(335, BARRIER_TIMEOUT) \
319268
M(336, UNKNOWN_DATABASE_ENGINE) \
320-
M(337, DDL_GUARD_IS_ACTIVE) \
321269
M(341, UNFINISHED) \
322270
M(342, METADATA_MISMATCH) \
323271
M(344, SUPPORT_IS_DISABLED) \
324272
M(345, TABLE_DIFFERS_TOO_MUCH) \
325273
M(346, CANNOT_CONVERT_CHARSET) \
326274
M(347, CANNOT_LOAD_CONFIG) \
327275
M(349, CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN) \
328-
M(350, INCOMPATIBLE_SOURCE_TABLES) \
329-
M(351, AMBIGUOUS_TABLE_NAME) \
330276
M(352, AMBIGUOUS_COLUMN_NAME) \
331277
M(353, INDEX_OF_POSITIONAL_ARGUMENT_IS_OUT_OF_RANGE) \
332278
M(354, ZLIB_INFLATE_FAILED) \
333279
M(355, ZLIB_DEFLATE_FAILED) \
334-
M(356, BAD_LAMBDA) \
335-
M(357, RESERVED_IDENTIFIER_NAME) \
336280
M(358, INTO_OUTFILE_NOT_ALLOWED) \
337281
M(359, TABLE_SIZE_EXCEEDS_MAX_DROP_SIZE_LIMIT) \
338282
M(360, CANNOT_CREATE_CHARSET_CONVERTER) \
@@ -341,7 +285,6 @@
341285
M(363, CANNOT_CREATE_IO_BUFFER) \
342286
M(364, RECEIVED_ERROR_TOO_MANY_REQUESTS) \
343287
M(366, SIZES_OF_NESTED_COLUMNS_ARE_INCONSISTENT) \
344-
M(367, TOO_MANY_FETCHES) \
345288
M(369, ALL_REPLICAS_ARE_STALE) \
346289
M(370, DATA_TYPE_CANNOT_BE_USED_IN_TABLES) \
347290
M(371, INCONSISTENT_CLUSTER_DEFINITION) \
@@ -352,7 +295,6 @@
352295
M(376, CANNOT_PARSE_UUID) \
353296
M(377, ILLEGAL_SYNTAX_FOR_DATA_TYPE) \
354297
M(378, DATA_TYPE_CANNOT_HAVE_ARGUMENTS) \
355-
M(379, UNKNOWN_STATUS_OF_DISTRIBUTED_DDL_TASK) \
356298
M(380, CANNOT_KILL) \
357299
M(381, HTTP_LENGTH_REQUIRED) \
358300
M(382, CANNOT_LOAD_CATBOOST_MODEL) \
@@ -378,11 +320,9 @@
378320
M(402, CANNOT_IOSETUP) \
379321
M(403, INVALID_JOIN_ON_EXPRESSION) \
380322
M(404, BAD_ODBC_CONNECTION_STRING) \
381-
M(405, PARTITION_SIZE_EXCEEDS_MAX_DROP_SIZE_LIMIT) \
382323
M(406, TOP_AND_LIMIT_TOGETHER) \
383324
M(407, DECIMAL_OVERFLOW) \
384325
M(408, BAD_REQUEST_PARAMETER) \
385-
M(409, EXTERNAL_EXECUTABLE_NOT_FOUND) \
386326
M(410, EXTERNAL_SERVER_IS_NOT_RESPONDING) \
387327
M(411, PTHREAD_ERROR) \
388328
M(412, NETLINK_ERROR) \
@@ -399,7 +339,6 @@
399339
M(424, CANNOT_LINK) \
400340
M(425, SYSTEM_ERROR) \
401341
M(427, CANNOT_COMPILE_REGEXP) \
402-
M(428, UNKNOWN_LOG_LEVEL) \
403342
M(429, FAILED_TO_GETPWUID) \
404343
M(430, MISMATCHING_USERS_FOR_PROCESS_AND_DATA) \
405344
M(431, ILLEGAL_SYNTAX_FOR_CODEC_TYPE) \
@@ -433,7 +372,6 @@
433372
M(459, CANNOT_SET_THREAD_PRIORITY) \
434373
M(460, CANNOT_CREATE_TIMER) \
435374
M(461, CANNOT_SET_TIMER_PERIOD) \
436-
M(462, CANNOT_DELETE_TIMER) \
437375
M(463, CANNOT_FCNTL) \
438376
M(464, CANNOT_PARSE_ELF) \
439377
M(465, CANNOT_PARSE_DWARF) \
@@ -456,15 +394,12 @@
456394
M(482, DICTIONARY_ACCESS_DENIED) \
457395
M(483, TOO_MANY_REDIRECTS) \
458396
M(484, INTERNAL_REDIS_ERROR) \
459-
M(485, SCALAR_ALREADY_EXISTS) \
460397
M(487, CANNOT_GET_CREATE_DICTIONARY_QUERY) \
461-
M(488, UNKNOWN_DICTIONARY) \
462398
M(489, INCORRECT_DICTIONARY_DEFINITION) \
463399
M(490, CANNOT_FORMAT_DATETIME) \
464400
M(491, UNACCEPTABLE_URL) \
465401
M(492, ACCESS_ENTITY_NOT_FOUND) \
466402
M(493, ACCESS_ENTITY_ALREADY_EXISTS) \
467-
M(494, ACCESS_ENTITY_FOUND_DUPLICATES) \
468403
M(495, ACCESS_STORAGE_READONLY) \
469404
M(496, QUOTA_REQUIRES_CLIENT_KEY) \
470405
M(497, ACCESS_DENIED) \
@@ -475,8 +410,6 @@
475410
M(502, CANNOT_SIGQUEUE) \
476411
M(503, AGGREGATE_FUNCTION_THROW) \
477412
M(504, FILE_ALREADY_EXISTS) \
478-
M(505, CANNOT_DELETE_DIRECTORY) \
479-
M(506, UNEXPECTED_ERROR_CODE) \
480413
M(507, UNABLE_TO_SKIP_UNUSED_SHARDS) \
481414
M(508, UNKNOWN_ACCESS_TYPE) \
482415
M(509, INVALID_GRANT) \
@@ -501,8 +434,6 @@
501434
M(530, CANNOT_CONNECT_RABBITMQ) \
502435
M(531, CANNOT_FSTAT) \
503436
M(532, LDAP_ERROR) \
504-
M(533, INCONSISTENT_RESERVATIONS) \
505-
M(534, NO_RESERVATIONS_PROVIDED) \
506437
M(535, UNKNOWN_RAID_TYPE) \
507438
M(536, CANNOT_RESTORE_FROM_FIELD_DUMP) \
508439
M(537, ILLEGAL_MYSQL_VARIABLE) \
@@ -518,8 +449,6 @@
518449
M(547, INVALID_RAID_TYPE) \
519450
M(548, UNKNOWN_VOLUME) \
520451
M(549, DATA_TYPE_CANNOT_BE_USED_IN_KEY) \
521-
M(550, CONDITIONAL_TREE_PARENT_NOT_FOUND) \
522-
M(551, ILLEGAL_PROJECTION_MANIPULATOR) \
523452
M(552, UNRECOGNIZED_ARGUMENTS) \
524453
M(553, LZMA_STREAM_ENCODER_FAILED) \
525454
M(554, LZMA_STREAM_DECODER_FAILED) \
@@ -580,8 +509,6 @@
580509
M(609, FUNCTION_ALREADY_EXISTS) \
581510
M(610, CANNOT_DROP_FUNCTION) \
582511
M(611, CANNOT_CREATE_RECURSIVE_FUNCTION) \
583-
M(612, OBJECT_ALREADY_STORED_ON_DISK) \
584-
M(613, OBJECT_WAS_NOT_STORED_ON_DISK) \
585512
M(614, POSTGRESQL_CONNECTION_FAILURE) \
586513
M(615, CANNOT_ADVISE) \
587514
M(616, UNKNOWN_READ_METHOD) \
@@ -612,9 +539,7 @@
612539
M(641, CANNOT_APPEND_TO_FILE) \
613540
M(642, CANNOT_PACK_ARCHIVE) \
614541
M(643, CANNOT_UNPACK_ARCHIVE) \
615-
M(644, REMOTE_FS_OBJECT_CACHE_ERROR) \
616542
M(645, NUMBER_OF_DIMENSIONS_MISMATCHED) \
617-
M(646, CANNOT_BACKUP_DATABASE) \
618543
M(647, CANNOT_BACKUP_TABLE) \
619544
M(648, WRONG_DDL_RENAMING_SETTINGS) \
620545
M(649, INVALID_TRANSACTION) \

0 commit comments

Comments
 (0)