From 21b1965ea83fc9772e21fc148ff21d3c7e7925a9 Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Wed, 6 Dec 2023 17:11:21 +0000 Subject: [PATCH 1/5] neon-extension 4344 --- Formula/neon-extension.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/neon-extension.rb b/Formula/neon-extension.rb index 7e50d94..8a2c193 100644 --- a/Formula/neon-extension.rb +++ b/Formula/neon-extension.rb @@ -2,8 +2,8 @@ class NeonExtension < Formula desc "Extension enabling storage manager API and Pageserver communication" homepage "https://github.com/neondatabase/neon" url "https://github.com/neondatabase/neon.git", - tag: "release-4277", - revision: "e65be4c2dcb26011fcb963e8445854305795286e" + tag: "release-4344", + revision: "60af392e4506f880de81a14cc5c361cb0af8a47c" license "Apache-2.0" head "https://github.com/neondatabase/neon.git", branch: "main" From 42eca0eb4b92f52b2621b1b11861daec50c1bffe Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Wed, 6 Dec 2023 17:11:30 +0000 Subject: [PATCH 2/5] neon-local 4344 --- Formula/neon-local.rb | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Formula/neon-local.rb b/Formula/neon-local.rb index f422f2b..72a0107 100644 --- a/Formula/neon-local.rb +++ b/Formula/neon-local.rb @@ -2,8 +2,8 @@ class NeonLocal < Formula desc "CLI for running Neon locally" homepage "https://github.com/neondatabase/neon" url "https://github.com/neondatabase/neon.git", - tag: "release-4277", - revision: "e65be4c2dcb26011fcb963e8445854305795286e" + tag: "release-4344", + revision: "60af392e4506f880de81a14cc5c361cb0af8a47c" license "Apache-2.0" head "https://github.com/neondatabase/neon.git", branch: "main" @@ -102,10 +102,11 @@ def post_install assert_includes output, "tenant #{tenant_id} successfully created on the pageserver", output ep_pg_port = free_port - system bin/"neon_local", "endpoint", "start", "ep-main-#{v}", - "--pg-version", vv, - "--tenant-id", tenant_id, - "--pg-port", ep_pg_port + system bin/"neon_local", "endpoint", "create", "ep-main-#{v}", + "--pg-version", vv, + "--tenant-id", tenant_id, + "--pg-port", ep_pg_port + system bin/"neon_local", "endpoint", "start", "ep-main-#{v}" output = shell_output psql.call("SELECT VERSION()", ep_pg_port) assert_match "PostgreSQL #{vv}", output.strip @@ -121,11 +122,12 @@ def post_install "--ancestor-start-lsn", lsn, "--ancestor-branch-name", "main" br_ep_pg_port = free_port - system bin/"neon_local", "endpoint", "start", "ep-branch-#{v}", - "--pg-version", vv, - "--branch-name", "branch", - "--tenant-id", tenant_id, - "--pg-port", br_ep_pg_port + system bin/"neon_local", "endpoint", "create", "ep-branch-#{v}", + "--pg-version", vv, + "--branch-name", "branch", + "--tenant-id", tenant_id, + "--pg-port", br_ep_pg_port + system bin/"neon_local", "endpoint", "start", "ep-branch-#{v}" count_output = shell_output psql.call("SELECT COUNT(*) FROM test", br_ep_pg_port) assert_match "1", count_output @@ -134,8 +136,8 @@ def post_install count_output = shell_output psql.call("SELECT COUNT(*) FROM test", br_ep_pg_port) assert_match "2", count_output - system bin/"neon_local", "endpoint", "stop", "ep-branch-#{v}", "--tenant-id", tenant_id - system bin/"neon_local", "endpoint", "stop", "ep-main-#{v}", "--tenant-id", tenant_id + system bin/"neon_local", "endpoint", "stop", "--destroy", "ep-branch-#{v}" + system bin/"neon_local", "endpoint", "stop", "--destroy", "ep-main-#{v}" end ensure system bin/"neon_local", "stop" From 10536e9e548c801922821b136ff1f1ba417b17af Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Wed, 6 Dec 2023 17:11:38 +0000 Subject: [PATCH 3/5] neon-postgres 4344 --- Formula/neon-postgres.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/neon-postgres.rb b/Formula/neon-postgres.rb index ddfb98e..6a18b41 100644 --- a/Formula/neon-postgres.rb +++ b/Formula/neon-postgres.rb @@ -2,8 +2,8 @@ class NeonPostgres < Formula desc "Neon's fork of PostgreSQL" homepage "https://github.com/neondatabase/postgres" url "https://github.com/neondatabase/neon.git", - tag: "release-4277", - revision: "e65be4c2dcb26011fcb963e8445854305795286e" + tag: "release-4344", + revision: "60af392e4506f880de81a14cc5c361cb0af8a47c" license "Apache-2.0" head "https://github.com/neondatabase/neon.git", branch: "main" From 3686541288cacd7a673b5a482178d1a549e2b1e0 Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Wed, 6 Dec 2023 17:11:53 +0000 Subject: [PATCH 4/5] neon-storage 4344 --- Formula/neon-storage.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/neon-storage.rb b/Formula/neon-storage.rb index 4c7327a..85554aa 100644 --- a/Formula/neon-storage.rb +++ b/Formula/neon-storage.rb @@ -2,8 +2,8 @@ class NeonStorage < Formula desc "Storage components for Neon" homepage "https://github.com/neondatabase/neon" url "https://github.com/neondatabase/neon.git", - tag: "release-4277", - revision: "e65be4c2dcb26011fcb963e8445854305795286e" + tag: "release-4344", + revision: "60af392e4506f880de81a14cc5c361cb0af8a47c" license "Apache-2.0" head "https://github.com/neondatabase/neon.git", branch: "main" From 8809b53eba33eee317ffbf3d6c83fea4e0a2518a Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Wed, 6 Dec 2023 23:32:46 +0000 Subject: [PATCH 5/5] README: Update example --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b6dec5a..7b4bcd1 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,13 @@ Based on examples from [neondatabase/neon](https://github.com/neondatabase/neon# neon-local start neon-local tenant create --set-default # use `--pg-version \d+` for a particular Postgres version neon-local tenant list -neon-local endpoint start main # use `--pg-version \d+` for a particular Postgres version, should match Postgres version for the tenant +neon_local endpoint create main # use `--pg-version \d+` for a particular Postgres version, should match Postgres version for the tenant +neon-local endpoint start main neon-local endpoint list neon-local timeline branch --branch-name test neon-local timeline list -neon-local endpoint start test --branch-name test +neon_local endpoint create test --branch-name test +neon-local endpoint start test ``` ```bash