Commit 05817435 authored by Tobias Koppers's avatar Tobias Koppers Committed by Tobias Koppers

use big endian for task ids

parent 03899db5
...@@ -41,7 +41,7 @@ struct IntKey([u8; 4]); ...@@ -41,7 +41,7 @@ struct IntKey([u8; 4]);
impl IntKey { impl IntKey {
fn new(value: u32) -> Self { fn new(value: u32) -> Self {
Self(value.to_le_bytes()) Self(value.to_be_bytes())
} }
} }
...@@ -52,7 +52,7 @@ impl AsRef<[u8]> for IntKey { ...@@ -52,7 +52,7 @@ impl AsRef<[u8]> for IntKey {
} }
fn as_u32(bytes: impl Borrow<[u8]>) -> Result<u32> { fn as_u32(bytes: impl Borrow<[u8]>) -> Result<u32> {
let n = u32::from_le_bytes(bytes.borrow().try_into()?); let n = u32::from_be_bytes(bytes.borrow().try_into()?);
Ok(n) Ok(n)
} }
...@@ -326,7 +326,7 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed ...@@ -326,7 +326,7 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
.put( .put(
KeySpace::TaskCache, KeySpace::TaskCache,
WriteBuffer::Borrowed(&task_type_bytes), WriteBuffer::Borrowed(&task_type_bytes),
WriteBuffer::Borrowed(&task_id.to_le_bytes()), WriteBuffer::Borrowed(&task_id.to_be_bytes()),
) )
.with_context(|| { .with_context(|| {
format!( format!(
...@@ -409,7 +409,7 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed ...@@ -409,7 +409,7 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
.put( .put(
KeySpace::TaskCache, KeySpace::TaskCache,
WriteBuffer::Borrowed(&task_type_bytes), WriteBuffer::Borrowed(&task_type_bytes),
WriteBuffer::Borrowed(&task_id.to_le_bytes()), WriteBuffer::Borrowed(&task_id.to_be_bytes()),
) )
.with_context(|| { .with_context(|| {
format!("Unable to write task cache {task_type:?} => {task_id}") format!("Unable to write task cache {task_type:?} => {task_id}")
...@@ -463,7 +463,7 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed ...@@ -463,7 +463,7 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
return Ok(None); return Ok(None);
}; };
let bytes = bytes.borrow().try_into()?; let bytes = bytes.borrow().try_into()?;
let id = TaskId::try_from(u32::from_le_bytes(bytes)).unwrap(); let id = TaskId::try_from(u32::from_be_bytes(bytes)).unwrap();
Ok(Some(id)) Ok(Some(id))
} }
if inner.database.is_empty() { if inner.database.is_empty() {
...@@ -565,7 +565,7 @@ where ...@@ -565,7 +565,7 @@ where
KeySpace::Infra, KeySpace::Infra,
IntKey::new(META_KEY_NEXT_FREE_TASK_ID).as_ref(), IntKey::new(META_KEY_NEXT_FREE_TASK_ID).as_ref(),
)? { )? {
Some(bytes) => u32::from_le_bytes(Borrow::<[u8]>::borrow(&bytes).try_into()?), Some(bytes) => u32::from_be_bytes(Borrow::<[u8]>::borrow(&bytes).try_into()?),
None => 1, None => 1,
}, },
) )
...@@ -585,7 +585,7 @@ where ...@@ -585,7 +585,7 @@ where
.put( .put(
KeySpace::Infra, KeySpace::Infra,
WriteBuffer::Borrowed(IntKey::new(META_KEY_NEXT_FREE_TASK_ID).as_ref()), WriteBuffer::Borrowed(IntKey::new(META_KEY_NEXT_FREE_TASK_ID).as_ref()),
WriteBuffer::Borrowed(&next_task_id.to_le_bytes()), WriteBuffer::Borrowed(&next_task_id.to_be_bytes()),
) )
.context("Unable to write next free task id")?; .context("Unable to write next free task id")?;
} }
......
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