Skip to content

Commit 3a5ac5d

Browse files
ml-metadata-teamBrianSong
ml-metadata-team
authored and
BrianSong
committed
Internal refactor
PiperOrigin-RevId: 481694820
1 parent 116fd7d commit 3a5ac5d

11 files changed

+25
-23
lines changed

‎ml_metadata/metadata_store/metadata_access_object_factory_test.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ limitations under the License.
1414
==============================================================================*/
1515
#include "ml_metadata/metadata_store/metadata_access_object_factory.h"
1616

17+
#include <memory>
18+
1719
#include <glog/logging.h>
1820
#include <gmock/gmock.h>
1921
#include <gtest/gtest.h>
@@ -32,7 +34,7 @@ namespace {
3234
TEST(MetadataAccessObjectFactory, CreateMetadataAccessObject) {
3335
SqliteMetadataSourceConfig config;
3436
std::unique_ptr<MetadataSource> metadata_source =
35-
absl::make_unique<SqliteMetadataSource>(config);
37+
std::make_unique<SqliteMetadataSource>(config);
3638
std::unique_ptr<MetadataAccessObject> metadata_access_object;
3739
ASSERT_EQ(absl::OkStatus(),
3840
CreateMetadataAccessObject(
@@ -60,7 +62,7 @@ TEST(MetadataAccessObjectFactory, CreateMetadataAccessObjectAtSchemaVersion7) {
6062
const int64 earlier_schema_version = kLibSchemaVersion - 1;
6163
SqliteMetadataSourceConfig config;
6264
std::unique_ptr<MetadataSource> metadata_source =
63-
absl::make_unique<SqliteMetadataSource>(config);
65+
std::make_unique<SqliteMetadataSource>(config);
6466

6567
{
6668
std::unique_ptr<MetadataAccessObject> metadata_access_object;

‎ml_metadata/metadata_store/metadata_access_object_test.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ using MetadataAccessObjectContainerFactory =
250250
// INSTANTIATE_TEST_CASE_P(
251251
// FooMetadataAccessObjectTest, MetadataAccessObjectTest,
252252
// ::testing::Values([]() {
253-
// return absl::make_unique<FakeMetadataAccessObjectContainer>();
253+
// return std::make_unique<FakeMetadataAccessObjectContainer>();
254254
// }));
255255
//
256256
// See concrete metadata_access_object_test.cc for examples.

‎ml_metadata/metadata_store/metadata_store_factory.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ namespace {
3333
absl::Status CreateMySQLMetadataStore(const MySQLDatabaseConfig& config,
3434
const MigrationOptions& migration_options,
3535
std::unique_ptr<MetadataStore>* result) {
36-
auto metadata_source = absl::make_unique<MySqlMetadataSource>(config);
36+
auto metadata_source = std::make_unique<MySqlMetadataSource>(config);
3737
auto transaction_executor =
38-
absl::make_unique<RdbmsTransactionExecutor>(metadata_source.get());
38+
std::make_unique<RdbmsTransactionExecutor>(metadata_source.get());
3939
MLMD_RETURN_IF_ERROR(MetadataStore::Create(
4040
util::GetMySqlMetadataSourceQueryConfig(), migration_options,
4141
std::move(metadata_source), std::move(transaction_executor), result));
@@ -56,9 +56,9 @@ absl::Status CreateSqliteMetadataStore(
5656
const SqliteMetadataSourceConfig& config,
5757
const MigrationOptions& migration_options,
5858
std::unique_ptr<MetadataStore>* result) {
59-
auto metadata_source = absl::make_unique<SqliteMetadataSource>(config);
59+
auto metadata_source = std::make_unique<SqliteMetadataSource>(config);
6060
auto transaction_executor =
61-
absl::make_unique<RdbmsTransactionExecutor>(metadata_source.get());
61+
std::make_unique<RdbmsTransactionExecutor>(metadata_source.get());
6262
MLMD_RETURN_IF_ERROR(MetadataStore::Create(
6363
util::GetSqliteMetadataSourceQueryConfig(), migration_options,
6464
std::move(metadata_source), std::move(transaction_executor), result));

‎ml_metadata/metadata_store/metadata_store_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ using ::testing::UnorderedPointwise;
4141

4242
std::unique_ptr<MetadataStore> CreateMetadataStore() {
4343
auto metadata_source =
44-
absl::make_unique<SqliteMetadataSource>(SqliteMetadataSourceConfig());
44+
std::make_unique<SqliteMetadataSource>(SqliteMetadataSourceConfig());
4545
auto transaction_executor =
46-
absl::make_unique<RdbmsTransactionExecutor>(metadata_source.get());
46+
std::make_unique<RdbmsTransactionExecutor>(metadata_source.get());
4747

4848
std::unique_ptr<MetadataStore> metadata_store;
4949
CHECK_EQ(
@@ -537,7 +537,7 @@ TEST(MetadataStoreExtendedTest, GetLineageGraphErrors) {
537537

538538
INSTANTIATE_TEST_SUITE_P(
539539
MetadataStoreTest, MetadataStoreTestSuite, ::testing::Values([]() {
540-
return absl::make_unique<RDBMSMetadataStoreContainer>();
540+
return std::make_unique<RDBMSMetadataStoreContainer>();
541541
}));
542542

543543
} // namespace testing

‎ml_metadata/metadata_store/mysql_metadata_access_object_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class MySqlMetadataAccessObjectContainer
8888
INSTANTIATE_TEST_SUITE_P(
8989
MySqlMetadataAccessObjectTest, MetadataAccessObjectTest,
9090
::testing::Values([]() {
91-
return absl::make_unique<MySqlMetadataAccessObjectContainer>();
91+
return std::make_unique<MySqlMetadataAccessObjectContainer>();
9292
}));
9393

9494
} // namespace testing

‎ml_metadata/metadata_store/mysql_metadata_source_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ TEST(MySqlMetadataSourceExtendedTest, TestEscapeString) {
121121
INSTANTIATE_TEST_SUITE_P(
122122
MysqlMetadataSourceCommonTest, MetadataSourceTestSuite,
123123
::testing::Values([]() {
124-
return absl::make_unique<MysqlMetadataSourceContainer>();
124+
return std::make_unique<MysqlMetadataSourceContainer>();
125125
}));
126126

127127
} // namespace testing

‎ml_metadata/metadata_store/sqlite_metadata_access_object_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class SqliteMetadataAccessObjectContainer
4545
util::GetSqliteMetadataSourceQueryConfig(),
4646
earlier_schema_version) {
4747
SqliteMetadataSourceConfig config;
48-
metadata_source_ = absl::make_unique<SqliteMetadataSource>(config);
48+
metadata_source_ = std::make_unique<SqliteMetadataSource>(config);
4949
CHECK_EQ(
5050
absl::OkStatus(),
5151
CreateMetadataAccessObject(
@@ -72,7 +72,7 @@ class SqliteMetadataAccessObjectContainer
7272
INSTANTIATE_TEST_SUITE_P(
7373
SqliteMetadataAccessObjectTest, MetadataAccessObjectTest,
7474
::testing::Values([]() {
75-
return absl::make_unique<SqliteMetadataAccessObjectContainer>();
75+
return std::make_unique<SqliteMetadataAccessObjectContainer>();
7676
}));
7777

7878
} // namespace testing

‎ml_metadata/metadata_store/sqlite_metadata_source_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ class SqliteMetadataSourceContainer : public MetadataSourceContainer {
3333
public:
3434
SqliteMetadataSourceContainer() : MetadataSourceContainer() {
3535
SqliteMetadataSourceConfig config;
36-
metadata_source_ = absl::make_unique<SqliteMetadataSource>(config);
36+
metadata_source_ = std::make_unique<SqliteMetadataSource>(config);
3737
}
3838

3939
explicit SqliteMetadataSourceContainer(SqliteMetadataSourceConfig config)
4040
: MetadataSourceContainer() {
41-
metadata_source_ = absl::make_unique<SqliteMetadataSource>(config);
41+
metadata_source_ = std::make_unique<SqliteMetadataSource>(config);
4242
}
4343

4444
~SqliteMetadataSourceContainer() override = default;
@@ -91,7 +91,7 @@ TEST(SqliteMetadataSourceExtendedTest, TestEscapeString) {
9191
INSTANTIATE_TEST_SUITE_P(
9292
SqliteMetadataSourceCommonTest, MetadataSourceTestSuite,
9393
::testing::Values([]() {
94-
return absl::make_unique<SqliteMetadataSourceContainer>();
94+
return std::make_unique<SqliteMetadataSourceContainer>();
9595
}));
9696

9797
} // namespace testing

‎ml_metadata/metadata_store/sqlite_query_config_executor_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class SqliteQueryConfigExecutorContainer : public QueryConfigExecutorContainer {
3939
: QueryConfigExecutorContainer(
4040
util::GetSqliteMetadataSourceQueryConfig()) {
4141
SqliteMetadataSourceConfig config;
42-
metadata_source_ = absl::make_unique<SqliteMetadataSource>(config);
42+
metadata_source_ = std::make_unique<SqliteMetadataSource>(config);
4343
if (!metadata_source_->is_connected())
4444
CHECK_EQ(absl::OkStatus(), metadata_source_->Connect());
4545
query_executor_ = absl::WrapUnique(new QueryConfigExecutor(
@@ -62,7 +62,7 @@ class SqliteQueryConfigExecutorContainer : public QueryConfigExecutorContainer {
6262

6363
INSTANTIATE_TEST_SUITE_P(
6464
SqliteQueryConfigExecutorTest, QueryExecutorTest, ::testing::Values([]() {
65-
return absl::make_unique<SqliteQueryConfigExecutorContainer>();
65+
return std::make_unique<SqliteQueryConfigExecutorContainer>();
6666
}));
6767

6868
} // namespace testing

‎ml_metadata/metadata_store/sqlite_rdbms_metadata_access_object_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class SqliteRDBMSMetadataAccessObjectContainer
5656
: QueryConfigRDBMSMetadataAccessObjectContainer(
5757
util::GetSqliteMetadataSourceQueryConfig()) {
5858
SqliteMetadataSourceConfig config;
59-
metadata_source_ = absl::make_unique<SqliteMetadataSource>(config);
59+
metadata_source_ = std::make_unique<SqliteMetadataSource>(config);
6060
CHECK_EQ(
6161
absl::OkStatus(),
6262
CreateRDBMSMetadataAccessObject(
@@ -83,7 +83,7 @@ class SqliteRDBMSMetadataAccessObjectContainer
8383
INSTANTIATE_TEST_SUITE_P(
8484
SqliteRDBMSMetadataAccessObjectTest, RDBMSMetadataAccessObjectTest,
8585
::testing::Values([]() {
86-
return absl::make_unique<SqliteRDBMSMetadataAccessObjectContainer>();
86+
return std::make_unique<SqliteRDBMSMetadataAccessObjectContainer>();
8787
}));
8888

8989
} // namespace testing

‎ml_metadata/metadata_store/test_standalone_mysql_metadata_source_initializer.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class TestStandaloneMySqlMetadataSourceInitializer
6363
<< static_cast<int>(connection_type);
6464
}
6565

66-
metadata_source_ = absl::make_unique<MySqlMetadataSource>(config);
66+
metadata_source_ = std::make_unique<MySqlMetadataSource>(config);
6767
CHECK_EQ(absl::OkStatus(), metadata_source_->Connect());
6868
CHECK_EQ(absl::OkStatus(), metadata_source_->Begin());
6969
CHECK_EQ(absl::OkStatus(),
@@ -82,7 +82,7 @@ class TestStandaloneMySqlMetadataSourceInitializer
8282

8383
std::unique_ptr<TestMySqlMetadataSourceInitializer>
8484
GetTestMySqlMetadataSourceInitializer() {
85-
return absl::make_unique<TestStandaloneMySqlMetadataSourceInitializer>();
85+
return std::make_unique<TestStandaloneMySqlMetadataSourceInitializer>();
8686
}
8787

8888
} // namespace testing

0 commit comments

Comments
 (0)