Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shared memory hash table #1379

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 14 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
2 changes: 1 addition & 1 deletion pgrx-examples/shmem/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ edition = "2021"
crate-type = ["cdylib"]

[features]
default = ["pg13"]
default = ["pg13", "pgrx/cshim"]
pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]
pg13 = ["pgrx/pg13", "pgrx-tests/pg13" ]
pg14 = ["pgrx/pg14", "pgrx-tests/pg14" ]
Expand Down
23 changes: 23 additions & 0 deletions pgrx-examples/shmem/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use pgrx::atomics::*;
use pgrx::lwlock::PgLwLock;
use pgrx::prelude::*;
use pgrx::shmem::*;
use pgrx::shmem_hash::*;
use pgrx::{pg_shmem_init, warning};
use serde::*;
use std::iter::Iterator;
Expand Down Expand Up @@ -39,6 +40,7 @@ static HASH: PgLwLock<heapless::FnvIndexMap<i32, i32, 4>> = PgLwLock::new();
static STRUCT: PgLwLock<Pgtest> = PgLwLock::new();
static PRIMITIVE: PgLwLock<i32> = PgLwLock::new();
static ATOMIC: PgAtomic<std::sync::atomic::AtomicBool> = PgAtomic::new();
static HASH_TABLE: PgHashMap<i64, i64> = PgHashMap::new(250);

#[pg_guard]
pub extern "C" fn _PG_init() {
Expand All @@ -48,6 +50,7 @@ pub extern "C" fn _PG_init() {
pg_shmem_init!(STRUCT);
pg_shmem_init!(PRIMITIVE);
pg_shmem_init!(ATOMIC);
pg_shmem_init!(HASH_TABLE);
}

#[pg_extern]
Expand All @@ -60,6 +63,26 @@ fn vec_count() -> i32 {
VEC.share().len() as i32
}

#[pg_extern]
fn hash_table_insert(key: i64, value: i64) -> Option<i64> {
HASH_TABLE.insert(key, value).unwrap()
}

#[pg_extern]
fn hash_table_get(key: i64) -> Option<i64> {
HASH_TABLE.get(key)
}

#[pg_extern]
fn hash_table_remove(key: i64) -> Option<i64> {
HASH_TABLE.remove(key)
}

#[pg_extern]
fn hash_table_len() -> i64 {
HASH_TABLE.len() as i64
}

#[pg_extern]
fn vec_drain() -> SetOfIterator<'static, Pgtest> {
let mut vec = VEC.exclusive();
Expand Down
64 changes: 64 additions & 0 deletions pgrx-tests/src/tests/shmem_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,35 @@ use pgrx::prelude::*;
use pgrx::{pg_shmem_init, PgAtomic, PgLwLock, PgSharedMemoryInitialization};
use std::sync::atomic::AtomicBool;

#[cfg(feature = "cshim")]
use pgrx::PgHashMap;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
use pgrx::PgHashMap;
use pgrx::ShmemHashMap;


static ATOMIC: PgAtomic<AtomicBool> = PgAtomic::new();
static LWLOCK: PgLwLock<bool> = PgLwLock::new();

#[cfg(feature = "cshim")]
static HASH_MAP: PgHashMap<i64, i64> = PgHashMap::new(500);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
static HASH_MAP: PgHashMap<i64, i64> = PgHashMap::new(500);
static HASH_MAP: ShmemHashMap<i64, i64> = ShmemHashMap::new(500);


#[pg_guard]
pub extern "C" fn _PG_init() {
// This ensures that this functionality works across PostgreSQL versions
pg_shmem_init!(ATOMIC);
pg_shmem_init!(LWLOCK);

#[cfg(feature = "cshim")]
pg_shmem_init!(HASH_MAP);
}

#[cfg(any(test, feature = "pg_test"))]
#[pgrx::pg_schema]
mod tests {
#[allow(unused_imports)]
use crate as pgrx_tests;

#[cfg(feature = "cshim")]
use crate::tests::shmem_tests::HASH_MAP;
use crate::tests::shmem_tests::LWLOCK;

use pgrx::prelude::*;

#[pg_test]
Expand All @@ -53,4 +66,55 @@ mod tests {
});
let _lock = LWLOCK.exclusive();
}

#[cfg(feature = "cshim")]
#[pg_test]
pub fn test_pg_hash_map() {
use rand::prelude::IteratorRandom;

for i in 1..250 {
assert_eq!(HASH_MAP.insert(i, i), Ok(None));
}

assert_eq!(HASH_MAP.len(), 249);

for i in 1..250 {
assert_eq!(HASH_MAP.get(i), Some(i));
}

assert_eq!(HASH_MAP.len(), 249);

for i in 251..500 {
assert_eq!(HASH_MAP.get(i), None);
}

assert_eq!(HASH_MAP.len(), 249);

for i in 1..250 {
assert_eq!(HASH_MAP.insert(i, i), Ok(Some(i)));
}

assert_eq!(HASH_MAP.len(), 249);

for i in 1..250 {
assert_eq!(HASH_MAP.remove(i), Some(i));
}

assert_eq!(HASH_MAP.len(), 0);

for i in 1..250 {
assert_eq!(HASH_MAP.get(i), None);
}

assert_eq!(HASH_MAP.len(), 0);

for _ in 0..25_000 {
for key in 0..250 {
let value = (0..1000).choose(&mut rand::thread_rng()).unwrap();
assert!(HASH_MAP.insert(key, value).is_ok());
}
}

assert_eq!(HASH_MAP.len(), 250);
}
}
4 changes: 4 additions & 0 deletions pgrx/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ pub mod pg_catalog;
pub mod pgbox;
pub mod rel;
pub mod shmem;
#[cfg(feature = "cshim")]
pub mod shmem_hash;
pub mod spi;
#[cfg(feature = "cshim")]
pub mod spinlock;
Expand Down Expand Up @@ -106,6 +108,8 @@ pub use nodes::*;
pub use pgbox::*;
pub use rel::*;
pub use shmem::*;
#[cfg(feature = "cshim")]
pub use shmem_hash::*;
pub use spi::Spi; // only Spi. We don't want the top-level namespace polluted with spi::Result and spi::Error
pub use stringinfo::*;
pub use trigger_support::*;
Expand Down
Loading
Loading