Skip to content
Permalink
Browse files

Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb…

…-10.2-mariarocks

Manually resolved a few conflicts
  • Loading branch information...
spetrunia committed Mar 11, 2017
2 parents fd39f25 + 65d01da commit 5c1c2f67ec9373f55f9b69bdaf4adad416e4788b
Showing with 4,768 additions and 972 deletions.
  1. +93 −0 storage/rocksdb/.clang-format
  2. +10 −1 storage/rocksdb/CMakeLists.txt
  3. +2 −4 storage/rocksdb/build_rocksdb.cmake
  4. +524 −331 storage/rocksdb/ha_rocksdb.cc
  5. +67 −15 storage/rocksdb/ha_rocksdb.h
  6. +1 −0 storage/rocksdb/ha_rocksdb_proto.h
  7. +18 −1 storage/rocksdb/logger.h
  8. +4 −4 storage/rocksdb/mysql-test/rocksdb/r/2pc_group_commit.result
  9. +21 −0 storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_cardinality.result
  10. +85 −0 storage/rocksdb/mysql-test/rocksdb/r/blind_delete_without_tx_api.result
  11. +16 −16 storage/rocksdb/mysql-test/rocksdb/r/bulk_load.result
  12. +1 −0 storage/rocksdb/mysql-test/rocksdb/r/collation.result
  13. +1 −1 storage/rocksdb/mysql-test/rocksdb/r/fail_system_cf.result
  14. +1 −1 storage/rocksdb/mysql-test/rocksdb/r/handler_basic.result
  15. +2 −2 storage/rocksdb/mysql-test/rocksdb/r/issue290.result
  16. +32 −0 storage/rocksdb/mysql-test/rocksdb/r/issue495.result
  17. +45 −0 storage/rocksdb/mysql-test/rocksdb/r/mysqldump.result
  18. +659 −6 storage/rocksdb/mysql-test/rocksdb/r/partition.result
  19. +25 −6 storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
  20. +409 −0 storage/rocksdb/mysql-test/rocksdb/r/rocksdb_cf_per_partition.result
  21. +0 −74 storage/rocksdb/mysql-test/rocksdb/r/show_engine.result
  22. +22 −19 storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result
  23. +105 −105 storage/rocksdb/mysql-test/rocksdb/r/transaction.result
  24. +12 −0 storage/rocksdb/mysql-test/rocksdb/r/unique_check.result
  25. +4 −4 storage/rocksdb/mysql-test/rocksdb/r/write_sync.result
  26. +4 −4 storage/rocksdb/mysql-test/rocksdb/t/2pc_group_commit.test
  27. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_cardinality-master.opt
  28. +44 −0 storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_cardinality.test
  29. +11 −0 storage/rocksdb/mysql-test/rocksdb/t/blind_delete_without_tx_api.cnf
  30. +129 −0 storage/rocksdb/mysql-test/rocksdb/t/blind_delete_without_tx_api.test
  31. +2 −2 storage/rocksdb/mysql-test/rocksdb/t/bulk_load.test
  32. +3 −0 storage/rocksdb/mysql-test/rocksdb/t/collation.test
  33. +1 −2 storage/rocksdb/mysql-test/rocksdb/t/handler_basic.test
  34. +1 −1 storage/rocksdb/mysql-test/rocksdb/t/issue290.test
  35. +29 −0 storage/rocksdb/mysql-test/rocksdb/t/issue495.test
  36. +3 −0 storage/rocksdb/mysql-test/rocksdb/t/mysqldump.test
  37. +719 −4 storage/rocksdb/mysql-test/rocksdb/t/partition.test
  38. +2 −2 storage/rocksdb/mysql-test/rocksdb/t/persistent_cache.test
  39. +14 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test
  40. +494 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_cf_per_partition.test
  41. +4 −0 storage/rocksdb/mysql-test/rocksdb/t/show_engine.test
  42. +30 −26 storage/rocksdb/mysql-test/rocksdb/t/tbl_opt_data_index_dir.test
  43. +6 −7 storage/rocksdb/mysql-test/rocksdb/t/transaction_select.inc
  44. +26 −0 storage/rocksdb/mysql-test/rocksdb/t/unique_check.test
  45. +4 −4 storage/rocksdb/mysql-test/rocksdb/t/write_sync.test
  46. +2 −0 storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_crash_safe_wal_corrupt.cnf
  47. +1 −1 storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_crash_safe-master.opt
  48. +1 −1 storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_crash_safe-slave.opt
  49. +2 −0 storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_crash_safe_wal_corrupt.cnf
  50. +1 −1 storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_rocksdb_2pc_crash_recover-master.opt
  51. +100 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_blind_delete_primary_key_basic.result
  52. +1 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_compact_cf_basic.result
  53. +85 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_delayed_write_rate_basic.result
  54. +0 −7 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_disabledatasync_basic.result
  55. +93 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_flush_log_at_trx_commit_basic.result
  56. +3 −3 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_flush_memtable_on_analyze_basic.result
  57. +15 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_force_compute_memtable_stats_basic.result
  58. +100 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_master_skip_tx_api_basic.result
  59. +4 −4 ...rs/r/{rocksdb_persistent_cache_size_basic.result → rocksdb_persistent_cache_size_mb_basic.result}
  60. +5 −5 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_wal_recovery_mode_basic.result
  61. +0 −114 storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_write_sync_basic.result
  62. +18 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_blind_delete_primary_key_basic.test
  63. +3 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compact_cf_basic.test
  64. +22 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_delayed_write_rate_basic.test
  65. +0 −6 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_disabledatasync_basic.test
  66. +18 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_flush_log_at_trx_commit_basic.test
  67. +2 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_flush_memtable_on_analyze_basic.test
  68. +23 −0 storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_force_compute_memtable_stats_basic.test
  69. +2 −2 ...l-test/rocksdb_sys_vars/t/{rocksdb_write_sync_basic.test → rocksdb_master_skip_tx_api_basic.test}
  70. +1 −1 ...s_vars/t/{rocksdb_persistent_cache_size_basic.test → rocksdb_persistent_cache_size_mb_basic.test}
  71. +18 −4 storage/rocksdb/properties_collector.cc
  72. +42 −25 storage/rocksdb/rdb_cf_manager.cc
  73. +170 −82 storage/rocksdb/rdb_datadic.cc
  74. +35 −5 storage/rocksdb/rdb_datadic.h
  75. +3 −7 storage/rocksdb/rdb_i_s.cc
  76. +3 −3 storage/rocksdb/rdb_mutex_wrapper.cc
  77. +113 −0 storage/rocksdb/rdb_psi.cc
  78. +55 −0 storage/rocksdb/rdb_psi.h
  79. +14 −7 storage/rocksdb/rdb_sst_info.cc
  80. +4 −1 storage/rocksdb/rdb_sst_info.h
  81. +12 −19 storage/rocksdb/rdb_threads.cc
  82. +31 −2 storage/rocksdb/rdb_threads.h
  83. +18 −0 storage/rocksdb/rdb_utils.cc
  84. +38 −0 storage/rocksdb/rdb_utils.h
  85. +1 −1 storage/rocksdb/rocksdb
  86. +3 −3 storage/rocksdb/tools/mysql_ldb.cc
  87. +20 −26 storage/rocksdb/unittest/test_properties_collector.cc
