Skip to content

GitLab

T
tangled
Commit 873ef4bc authored by Ken Rockot's avatar Ken Rockot Committed by Commit Bot
Browse files
Options

DOM Storage: Simplify metadata fetch 

This removes the generalized GetMany API from LevelDBDatabaseImpl,
which was only used by session storage to fetch specific metadata
fields. The database logic has been migrated fully into
SessionStorageContextMojo.

Bug: 1000959
Change-Id: Ie972684a5ccedfc879997540ea2b3d4ac6698dde
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1859587Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Commit-Queue: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#706180}
parent 8ddbda78
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 173 deletions
components/services/leveldb/leveldb_database_impl.cc
View file @ 873ef4bc
...@@ -176,51 +176,6 @@ void LevelDBDatabaseImpl::Get(const std::vector<uint8_t>& key, ...@@ -176,51 +176,6 @@ void LevelDBDatabaseImpl::Get(const std::vector<uint8_t>& key,
std::move(callback))); std::move(callback)));
} }
void LevelDBDatabaseImpl::GetMany(
std::vector<mojom::GetManyRequestPtr> keys_or_prefixes,
GetManyCallback callback) {
RunDatabaseTask(
base::BindOnce(
[](std::vector<mojom::GetManyRequestPtr> keys_or_prefixes,
const storage::DomStorageDatabase& db) {
std::vector<mojom::GetManyResultPtr> data;
for (const auto& request : keys_or_prefixes) {
mojom::GetManyResultPtr result = mojom::GetManyResult::New();
Status status;
if (request->is_key()) {
const std::vector<uint8_t>& key = request->get_key();
storage::DomStorageDatabase::Value value;
status = db.Get(key, &value);
if (status.ok())
result->set_key_value(value);
else
result->set_status(LeveldbStatusToError(status));
} else {
const std::vector<uint8_t>& key_prefix =
request->get_key_prefix();
std::vector<storage::DomStorageDatabase::KeyValuePair> entries;
status = db.GetPrefixed(key_prefix, &entries);
if (status.ok()) {
std::vector<mojom::KeyValuePtr> out_entries;
for (auto& entry : entries) {
out_entries.push_back(
mojom::KeyValue::New(entry.key, entry.value));
}
result->set_key_prefix_values(std::move(out_entries));
} else {
result->set_status(LeveldbStatusToError(status));
}
}
data.push_back(std::move(result));
}
return data;
},
std::move(keys_or_prefixes)),
std::move(callback));
}
void LevelDBDatabaseImpl::GetPrefixed(const std::vector<uint8_t>& key_prefix, void LevelDBDatabaseImpl::GetPrefixed(const std::vector<uint8_t>& key_prefix,
GetPrefixedCallback callback) { GetPrefixedCallback callback) {
struct GetPrefixedResult { struct GetPrefixedResult {
......
components/services/leveldb/leveldb_database_impl.h
View file @ 873ef4bc
...@@ -79,26 +79,10 @@ class LevelDBDatabaseImpl { ...@@ -79,26 +79,10 @@ class LevelDBDatabaseImpl {
void GetPrefixed(const std::vector<uint8_t>& key_prefix, void GetPrefixed(const std::vector<uint8_t>& key_prefix,
GetPrefixedCallback callback); GetPrefixedCallback callback);
using GetManyCallback =
base::OnceCallback<void(std::vector<mojom::GetManyResultPtr>)>;
void GetMany(std::vector<mojom::GetManyRequestPtr> keys_or_prefixes,
GetManyCallback callback);
void CopyPrefixed(const std::vector<uint8_t>& source_key_prefix, void CopyPrefixed(const std::vector<uint8_t>& source_key_prefix,
const std::vector<uint8_t>& destination_key_prefix, const std::vector<uint8_t>& destination_key_prefix,
StatusCallback callback); StatusCallback callback);
private:
using StatusAndKeyValues =
std::tuple<Status, std::vector<mojom::KeyValuePtr>>;
void OnDatabaseOpened(
StatusCallback callback,
base::SequenceBound<storage::DomStorageDatabase> database,
leveldb::Status status);
explicit LevelDBDatabaseImpl();
template <typename ResultType> template <typename ResultType>
void RunDatabaseTask( void RunDatabaseTask(
base::OnceCallback<ResultType(const storage::DomStorageDatabase&)> task, base::OnceCallback<ResultType(const storage::DomStorageDatabase&)> task,
...@@ -122,6 +106,17 @@ class LevelDBDatabaseImpl { ...@@ -122,6 +106,17 @@ class LevelDBDatabaseImpl {
} }
} }
private:
using StatusAndKeyValues =
std::tuple<Status, std::vector<mojom::KeyValuePtr>>;
void OnDatabaseOpened(
StatusCallback callback,
base::SequenceBound<storage::DomStorageDatabase> database,
leveldb::Status status);
explicit LevelDBDatabaseImpl();
base::SequenceBound<storage::DomStorageDatabase> database_; base::SequenceBound<storage::DomStorageDatabase> database_;
using DatabaseTask = using DatabaseTask =
......
components/services/leveldb/public/mojom/leveldb.mojom
View file @ 873ef4bc
...@@ -33,15 +33,3 @@ struct KeyValue { ...@@ -33,15 +33,3 @@ struct KeyValue {
array<uint8> key; array<uint8> key;
array<uint8> value; array<uint8> value;
}; };
union GetManyRequest {
array<uint8> key_prefix;
array<uint8> key;
};
union GetManyResult {
DatabaseError status;
array<KeyValue> key_prefix_values;
array<uint8> key_value;
};
content/browser/dom_storage/session_storage_context_mojo.cc
View file @ 873ef4bc
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/containers/span.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
...@@ -768,73 +769,70 @@ void SessionStorageContextMojo::OnDatabaseOpened( ...@@ -768,73 +769,70 @@ void SessionStorageContextMojo::OnDatabaseOpened(
return; return;
} }
std::vector<uint8_t> database_version( database_->RunDatabaseTask(
SessionStorageMetadata::kDatabaseVersionBytes, base::BindOnce([](const storage::DomStorageDatabase& db) {
std::end(SessionStorageMetadata::kDatabaseVersionBytes)); DatabaseMetadataResult result;
std::vector<uint8_t> namespace_prefix( result.version_status = db.Get(
SessionStorageMetadata::kNamespacePrefixBytes, base::make_span(SessionStorageMetadata::kDatabaseVersionBytes),
std::end(SessionStorageMetadata::kNamespacePrefixBytes)); &result.version);
std::vector<uint8_t> next_map_id_key( result.next_map_id_status =
SessionStorageMetadata::kNextMapIdKeyBytes, db.Get(base::make_span(SessionStorageMetadata::kNextMapIdKeyBytes),
std::end(SessionStorageMetadata::kNextMapIdKeyBytes)); &result.next_map_id);
result.namespaces_status = db.GetPrefixed(
std::vector<leveldb::mojom::GetManyRequestPtr> requests; base::make_span(SessionStorageMetadata::kNamespacePrefixBytes),
requests.emplace_back( &result.namespaces);
leveldb::mojom::GetManyRequest::NewKey(std::move(database_version))); return result;
requests.emplace_back(leveldb::mojom::GetManyRequest::NewKeyPrefix( }),
std::move(namespace_prefix)));
requests.emplace_back(
leveldb::mojom::GetManyRequest::NewKey(std::move(next_map_id_key)));
database_->GetMany(
std::move(requests),
base::BindOnce(&SessionStorageContextMojo::OnGotDatabaseMetadata, base::BindOnce(&SessionStorageContextMojo::OnGotDatabaseMetadata,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
} }
void SessionStorageContextMojo::OnGotDatabaseMetadata( SessionStorageContextMojo::DatabaseMetadataResult::DatabaseMetadataResult() =
std::vector<leveldb::mojom::GetManyResultPtr> results) { default;
DCHECK_EQ(results.size(), 3U);
std::vector<leveldb::mojom::BatchedOperationPtr> migration_operations; SessionStorageContextMojo::DatabaseMetadataResult::DatabaseMetadataResult(
DatabaseMetadataResult&&) = default;
OpenResult open_result; SessionStorageContextMojo::DatabaseMetadataResult::~DatabaseMetadataResult() =
const char* histogram_name; default;
void SessionStorageContextMojo::OnGotDatabaseMetadata(
DatabaseMetadataResult result) {
std::vector<leveldb::mojom::BatchedOperationPtr> migration_operations;
std::tie(open_result, histogram_name) = MetadataParseResult version_parse =
ParseDatabaseVersion(results[0], &migration_operations); ParseDatabaseVersion(&result, &migration_operations);
if (open_result != OpenResult::kSuccess) { if (version_parse.open_result != OpenResult::kSuccess) {
LogDatabaseOpenResult(open_result); LogDatabaseOpenResult(version_parse.open_result);
DeleteAndRecreateDatabase(histogram_name); DeleteAndRecreateDatabase(version_parse.histogram_name);
return; return;
} }
std::tie(open_result, histogram_name) = MetadataParseResult namespaces_parse =
ParseNamespaces(results[1], std::move(migration_operations)); ParseNamespaces(&result, std::move(migration_operations));
if (open_result != OpenResult::kSuccess) { if (namespaces_parse.open_result != OpenResult::kSuccess) {
LogDatabaseOpenResult(open_result); LogDatabaseOpenResult(namespaces_parse.open_result);
DeleteAndRecreateDatabase(histogram_name); DeleteAndRecreateDatabase(namespaces_parse.histogram_name);
return; return;
} }
std::tie(open_result, histogram_name) = ParseNextMapId(results[2]); MetadataParseResult next_map_id_parse = ParseNextMapId(&result);
if (open_result != OpenResult::kSuccess) { if (next_map_id_parse.open_result != OpenResult::kSuccess) {
LogDatabaseOpenResult(open_result); LogDatabaseOpenResult(next_map_id_parse.open_result);
DeleteAndRecreateDatabase(histogram_name); DeleteAndRecreateDatabase(next_map_id_parse.histogram_name);
return; return;
} }
OnConnectionFinished(); OnConnectionFinished();
} }
SessionStorageContextMojo::OpenResultAndHistogramName SessionStorageContextMojo::MetadataParseResult
SessionStorageContextMojo::ParseDatabaseVersion( SessionStorageContextMojo::ParseDatabaseVersion(
const leveldb::mojom::GetManyResultPtr& result, DatabaseMetadataResult* result,
std::vector<leveldb::mojom::BatchedOperationPtr>* migration_operations) { std::vector<leveldb::mojom::BatchedOperationPtr>* migration_operations) {
if (result->is_key_value()) { if (result->version_status.ok()) {
const std::vector<uint8_t>& value = result->get_key_value(); if (!metadata_.ParseDatabaseVersion(std::move(result->version),
migration_operations)) {
if (!metadata_.ParseDatabaseVersion(value, migration_operations)) {
return {OpenResult::kInvalidVersion, return {OpenResult::kInvalidVersion,
"SessionStorageContext.OpenResultAfterInvalidVersion"}; "SessionStorageContext.OpenResultAfterInvalidVersion"};
} }
...@@ -842,47 +840,43 @@ SessionStorageContextMojo::ParseDatabaseVersion( ...@@ -842,47 +840,43 @@ SessionStorageContextMojo::ParseDatabaseVersion(
return {OpenResult::kSuccess, ""}; return {OpenResult::kSuccess, ""};
} }
// Failed to get DatabaseVersion, |result| contains error status if (result->version_status.IsNotFound()) {
leveldb::mojom::DatabaseError status = result->get_status();
if (status == leveldb::mojom::DatabaseError::NOT_FOUND) {
// treat as v0 or new database // treat as v0 or new database
metadata_.ParseDatabaseVersion(base::nullopt, migration_operations); metadata_.ParseDatabaseVersion(base::nullopt, migration_operations);
return {OpenResult::kSuccess, ""}; return {OpenResult::kSuccess, ""};
} }
// Other read error, Possibly database corruption // Other read error, Possibly database corruption
UMA_HISTOGRAM_ENUMERATION("SessionStorageContext.ReadVersionError", UMA_HISTOGRAM_ENUMERATION(
leveldb::GetLevelDBStatusUMAValue(status), "SessionStorageContext.ReadVersionError",
leveldb_env::LEVELDB_STATUS_MAX); leveldb_env::GetLevelDBStatusUMAValue(result->version_status),
leveldb_env::LEVELDB_STATUS_MAX);
return {OpenResult::kVersionReadError, return {OpenResult::kVersionReadError,
"SessionStorageContext.OpenResultAfterReadVersionError"}; "SessionStorageContext.OpenResultAfterReadVersionError"};
} }
SessionStorageContextMojo::OpenResultAndHistogramName SessionStorageContextMojo::MetadataParseResult
SessionStorageContextMojo::ParseNamespaces( SessionStorageContextMojo::ParseNamespaces(
const leveldb::mojom::GetManyResultPtr& result, DatabaseMetadataResult* result,
std::vector<leveldb::mojom::BatchedOperationPtr> migration_operations) { std::vector<leveldb::mojom::BatchedOperationPtr> migration_operations) {
DCHECK_EQ(connection_state_, CONNECTION_IN_PROGRESS); DCHECK_EQ(connection_state_, CONNECTION_IN_PROGRESS);
if (result->is_status()) { if (!result->namespaces_status.ok()) {
UMA_HISTOGRAM_ENUMERATION( UMA_HISTOGRAM_ENUMERATION(
"SessionStorageContext.ReadNamespacesError", "SessionStorageContext.ReadNamespacesError",
leveldb::GetLevelDBStatusUMAValue(result->get_status()), leveldb_env::GetLevelDBStatusUMAValue(result->namespaces_status),
leveldb_env::LEVELDB_STATUS_MAX); leveldb_env::LEVELDB_STATUS_MAX);
return {OpenResult::kNamespacesReadError, return {OpenResult::kNamespacesReadError,
"SessionStorageContext.OpenResultAfterReadNamespacesError"}; "SessionStorageContext.OpenResultAfterReadNamespacesError"};
} }
DCHECK(result->is_key_prefix_values());
bool parsing_success = metadata_.ParseNamespaces( bool parsing_success = metadata_.ParseNamespaces(
std::move(result->get_key_prefix_values()), &migration_operations); std::move(result->namespaces), &migration_operations);
if (!parsing_success) { if (!parsing_success) {
UMA_HISTOGRAM_ENUMERATION( UMA_HISTOGRAM_ENUMERATION(
"SessionStorageContext.ReadNamespacesError", "SessionStorageContext.ReadNamespacesError",
leveldb::GetLevelDBStatusUMAValue(leveldb::mojom::DatabaseError::OK), leveldb_env::GetLevelDBStatusUMAValue(leveldb::Status::OK()),
leveldb_env::LEVELDB_STATUS_MAX); leveldb_env::LEVELDB_STATUS_MAX);
return {OpenResult::kNamespacesReadError, return {OpenResult::kNamespacesReadError,
"SessionStorageContext.OpenResultAfterReadNamespacesError"}; "SessionStorageContext.OpenResultAfterReadNamespacesError"};
...@@ -910,26 +904,22 @@ SessionStorageContextMojo::ParseNamespaces( ...@@ -910,26 +904,22 @@ SessionStorageContextMojo::ParseNamespaces(
return {OpenResult::kSuccess, ""}; return {OpenResult::kSuccess, ""};
} }
SessionStorageContextMojo::OpenResultAndHistogramName SessionStorageContextMojo::MetadataParseResult
SessionStorageContextMojo::ParseNextMapId( SessionStorageContextMojo::ParseNextMapId(DatabaseMetadataResult* result) {
const leveldb::mojom::GetManyResultPtr& result) { if (!result->next_map_id_status.ok()) {
if (result->is_status()) { if (result->next_map_id_status.IsNotFound())
leveldb::mojom::DatabaseError status = result->get_status();
if (status == leveldb::mojom::DatabaseError::NOT_FOUND) {
return {OpenResult::kSuccess, ""}; return {OpenResult::kSuccess, ""};
}
// Other read error. Possibly database corruption. // Other read error. Possibly database corruption.
UMA_HISTOGRAM_ENUMERATION("SessionStorageContext.ReadNextMapIdError", UMA_HISTOGRAM_ENUMERATION(
leveldb::GetLevelDBStatusUMAValue(status), "SessionStorageContext.ReadNextMapIdError",
leveldb_env::LEVELDB_STATUS_MAX); leveldb_env::GetLevelDBStatusUMAValue(result->next_map_id_status),
leveldb_env::LEVELDB_STATUS_MAX);
return {OpenResult::kNamespacesReadError, return {OpenResult::kNamespacesReadError,
"SessionStorageContext.OpenResultAfterReadNextMapIdError"}; "SessionStorageContext.OpenResultAfterReadNextMapIdError"};
} }
DCHECK(result->is_key_value()); metadata_.ParseNextMapId(std::move(result->next_map_id));
metadata_.ParseNextMapId(result->get_key_value());
return {OpenResult::kSuccess, ""}; return {OpenResult::kSuccess, ""};
} }
......
content/browser/dom_storage/session_storage_context_mojo.h
View file @ 873ef4bc
...@@ -208,18 +208,34 @@ class CONTENT_EXPORT SessionStorageContextMojo ...@@ -208,18 +208,34 @@ class CONTENT_EXPORT SessionStorageContextMojo
void InitiateConnection(bool in_memory_only = false); void InitiateConnection(bool in_memory_only = false);
void OnDatabaseOpened(leveldb::mojom::DatabaseError status); void OnDatabaseOpened(leveldb::mojom::DatabaseError status);
void OnGotDatabaseMetadata( struct DatabaseMetadataResult {
std::vector<leveldb::mojom::GetManyResultPtr> results); DatabaseMetadataResult();
DatabaseMetadataResult(DatabaseMetadataResult&&);
DatabaseMetadataResult(const DatabaseMetadataResult&) = delete;
~DatabaseMetadataResult();
using OpenResultAndHistogramName = std::tuple<OpenResult, const char*>; storage::DomStorageDatabase::Value version;
OpenResultAndHistogramName ParseDatabaseVersion( leveldb::Status version_status;
const leveldb::mojom::GetManyResultPtr& result,
storage::DomStorageDatabase::Value next_map_id;
leveldb::Status next_map_id_status;
std::vector<storage::DomStorageDatabase::KeyValuePair> namespaces;
leveldb::Status namespaces_status;
};
void OnGotDatabaseMetadata(DatabaseMetadataResult result);
struct MetadataParseResult {
OpenResult open_result;
const char* histogram_name;
};
MetadataParseResult ParseDatabaseVersion(
DatabaseMetadataResult* result,
std::vector<leveldb::mojom::BatchedOperationPtr>* migration_operations); std::vector<leveldb::mojom::BatchedOperationPtr>* migration_operations);
OpenResultAndHistogramName ParseNamespaces( MetadataParseResult ParseNamespaces(
const leveldb::mojom::GetManyResultPtr& result, DatabaseMetadataResult* result,
std::vector<leveldb::mojom::BatchedOperationPtr> migration_operations); std::vector<leveldb::mojom::BatchedOperationPtr> migration_operations);
OpenResultAndHistogramName ParseNextMapId( MetadataParseResult ParseNextMapId(DatabaseMetadataResult* result);
const leveldb::mojom::GetManyResultPtr& result);
void OnConnectionFinished(); void OnConnectionFinished();
void DeleteAndRecreateDatabase(const char* histogram_name); void DeleteAndRecreateDatabase(const char* histogram_name);
......
content/browser/dom_storage/session_storage_metadata.cc
View file @ 873ef4bc
...@@ -121,7 +121,7 @@ bool SessionStorageMetadata::ParseDatabaseVersion( ...@@ -121,7 +121,7 @@ bool SessionStorageMetadata::ParseDatabaseVersion(
} }
bool SessionStorageMetadata::ParseNamespaces( bool SessionStorageMetadata::ParseNamespaces(
std::vector<leveldb::mojom::KeyValuePtr> values, std::vector<storage::DomStorageDatabase::KeyValuePair> values,
std::vector<leveldb::mojom::BatchedOperationPtr>* upgrade_operations) { std::vector<leveldb::mojom::BatchedOperationPtr>* upgrade_operations) {
namespace_origin_map_.clear(); namespace_origin_map_.clear();
next_map_id_from_namespaces_ = 0; next_map_id_from_namespaces_ = 0;
...@@ -131,11 +131,11 @@ bool SessionStorageMetadata::ParseNamespaces( ...@@ -131,11 +131,11 @@ bool SessionStorageMetadata::ParseNamespaces(
std::map<url::Origin, scoped_refptr<MapData>>* last_namespace = nullptr; std::map<url::Origin, scoped_refptr<MapData>>* last_namespace = nullptr;
std::map<int64_t, scoped_refptr<MapData>> maps; std::map<int64_t, scoped_refptr<MapData>> maps;
bool error = false; bool error = false;
for (const leveldb::mojom::KeyValuePtr& key_value : values) { for (const storage::DomStorageDatabase::KeyValuePair& key_value : values) {
size_t key_size = key_value->key.size(); size_t key_size = key_value.key.size();
base::StringPiece key_as_string = base::StringPiece key_as_string =
leveldb::Uint8VectorToStringPiece(key_value->key); leveldb::Uint8VectorToStringPiece(key_value.key);
if (key_size < kNamespacePrefixLength) { if (key_size < kNamespacePrefixLength) {
LOG(ERROR) << "Key size is less than prefix length: " << key_as_string; LOG(ERROR) << "Key size is less than prefix length: " << key_as_string;
...@@ -176,10 +176,10 @@ bool SessionStorageMetadata::ParseNamespaces( ...@@ -176,10 +176,10 @@ bool SessionStorageMetadata::ParseNamespaces(
key_as_string.substr(kPrefixBeforeOriginLength); key_as_string.substr(kPrefixBeforeOriginLength);
int64_t map_number; int64_t map_number;
if (!ValueToNumber(key_value->value, &map_number)) { if (!ValueToNumber(key_value.value, &map_number)) {
error = true; error = true;
LOG(ERROR) << "Could not parse map number " LOG(ERROR) << "Could not parse map number "
<< leveldb::Uint8VectorToStringPiece(key_value->value); << leveldb::Uint8VectorToStringPiece(key_value.value);
break; break;
} }
......
content/browser/dom_storage/session_storage_metadata.h
View file @ 873ef4bc
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "components/services/leveldb/public/mojom/leveldb.mojom.h" #include "components/services/leveldb/public/mojom/leveldb.mojom.h"
#include "components/services/storage/dom_storage/dom_storage_database.h"
#include "content/common/content_export.h" #include "content/common/content_export.h"
#include "url/origin.h" #include "url/origin.h"
...@@ -106,7 +107,7 @@ class CONTENT_EXPORT SessionStorageMetadata { ...@@ -106,7 +107,7 @@ class CONTENT_EXPORT SessionStorageMetadata {
// will be populated in |upgrade_operations|. This call is not necessary on // will be populated in |upgrade_operations|. This call is not necessary on
// new databases. // new databases.
bool ParseNamespaces( bool ParseNamespaces(
std::vector<leveldb::mojom::KeyValuePtr> values, std::vector<storage::DomStorageDatabase::KeyValuePair> values,
std::vector<leveldb::mojom::BatchedOperationPtr>* upgrade_operations); std::vector<leveldb::mojom::BatchedOperationPtr>* upgrade_operations);
// Parses the next map id from the given bytes. If that fails, then it uses // Parses the next map id from the given bytes. If that fails, then it uses
......
content/browser/dom_storage/session_storage_metadata_unittest.cc
View file @ 873ef4bc
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "base/test/task_environment.h" #include "base/test/task_environment.h"
#include "components/services/leveldb/leveldb_database_impl.h" #include "components/services/leveldb/leveldb_database_impl.h"
#include "components/services/leveldb/public/cpp/util.h" #include "components/services/leveldb/public/cpp/util.h"
#include "components/services/storage/dom_storage/dom_storage_database.h"
#include "content/browser/dom_storage/dom_storage_types.h" #include "content/browser/dom_storage/dom_storage_types.h"
#include "content/browser/dom_storage/session_storage_database.h" #include "content/browser/dom_storage/session_storage_database.h"
#include "content/browser/indexed_db/leveldb/leveldb_env.h" #include "content/browser/indexed_db/leveldb/leveldb_env.h"
...@@ -92,12 +93,7 @@ class SessionStorageMetadataTest : public testing::Test { ...@@ -92,12 +93,7 @@ class SessionStorageMetadataTest : public testing::Test {
metadata->ParseNextMapId(next_map_id_value); metadata->ParseNextMapId(next_map_id_value);
std::vector<leveldb::mojom::KeyValuePtr> namespace_values; EXPECT_TRUE(metadata->ParseNamespaces(std::move(namespace_entries),
for (auto& entry : namespace_entries) {
namespace_values.push_back(
leveldb::mojom::KeyValue::New(entry.key, entry.value));
}
EXPECT_TRUE(metadata->ParseNamespaces(std::move(namespace_values),
&migration_operations)); &migration_operations));
EXPECT_TRUE(migration_operations.empty()); EXPECT_TRUE(migration_operations.empty());
} }
...@@ -487,7 +483,7 @@ TEST_F(SessionStorageMetadataMigrationTest, MigrateV0ToV1) { ...@@ -487,7 +483,7 @@ TEST_F(SessionStorageMetadataMigrationTest, MigrateV0ToV1) {
metadata.ParseNextMapId(leveldb::StdStringToUint8Vector(db_value)); metadata.ParseNextMapId(leveldb::StdStringToUint8Vector(db_value));
// Get all keys-value pairs with the given key prefix // Get all keys-value pairs with the given key prefix
std::vector<leveldb::mojom::KeyValuePtr> values; std::vector<storage::DomStorageDatabase::KeyValuePair> values;
{ {
std::unique_ptr<leveldb::Iterator> it(db()->NewIterator(options)); std::unique_ptr<leveldb::Iterator> it(db()->NewIterator(options));
it->Seek(leveldb::Slice("namespace-")); it->Seek(leveldb::Slice("namespace-"));
...@@ -495,9 +491,8 @@ TEST_F(SessionStorageMetadataMigrationTest, MigrateV0ToV1) { ...@@ -495,9 +491,8 @@ TEST_F(SessionStorageMetadataMigrationTest, MigrateV0ToV1) {
if (!it->key().starts_with(leveldb::Slice("namespace-"))) if (!it->key().starts_with(leveldb::Slice("namespace-")))
break; break;
leveldb::mojom::KeyValuePtr kv = leveldb::mojom::KeyValue::New(); leveldb::mojom::KeyValuePtr kv = leveldb::mojom::KeyValue::New();
kv->key = leveldb::GetVectorFor(it->key()); values.emplace_back(leveldb::GetVectorFor(it->key()),
kv->value = leveldb::GetVectorFor(it->value()); leveldb::GetVectorFor(it->value()));
values.push_back(std::move(kv));
} }
EXPECT_TRUE(it->status().ok()); EXPECT_TRUE(it->status().ok());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment