StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add fingerprint to packages.map."

Browse Source 
This reverts commit 769d8eed37.

Reason for revert: Caused crashed in places where old version files were present.

Change-Id: I7d529773226cd834979400aa018c47bbf6891b72
This commit is contained in:
Marybeth Fair
2024-09-23 19:37:21 +00:00
committed by Gerrit Code Review
parent 769d8eed37
commit a80e298d34
30 changed files with 80 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/aconfig/aconfig/Android.bp
View File

@@ -68,14 +68,6 @@ aconfig_values {
], ],
} }
aconfig_values {
name: "aconfig.test.flag.second_values",
package: "com.android.aconfig.test",
srcs: [
"tests/third.values",
],
}
aconfig_value_set { aconfig_value_set {
name: "aconfig.test.flag.value_set", name: "aconfig.test.flag.value_set",
values: [ values: [

74
tools/aconfig/aconfig/src/commands.rs
View File

@@ -17,7 +17,7 @@
use anyhow::{bail, ensure, Context, Result}; use anyhow::{bail, ensure, Context, Result};
use itertools::Itertools; use itertools::Itertools;
use protobuf::Message; use protobuf::Message;
use std::collections::HashMap; use std::collections::{BTreeMap, HashMap};
use std::hash::Hasher; use std::hash::Hasher;
use std::io::Read; use std::io::Read;
use std::path::PathBuf; use std::path::PathBuf;
@@ -422,30 +422,23 @@ where
Ok(flag_ids) Ok(flag_ids)
} }
// Creates a fingerprint of the flag names. Sorts the vector.
pub fn compute_flags_fingerprint(flag_names: &mut Vec<String>) -> Result<u64> {
flag_names.sort();
let mut hasher = SipHasher13::new();
for flag in flag_names {
hasher.write(flag.as_bytes());
}
Ok(hasher.finish())
}
#[allow(dead_code)] // TODO: b/316357686 - Use fingerprint in codegen to #[allow(dead_code)] // TODO: b/316357686 - Use fingerprint in codegen to
// protect hardcoded offset reads. // protect hardcoded offset reads.
fn compute_fingerprint_from_parsed_flags(flags: ProtoParsedFlags) -> Result<u64> { pub fn compute_flag_offsets_fingerprint(flags_map: &HashMap<String, u16>) -> Result<u64> {
let separated_flags: Vec<ProtoParsedFlag> = flags.parsed_flag.into_iter().collect::<Vec<_>>(); let mut hasher = SipHasher13::new();
// All flags must belong to the same package as the fingerprint is per-package. // Need to sort to ensure the data is added to the hasher in the same order
let Some(_package) = find_unique_package(&separated_flags) else { // each run.
bail!("No parsed flags, or the parsed flags use different packages."); let sorted_map: BTreeMap<&String, &u16> = flags_map.iter().collect();
};
let mut flag_names = for (flag, offset) in sorted_map {
separated_flags.into_iter().map(|flag| flag.name.unwrap()).collect::<Vec<_>>(); // See https://docs.rs/siphasher/latest/siphasher/#note for use of write
compute_flags_fingerprint(&mut flag_names) // over write_i16. Similarly, use to_be_bytes rather than to_ne_bytes to
// ensure consistency.
hasher.write(flag.as_bytes());
hasher.write(&offset.to_be_bytes());
}
Ok(hasher.finish())
} }
#[cfg(test)] #[cfg(test)]
@@ -456,46 +449,15 @@ mod tests {
#[test] #[test]
fn test_offset_fingerprint() { fn test_offset_fingerprint() {
let parsed_flags = crate::test::parse_test_flags(); let parsed_flags = crate::test::parse_test_flags();
let expected_fingerprint: u64 = 5801144784618221668; let package = find_unique_package(&parsed_flags.parsed_flag).unwrap().to_string();
let flag_ids = assign_flag_ids(&package, parsed_flags.parsed_flag.iter()).unwrap();
let expected_fingerprint = 10709892481002252132u64;
let hash_result = compute_fingerprint_from_parsed_flags(parsed_flags); let hash_result = compute_flag_offsets_fingerprint(&flag_ids);
assert_eq!(hash_result.unwrap(), expected_fingerprint); assert_eq!(hash_result.unwrap(), expected_fingerprint);
} }
#[test]
fn test_offset_fingerprint_matches_from_package() {
let parsed_flags: ProtoParsedFlags = crate::test::parse_test_flags();
// All test flags are in the same package, so fingerprint from all of them.
let result_from_parsed_flags = compute_fingerprint_from_parsed_flags(parsed_flags.clone());
let mut flag_names_vec = parsed_flags
.parsed_flag
.clone()
.into_iter()
.map(|flag| flag.name.unwrap())
.map(String::from)
.collect::<Vec<_>>();
let result_from_names = compute_flags_fingerprint(&mut flag_names_vec);
// Assert the same hash is generated for each case.
assert_eq!(result_from_parsed_flags.unwrap(), result_from_names.unwrap());
}
#[test]
fn test_offset_fingerprint_different_packages_does_not_match() {
// Parse flags from two packages.
let parsed_flags: ProtoParsedFlags = crate::test::parse_test_flags();
let second_parsed_flags = crate::test::parse_second_package_flags();
let result_from_parsed_flags = compute_fingerprint_from_parsed_flags(parsed_flags).unwrap();
let second_result = compute_fingerprint_from_parsed_flags(second_parsed_flags).unwrap();
// Different flags should have a different fingerprint.
assert_ne!(result_from_parsed_flags, second_result);
}
#[test] #[test]
fn test_parse_flags() { fn test_parse_flags() {
let parsed_flags = crate::test::parse_test_flags(); // calls parse_flags let parsed_flags = crate::test::parse_test_flags(); // calls parse_flags

9
tools/aconfig/aconfig/src/storage/mod.rs
View File

@@ -25,14 +25,12 @@ use crate::storage::{
flag_table::create_flag_table, flag_value::create_flag_value, flag_table::create_flag_table, flag_value::create_flag_value,
package_table::create_package_table, package_table::create_package_table,
}; };
use aconfig_protos::ProtoParsedFlag; use aconfig_protos::{ProtoParsedFlag, ProtoParsedFlags};
use aconfig_protos::ProtoParsedFlags;
use aconfig_storage_file::StorageFileType; use aconfig_storage_file::StorageFileType;
pub struct FlagPackage<'a> { pub struct FlagPackage<'a> {
pub package_name: &'a str, pub package_name: &'a str,
pub package_id: u32, pub package_id: u32,
pub fingerprint: u64,
pub flag_names: HashSet<&'a str>, pub flag_names: HashSet<&'a str>,
pub boolean_flags: Vec<&'a ProtoParsedFlag>, pub boolean_flags: Vec<&'a ProtoParsedFlag>,
// The index of the first boolean flag in this aconfig package among all boolean // The index of the first boolean flag in this aconfig package among all boolean
@@ -45,7 +43,6 @@ impl<'a> FlagPackage<'a> {
FlagPackage { FlagPackage {
package_name, package_name,
package_id, package_id,
fingerprint: 0,
flag_names: HashSet::new(), flag_names: HashSet::new(),
boolean_flags: vec![], boolean_flags: vec![],
boolean_start_index: 0, boolean_start_index: 0,
@@ -81,8 +78,6 @@ where
for p in packages.iter_mut() { for p in packages.iter_mut() {
p.boolean_start_index = boolean_start_index; p.boolean_start_index = boolean_start_index;
boolean_start_index += p.boolean_flags.len() as u32; boolean_start_index += p.boolean_flags.len() as u32;
// TODO: b/316357686 - Calculate fingerprint and add to package.
} }
packages packages
@@ -120,8 +115,6 @@ mod tests {
use super::*; use super::*;
use crate::Input; use crate::Input;
use aconfig_protos::ProtoParsedFlags;
pub fn parse_all_test_flags() -> Vec<ProtoParsedFlags> { pub fn parse_all_test_flags() -> Vec<ProtoParsedFlags> {
let aconfig_files = [ let aconfig_files = [
( (

1
tools/aconfig/aconfig/src/storage/package_table.rs
View File

@@ -48,7 +48,6 @@ impl PackageTableNodeWrapper {
let node = PackageTableNode { let node = PackageTableNode {
package_name: String::from(package.package_name), package_name: String::from(package.package_name),
package_id: package.package_id, package_id: package.package_id,
fingerprint: package.fingerprint,
boolean_start_index: package.boolean_start_index, boolean_start_index: package.boolean_start_index,
next_offset: None, next_offset: None,
}; };

18
tools/aconfig/aconfig/src/test.rs
View File

@@ -295,24 +295,6 @@ parsed_flag {
aconfig_protos::parsed_flags::try_from_binary_proto(&bytes).unwrap() aconfig_protos::parsed_flags::try_from_binary_proto(&bytes).unwrap()
} }
pub fn parse_second_package_flags() -> ProtoParsedFlags {
let bytes = crate::commands::parse_flags(
"com.android.aconfig.second_test",
Some("system"),
vec![Input {
source: "tests/test_second_package.aconfig".to_string(),
reader: Box::new(include_bytes!("../tests/test_second_package.aconfig").as_slice()),
}],
vec![Input {
source: "tests/third.values".to_string(),
reader: Box::new(include_bytes!("../tests/third.values").as_slice()),
}],
crate::commands::DEFAULT_FLAG_PERMISSION,
)
.unwrap();
aconfig_protos::parsed_flags::try_from_binary_proto(&bytes).unwrap()
}
pub fn first_significant_code_diff(a: &str, b: &str) -> Option<String> { pub fn first_significant_code_diff(a: &str, b: &str) -> Option<String> {
let a = a.lines().map(|line| line.trim_start()).filter(|line| !line.is_empty()); let a = a.lines().map(|line| line.trim_start()).filter(|line| !line.is_empty());
let b = b.lines().map(|line| line.trim_start()).filter(|line| !line.is_empty()); let b = b.lines().map(|line| line.trim_start()).filter(|line| !line.is_empty());

2
tools/aconfig/aconfig/tests/test.aconfig
View File

@@ -86,4 +86,4 @@ flag {
bug: "111" bug: "111"
is_fixed_read_only: true is_fixed_read_only: true
is_exported: true is_exported: true
} }

12
tools/aconfig/aconfig/tests/test_second_package.aconfig
View File

@@ -1,12 +0,0 @@
package: "com.android.aconfig.second_test"
container: "system"
flag {
name: "testing_flag"
namespace: "another_namespace"
description: "This is a flag for testing."
bug: "123"
metadata {
purpose: PURPOSE_UNSPECIFIED
}
}

6
tools/aconfig/aconfig/tests/third.values
View File

@@ -1,6 +0,0 @@
flag_value {
package: "com.android.aconfig.second_test"
name: "testing_flag"
state: DISABLED
permission: READ_WRITE
}

2
tools/aconfig/aconfig_storage_file/src/flag_info.rs
View File

@@ -227,7 +227,7 @@ mod tests {
let bytes = &flag_info_list.into_bytes(); let bytes = &flag_info_list.into_bytes();
let mut head = 0; let mut head = 0;
let version = read_u32_from_bytes(bytes, &mut head).unwrap(); let version = read_u32_from_bytes(bytes, &mut head).unwrap();
assert_eq!(version, 2); assert_eq!(version, 1);
} }
#[test] #[test]

2
tools/aconfig/aconfig_storage_file/src/flag_table.rs
View File

@@ -253,7 +253,7 @@ mod tests {
let bytes = &flag_table.into_bytes(); let bytes = &flag_table.into_bytes();
let mut head = 0; let mut head = 0;
let version = read_u32_from_bytes(bytes, &mut head).unwrap(); let version = read_u32_from_bytes(bytes, &mut head).unwrap();
assert_eq!(version, 2); assert_eq!(version, 1);
} }
#[test] #[test]

2
tools/aconfig/aconfig_storage_file/src/flag_value.rs
View File

@@ -159,7 +159,7 @@ mod tests {
let bytes = &flag_value_list.into_bytes(); let bytes = &flag_value_list.into_bytes();
let mut head = 0; let mut head = 0;
let version = read_u32_from_bytes(bytes, &mut head).unwrap(); let version = read_u32_from_bytes(bytes, &mut head).unwrap();
assert_eq!(version, 2); assert_eq!(version, 1);
} }
#[test] #[test]

12
tools/aconfig/aconfig_storage_file/src/lib.rs
View File

@@ -58,7 +58,7 @@ use crate::AconfigStorageError::{
}; };
/// Storage file version /// Storage file version
pub const FILE_VERSION: u32 = 2; pub const FILE_VERSION: u32 = 1;
/// Good hash table prime number /// Good hash table prime number
pub(crate) const HASH_PRIMES: [u32; 29] = [ pub(crate) const HASH_PRIMES: [u32; 29] = [
@@ -254,16 +254,6 @@ pub fn read_u32_from_bytes(buf: &[u8], head: &mut usize) -> Result<u32, AconfigS
Ok(val) Ok(val)
} }
// Read and parse bytes as u64
pub fn read_u64_from_bytes(buf: &[u8], head: &mut usize) -> Result<u64, AconfigStorageError> {
let val =
u64::from_le_bytes(buf[*head..*head + 8].try_into().map_err(|errmsg| {
BytesParseFail(anyhow!("fail to parse u64 from bytes: {}", errmsg))
})?);
*head += 8;
Ok(val)
}
/// Read and parse bytes as string /// Read and parse bytes as string
pub(crate) fn read_str_from_bytes( pub(crate) fn read_str_from_bytes(
buf: &[u8], buf: &[u8],

18
tools/aconfig/aconfig_storage_file/src/package_table.rs
View File

@@ -17,10 +17,7 @@
//! package table module defines the package table file format and methods for serialization //! package table module defines the package table file format and methods for serialization
//! and deserialization //! and deserialization
use crate::{ use crate::{get_bucket_index, read_str_from_bytes, read_u32_from_bytes, read_u8_from_bytes};
get_bucket_index, read_str_from_bytes, read_u32_from_bytes, read_u64_from_bytes,
read_u8_from_bytes,
};
use crate::{AconfigStorageError, StorageFileType}; use crate::{AconfigStorageError, StorageFileType};
use anyhow::anyhow; use anyhow::anyhow;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@@ -100,7 +97,6 @@ impl PackageTableHeader {
pub struct PackageTableNode { pub struct PackageTableNode {
pub package_name: String, pub package_name: String,
pub package_id: u32, pub package_id: u32,
pub fingerprint: u64,
// The index of the first boolean flag in this aconfig package among all boolean // The index of the first boolean flag in this aconfig package among all boolean
// flags in this container. // flags in this container.
pub boolean_start_index: u32, pub boolean_start_index: u32,
@@ -112,12 +108,8 @@ impl fmt::Debug for PackageTableNode {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
writeln!( writeln!(
f, f,
"Package: {}, Id: {}, Fingerprint: {}, Boolean flag start index: {}, Next: {:?}", "Package: {}, Id: {}, Boolean flag start index: {}, Next: {:?}",
self.package_name, self.package_name, self.package_id, self.boolean_start_index, self.next_offset
self.package_id,
self.fingerprint,
self.boolean_start_index,
self.next_offset
)?; )?;
Ok(()) Ok(())
} }
@@ -131,7 +123,6 @@ impl PackageTableNode {
result.extend_from_slice(&(name_bytes.len() as u32).to_le_bytes()); result.extend_from_slice(&(name_bytes.len() as u32).to_le_bytes());
result.extend_from_slice(name_bytes); result.extend_from_slice(name_bytes);
result.extend_from_slice(&self.package_id.to_le_bytes()); result.extend_from_slice(&self.package_id.to_le_bytes());
result.extend_from_slice(&self.fingerprint.to_le_bytes());
result.extend_from_slice(&self.boolean_start_index.to_le_bytes()); result.extend_from_slice(&self.boolean_start_index.to_le_bytes());
result.extend_from_slice(&self.next_offset.unwrap_or(0).to_le_bytes()); result.extend_from_slice(&self.next_offset.unwrap_or(0).to_le_bytes());
result result
@@ -143,7 +134,6 @@ impl PackageTableNode {
let node = Self { let node = Self {
package_name: read_str_from_bytes(bytes, &mut head)?, package_name: read_str_from_bytes(bytes, &mut head)?,
package_id: read_u32_from_bytes(bytes, &mut head)?, package_id: read_u32_from_bytes(bytes, &mut head)?,
fingerprint: read_u64_from_bytes(bytes, &mut head)?,
boolean_start_index: read_u32_from_bytes(bytes, &mut head)?, boolean_start_index: read_u32_from_bytes(bytes, &mut head)?,
next_offset: match read_u32_from_bytes(bytes, &mut head)? { next_offset: match read_u32_from_bytes(bytes, &mut head)? {
0 => None, 0 => None,
@@ -261,7 +251,7 @@ mod tests {
let bytes = &package_table.into_bytes(); let bytes = &package_table.into_bytes();
let mut head = 0; let mut head = 0;
let version = read_u32_from_bytes(bytes, &mut head).unwrap(); let version = read_u32_from_bytes(bytes, &mut head).unwrap();
assert_eq!(version, 2); assert_eq!(version, 1);
} }
#[test] #[test]

17
tools/aconfig/aconfig_storage_file/src/test_utils.rs
View File

@@ -26,33 +26,30 @@ use tempfile::NamedTempFile;
pub fn create_test_package_table() -> PackageTable { pub fn create_test_package_table() -> PackageTable {
let header = PackageTableHeader { let header = PackageTableHeader {
version: 2, version: 1,
container: String::from("mockup"), container: String::from("mockup"),
file_type: StorageFileType::PackageMap as u8, file_type: StorageFileType::PackageMap as u8,
file_size: 233, file_size: 209,
num_packages: 3, num_packages: 3,
bucket_offset: 31, bucket_offset: 31,
node_offset: 59, node_offset: 59,
}; };
let buckets: Vec<Option<u32>> = vec![Some(59), None, None, Some(117), None, None, None]; let buckets: Vec<Option<u32>> = vec![Some(59), None, None, Some(109), None, None, None];
let first_node = PackageTableNode { let first_node = PackageTableNode {
package_name: String::from("com.android.aconfig.storage.test_2"), package_name: String::from("com.android.aconfig.storage.test_2"),
package_id: 1, package_id: 1,
fingerprint: 0,
boolean_start_index: 3, boolean_start_index: 3,
next_offset: None, next_offset: None,
}; };
let second_node = PackageTableNode { let second_node = PackageTableNode {
package_name: String::from("com.android.aconfig.storage.test_1"), package_name: String::from("com.android.aconfig.storage.test_1"),
package_id: 0, package_id: 0,
fingerprint: 0,
boolean_start_index: 0, boolean_start_index: 0,
next_offset: Some(175), next_offset: Some(159),
}; };
let third_node = PackageTableNode { let third_node = PackageTableNode {
package_name: String::from("com.android.aconfig.storage.test_4"), package_name: String::from("com.android.aconfig.storage.test_4"),
package_id: 2, package_id: 2,
fingerprint: 0,
boolean_start_index: 6, boolean_start_index: 6,
next_offset: None, next_offset: None,
}; };
@@ -81,7 +78,7 @@ impl FlagTableNode {
pub fn create_test_flag_table() -> FlagTable { pub fn create_test_flag_table() -> FlagTable {
let header = FlagTableHeader { let header = FlagTableHeader {
version: 2, version: 1,
container: String::from("mockup"), container: String::from("mockup"),
file_type: StorageFileType::FlagMap as u8, file_type: StorageFileType::FlagMap as u8,
file_size: 321, file_size: 321,
@@ -123,7 +120,7 @@ pub fn create_test_flag_table() -> FlagTable {
pub fn create_test_flag_value_list() -> FlagValueList { pub fn create_test_flag_value_list() -> FlagValueList {
let header = FlagValueHeader { let header = FlagValueHeader {
version: 2, version: 1,
container: String::from("mockup"), container: String::from("mockup"),
file_type: StorageFileType::FlagVal as u8, file_type: StorageFileType::FlagVal as u8,
file_size: 35, file_size: 35,
@@ -136,7 +133,7 @@ pub fn create_test_flag_value_list() -> FlagValueList {
pub fn create_test_flag_info_list() -> FlagInfoList { pub fn create_test_flag_info_list() -> FlagInfoList {
let header = FlagInfoHeader { let header = FlagInfoHeader {
version: 2, version: 1,
container: String::from("mockup"), container: String::from("mockup"),
file_type: StorageFileType::FlagInfo as u8, file_type: StorageFileType::FlagInfo as u8,
file_size: 35, file_size: 35,

4
tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/ByteBufferReader.java
View File

@@ -37,10 +37,6 @@ public class ByteBufferReader {
return Short.toUnsignedInt(mByteBuffer.getShort()); return Short.toUnsignedInt(mByteBuffer.getShort());
} }
public long readLong() {
return mByteBuffer.getLong();
}
public int readInt() { public int readInt() {
return this.mByteBuffer.getInt(); return this.mByteBuffer.getInt();
} }

7
tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/PackageTable.java
View File

@@ -118,7 +118,6 @@ public class PackageTable {
private String mPackageName; private String mPackageName;
private int mPackageId; private int mPackageId;
private long mFingerprint;
private int mBooleanStartIndex; private int mBooleanStartIndex;
private int mNextOffset; private int mNextOffset;
@@ -126,7 +125,6 @@ public class PackageTable {
Node node = new Node(); Node node = new Node();
node.mPackageName = reader.readString(); node.mPackageName = reader.readString();
node.mPackageId = reader.readInt(); node.mPackageId = reader.readInt();
node.mFingerprint = reader.readLong();
node.mBooleanStartIndex = reader.readInt(); node.mBooleanStartIndex = reader.readInt();
node.mNextOffset = reader.readInt(); node.mNextOffset = reader.readInt();
node.mNextOffset = node.mNextOffset == 0 ? -1 : node.mNextOffset; node.mNextOffset = node.mNextOffset == 0 ? -1 : node.mNextOffset;
@@ -152,7 +150,6 @@ public class PackageTable {
return Objects.equals(mPackageName, other.mPackageName) return Objects.equals(mPackageName, other.mPackageName)
&& mPackageId == other.mPackageId && mPackageId == other.mPackageId
&& mBooleanStartIndex == other.mBooleanStartIndex && mBooleanStartIndex == other.mBooleanStartIndex
&& mFingerprint == other.mFingerprint
&& mNextOffset == other.mNextOffset; && mNextOffset == other.mNextOffset;
} }
@@ -168,10 +165,6 @@ public class PackageTable {
return mBooleanStartIndex; return mBooleanStartIndex;
} }
public long getFingerprint() {
return mFingerprint;
}
public int getNextOffset() { public int getNextOffset() {
return mNextOffset; return mNextOffset;
} }

BIN
tools/aconfig/aconfig_storage_file/tests/flag.info
View File

Binary file not shown.

BIN
tools/aconfig/aconfig_storage_file/tests/flag.map
View File

Binary file not shown.

BIN
tools/aconfig/aconfig_storage_file/tests/flag.val
View File

Binary file not shown.

BIN
tools/aconfig/aconfig_storage_file/tests/package.map
View File

Binary file not shown.

2
tools/aconfig/aconfig_storage_file/tests/srcs/FlagTableTest.java
View File

@@ -33,7 +33,7 @@ public class FlagTableTest {
public void testFlagTable_rightHeader() throws Exception { public void testFlagTable_rightHeader() throws Exception {
FlagTable flagTable = FlagTable.fromBytes(TestDataUtils.getTestFlagMapByteBuffer()); FlagTable flagTable = FlagTable.fromBytes(TestDataUtils.getTestFlagMapByteBuffer());
FlagTable.Header header = flagTable.getHeader(); FlagTable.Header header = flagTable.getHeader();
assertEquals(2, header.getVersion()); assertEquals(1, header.getVersion());
assertEquals("mockup", header.getContainer()); assertEquals("mockup", header.getContainer());
assertEquals(FileType.FLAG_MAP, header.getFileType()); assertEquals(FileType.FLAG_MAP, header.getFileType());
assertEquals(321, header.getFileSize()); assertEquals(321, header.getFileSize());

2
tools/aconfig/aconfig_storage_file/tests/srcs/FlagValueListTest.java
View File

@@ -36,7 +36,7 @@ public class FlagValueListTest {
FlagValueList flagValueList = FlagValueList flagValueList =
FlagValueList.fromBytes(TestDataUtils.getTestFlagValByteBuffer()); FlagValueList.fromBytes(TestDataUtils.getTestFlagValByteBuffer());
FlagValueList.Header header = flagValueList.getHeader(); FlagValueList.Header header = flagValueList.getHeader();
assertEquals(2, header.getVersion()); assertEquals(1, header.getVersion());
assertEquals("mockup", header.getContainer()); assertEquals("mockup", header.getContainer());
assertEquals(FileType.FLAG_VAL, header.getFileType()); assertEquals(FileType.FLAG_VAL, header.getFileType());
assertEquals(35, header.getFileSize()); assertEquals(35, header.getFileSize());

59
tools/aconfig/aconfig_storage_file/tests/srcs/PackageTableTest.java
View File

@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
import android.aconfig.storage.FileType; import android.aconfig.storage.FileType;
import android.aconfig.storage.PackageTable; import android.aconfig.storage.PackageTable;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;
@@ -27,40 +28,42 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class PackageTableTest { public class PackageTableTest {
@Test @Test
public void testPackageTable_rightHeader() throws Exception { public void testPackageTable_rightHeader() throws Exception {
PackageTable packageTable = PackageTable.fromBytes(TestDataUtils.getTestPackageMapByteBuffer()); PackageTable packageTable =
PackageTable.Header header = packageTable.getHeader(); PackageTable.fromBytes(TestDataUtils.getTestPackageMapByteBuffer());
assertEquals(2, header.getVersion()); PackageTable.Header header = packageTable.getHeader();
assertEquals("mockup", header.getContainer()); assertEquals(1, header.getVersion());
assertEquals(FileType.PACKAGE_MAP, header.getFileType()); assertEquals("mockup", header.getContainer());
assertEquals(209, header.getFileSize()); assertEquals(FileType.PACKAGE_MAP, header.getFileType());
assertEquals(3, header.getNumPackages()); assertEquals(209, header.getFileSize());
assertEquals(31, header.getBucketOffset()); assertEquals(3, header.getNumPackages());
assertEquals(59, header.getNodeOffset()); assertEquals(31, header.getBucketOffset());
} assertEquals(59, header.getNodeOffset());
}
@Test @Test
public void testPackageTable_rightNode() throws Exception { public void testPackageTable_rightNode() throws Exception {
PackageTable packageTable = PackageTable.fromBytes(TestDataUtils.getTestPackageMapByteBuffer()); PackageTable packageTable =
PackageTable.fromBytes(TestDataUtils.getTestPackageMapByteBuffer());
PackageTable.Node node1 = packageTable.get("com.android.aconfig.storage.test_1"); PackageTable.Node node1 = packageTable.get("com.android.aconfig.storage.test_1");
PackageTable.Node node2 = packageTable.get("com.android.aconfig.storage.test_2"); PackageTable.Node node2 = packageTable.get("com.android.aconfig.storage.test_2");
PackageTable.Node node4 = packageTable.get("com.android.aconfig.storage.test_4"); PackageTable.Node node4 = packageTable.get("com.android.aconfig.storage.test_4");
assertEquals("com.android.aconfig.storage.test_1", node1.getPackageName()); assertEquals("com.android.aconfig.storage.test_1", node1.getPackageName());
assertEquals("com.android.aconfig.storage.test_2", node2.getPackageName()); assertEquals("com.android.aconfig.storage.test_2", node2.getPackageName());
assertEquals("com.android.aconfig.storage.test_4", node4.getPackageName()); assertEquals("com.android.aconfig.storage.test_4", node4.getPackageName());
assertEquals(0, node1.getPackageId()); assertEquals(0, node1.getPackageId());
assertEquals(1, node2.getPackageId()); assertEquals(1, node2.getPackageId());
assertEquals(2, node4.getPackageId()); assertEquals(2, node4.getPackageId());
assertEquals(0, node1.getBooleanStartIndex()); assertEquals(0, node1.getBooleanStartIndex());
assertEquals(3, node2.getBooleanStartIndex()); assertEquals(3, node2.getBooleanStartIndex());
assertEquals(6, node4.getBooleanStartIndex()); assertEquals(6, node4.getBooleanStartIndex());
assertEquals(175, node1.getNextOffset()); assertEquals(159, node1.getNextOffset());
assertEquals(-1, node2.getNextOffset()); assertEquals(-1, node2.getNextOffset());
assertEquals(-1, node4.getNextOffset()); assertEquals(-1, node4.getNextOffset());
} }

8
tools/aconfig/aconfig_storage_read_api/src/lib.rs
View File

@@ -507,9 +507,9 @@ mod tests {
#[test] #[test]
// this test point locks down flag storage file version number query api // this test point locks down flag storage file version number query api
fn test_storage_version_query() { fn test_storage_version_query() {
assert_eq!(get_storage_file_version("./tests/package.map").unwrap(), 2); assert_eq!(get_storage_file_version("./tests/package.map").unwrap(), 1);
assert_eq!(get_storage_file_version("./tests/flag.map").unwrap(), 2); assert_eq!(get_storage_file_version("./tests/flag.map").unwrap(), 1);
assert_eq!(get_storage_file_version("./tests/flag.val").unwrap(), 2); assert_eq!(get_storage_file_version("./tests/flag.val").unwrap(), 1);
assert_eq!(get_storage_file_version("./tests/flag.info").unwrap(), 2); assert_eq!(get_storage_file_version("./tests/flag.info").unwrap(), 1);
} }
} }

BIN
tools/aconfig/aconfig_storage_read_api/tests/flag.info
View File

Binary file not shown.

BIN
tools/aconfig/aconfig_storage_read_api/tests/flag.map
View File

Binary file not shown.

BIN
tools/aconfig/aconfig_storage_read_api/tests/flag.val
View File

Binary file not shown.

BIN
tools/aconfig/aconfig_storage_read_api/tests/package.map
View File

Binary file not shown.

8
tools/aconfig/aconfig_storage_read_api/tests/storage_read_api_test.cpp
View File

@@ -80,16 +80,16 @@ class AconfigStorageTest : public ::testing::Test {
TEST_F(AconfigStorageTest, test_storage_version_query) { TEST_F(AconfigStorageTest, test_storage_version_query) {
auto version = api::get_storage_file_version(package_map); auto version = api::get_storage_file_version(package_map);
ASSERT_TRUE(version.ok()); ASSERT_TRUE(version.ok());
ASSERT_EQ(*version, 2); ASSERT_EQ(*version, 1);
version = api::get_storage_file_version(flag_map); version = api::get_storage_file_version(flag_map);
ASSERT_TRUE(version.ok()); ASSERT_TRUE(version.ok());
ASSERT_EQ(*version, 2); ASSERT_EQ(*version, 1);
version = api::get_storage_file_version(flag_val); version = api::get_storage_file_version(flag_val);
ASSERT_TRUE(version.ok()); ASSERT_TRUE(version.ok());
ASSERT_EQ(*version, 2); ASSERT_EQ(*version, 1);
version = api::get_storage_file_version(flag_info); version = api::get_storage_file_version(flag_info);
ASSERT_TRUE(version.ok()); ASSERT_TRUE(version.ok());
ASSERT_EQ(*version, 2); ASSERT_EQ(*version, 1);
} }
/// Negative test to lock down the error when mapping none exist storage files /// Negative test to lock down the error when mapping none exist storage files

8
tools/aconfig/aconfig_storage_read_api/tests/storage_read_api_test.rs
View File

@@ -200,9 +200,9 @@ mod aconfig_storage_rust_test {
#[test] #[test]
fn test_storage_version_query() { fn test_storage_version_query() {
assert_eq!(get_storage_file_version("./package.map").unwrap(), 2); assert_eq!(get_storage_file_version("./package.map").unwrap(), 1);
assert_eq!(get_storage_file_version("./flag.map").unwrap(), 2); assert_eq!(get_storage_file_version("./flag.map").unwrap(), 1);
assert_eq!(get_storage_file_version("./flag.val").unwrap(), 2); assert_eq!(get_storage_file_version("./flag.val").unwrap(), 1);
assert_eq!(get_storage_file_version("./flag.info").unwrap(), 2); assert_eq!(get_storage_file_version("./flag.info").unwrap(), 1);
} }
} }