This is an automated email from the ASF dual-hosted git repository.
adar 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 899c8bf move data_gen_util to integration-tests
899c8bf is described below
commit 899c8bfa648becb6729b744e81ab95aef3871c31
Author: Adar Dembo <[email protected]>
AuthorDate: Tue Oct 22 13:52:43 2019 -0700
move data_gen_util to integration-tests
I want it in client-test and a client -> tools dependency feels awkward.
Change-Id: I4895f66ffff940c9215f948512f783d44cf1d924
Reviewed-on: http://gerrit.cloudera.org:8080/14532
Reviewed-by: Alexey Serbin <[email protected]>
Tested-by: Kudu Jenkins
---
src/kudu/integration-tests/CMakeLists.txt | 1 +
src/kudu/{tools => integration-tests}/data_gen_util.cc | 4 +---
src/kudu/{tools => integration-tests}/data_gen_util.h | 10 ++--------
src/kudu/integration-tests/flex_partitioning-itest.cc | 4 ++--
src/kudu/integration-tests/test_workload.cc | 10 +++++-----
src/kudu/integration-tests/ts_sentry-itest.cc | 3 +--
src/kudu/tools/CMakeLists.txt | 1 -
src/kudu/tools/ksck_remote-test.cc | 2 +-
8 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/src/kudu/integration-tests/CMakeLists.txt
b/src/kudu/integration-tests/CMakeLists.txt
index 22785bb..64d8fef 100644
--- a/src/kudu/integration-tests/CMakeLists.txt
+++ b/src/kudu/integration-tests/CMakeLists.txt
@@ -23,6 +23,7 @@ endif()
set(INTEGRATION_TESTS_SRCS
cluster_itest_util.cc
cluster_verifier.cc
+ data_gen_util.cc
external_mini_cluster-itest-base.cc
hms_itest-base.cc
internal_mini_cluster-itest-base.cc
diff --git a/src/kudu/tools/data_gen_util.cc
b/src/kudu/integration-tests/data_gen_util.cc
similarity index 97%
rename from src/kudu/tools/data_gen_util.cc
rename to src/kudu/integration-tests/data_gen_util.cc
index 81c7d82..7a46ed2 100644
--- a/src/kudu/tools/data_gen_util.cc
+++ b/src/kudu/integration-tests/data_gen_util.cc
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-#include "kudu/tools/data_gen_util.h"
+#include "kudu/integration-tests/data_gen_util.h"
#include <ostream>
@@ -28,7 +28,6 @@
#include "kudu/util/status.h"
namespace kudu {
-namespace tools {
void WriteValueToColumn(const client::KuduSchema& schema,
int col_idx,
@@ -99,5 +98,4 @@ template
void GenerateDataForRow(const client::KuduSchema& schema, uint64_t record_id,
ThreadSafeRandom* random, KuduPartialRow* row);
-} // namespace tools
} // namespace kudu
diff --git a/src/kudu/tools/data_gen_util.h
b/src/kudu/integration-tests/data_gen_util.h
similarity index 91%
rename from src/kudu/tools/data_gen_util.h
rename to src/kudu/integration-tests/data_gen_util.h
index b13fd25..c7ff838 100644
--- a/src/kudu/tools/data_gen_util.h
+++ b/src/kudu/integration-tests/data_gen_util.h
@@ -17,10 +17,9 @@
//
// Utility functions for generating data for use by tools and tests.
-#ifndef KUDU_TOOLS_DATA_GEN_UTIL_H_
-#define KUDU_TOOLS_DATA_GEN_UTIL_H_
+#pragma once
-#include <stdint.h>
+#include <cstdint>
namespace kudu {
class KuduPartialRow;
@@ -29,8 +28,6 @@ namespace client {
class KuduSchema;
} // namespace client
-namespace tools {
-
// Detect the type of the given column and coerce the given number value in
// 'value' to the data type of that column.
// At the time of this writing, we only support ints, bools, and strings.
@@ -47,7 +44,4 @@ template<class RNG>
void GenerateDataForRow(const client::KuduSchema& schema, uint64_t record_id,
RNG* random, KuduPartialRow* row);
-} // namespace tools
} // namespace kudu
-
-#endif // KUDU_TOOLS_DATA_GEN_UTIL_H_
diff --git a/src/kudu/integration-tests/flex_partitioning-itest.cc
b/src/kudu/integration-tests/flex_partitioning-itest.cc
index cfa7c57..4eeaa68 100644
--- a/src/kudu/integration-tests/flex_partitioning-itest.cc
+++ b/src/kudu/integration-tests/flex_partitioning-itest.cc
@@ -44,11 +44,11 @@
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/integration-tests/cluster_itest_util.h"
+#include "kudu/integration-tests/data_gen_util.h"
#include "kudu/master/master.pb.h"
#include "kudu/master/master.proxy.h"
#include "kudu/mini-cluster/external_mini_cluster.h"
#include "kudu/rpc/rpc_controller.h"
-#include "kudu/tools/data_gen_util.h"
#include "kudu/util/monotime.h"
#include "kudu/util/random.h"
#include "kudu/util/random_util.h"
@@ -340,7 +340,7 @@ Status FlexPartitioningITest::InsertRows(const
RangePartitionOptions& range_part
for (const auto& bound : bounds) {
for (int32_t i = bound.first[0]; i < bound.second[0]; i++) {
gscoped_ptr<KuduInsert> insert(table_->NewInsert());
- tools::GenerateDataForRow(table_->schema(), i, &random_,
insert->mutable_row());
+ GenerateDataForRow(table_->schema(), i, &random_, insert->mutable_row());
inserted_rows_.emplace_back(new KuduPartialRow(*insert->mutable_row()));
RETURN_NOT_OK(session->Apply(insert.release()));
count++;
diff --git a/src/kudu/integration-tests/test_workload.cc
b/src/kudu/integration-tests/test_workload.cc
index eb2bb70..539ceec 100644
--- a/src/kudu/integration-tests/test_workload.cc
+++ b/src/kudu/integration-tests/test_workload.cc
@@ -32,8 +32,8 @@
#include "kudu/gutil/mathlimits.h"
#include "kudu/gutil/port.h"
#include "kudu/gutil/stl_util.h"
+#include "kudu/integration-tests/data_gen_util.h"
#include "kudu/mini-cluster/mini_cluster.h"
-#include "kudu/tools/data_gen_util.h"
#include "kudu/util/random.h"
#include "kudu/util/status.h"
#include "kudu/util/test_util.h"
@@ -150,7 +150,7 @@ void TestWorkload::WriteThread() {
if (write_pattern_ == UPDATE_ONE_ROW) {
gscoped_ptr<KuduUpdate> update(table->NewUpdate());
KuduPartialRow* row = update->mutable_row();
- tools::GenerateDataForRow(schema_, 0, &rng_, row);
+ GenerateDataForRow(schema_, 0, &rng_, row);
CHECK_OK(session->Apply(update.release()));
} else {
gscoped_ptr<KuduInsert> insert(table->NewInsert());
@@ -166,7 +166,7 @@ void TestWorkload::WriteThread() {
}
keys.push_back(key);
- tools::GenerateDataForRow(schema_, key, &rng_, row);
+ GenerateDataForRow(schema_, key, &rng_, row);
if (payload_bytes_) {
// Note: overriding payload_bytes_ requires the "simple" schema.
std::string test_payload(payload_bytes_.get(), '0');
@@ -194,7 +194,7 @@ void TestWorkload::WriteThread() {
for (auto key : keys) {
gscoped_ptr<KuduDelete> op(table->NewDelete());
KuduPartialRow* row = op->mutable_row();
- tools::WriteValueToColumn(schema_, 0, key, row);
+ WriteValueToColumn(schema_, 0, key, row);
CHECK_OK(session->Apply(op.release()));
deleted++;
}
@@ -340,7 +340,7 @@ void TestWorkload::Setup() {
std::unique_ptr<KuduInsert> insert(table->NewInsert());
KuduPartialRow* row = insert->mutable_row();
Random r(rng_.Next32());
- tools::GenerateDataForRow(schema_, 0, &r, row);
+ GenerateDataForRow(schema_, 0, &r, row);
CHECK_OK(session->Apply(insert.release()));
rows_inserted_.Store(1);
}
diff --git a/src/kudu/integration-tests/ts_sentry-itest.cc
b/src/kudu/integration-tests/ts_sentry-itest.cc
index 9c8b3be..85490d4 100644
--- a/src/kudu/integration-tests/ts_sentry-itest.cc
+++ b/src/kudu/integration-tests/ts_sentry-itest.cc
@@ -41,6 +41,7 @@
#include "kudu/gutil/strings/substitute.h"
#include "kudu/hms/hms_client.h"
#include "kudu/hms/mini_hms.h"
+#include "kudu/integration-tests/data_gen_util.h"
#include "kudu/integration-tests/hms_itest-base.h"
#include "kudu/master/sentry_authz_provider-test-base.h"
#include "kudu/mini-cluster/external_mini_cluster.h"
@@ -50,7 +51,6 @@
#include "kudu/sentry/sentry_policy_service_types.h"
#include "kudu/tablet/transactions/write_transaction.h"
#include "kudu/thrift/client.h"
-#include "kudu/tools/data_gen_util.h"
#include "kudu/util/barrier.h"
#include "kudu/util/monotime.h"
#include "kudu/util/random.h"
@@ -84,7 +84,6 @@ using kudu::master::GetTablePrivilege;
using kudu::sentry::SentryClient;
using kudu::tablet::WritePrivileges;
using kudu::tablet::WritePrivilegeType;
-using kudu::tools::GenerateDataForRow;
using sentry::TSentryGrantOption;
using std::pair;
using std::string;
diff --git a/src/kudu/tools/CMakeLists.txt b/src/kudu/tools/CMakeLists.txt
index 901a081..7958789 100644
--- a/src/kudu/tools/CMakeLists.txt
+++ b/src/kudu/tools/CMakeLists.txt
@@ -40,7 +40,6 @@ target_link_libraries(tool_proto
add_library(kudu_tools_util
color.cc
- data_gen_util.cc
diagnostics_log_parser.cc
table_scanner.cc
tool_action.cc
diff --git a/src/kudu/tools/ksck_remote-test.cc
b/src/kudu/tools/ksck_remote-test.cc
index d6d7e6b..0649060 100644
--- a/src/kudu/tools/ksck_remote-test.cc
+++ b/src/kudu/tools/ksck_remote-test.cc
@@ -40,9 +40,9 @@
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/substitute.h"
+#include "kudu/integration-tests/data_gen_util.h"
#include "kudu/master/mini_master.h"
#include "kudu/mini-cluster/internal_mini_cluster.h"
-#include "kudu/tools/data_gen_util.h"
#include "kudu/tools/ksck.h"
#include "kudu/tools/ksck_checksum.h"
#include "kudu/tools/ksck_results.h"
