kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danburk...@apache.org
Subject kudu git commit: tablet_server-test: fix compilation error
Date Tue, 17 Oct 2017 18:14:53 GMT
Repository: kudu
Updated Branches:
  refs/heads/master d76220245 -> 294a8fa65


tablet_server-test: fix compilation error

Commits 3a7342a and d762202 were both merged and logically conflicted with
one another, but physically did not. The error was:

  src/kudu/tserver/tablet_server-test.cc>:1254:29: error: cannot initialize a parameter
of type 'kudu::TimeSeries *' with an rvalue of type 'int'
    UpdateTestRowRemote(0, 1, 100);
                              ^~~
  src/kudu/tserver/tablet_server-test-base.h>:69:40: note: passing argument to parameter
'ts' here
                             TimeSeries* ts = nullptr);
                                       ^

Change-Id: I2d320dbc4e9516d9a6eaeca02a97ee72d1255d32
Reviewed-on: http://gerrit.cloudera.org:8080/8300
Reviewed-by: Andrew Wong <awong@cloudera.com>
Reviewed-by: Dan Burkert <danburkert@apache.org>
Tested-by: Dan Burkert <danburkert@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/294a8fa6
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/294a8fa6
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/294a8fa6

Branch: refs/heads/master
Commit: 294a8fa65b41c539dc4590f2f050568f1d1d747a
Parents: d762202
Author: Adar Dembo <adar@cloudera.com>
Authored: Tue Oct 17 10:58:58 2017 -0700
Committer: Dan Burkert <danburkert@apache.org>
Committed: Tue Oct 17 18:14:41 2017 +0000

----------------------------------------------------------------------
 src/kudu/tserver/tablet_server-test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/294a8fa6/src/kudu/tserver/tablet_server-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server-test.cc b/src/kudu/tserver/tablet_server-test.cc
index bb3b13f..df35822 100644
--- a/src/kudu/tserver/tablet_server-test.cc
+++ b/src/kudu/tserver/tablet_server-test.cc
@@ -1251,7 +1251,7 @@ TEST_F(TabletServerTest, TestScanCorruptedDeltas) {
   // Ensure some rows get to disk with deltas.
   InsertTestRowsDirect(0, 100);
   ASSERT_OK(tablet_replica_->tablet()->Flush());
-  UpdateTestRowRemote(0, 1, 100);
+  UpdateTestRowRemote(1, 100);
   ASSERT_OK(tablet_replica_->tablet()->Flush());
 
   // Fudge with some delta blocks.


Mime
View raw message