[kudu] branch master updated: tablet: fix build on macOS

[awong]

This is an automated email from the ASF dual-hosted git repository.

awong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f5605d  tablet: fix build on macOS
2f5605d is described below

commit 2f5605dfc9f6aed3bfdf5f3e6adad633658b7791
Author: Andrew Wong <aw...@cloudera.com>
AuthorDate: Mon Oct 26 12:30:55 2020 -0700

    tablet: fix build on macOS
    
    This fixes the following error:
    
    ../../src/kudu/tablet/compaction-test.cc:1061:33: error: cannot initialize 
a parameter of type 'uint64_t *' (aka 'unsigned long long *') with an rvalue of 
type 'size_t *' (aka 'unsigned long *')
        ASSERT_OK(rs->CountLiveRows(&rs_live_rows));
                                    ^~~~~~~~~~~~~
    
    Change-Id: I4d65f95ba10a33a510d082237508ffde2783fbc0
    Reviewed-on: http://gerrit.cloudera.org:8080/16650
    Reviewed-by: Alexey Serbin <aser...@cloudera.com>
    Reviewed-by: Attila Bukor <abu...@apache.org>
    Tested-by: Attila Bukor <abu...@apache.org>
---
 src/kudu/tablet/compaction-test.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kudu/tablet/compaction-test.cc 
b/src/kudu/tablet/compaction-test.cc
index 3dae68d..e96ecbc 100644
--- a/src/kudu/tablet/compaction-test.cc
+++ b/src/kudu/tablet/compaction-test.cc
@@ -1055,9 +1055,9 @@ TEST_F(TestCompaction, TestMergeMRS) {
   unique_ptr<CompactionInput> input(CompactionInput::Merge(merge_inputs, 
&schema_));
   vector<shared_ptr<DiskRowSet>> result_rs;
   DoFlushAndReopen(input.get(), schema_, snap, kSmallRollThreshold, 
&result_rs);
-  int total_num_rows = 0;
+  uint64_t total_num_rows = 0;
   for (const auto& rs : result_rs) {
-    size_t rs_live_rows;
+    uint64_t rs_live_rows;
     ASSERT_OK(rs->CountLiveRows(&rs_live_rows));
     total_num_rows += rs_live_rows;
   }