update

apache · Oct 20, 2020 · 9b82ac9 · 9b82ac9
1 parent 4d5cbd6
commit 9b82ac9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/rdsn b/rdsn
diff --git a/src/server/hotkey_collector.cpp b/src/server/hotkey_collector.cpp
@@ -171,10 +171,10 @@ detect_hotkey_result
 hotkey_coarse_data_collector::internal_analysis_method(const std::vector<uint64_t> &captured_keys,
                                                        int threshold)
 {
-
     int data_size = captured_keys.size();
-    dassert(captured_keys.size() > 2, "data_capture_hash_bucket_num is too small");
-
+    dcheck_gt(captured_keys.size(), 2);
+    // empirical rule to calculate hot point of each partition
+    // same algorithm as hotspot_partition_calculator::stat_histories_analyse
     double table_captured_key_sum = 0;
     int hot_index = 0;
     int hot_value = 0;
@@ -197,8 +197,9 @@ hotkey_coarse_data_collector::internal_analysis_method(const std::vector<uint64_
     standard_deviation = sqrt(standard_deviation / (data_size - 2));
     double hot_point = (hot_value - captured_keys_avg_count) / standard_deviation;
     detect_hotkey_result result;
-    hot_point > threshold ? result.coarse_bucket_index = hot_index
-                          : result.coarse_bucket_index = -1;
+    if (hot_point > threshold) {
+        result.coarse_bucket_index = hot_index;
+    }
     return result;
 }
 

diff --git a/src/server/hotkey_collector.h b/src/server/hotkey_collector.h
@@ -28,8 +28,7 @@ class internal_collector_base;
 
 struct detect_hotkey_result
 {
-    int coarse_bucket_index;
-    detect_hotkey_result() : coarse_bucket_index(-1) {}
+    int coarse_bucket_index = -1;
 };
 
 //    hotkey_collector is responsible to find the hot keys after the partition
@@ -105,7 +104,7 @@ class internal_collector_base : public dsn::replication::replica_base
 class hotkey_empty_data_collector : public internal_collector_base
 {
 public:
-    explicit hotkey_empty_data_collector(replica_base *base) : internal_collector_base(base){};
+    explicit hotkey_empty_data_collector(replica_base *base) : internal_collector_base(base) {}
     void capture_data(const dsn::blob &hash_key, uint64_t weight) override {}
     void analyse_data(detect_hotkey_result &result) override {}
 };
+2 −2		include/dsn/dist/replication/replication.codes.h
+9 −0		include/dsn/dist/replication/replication_enums.h
+14 −0		include/dsn/dist/replication/replication_types.h
+3 −3		src/aio/aio_provider.h
+1 −0		src/aio/disk_engine.h
+47 −139		src/aio/native_linux_aio_provider.cpp
+4 −34		src/aio/native_linux_aio_provider.h
+10 −0		src/common/replication_types.cpp
+14 −0		src/meta/meta_data.h
+11 −12		src/meta/meta_split_service.cpp
+31 −25		src/meta/test/meta_split_service_test.cpp
+2 −1		src/nfs/nfs_client_impl.cpp
+2 −2		src/replica/replica.cpp
+7 −0		src/replica/replica_config.cpp
+3 −1		src/replica/replication_app_base.cpp
+27 −14		src/replica/split/replica_split_manager.cpp
+4 −2		src/replica/split/replica_split_manager.h
+74 −47		src/replica/split/test/replica_split_test.cpp
+1 −0		src/replica/test/log_file_test.cpp
+10 −0		src/replication.thrift