Skip to content
Permalink
Browse files

Merge branch 'bb-10.2-myrocks-merge' into 10.2

  • Loading branch information...
spetrunia committed Jun 21, 2019
2 parents c631bd7 + 7345c0d commit 821b866b5502511fe6fcba9503c5eb5790c393a9
Showing with 20,005 additions and 5,243 deletions.
  1. +70 −26 storage/rocksdb/.clang-format
  2. +26 −0 storage/rocksdb/CMakeLists.txt
  3. +97 −81 storage/rocksdb/build_rocksdb.cmake
  4. +5 −4 storage/rocksdb/event_listener.cc
  5. +3 −3 storage/rocksdb/event_listener.h
  6. +2,139 −1,813 storage/rocksdb/ha_rocksdb.cc
  7. +127 −524 storage/rocksdb/ha_rocksdb.h
  8. +2 −2 storage/rocksdb/ha_rocksdb_proto.h
  9. +3 −3 storage/rocksdb/logger.h
  10. +16 −4 storage/rocksdb/myrocks_hotbackup.py
  11. +0 −1 storage/rocksdb/mysql-test/rocksdb/combinations
  12. +14 −2 storage/rocksdb/mysql-test/rocksdb/include/bulk_load.inc
  13. +3 −2 storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc
  14. +298 −0 storage/rocksdb/mysql-test/rocksdb/include/bypass_create_table.inc
  15. +1,425 −0 storage/rocksdb/mysql-test/rocksdb/include/group_min_max.inc
  16. +23 −0 storage/rocksdb/mysql-test/rocksdb/include/have_direct_io.inc
  17. +3 −2 storage/rocksdb/mysql-test/rocksdb/include/locking_issues_case3.inc
  18. +3 −2 storage/rocksdb/mysql-test/rocksdb/include/locking_issues_case4.inc
  19. +3 −2 storage/rocksdb/mysql-test/rocksdb/include/locking_issues_case5.inc
  20. +3 −2 storage/rocksdb/mysql-test/rocksdb/include/locking_issues_case6.inc
  21. +0 −53 storage/rocksdb/mysql-test/rocksdb/include/rocksdb_concurrent_delete.inc
  22. +23 −0 storage/rocksdb/mysql-test/rocksdb/include/use_direct_io_option.inc
  23. +1 −1 storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_sstfilewriter.result
  24. +21 −0 storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars.result
  25. +5 −3 storage/rocksdb/mysql-test/rocksdb/r/{blind_delete_without_tx_api.result → blind_delete_rc.result}
  26. +87 −0 storage/rocksdb/mysql-test/rocksdb/r/blind_delete_rr.result
  27. +18 −0 storage/rocksdb/mysql-test/rocksdb/r/bloomfilter3.result
  28. +24 −1 storage/rocksdb/mysql-test/rocksdb/r/bloomfilter5.result
  29. +8 −7 storage/rocksdb/mysql-test/rocksdb/r/bulk_load.result
  30. +8 −7 storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_cf.result
  31. +8 −7 storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_cf_and_data.result
  32. +8 −7 storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_data.result
  33. +3 −6 storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result
  34. +3 −6 storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result
  35. +693 −0 storage/rocksdb/mysql-test/rocksdb/r/bypass_select_basic.result
  36. +693 −0 storage/rocksdb/mysql-test/rocksdb/r/bypass_select_basic_bloom.result
  37. +66 −0 storage/rocksdb/mysql-test/rocksdb/r/check_flags.result
  38. +15 −1 storage/rocksdb/mysql-test/rocksdb/r/create_no_primary_key_table.result
  39. +77 −77 storage/rocksdb/mysql-test/rocksdb/r/ddl_high_priority.result
  40. +0 −22 storage/rocksdb/mysql-test/rocksdb/r/delete_before_lock.result
  41. +38 −0 storage/rocksdb/mysql-test/rocksdb/r/force_shutdown.result
  42. +3,503 −0 storage/rocksdb/mysql-test/rocksdb/r/group_min_max.result
  43. +10 −0 storage/rocksdb/mysql-test/rocksdb/r/ha_extra_keyread.result
  44. +200 −3 storage/rocksdb/mysql-test/rocksdb/r/insert_with_keys.result
  45. +79 −0 storage/rocksdb/mysql-test/rocksdb/r/issue884.result
  46. +17 −0 storage/rocksdb/mysql-test/rocksdb/r/issue896.result
  47. +11 −0 storage/rocksdb/mysql-test/rocksdb/r/issue900.result
  48. +15 −0 storage/rocksdb/mysql-test/rocksdb/r/iterator_bounds.result
  49. +128 −0 storage/rocksdb/mysql-test/rocksdb/r/mysqlbinlog_blind_replace.result
  50. +73 −9 storage/rocksdb/mysql-test/rocksdb/r/mysqldump.result
  51. +98 −0 storage/rocksdb/mysql-test/rocksdb/r/optimize_myrocks_replace_into_base.result
  52. +46 −0 storage/rocksdb/mysql-test/rocksdb/r/optimize_myrocks_replace_into_lock.result
  53. +7 −0 storage/rocksdb/mysql-test/rocksdb/r/prefix_extractor_override.result
  54. +13 −6 storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
  55. +1 −1 storage/rocksdb/mysql-test/rocksdb/r/rocksdb_checksums.result
  56. +595 −8 storage/rocksdb/mysql-test/rocksdb/r/rocksdb_concurrent_delete.result
  57. +335 −0 storage/rocksdb/mysql-test/rocksdb/r/rocksdb_read_free_rpl.result
  58. +35 −0 storage/rocksdb/mysql-test/rocksdb/r/rocksdb_read_free_rpl_stress.result
  59. +84 −0 storage/rocksdb/mysql-test/rocksdb/r/rocksdb_timeout_rollback.result
  60. +0 −321 storage/rocksdb/mysql-test/rocksdb/r/rpl_read_free.result
  61. +56 −0 storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found_rc.result
  62. +16 −0 storage/rocksdb/mysql-test/rocksdb/r/show_engine.result
  63. +3 −3 storage/rocksdb/mysql-test/rocksdb/r/show_table_status.result
  64. +31 −0 storage/rocksdb/mysql-test/rocksdb/r/skip_core_dump_on_error.result
  65. +9 −9 storage/rocksdb/mysql-test/rocksdb/r/statistics.result
  66. +16 −8 storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result
  67. +620 −0 storage/rocksdb/mysql-test/rocksdb/r/truncate_partition.result
  68. +45 −0 storage/rocksdb/mysql-test/rocksdb/r/ttl_rows_examined.result
  69. +3 −3 storage/rocksdb/mysql-test/rocksdb/r/type_decimal.result
  70. +18 −0 storage/rocksdb/mysql-test/rocksdb/r/use_direct_io_for_flush_and_compaction.result
  71. +20 −0 storage/rocksdb/mysql-test/rocksdb/t/autoinc_vars.test
  72. 0 storage/rocksdb/mysql-test/rocksdb/t/{blind_delete_without_tx_api.cnf → blind_delete_rc.cnf}
  73. +3 −0 storage/rocksdb/mysql-test/rocksdb/t/blind_delete_rc.test
  74. +11 −0 storage/rocksdb/mysql-test/rocksdb/t/blind_delete_rr.cnf
  75. +3 −0 storage/rocksdb/mysql-test/rocksdb/t/blind_delete_rr.test
  76. +5 −3 ...rocksdb/mysql-test/rocksdb/t/{blind_delete_without_tx_api.test → blind_delete_without_tx_api.inc}
  77. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/bloomfilter3-master.opt
  78. +18 −0 storage/rocksdb/mysql-test/rocksdb/t/bloomfilter3.test
  79. +1 −1 storage/rocksdb/mysql-test/rocksdb/t/bloomfilter5-master.opt
  80. +26 −1 storage/rocksdb/mysql-test/rocksdb/t/bloomfilter5.test
  81. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/bulk_load.test
  82. +20 −0 storage/rocksdb/mysql-test/rocksdb/t/bulk_load_errors.test
  83. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/bulk_load_rev_cf.test
  84. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/bulk_load_rev_cf_and_data.test
  85. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/bulk_load_rev_data.test
  86. +213 −0 storage/rocksdb/mysql-test/rocksdb/t/bypass_select_basic.inc
  87. +3 −0 storage/rocksdb/mysql-test/rocksdb/t/bypass_select_basic.test
  88. +3 −0 storage/rocksdb/mysql-test/rocksdb/t/bypass_select_basic_bloom-master.opt
  89. +3 −0 storage/rocksdb/mysql-test/rocksdb/t/bypass_select_basic_bloom.test
  90. +117 −0 storage/rocksdb/mysql-test/rocksdb/t/check_flags.test
  91. +3 −0 storage/rocksdb/mysql-test/rocksdb/t/com_rpc_tx.test
  92. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/cons_snapshot_read_committed.opt
  93. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/cons_snapshot_repeatable_read.opt
  94. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/cons_snapshot_serializable.opt
  95. +20 −1 storage/rocksdb/mysql-test/rocksdb/t/create_no_primary_key_table.test
  96. +0 −36 storage/rocksdb/mysql-test/rocksdb/t/delete_before_lock.test
  97. +12 −1 storage/rocksdb/mysql-test/rocksdb/t/disabled.def
  98. +97 −0 storage/rocksdb/mysql-test/rocksdb/t/force_shutdown.test
  99. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/group_min_max-master.opt
  100. +8 −0 storage/rocksdb/mysql-test/rocksdb/t/group_min_max.test
  101. +15 −0 storage/rocksdb/mysql-test/rocksdb/t/ha_extra_keyread.test
  102. +90 −14 storage/rocksdb/mysql-test/rocksdb/t/insert_with_keys.test
  103. +43 −0 storage/rocksdb/mysql-test/rocksdb/t/issue884.test
  104. +17 −0 storage/rocksdb/mysql-test/rocksdb/t/issue896.test
  105. +13 −0 storage/rocksdb/mysql-test/rocksdb/t/issue900.test
  106. +2 −0 storage/rocksdb/mysql-test/rocksdb/t/iterator_bounds-master.opt
  107. +29 −0 storage/rocksdb/mysql-test/rocksdb/t/iterator_bounds.test
  108. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/level_read_uncommitted.opt
  109. +62 −0 storage/rocksdb/mysql-test/rocksdb/t/mysqlbinlog_blind_replace.test
  110. +7 −1 storage/rocksdb/mysql-test/rocksdb/t/mysqldump.test
  111. +96 −0 storage/rocksdb/mysql-test/rocksdb/t/optimize_myrocks_replace_into_base.test
  112. +88 −0 storage/rocksdb/mysql-test/rocksdb/t/optimize_myrocks_replace_into_lock.test
  113. +4 −0 storage/rocksdb/mysql-test/rocksdb/t/prefix_extractor_override.test
  114. +5 −4 storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test
  115. +106 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_concurrent_delete.inc
  116. +33 −19 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_concurrent_delete.test
  117. +30 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_concurrent_delete_main.inc
  118. +85 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_concurrent_delete_range.inc
  119. +82 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_concurrent_delete_sk.inc
  120. +3 −2 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_locks.test
  121. +4 −2 storage/rocksdb/mysql-test/rocksdb/t/{rpl_read_free.cnf → rocksdb_read_free_rpl.cnf}
  122. +414 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_read_free_rpl.test
  123. +17 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_read_free_rpl_stress.cnf
  124. +69 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_read_free_rpl_stress.inc
  125. +22 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_read_free_rpl_stress.test
  126. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_timeout_rollback-master.opt
  127. +78 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_timeout_rollback.test
  128. +0 −302 storage/rocksdb/mysql-test/rocksdb/t/rpl_read_free.test
  129. +11 −0 storage/rocksdb/mysql-test/rocksdb/t/rpl_row_not_found_rc.cnf
  130. +4 −0 storage/rocksdb/mysql-test/rocksdb/t/rpl_row_not_found_rc.test
  131. +2 −2 storage/rocksdb/mysql-test/rocksdb/t/rpl_row_triggers.cnf
  132. +4 −0 storage/rocksdb/mysql-test/rocksdb/t/rqg_examples.test
  133. +4 −0 storage/rocksdb/mysql-test/rocksdb/t/rqg_runtime.test
  134. +4 −0 storage/rocksdb/mysql-test/rocksdb/t/rqg_transactions.test
  135. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/skip_core_dump_on_error-master.opt
  136. +53 −0 storage/rocksdb/mysql-test/rocksdb/t/skip_core_dump_on_error.test
  137. +2 −0 storage/rocksdb/mysql-test/rocksdb/t/tbl_opt_data_index_dir.test
  138. +102 −0 storage/rocksdb/mysql-test/rocksdb/t/truncate_partition.inc
  139. +83 −0 storage/rocksdb/mysql-test/rocksdb/t/truncate_partition.test
  140. +56 −0 storage/rocksdb/mysql-test/rocksdb/t/ttl_rows_examined.test
  141. +2 −1 storage/rocksdb/mysql-test/rocksdb/t/unique_check.test
  142. +5 −0 storage/rocksdb/mysql-test/rocksdb/t/use_direct_io_for_flush_and_compaction.test
  143. +2 −34 storage/rocksdb/mysql-test/rocksdb/t/use_direct_reads.test
  144. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/use_direct_reads_writes.test
  145. +8 −0 storage/rocksdb/mysql-test/rocksdb_hotbackup/include/clean_tmpfiles.sh
  146. +14 −16 storage/rocksdb/mysql-test/rocksdb_hotbackup/include/stream_run.sh
  147. +21 −0 storage/rocksdb/mysql-test/rocksdb_hotbackup/r/xbstream_direct.result
  148. +25 −0 storage/rocksdb/mysql-test/rocksdb_hotbackup/t/xbstream.inc
  149. +6 −24 storage/rocksdb/mysql-test/rocksdb_hotbackup/t/xbstream.test
  150. +1 −0 storage/rocksdb/mysql-test/rocksdb_hotbackup/t/xbstream_direct-master.opt
  151. +7 −0 storage/rocksdb/mysql-test/rocksdb_hotbackup/t/xbstream_direct.test
  152. +5 −1 storage/rocksdb/mysql-test/rocksdb_rpl/combinations
  153. +37 −0 storage/rocksdb/mysql-test/rocksdb_rpl/include/rpl_gtid_crash_safe.inc
  154. +282 −0 storage/rocksdb/mysql-test/rocksdb_rpl/r/optimize_myrocks_replace_into.result
  155. +165 −0 storage/rocksdb/mysql-test/rocksdb_rpl/r/rocksdb_slave_check_before_image_consistency.result
  156. +361 −0 storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe_optimized.result
  157. +43 −0 storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_rocksdb_slave_gtid_info_optimized.result
  158. +0 −2 storage/rocksdb/mysql-test/rocksdb_rpl/t/combinations
  159. +2 −1 storage/rocksdb/mysql-test/rocksdb_rpl/t/disabled.def
  160. +149 −0 storage/rocksdb/mysql-test/rocksdb_rpl/t/optimize_myrocks_replace_into.test
  161. +1 −0 storage/rocksdb/mysql-test/rocksdb_rpl/t/rocksdb_slave_check_before_image_consistency-slave.opt
  162. +22 −0 storage/rocksdb/mysql-test/rocksdb_rpl/t/rocksdb_slave_check_before_image_consistency.test
  163. +4 −35 storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_crash_safe.test
  164. +1 −0 storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_crash_safe_optimized-master.opt
  165. +2 −0 storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_crash_safe_optimized-slave.opt
  166. +11 −0 storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_crash_safe_optimized.test
  167. +1 −0 storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_rocksdb_slave_gtid_info_optimized-master.opt
  168. +1 −0 storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_rocksdb_slave_gtid_info_optimized-slave.opt
  169. +51 −0 storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_rocksdb_slave_gtid_info_optimized.test
  170. +19 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_cache_dump_basic.result
  171. +22 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_cache_high_pri_pool_ratio_basic.result
  172. +19 −0 ...ksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_cache_index_and_filter_with_high_priority_basic.result
  173. +14 −14 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_commit_time_batch_for_recovery_basic.result
  174. +6 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_delete_cf_basic.result
  175. +75 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_enable_insert_with_update_caching_basic.result
  176. +58 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_read_free_rpl_basic.result
  177. +17 −33 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_read_free_rpl_tables_basic.result
  178. +97 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_rollback_on_timeout_basic.result
  179. +2 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_skip_unique_check_tables_basic.result
  180. +85 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_stats_level_basic.result
  181. +4 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_update_cf_options_basic.result
  182. +5 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/disabled.def
  183. +21 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_cache_dump_basic.test
  184. +24 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_cache_high_pri_pool_ratio_basic.test
  185. +21 −0 ...ocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_cache_index_and_filter_with_high_priority_basic.test
  186. +1 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_delete_cf_basic-master.opt
  187. +75 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_delete_cf_basic.test
  188. +21 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_insert_with_update_caching_basic.test
  189. +19 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_read_free_rpl_basic.test
  190. +6 −1 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_read_free_rpl_tables_basic.test
  191. +21 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_rollback_on_timeout_basic.test
  192. +3 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_unique_check_tables_basic.test
  193. +21 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_stats_level_basic.test
  194. +11 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_update_cf_options_basic.test
  195. +52 −0 storage/rocksdb/nosql_access.cc
  196. +36 −0 storage/rocksdb/nosql_access.h
  197. +52 −44 storage/rocksdb/properties_collector.cc
  198. +29 −24 storage/rocksdb/properties_collector.h
  199. +106 −32 storage/rocksdb/rdb_buff.h
  200. +96 −16 storage/rocksdb/rdb_cf_manager.cc
  201. +7 −5 storage/rocksdb/rdb_cf_manager.h
  202. +33 −37 storage/rocksdb/rdb_cf_options.cc
  203. +9 −9 storage/rocksdb/rdb_cf_options.h
  204. +17 −15 storage/rocksdb/rdb_compact_filter.h
  205. +3 −3 storage/rocksdb/rdb_comparator.h
  206. +838 −0 storage/rocksdb/rdb_converter.cc
  207. +247 −0 storage/rocksdb/rdb_converter.h
  208. +988 −912 storage/rocksdb/rdb_datadic.cc
  209. +311 −207 storage/rocksdb/rdb_datadic.h
  210. +392 −0 storage/rocksdb/rdb_global.h
  211. +73 −44 storage/rocksdb/rdb_i_s.cc
  212. +1 −1 storage/rocksdb/rdb_i_s.h
  213. +12 −8 storage/rocksdb/rdb_index_merge.cc
  214. +9 −6 storage/rocksdb/rdb_index_merge.h
  215. +6 −5 storage/rocksdb/rdb_io_watchdog.cc
  216. +8 −6 storage/rocksdb/rdb_io_watchdog.h
  217. +1 −3 storage/rocksdb/rdb_mariadb_server_port.cc
  218. +9 −10 storage/rocksdb/rdb_mutex_wrapper.cc
  219. +20 −20 storage/rocksdb/rdb_mutex_wrapper.h
  220. +13 −11 storage/rocksdb/rdb_perf_context.cc
  221. +8 −5 storage/rocksdb/rdb_perf_context.h
  222. +5 −11 storage/rocksdb/rdb_psi.cc
  223. +2 −1 storage/rocksdb/rdb_psi.h
  224. +87 −146 storage/rocksdb/rdb_sst_info.cc
  225. +99 −20 storage/rocksdb/rdb_sst_info.h
  226. +5 −5 storage/rocksdb/rdb_threads.cc
  227. +10 −13 storage/rocksdb/rdb_threads.h
  228. +15 −11 storage/rocksdb/rdb_utils.cc
  229. +42 −19 storage/rocksdb/rdb_utils.h
  230. +1 −1 storage/rocksdb/rocksdb
@@ -1,23 +1,49 @@
---
# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License, version 2.0,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# but not limited to OpenSSL) that is licensed under separate terms,
# as designated in a particular file or component or in included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License, version 2.0, for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

# This is the output of clang-format-5.0 --style=google --dump-config,
# except for changes mentioned below. We lock the style so that any newer
# version of clang-format will give the same result; as time goes, we may
# update this list, requiring newer versions of clang-format.

Language: Cpp
# BasedOnStyle: LLVM
AccessModifierOffset: -2
# BasedOnStyle: Google
AccessModifierOffset: -1
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlinesLeft: false
AlignEscapedNewlines: Left
AlignOperands: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: true
AllowShortLoopsOnASingleLine: true
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: false
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: true
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
@@ -32,62 +58,80 @@ BraceWrapping:
BeforeCatch: false
BeforeElse: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeInheritanceComma: false
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: false
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
- Regex: '^<.*\.h>'
Priority: 1
- Regex: '^<.*'
Priority: 2
- Regex: '^(<|"(gtest|isl|json)/)'
Priority: 3
- Regex: '.*'
Priority: 1
IncludeIsMainRegex: '$'
IndentCaseLabels: false
Priority: 3
IncludeIsMainRegex: '([-_](test|unittest))?$'
IndentCaseLabels: true
IndentWidth: 2
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: true
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 19
ObjCSpaceBeforeProtocolList: false
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Right
PenaltyReturnTypeOnItsOwnLine: 200
ReflowComments: true
SortIncludes: true
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesBeforeTrailingComments: 2
SpacesInAngles: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 8
UseTab: Never
JavaScriptQuotes: Leave
...

# We declare one specific pointer style since right alignment is dominant in
# the MySQL code base (default --style=google has DerivePointerAlignment true).
DerivePointerAlignment: false
PointerAlignment: Right

# MySQL source code is allowed to use C++11 features.
Standard: Cpp11
@@ -100,6 +100,8 @@ SET(ROCKSDB_SE_SOURCES
rdb_psi.cc
rdb_sst_info.cc
rdb_sst_info.h
rdb_converter.cc
rdb_converter.h
)

# MariaDB: the following is added in build_rocksdb.cmake, when appropriate:
@@ -149,6 +151,7 @@ ADD_CONVENIENCE_LIBRARY(rocksdb_aux_lib
rdb_perf_context.h
rdb_buff.h
rdb_mariadb_port.h
nosql_access.cc nosql_access.h
)

ADD_DEPENDENCIES(rocksdb_aux_lib GenError)
@@ -159,6 +162,27 @@ if (UNIX AND NOT APPLE)
TARGET_LINK_LIBRARIES(rocksdb_aux_lib -lrt)
endif()

# IF (WITH_JEMALLOC)
# FIND_LIBRARY(JEMALLOC_LIBRARY
# NAMES libjemalloc${PIC_EXT}.a jemalloc
# HINTS ${WITH_JEMALLOC}/lib)
# SET(rocksdb_static_libs ${rocksdb_static_libs}
# ${JEMALLOC_LIBRARY})
# ADD_DEFINITIONS(-DROCKSDB_JEMALLOC)
# ADD_DEFINITIONS(-DROCKSDB_MALLOC_USABLE_SIZE)
# ENDIF()

# MariaDB: Q: why does the upstream add libunwind for a particular
# storage engine?
#IF (WITH_UNWIND)
# FIND_LIBRARY(UNWIND_LIBRARY
# NAMES libunwind${PIC_EXT}.a unwind
# HINTS ${WITH_UNWIND}/lib)
# SET(rocksdb_static_libs ${rocksdb_static_libs}
# ${UNWIND_LIBRARY})
#ENDIF()


TARGET_LINK_LIBRARIES(rocksdb rocksdb_aux_lib)
FIND_LIBRARY(LZ4_LIBRARY
NAMES liblz4${PIC_EXT}.a lz4
@@ -187,6 +211,8 @@ ENDIF()
CHECK_FUNCTION_EXISTS(sched_getcpu HAVE_SCHED_GETCPU)
IF(HAVE_SCHED_GETCPU)
ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU=1)
# MariaDB: don't do this:
# ADD_DEFINITIONS(-DZSTD_STATIC_LINKING_ONLY)
ENDIF()

IF (WITH_TBB)

0 comments on commit 821b866

Please sign in to comment.
You can’t perform that action at this time.