Merge branch 'pr_1585'

src/storage/ob_partition_range_spliter.cpp

@@ -138,7 +138,7 @@ int ObEndkeyIterator::push_rowkey(
 
   if (OB_UNLIKELY(rowkey_col_cnt <= 0 || end_key.datum_cnt_ < rowkey_col_cnt)) {
     ret = OB_ERR_UNEXPECTED;
-    STORAGE_LOG(WARN, "unexptcted rowkey_col_cnt", K(ret), K(rowkey_col_cnt), K(end_key));
+    STORAGE_LOG(WARN, "unexpected rowkey_col_cnt", K(ret), K(rowkey_col_cnt), K(end_key));
   } else if (OB_FAIL(rowkey.assign(end_key.datums_, rowkey_col_cnt))) {
     STORAGE_LOG(WARN, "Fail to construct src rowkey", K(ret), K(end_key));
   } else if (OB_FAIL(rowkey.to_store_rowkey(col_descs, allocator, endkey))) {
@@ -323,7 +323,7 @@ int ObPartitionParallelRanger::init(ObRangeSplitInfo &range_info, const bool for
     STORAGE_LOG(WARN, "ObPartitionParallelRanger is inited twice", K(ret));
   } else if (OB_UNLIKELY(!range_info.is_valid())) {
     ret = OB_INVALID_ARGUMENT;
-    STORAGE_LOG(WARN, "Invalid arugment to init ObPartitionParallelRanger", K(ret), K(range_info));
+    STORAGE_LOG(WARN, "Invalid argument to init ObPartitionParallelRanger", K(ret), K(range_info));
   } else if (parallel_target_count_ == 1) {
     //  construct single range
   } else if (OB_FAIL(calc_sample_count(for_compaction, range_info))) {
@@ -382,7 +382,7 @@ int ObPartitionParallelRanger::init_macro_iters(ObRangeSplitInfo &range_info)
 
   if (OB_UNLIKELY(sample_cnt_ <= 0)) {
     ret = OB_ERR_UNEXPECTED;
-    STORAGE_LOG(WARN, "Unexpecte sample count to init macro endkey iters", K(ret), K_(sample_cnt));
+    STORAGE_LOG(WARN, "Unexpected sample count to init macro endkey iters", K(ret), K_(sample_cnt));
   } else {
     ObEndkeyIterator *endkey_iter = nullptr;
     total_endkey_cnt_ = 0;
@@ -511,7 +511,7 @@ int ObPartitionParallelRanger::get_next_macro_endkey(ObStoreRowkey &rowkey)
         } else if (OB_FAIL(range_heap_.pop())) {
           STORAGE_LOG(WARN, "Failed to pop the last macro endkey", K(ret));
         } else if (OB_FAIL(comparor_.get_error_code())) {
-          STORAGE_LOG(WARN, "Failed copmare macro endkeys", K(ret));
+          STORAGE_LOG(WARN, "Failed compare macro endkeys", K(ret));
         }
       } else if (OB_UNLIKELY(!endkey.is_valid())) {
         ret = OB_ERR_UNEXPECTED;
@@ -606,7 +606,7 @@ int ObPartitionParallelRanger::split_ranges(
     STORAGE_LOG(WARN, "ObPartitionParallelRanger is not init", K(ret));
   } else if (sample_cnt_ == 0 || parallel_target_count_ == 1
              || parallel_target_count_ > total_endkey_cnt_ + 1) {
-    // cannot affort specified parallel target count, back into single whole range
+    // cannot afford specified parallel target count, back into single whole range
     if (OB_FAIL(construct_single_range(allocator,
                                        store_range_->get_start_key(),
                                        store_range_->get_end_key(),
@@ -1073,7 +1073,7 @@ int ObPartitionRangeSpliter::split_ranges_memtable(ObRangeSplitInfo &range_info,
     STORAGE_LOG(WARN, "Invalid range info to split ranges for memtable", K(ret));
   } else if (OB_UNLIKELY(range_info.tables_->count() != 1)) {
     ret = OB_ERR_UNEXPECTED;
-    STORAGE_LOG(WARN, "Unexpcted table count for memtable range info", K(ret), K(range_info));
+    STORAGE_LOG(WARN, "Unexpected table count for memtable range info", K(ret), K(range_info));
   } else {
     ObSEArray<ObStoreRange, 16> store_ranges;
     memtable::ObMemtable *memtable = static_cast<memtable::ObMemtable *>(range_info.tables_->at(0));
@@ -1234,7 +1234,7 @@ int ObPartitionMultiRangeSpliter::get_multi_range_size(
   } else if (OB_FAIL(get_split_tables(table_iter, tables))) {
     STORAGE_LOG(WARN, "Failed to get all sstables", K(ret), K(table_iter));
   } else if (tables.empty()) {
-    // only small tables, can not support arbitary range split
+    // only small tables, can not support arbitrary range split
     total_size = 0;
   } else {
     RangeSplitInfoArray range_info_array;
@@ -1343,7 +1343,7 @@ int ObPartitionMultiRangeSpliter::merge_and_push_range_array(
 
   if (OB_UNLIKELY(src_range_split_array.empty())) {
     ret = OB_INVALID_ARGUMENT;
-    STORAGE_LOG(WARN, "Invalid arugment to merge range array", K(ret), K(src_range_split_array));
+    STORAGE_LOG(WARN, "Invalid argument to merge range array", K(ret), K(src_range_split_array));
   } else {
     const ObStoreRange *last_range = nullptr;
     RangeSplitArray dst_range_array;
@@ -1433,7 +1433,7 @@ int ObPartitionMultiRangeSpliter::build_single_range_array(
 
   if (OB_UNLIKELY(range_array.empty())) {
     ret = OB_INVALID_ARGUMENT;
-    STORAGE_LOG(WARN, "Invalid arugment to build single range array", K(ret), K(range_array));
+    STORAGE_LOG(WARN, "Invalid argument to build single range array", K(ret), K(range_array));
   } else {
     RangeSplitArray range_split_array;
     ObStoreRange store_range;