mirror of
https://github.com/neondatabase/neon.git
synced 2025-12-22 21:59:59 +00:00
Revert pgvector 0.6.0 (#6592)
It doesn't work in our VMs. Need more time to investigate
This commit is contained in:
@@ -1,28 +1,27 @@
|
|||||||
*
|
*
|
||||||
|
|
||||||
# Files
|
|
||||||
!Cargo.lock
|
|
||||||
!Cargo.toml
|
|
||||||
!Makefile
|
|
||||||
!rust-toolchain.toml
|
!rust-toolchain.toml
|
||||||
!scripts/combine_control_files.py
|
!Cargo.toml
|
||||||
!scripts/ninstall.sh
|
!Cargo.lock
|
||||||
!vm-cgconfig.conf
|
!Makefile
|
||||||
|
|
||||||
# Directories
|
|
||||||
!.cargo/
|
!.cargo/
|
||||||
!.config/
|
!.config/
|
||||||
!compute_tools/
|
|
||||||
!control_plane/
|
!control_plane/
|
||||||
|
!compute_tools/
|
||||||
!libs/
|
!libs/
|
||||||
!neon_local/
|
|
||||||
!pageserver/
|
!pageserver/
|
||||||
!patches/
|
|
||||||
!pgxn/
|
!pgxn/
|
||||||
!proxy/
|
!proxy/
|
||||||
!s3_scrubber/
|
|
||||||
!safekeeper/
|
!safekeeper/
|
||||||
|
!s3_scrubber/
|
||||||
!storage_broker/
|
!storage_broker/
|
||||||
!trace/
|
!trace/
|
||||||
!vendor/postgres-*/
|
!vendor/postgres-v14/
|
||||||
|
!vendor/postgres-v15/
|
||||||
|
!vendor/postgres-v16/
|
||||||
!workspace_hack/
|
!workspace_hack/
|
||||||
|
!neon_local/
|
||||||
|
!scripts/ninstall.sh
|
||||||
|
!scripts/combine_control_files.py
|
||||||
|
!vm-cgconfig.conf
|
||||||
|
|||||||
@@ -241,12 +241,9 @@ RUN wget https://github.com/df7cb/postgresql-unit/archive/refs/tags/7.7.tar.gz -
|
|||||||
FROM build-deps AS vector-pg-build
|
FROM build-deps AS vector-pg-build
|
||||||
COPY --from=pg-build /usr/local/pgsql/ /usr/local/pgsql/
|
COPY --from=pg-build /usr/local/pgsql/ /usr/local/pgsql/
|
||||||
|
|
||||||
COPY patches/pgvector.patch /pgvector.patch
|
RUN wget https://github.com/pgvector/pgvector/archive/refs/tags/v0.5.1.tar.gz -O pgvector.tar.gz && \
|
||||||
|
echo "cc7a8e034a96e30a819911ac79d32f6bc47bdd1aa2de4d7d4904e26b83209dc8 pgvector.tar.gz" | sha256sum --check && \
|
||||||
RUN wget https://github.com/pgvector/pgvector/archive/refs/tags/v0.6.0.tar.gz -O pgvector.tar.gz && \
|
|
||||||
echo "b0cf4ba1ab016335ac8fb1cada0d2106235889a194fffeece217c5bda90b2f19 pgvector.tar.gz" | sha256sum --check && \
|
|
||||||
mkdir pgvector-src && cd pgvector-src && tar xvzf ../pgvector.tar.gz --strip-components=1 -C . && \
|
mkdir pgvector-src && cd pgvector-src && tar xvzf ../pgvector.tar.gz --strip-components=1 -C . && \
|
||||||
patch -p1 < /pgvector.patch && \
|
|
||||||
make -j $(getconf _NPROCESSORS_ONLN) PG_CONFIG=/usr/local/pgsql/bin/pg_config && \
|
make -j $(getconf _NPROCESSORS_ONLN) PG_CONFIG=/usr/local/pgsql/bin/pg_config && \
|
||||||
make -j $(getconf _NPROCESSORS_ONLN) install PG_CONFIG=/usr/local/pgsql/bin/pg_config && \
|
make -j $(getconf _NPROCESSORS_ONLN) install PG_CONFIG=/usr/local/pgsql/bin/pg_config && \
|
||||||
echo 'trusted = true' >> /usr/local/pgsql/share/extension/vector.control
|
echo 'trusted = true' >> /usr/local/pgsql/share/extension/vector.control
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
From de3dd0cd034d2bcc12b456171ce163bdc1f4cb65 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
|
|
||||||
Date: Thu, 1 Feb 2024 17:42:31 +0200
|
|
||||||
Subject: [PATCH 1/1] Make v0.6.0 work with Neon
|
|
||||||
|
|
||||||
Now that the WAL-logging happens as a separate step at the end of the
|
|
||||||
build, we need a few neon-specific hints to make it work.
|
|
||||||
---
|
|
||||||
src/hnswbuild.c | 28 ++++++++++++++++++++++++++++
|
|
||||||
1 file changed, 28 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/hnswbuild.c b/src/hnswbuild.c
|
|
||||||
index 680789b..bfa657a 100644
|
|
||||||
--- a/src/hnswbuild.c
|
|
||||||
+++ b/src/hnswbuild.c
|
|
||||||
@@ -1089,13 +1089,41 @@ BuildIndex(Relation heap, Relation index, IndexInfo *indexInfo,
|
|
||||||
SeedRandom(42);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifdef NEON_SMGR
|
|
||||||
+ smgr_start_unlogged_build(RelationGetSmgr(index));
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
InitBuildState(buildstate, heap, index, indexInfo, forkNum);
|
|
||||||
|
|
||||||
BuildGraph(buildstate, forkNum);
|
|
||||||
|
|
||||||
+#ifdef NEON_SMGR
|
|
||||||
+ smgr_finish_unlogged_build_phase_1(RelationGetSmgr(index));
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
if (RelationNeedsWAL(index))
|
|
||||||
+ {
|
|
||||||
log_newpage_range(index, forkNum, 0, RelationGetNumberOfBlocks(index), true);
|
|
||||||
|
|
||||||
+#ifdef NEON_SMGR
|
|
||||||
+ {
|
|
||||||
+#if PG_VERSION_NUM >= 160000
|
|
||||||
+ RelFileLocator rlocator = RelationGetSmgr(index)->smgr_rlocator.locator;
|
|
||||||
+#else
|
|
||||||
+ RelFileNode rlocator = RelationGetSmgr(index)->smgr_rnode.node;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+ SetLastWrittenLSNForBlockRange(XactLastRecEnd, rlocator,
|
|
||||||
+ MAIN_FORKNUM, 0, RelationGetNumberOfBlocks(index));
|
|
||||||
+ SetLastWrittenLSNForRelation(XactLastRecEnd, rlocator, MAIN_FORKNUM);
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+#ifdef NEON_SMGR
|
|
||||||
+ smgr_end_unlogged_build(RelationGetSmgr(index));
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
FreeBuildState(buildstate);
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.39.2
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user