@@ -0,0 +1,93 @@
---
Language: Cpp
# BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlinesLeft: false
AlignOperands: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: false
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 2
- Regex: '^(<|"(gtest|isl|json)/)'
Priority: 3
- Regex: '.*'
Priority: 1
IncludeIsMainRegex: '$'
IndentCaseLabels: false
IndentWidth: 2
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: true
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Right
ReflowComments: true
SortIncludes: true
SpaceAfterCStyleCast: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 8
UseTab: Never
JavaScriptQuotes: Leave
...
@@ -65,6 +65,8 @@ SET(ROCKSDB_SE_SOURCES
rdb_utils.cc rdb_utils.h
rdb_threads.cc
rdb_threads.h
rdb_psi.h
rdb_psi.cc
)

MYSQL_ADD_PLUGIN(rocksdb_se ${ROCKSDB_SE_SOURCES} STORAGE_ENGINE MODULE_OUTPUT_NAME ha_rocksdb)
@@ -74,6 +76,12 @@ IF(NOT TARGET rocksdb_se)
RETURN()
ENDIF()

# MARIAROCKS-TODO: ???
CHECK_FUNCTION_EXISTS(fallocate HAVE_FALLOCATE)
IF(HAVE_FALLOCATE)
ADD_DEFINITIONS(-DROCKSDB_FALLOCATE_PRESENT)
ENDIF()

INCLUDE(build_rocksdb.cmake)

ADD_CONVENIENCE_LIBRARY(rocksdb_aux_lib
@@ -89,7 +97,8 @@ ADD_CONVENIENCE_LIBRARY(rocksdb_aux_lib
rdb_sst_info.cc
rdb_sst_info.h
rdb_buff.h
rdb_mariadb_port.h)
rdb_mariadb_port.h
)

ADD_DEPENDENCIES(rocksdb_aux_lib GenError)

@@ -191,7 +191,6 @@ set(ROCKSDB_SOURCES
db/write_batch_base.cc
db/write_controller.cc
db/write_thread.cc
db/xfunc_test_points.cc
memtable/hash_cuckoo_rep.cc
memtable/hash_linklist_rep.cc
memtable/hash_skiplist_rep.cc
@@ -215,7 +214,7 @@ set(ROCKSDB_SOURCES
table/full_filter_block.cc
table/get_context.cc
table/iterator.cc
table/merger.cc
table/merging_iterator.cc
table/sst_file_writer.cc
table/meta_blocks.cc
table/plain_table_builder.cc
@@ -254,6 +253,7 @@ set(ROCKSDB_SOURCES
util/histogram_windowing.cc
util/instrumented_mutex.cc
util/iostats_context.cc

util/lru_cache.cc
tools/ldb_cmd.cc
tools/ldb_tool.cc
@@ -284,7 +284,6 @@ set(ROCKSDB_SOURCES
util/thread_status_util.cc
util/thread_status_util_debug.cc
util/transaction_test_util.cc
util/xfunc.cc
util/xxhash.cc
utilities/backupable/backupable_db.cc
utilities/blob_db/blob_db.cc
@@ -295,7 +294,6 @@ set(ROCKSDB_SOURCES
utilities/document/json_document.cc
utilities/document/json_document_builder.cc
utilities/env_mirror.cc
utilities/env_registry.cc
utilities/geodb/geodb_impl.cc
utilities/leveldb_options/leveldb_options.cc
utilities/lua/rocks_lua_compaction_filter.cc

0 comments on commit 5c1c2f6

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