You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by da...@apache.org on 2016/07/14 17:42:58 UTC
incubator-kudu git commit: Fix encoding-test on OS X
Repository: incubator-kudu
Updated Branches:
refs/heads/master 146fe826b -> 4e99544d6
Fix encoding-test on OS X
A recent change caused encoding-test to fail on OS X. This reverts
the part of the change that causes the test to fail (and nothing
else).
I'm not sure why it fails on OS X and not in, e.g., Jenkins builds.
Change-Id: Ie221906ee3960fa158843c2ae2dd7a531e74c5c4
Reviewed-on: http://gerrit.cloudera.org:8080/3640
Reviewed-by: Dan Burkert <da...@cloudera.com>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/4e99544d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/4e99544d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/4e99544d
Branch: refs/heads/master
Commit: 4e99544d64e59ca9c0525fc0faf06546977c3055
Parents: 146fe82
Author: Will Berkeley <wd...@gmail.com>
Authored: Wed Jul 13 18:37:48 2016 -0400
Committer: Dan Burkert <da...@cloudera.com>
Committed: Thu Jul 14 17:42:45 2016 +0000
----------------------------------------------------------------------
src/kudu/cfile/encoding-test.cc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/4e99544d/src/kudu/cfile/encoding-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/cfile/encoding-test.cc b/src/kudu/cfile/encoding-test.cc
index 0e6a6d9..73b2f6d 100644
--- a/src/kudu/cfile/encoding-test.cc
+++ b/src/kudu/cfile/encoding-test.cc
@@ -17,6 +17,7 @@
#include <glog/logging.h>
#include <gtest/gtest.h>
+#include <memory>
#include <limits>
#include <stdlib.h>
#include <vector>
@@ -39,6 +40,7 @@
#include "kudu/util/test_macros.h"
#include "kudu/util/stopwatch.h"
+using std::unique_ptr;
using std::vector;
namespace kudu { namespace cfile {
@@ -73,15 +75,13 @@ class TestEncoding : public ::testing::Test {
static Slice CreateBinaryBlock(BuilderType *sbb,
int num_items,
const char *fmt_str) {
- vector<string> to_insert;
+ vector<unique_ptr<string>> to_insert;
std::vector<Slice> slices;
-
for (uint i = 0; i < num_items; i++) {
- to_insert.emplace_back(StringPrintf(fmt_str, i));
- slices.push_back(Slice(to_insert.back()));
+ to_insert.emplace_back(new string(StringPrintf(fmt_str, i)));
+ slices.push_back(Slice(to_insert.back()->data()));
}
-
int rem = slices.size();
Slice *ptr = &slices[0];
while (rem > 0) {