Skip to content

Commit

Permalink
chore: Bump pgrx to 0.12.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Weijun-H committed Aug 25, 2024
1 parent d2d462e commit 4f4cf5d
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
sudo apt-get update && sudo apt-get install -y postgresql-${{ matrix.pg_version }} postgresql-server-dev-${{ matrix.pg_version }}
- name: Install pgrx
run: cargo install --locked cargo-pgrx --version 0.11.3
run: cargo install --locked cargo-pgrx --version 0.12.1

- name: Initialize pgrx for Current PostgreSQL Version
run: cargo pgrx init --pg${{ matrix.pg_version }}=/usr/lib/postgresql/${{ matrix.pg_version }}/bin/pg_config
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-pg_analytics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
- name: Install pgrx & llvm-tools-preview
if: steps.check_skip.outputs.skip_remaining_steps != 'true'
run: |
cargo install -j $(nproc) --locked cargo-pgrx --version 0.11.3
cargo install -j $(nproc) --locked cargo-pgrx --version 0.12.1
rustup component add llvm-tools-preview
cargo pgrx init "--pg${{ matrix.pg_version }}=/usr/lib/postgresql/${{ matrix.pg_version }}/bin/pg_config"
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ duckdb = { git = "https://github.com/paradedb/duckdb-rs.git", features = [
"bundled",
"extensions-full",
], rev = "e532dd6" }
pgrx = "0.11.3"
pgrx = "0.12.1"
serde = "1.0.201"
serde_json = "1.0.120"
signal-hook = "0.3.17"
signal-hook-async-std = "0.2.2"
strum = { version = "0.26.3", features = ["derive"] }
supabase-wrappers = { git = "https://github.com/paradedb/wrappers.git", default-features = false, rev = "27af09b" }
supabase-wrappers = { git = "https://github.com/paradedb/wrappers.git", default-features = false, rev = "c6f5e79" }
thiserror = "1.0.59"
uuid = "1.9.1"

Expand All @@ -44,7 +44,7 @@ bytes = "1.7.1"
datafusion = "37.1.0"
deltalake = { version = "0.17.3", features = ["datafusion"] }
futures = "0.3.30"
pgrx-tests = "0.11.3"
pgrx-tests = "0.12.1"
rstest = "0.19.0"
serde_arrow = { version = "0.11.3", features = ["arrow-51"] }
soa_derive = "0.13.0"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ Then, install and initialize `pgrx`:

```bash
# Note: Replace --pg16 with your version of Postgres, if different (i.e. --pg15, --pg14, etc.)
cargo install --locked cargo-pgrx --version 0.11.3
cargo install --locked cargo-pgrx --version 0.12.1

# macOS arm64
cargo pgrx init --pg16=/opt/homebrew/opt/postgresql@16/bin/pg_config
Expand Down
2 changes: 1 addition & 1 deletion src/api/time_bucket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

use pgrx::*;
use pgrx::{datum::*, pg_extern};

const TIME_BUCKET_FALLBACK_ERROR: &str = "Function `time_bucket()` must be used with a DuckDB FDW. Native postgres does not support this function. If you believe this function should be implemented natively as a fallback please submit a ticket to https://github.com/paradedb/pg_analytics/issues.";

Expand Down
2 changes: 1 addition & 1 deletion src/fdw/handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ impl From<*mut pg_sys::ForeignServer> for FdwHandler {
let handler_oid = unsafe { (*fdw).fdwhandler };
let proc_tuple = unsafe {
pg_sys::SearchSysCache1(
pg_sys::SysCacheIdentifier_PROCOID as i32,
pg_sys::SysCacheIdentifier::PROCOID as i32,
handler_oid.into_datum().unwrap(),
)
};
Expand Down
7 changes: 4 additions & 3 deletions src/hooks/executor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@ macro_rules! fallback_warning {
};
}

#[allow(deprecated)]
pub async fn executor_run(
query_desc: PgBox<pg_sys::QueryDesc>,
direction: pg_sys::ScanDirection,
direction: pg_sys::ScanDirection::Type,
count: u64,
execute_once: bool,
prev_hook: fn(
query_desc: PgBox<pg_sys::QueryDesc>,
direction: pg_sys::ScanDirection,
direction: pg_sys::ScanDirection::Type,
count: u64,
execute_once: bool,
) -> HookResult<()>,
Expand All @@ -61,7 +62,7 @@ pub async fn executor_run(
});

if rtable.is_null()
|| query_desc.operation != pg_sys::CmdType_CMD_SELECT
|| query_desc.operation != pg_sys::CmdType::CMD_SELECT
|| !is_duckdb_query
// Tech Debt: Find a less hacky way to let COPY/CREATE go through
|| query.to_lowercase().starts_with("copy")
Expand Down
5 changes: 3 additions & 2 deletions src/hooks/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,17 @@ use pgrx::*;

pub struct ExtensionHook;

#[allow(deprecated)]
impl hooks::PgHooks for ExtensionHook {
fn executor_run(
&mut self,
query_desc: PgBox<pg_sys::QueryDesc>,
direction: pg_sys::ScanDirection,
direction: pg_sys::ScanDirection::Type,
count: u64,
execute_once: bool,
prev_hook: fn(
query_desc: PgBox<pg_sys::QueryDesc>,
direction: pg_sys::ScanDirection,
direction: pg_sys::ScanDirection::Type,
count: u64,
execute_once: bool,
) -> HookResult<()>,
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ pub fn get_query_relations(planned_stmt: *mut pg_sys::PlannedStmt) -> Vec<PgRela
rte = (*elements.offset(i as isize)).ptr_value as *mut pg_sys::RangeTblEntry;
}

if (*rte).rtekind != pg_sys::RTEKind_RTE_RELATION {
if (*rte).rtekind != pg_sys::RTEKind::RTE_RELATION {
continue;
}
let relation = pg_sys::RelationIdGetRelation((*rte).relid);
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ static mut EXTENSION_HOOK: ExtensionHook = ExtensionHook;
#[pg_guard]
pub extern "C" fn _PG_init() {
#[allow(static_mut_refs)]
#[allow(deprecated)]
unsafe {
register_hook(&mut EXTENSION_HOOK)
};
Expand Down

0 comments on commit 4f4cf5d

Please sign in to comment.