Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#
# Copyright 2020 Joyent, Inc.
# Copyright 2023 MNX Cloud, Inc.
# Copyright 2026 Edgecast Cloud LLC.
#

NAME = manta-buckets-mdapi
Expand Down Expand Up @@ -104,12 +105,16 @@ build-buckets-mdapi: | $(CARGO_EXEC)
$(CARGO) build --release

.PHONY: test
test: test-unit
test: test-unit test-integration

.PHONY: test-unit
test-unit: | $(CARGO_EXEC)
$(CARGO) test --lib

.PHONY: test-integration
test-integration: | $(CARGO_EXEC)
$(CARGO) test --test rpc_handlers -- --nocapture

include ./deps/eng/tools/mk/Makefile.deps
include ./deps/eng/tools/mk/Makefile.agent_prebuilt.targ
include ./deps/eng/tools/mk/Makefile.smf.targ
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,10 @@ The functional tests require that postgresql is installed as well as
and configure a temporary postgres database and once the test has completed the
temporary database is removed within a few seconds. The tests use the same code
used by the `schema-manager` to prepare the database for use by the test suite.

To build `ephemeralpg` from source on SmartOS, the socket library must be linked
explicitly:

```
LDFLAGS=-lsocket make
```
12 changes: 12 additions & 0 deletions buckets-mdapi/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright 2020 Joyent, Inc.
// Copyright 2026 Edgecast Cloud LLC.

#![allow(clippy::module_name_repetitions)]

Expand Down Expand Up @@ -123,6 +124,17 @@ pub mod util {
metrics,
log,
),
"batchupdateobjects" => handle_request(
msg.id,
method,
object::batch_update::decode_msg(
&msg.data.d,
),
&mut conn,
&object::batch_update::action,
metrics,
log,
),
"deleteobject" => handle_request(
msg.id,
method,
Expand Down
2 changes: 2 additions & 0 deletions buckets-mdapi/src/object.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright 2020 Joyent, Inc.
// Copyright 2023 MNX Cloud, Inc.
// Copyright 2026 Edgecast Cloud LLC.

use std::error::Error;
use std::vec::Vec;
Expand All @@ -16,6 +17,7 @@ use crate::conditional;
use crate::error::BucketsMdapiError;
use crate::types::{HasRequestId, Hstore, RowSlice, Timestamptz};

pub mod batch_update;
pub mod create;
pub mod delete;
pub mod get;
Expand Down
Loading