From 424635cd312e515881d8e781ffb549aa5a0e6e19 Mon Sep 17 00:00:00 2001 From: Lijun Wang <83639177+lijunwangs@users.noreply.github.com> Date: Wed, 19 Jan 2022 10:46:19 -0800 Subject: [PATCH] Removed solana-accountsdb-plugin-postgres from the monorepo as it has its own (#22567) Removed solana-accountsdb-plugin-postgres from the monorepo as it has its own standalone repo now (cherry picked from commit 60850d71cef6e057a179b6269981416c1bdba277) # Conflicts: # Cargo.lock # accountsdb-plugin-postgres/Cargo.toml # accountsdb-plugin-postgres/src/postgres_client.rs # accountsdb-plugin-postgres/src/postgres_client/postgres_client_transaction.rs --- Cargo.lock | 69 +- Cargo.toml | 1 - accountsdb-plugin-postgres/README.md | 5 - .../scripts/create_schema.sql | 201 ----- .../scripts/drop_schema.sql | 26 - .../scripts/postgresql.conf | 802 ------------------ .../src/accounts_selector.rs | 74 -- .../src/accountsdb_plugin_postgres.rs | 466 ---------- accountsdb-plugin-postgres/src/lib.rs | 4 - .../postgres_client_block_metadata.rs | 97 --- .../src/transaction_selector.rs | 194 ----- 11 files changed, 35 insertions(+), 1904 deletions(-) delete mode 100644 accountsdb-plugin-postgres/README.md delete mode 100644 accountsdb-plugin-postgres/scripts/create_schema.sql delete mode 100644 accountsdb-plugin-postgres/scripts/drop_schema.sql delete mode 100644 accountsdb-plugin-postgres/scripts/postgresql.conf delete mode 100644 accountsdb-plugin-postgres/src/accounts_selector.rs delete mode 100644 accountsdb-plugin-postgres/src/accountsdb_plugin_postgres.rs delete mode 100644 accountsdb-plugin-postgres/src/lib.rs delete mode 100644 accountsdb-plugin-postgres/src/postgres_client/postgres_client_block_metadata.rs delete mode 100644 accountsdb-plugin-postgres/src/transaction_selector.rs diff --git a/Cargo.lock b/Cargo.lock index c77f6f3a6105ec..2e240608135f97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -951,6 +951,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "crypto-mac" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -961,6 +962,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> 60850d71c (Removed solana-accountsdb-plugin-postgres from the monorepo as it has its own (#22567)) name = "csv" version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1356,6 +1359,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "fake-simd" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1368,6 +1372,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] +======= +>>>>>>> 60850d71c (Removed solana-accountsdb-plugin-postgres from the monorepo as it has its own (#22567)) name = "fast-math" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1837,12 +1843,20 @@ dependencies = [ [[package]] name = "hmac" +<<<<<<< HEAD version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ "crypto-mac 0.11.1", "digest 0.9.0", +======= +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddca131f3e7f2ce2df364b57949a9d47915cfbd35e46cfee355ccebbf794d6a2" +dependencies = [ + "digest 0.10.1", +>>>>>>> 60850d71c (Removed solana-accountsdb-plugin-postgres from the monorepo as it has its own (#22567)) ] [[package]] @@ -2437,6 +2451,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] +<<<<<<< HEAD name = "md-5" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2448,6 +2463,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> 60850d71c (Removed solana-accountsdb-plugin-postgres from the monorepo as it has its own (#22567)) name = "memchr" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2993,24 +3010,6 @@ dependencies = [ "indexmap", ] -[[package]] -name = "phf" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fc3db1018c4b59d7d582a739436478b6035138b6aecbce989fc91c3e98409f" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - [[package]] name = "pickledb" version = "0.4.1" @@ -3069,6 +3068,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] +<<<<<<< HEAD name = "postgres" version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3122,6 +3122,17 @@ dependencies = [ "fallible-iterator", "postgres-derive", "postgres-protocol", +======= +name = "polyval" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "opaque-debug", + "universal-hash", +>>>>>>> 60850d71c (Removed solana-accountsdb-plugin-postgres from the monorepo as it has its own (#22567)) ] [[package]] @@ -4195,12 +4206,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a30f10c911c0355f80f1c2faa8096efc4a58cdf8590b954d5b395efa071c711" -[[package]] -name = "siphasher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b" - [[package]] name = "slab" version = "0.4.5" @@ -4358,6 +4363,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "solana-accountsdb-plugin-postgres" version = "1.9.5" dependencies = [ @@ -4383,6 +4389,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> 60850d71c (Removed solana-accountsdb-plugin-postgres from the monorepo as it has its own (#22567)) name = "solana-address-lookup-table-program" version = "1.9.5" dependencies = [ @@ -6259,16 +6267,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "stringprep" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "strsim" version = "0.8.0" @@ -6704,6 +6702,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "tokio-postgres" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6727,6 +6726,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> 60850d71c (Removed solana-accountsdb-plugin-postgres from the monorepo as it has its own (#22567)) name = "tokio-reactor" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/Cargo.toml b/Cargo.toml index cafa5685d30a42..693c2ec71b224c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,6 @@ members = [ "accountsdb-plugin-interface", "accountsdb-plugin-manager", - "accountsdb-plugin-postgres", "accounts-cluster-bench", "bench-streamer", "bench-tps", diff --git a/accountsdb-plugin-postgres/README.md b/accountsdb-plugin-postgres/README.md deleted file mode 100644 index e43c3273636126..00000000000000 --- a/accountsdb-plugin-postgres/README.md +++ /dev/null @@ -1,5 +0,0 @@ -This is an example implementing the AccountsDb plugin for PostgreSQL database. -Please see the `src/accountsdb_plugin_postgres.rs` for the format of the plugin's configuration file. - -To create the schema objects for the database, please use `scripts/create_schema.sql`. -`scripts/drop_schema.sql` can be used to tear down the schema objects. \ No newline at end of file diff --git a/accountsdb-plugin-postgres/scripts/create_schema.sql b/accountsdb-plugin-postgres/scripts/create_schema.sql deleted file mode 100644 index 732bcd6783c164..00000000000000 --- a/accountsdb-plugin-postgres/scripts/create_schema.sql +++ /dev/null @@ -1,201 +0,0 @@ -/** - * This plugin implementation for PostgreSQL requires the following tables - */ --- The table storing accounts - - -CREATE TABLE account ( - pubkey BYTEA PRIMARY KEY, - owner BYTEA, - lamports BIGINT NOT NULL, - slot BIGINT NOT NULL, - executable BOOL NOT NULL, - rent_epoch BIGINT NOT NULL, - data BYTEA, - write_version BIGINT NOT NULL, - updated_on TIMESTAMP NOT NULL -); - --- The table storing slot information -CREATE TABLE slot ( - slot BIGINT PRIMARY KEY, - parent BIGINT, - status VARCHAR(16) NOT NULL, - updated_on TIMESTAMP NOT NULL -); - --- Types for Transactions - -Create TYPE "TransactionErrorCode" AS ENUM ( - 'AccountInUse', - 'AccountLoadedTwice', - 'AccountNotFound', - 'ProgramAccountNotFound', - 'InsufficientFundsForFee', - 'InvalidAccountForFee', - 'AlreadyProcessed', - 'BlockhashNotFound', - 'InstructionError', - 'CallChainTooDeep', - 'MissingSignatureForFee', - 'InvalidAccountIndex', - 'SignatureFailure', - 'InvalidProgramForExecution', - 'SanitizeFailure', - 'ClusterMaintenance', - 'AccountBorrowOutstanding', - 'WouldExceedMaxAccountCostLimit', - 'WouldExceedMaxBlockCostLimit', - 'UnsupportedVersion', - 'InvalidWritableAccount', - 'WouldExceedMaxAccountDataCostLimit', - 'TooManyAccountLocks', - 'AddressLookupTableNotFound', - 'InvalidAddressLookupTableOwner', - 'InvalidAddressLookupTableData', - 'InvalidAddressLookupTableIndex', - 'InvalidRentPayingAccount' -); - -CREATE TYPE "TransactionError" AS ( - error_code "TransactionErrorCode", - error_detail VARCHAR(256) -); - -CREATE TYPE "CompiledInstruction" AS ( - program_id_index SMALLINT, - accounts SMALLINT[], - data BYTEA -); - -CREATE TYPE "InnerInstructions" AS ( - index SMALLINT, - instructions "CompiledInstruction"[] -); - -CREATE TYPE "TransactionTokenBalance" AS ( - account_index SMALLINT, - mint VARCHAR(44), - ui_token_amount DOUBLE PRECISION, - owner VARCHAR(44) -); - -Create TYPE "RewardType" AS ENUM ( - 'Fee', - 'Rent', - 'Staking', - 'Voting' -); - -CREATE TYPE "Reward" AS ( - pubkey VARCHAR(44), - lamports BIGINT, - post_balance BIGINT, - reward_type "RewardType", - commission SMALLINT -); - -CREATE TYPE "TransactionStatusMeta" AS ( - error "TransactionError", - fee BIGINT, - pre_balances BIGINT[], - post_balances BIGINT[], - inner_instructions "InnerInstructions"[], - log_messages TEXT[], - pre_token_balances "TransactionTokenBalance"[], - post_token_balances "TransactionTokenBalance"[], - rewards "Reward"[] -); - -CREATE TYPE "TransactionMessageHeader" AS ( - num_required_signatures SMALLINT, - num_readonly_signed_accounts SMALLINT, - num_readonly_unsigned_accounts SMALLINT -); - -CREATE TYPE "TransactionMessage" AS ( - header "TransactionMessageHeader", - account_keys BYTEA[], - recent_blockhash BYTEA, - instructions "CompiledInstruction"[] -); - -CREATE TYPE "TransactionMessageAddressTableLookup" AS ( - account_key BYTEA, - writable_indexes SMALLINT[], - readonly_indexes SMALLINT[] -); - -CREATE TYPE "TransactionMessageV0" AS ( - header "TransactionMessageHeader", - account_keys BYTEA[], - recent_blockhash BYTEA, - instructions "CompiledInstruction"[], - address_table_lookups "TransactionMessageAddressTableLookup"[] -); - -CREATE TYPE "LoadedAddresses" AS ( - writable BYTEA[], - readonly BYTEA[] -); - -CREATE TYPE "LoadedMessageV0" AS ( - message "TransactionMessageV0", - loaded_addresses "LoadedAddresses" -); - --- The table storing transactions -CREATE TABLE transaction ( - slot BIGINT NOT NULL, - signature BYTEA NOT NULL, - is_vote BOOL NOT NULL, - message_type SMALLINT, -- 0: legacy, 1: v0 message - legacy_message "TransactionMessage", - v0_loaded_message "LoadedMessageV0", - signatures BYTEA[], - message_hash BYTEA, - meta "TransactionStatusMeta", - updated_on TIMESTAMP NOT NULL, - CONSTRAINT transaction_pk PRIMARY KEY (slot, signature) -); - --- The table storing block metadata -CREATE TABLE block ( - slot BIGINT PRIMARY KEY, - blockhash VARCHAR(44), - rewards "Reward"[], - block_time BIGINT, - block_height BIGINT, - updated_on TIMESTAMP NOT NULL -); - -/** - * The following is for keeping historical data for accounts and is not required for plugin to work. - */ --- The table storing historical data for accounts -CREATE TABLE account_audit ( - pubkey BYTEA, - owner BYTEA, - lamports BIGINT NOT NULL, - slot BIGINT NOT NULL, - executable BOOL NOT NULL, - rent_epoch BIGINT NOT NULL, - data BYTEA, - write_version BIGINT NOT NULL, - updated_on TIMESTAMP NOT NULL -); - -CREATE INDEX account_audit_account_key ON account_audit (pubkey, write_version); - -CREATE FUNCTION audit_account_update() RETURNS trigger AS $audit_account_update$ - BEGIN - INSERT INTO account_audit (pubkey, owner, lamports, slot, executable, rent_epoch, data, write_version, updated_on) - VALUES (OLD.pubkey, OLD.owner, OLD.lamports, OLD.slot, - OLD.executable, OLD.rent_epoch, OLD.data, OLD.write_version, OLD.updated_on); - RETURN NEW; - END; - -$audit_account_update$ LANGUAGE plpgsql; - -CREATE TRIGGER account_update_trigger AFTER UPDATE OR DELETE ON account - FOR EACH ROW EXECUTE PROCEDURE audit_account_update(); diff --git a/accountsdb-plugin-postgres/scripts/drop_schema.sql b/accountsdb-plugin-postgres/scripts/drop_schema.sql deleted file mode 100644 index 448564f93399cf..00000000000000 --- a/accountsdb-plugin-postgres/scripts/drop_schema.sql +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Script for cleaning up the schema for PostgreSQL used for the AccountsDb plugin. - */ - -DROP TRIGGER account_update_trigger ON account; -DROP FUNCTION audit_account_update; -DROP TABLE account_audit; -DROP TABLE account; -DROP TABLE slot; -DROP TABLE transaction; -DROP TABLE block; - -DROP TYPE "TransactionError" CASCADE; -DROP TYPE "TransactionErrorCode" CASCADE; -DROP TYPE "LoadedMessageV0" CASCADE; -DROP TYPE "LoadedAddresses" CASCADE; -DROP TYPE "TransactionMessageV0" CASCADE; -DROP TYPE "TransactionMessage" CASCADE; -DROP TYPE "TransactionMessageHeader" CASCADE; -DROP TYPE "TransactionMessageAddressTableLookup" CASCADE; -DROP TYPE "TransactionStatusMeta" CASCADE; -DROP TYPE "RewardType" CASCADE; -DROP TYPE "Reward" CASCADE; -DROP TYPE "TransactionTokenBalance" CASCADE; -DROP TYPE "InnerInstructions" CASCADE; -DROP TYPE "CompiledInstruction" CASCADE; diff --git a/accountsdb-plugin-postgres/scripts/postgresql.conf b/accountsdb-plugin-postgres/scripts/postgresql.conf deleted file mode 100644 index 53b089ab21eb3b..00000000000000 --- a/accountsdb-plugin-postgres/scripts/postgresql.conf +++ /dev/null @@ -1,802 +0,0 @@ -# This a reference configuration file for the PostgreSQL database version 14. - -# ----------------------------- -# PostgreSQL configuration file -# ----------------------------- -# -# This file consists of lines of the form: -# -# name = value -# -# (The "=" is optional.) Whitespace may be used. Comments are introduced with -# "#" anywhere on a line. The complete list of parameter names and allowed -# values can be found in the PostgreSQL documentation. -# -# The commented-out settings shown in this file represent the default values. -# Re-commenting a setting is NOT sufficient to revert it to the default value; -# you need to reload the server. -# -# This file is read on server startup and when the server receives a SIGHUP -# signal. If you edit the file on a running system, you have to SIGHUP the -# server for the changes to take effect, run "pg_ctl reload", or execute -# "SELECT pg_reload_conf()". Some parameters, which are marked below, -# require a server shutdown and restart to take effect. -# -# Any parameter can also be given as a command-line option to the server, e.g., -# "postgres -c log_connections=on". Some parameters can be changed at run time -# with the "SET" SQL command. -# -# Memory units: B = bytes Time units: us = microseconds -# kB = kilobytes ms = milliseconds -# MB = megabytes s = seconds -# GB = gigabytes min = minutes -# TB = terabytes h = hours -# d = days - - -#------------------------------------------------------------------------------ -# FILE LOCATIONS -#------------------------------------------------------------------------------ - -# The default values of these variables are driven from the -D command-line -# option or PGDATA environment variable, represented here as ConfigDir. - -data_directory = '/var/lib/postgresql/14/main' # use data in another directory - # (change requires restart) - -hba_file = '/etc/postgresql/14/main/pg_hba.conf' # host-based authentication file - # (change requires restart) -ident_file = '/etc/postgresql/14/main/pg_ident.conf' # ident configuration file - # (change requires restart) - -# If external_pid_file is not explicitly set, no extra PID file is written. -external_pid_file = '/var/run/postgresql/14-main.pid' # write an extra PID file - # (change requires restart) - - -#------------------------------------------------------------------------------ -# CONNECTIONS AND AUTHENTICATION -#------------------------------------------------------------------------------ - -# - Connection Settings - - -#listen_addresses = 'localhost' # what IP address(es) to listen on; - # comma-separated list of addresses; - # defaults to 'localhost'; use '*' for all - # (change requires restart) -listen_addresses = '*' -port = 5433 # (change requires restart) -max_connections = 200 # (change requires restart) -#superuser_reserved_connections = 3 # (change requires restart) -unix_socket_directories = '/var/run/postgresql' # comma-separated list of directories - # (change requires restart) -#unix_socket_group = '' # (change requires restart) -#unix_socket_permissions = 0777 # begin with 0 to use octal notation - # (change requires restart) -#bonjour = off # advertise server via Bonjour - # (change requires restart) -#bonjour_name = '' # defaults to the computer name - # (change requires restart) - -# - TCP settings - -# see "man tcp" for details - -#tcp_keepalives_idle = 0 # TCP_KEEPIDLE, in seconds; - # 0 selects the system default -#tcp_keepalives_interval = 0 # TCP_KEEPINTVL, in seconds; - # 0 selects the system default -#tcp_keepalives_count = 0 # TCP_KEEPCNT; - # 0 selects the system default -#tcp_user_timeout = 0 # TCP_USER_TIMEOUT, in milliseconds; - # 0 selects the system default - -#client_connection_check_interval = 0 # time between checks for client - # disconnection while running queries; - # 0 for never - -# - Authentication - - -#authentication_timeout = 1min # 1s-600s -#password_encryption = scram-sha-256 # scram-sha-256 or md5 -#db_user_namespace = off - -# GSSAPI using Kerberos -#krb_server_keyfile = 'FILE:${sysconfdir}/krb5.keytab' -#krb_caseins_users = off - -# - SSL - - -ssl = on -#ssl_ca_file = '' -ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem' -#ssl_crl_file = '' -#ssl_crl_dir = '' -ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key' -#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers -#ssl_prefer_server_ciphers = on -#ssl_ecdh_curve = 'prime256v1' -#ssl_min_protocol_version = 'TLSv1.2' -#ssl_max_protocol_version = '' -#ssl_dh_params_file = '' -#ssl_passphrase_command = '' -#ssl_passphrase_command_supports_reload = off - - -#------------------------------------------------------------------------------ -# RESOURCE USAGE (except WAL) -#------------------------------------------------------------------------------ - -# - Memory - - -shared_buffers = 1GB # min 128kB - # (change requires restart) -#huge_pages = try # on, off, or try - # (change requires restart) -#huge_page_size = 0 # zero for system default - # (change requires restart) -#temp_buffers = 8MB # min 800kB -#max_prepared_transactions = 0 # zero disables the feature - # (change requires restart) -# Caution: it is not advisable to set max_prepared_transactions nonzero unless -# you actively intend to use prepared transactions. -#work_mem = 4MB # min 64kB -#hash_mem_multiplier = 1.0 # 1-1000.0 multiplier on hash table work_mem -#maintenance_work_mem = 64MB # min 1MB -#autovacuum_work_mem = -1 # min 1MB, or -1 to use maintenance_work_mem -#logical_decoding_work_mem = 64MB # min 64kB -#max_stack_depth = 2MB # min 100kB -#shared_memory_type = mmap # the default is the first option - # supported by the operating system: - # mmap - # sysv - # windows - # (change requires restart) -dynamic_shared_memory_type = posix # the default is the first option - # supported by the operating system: - # posix - # sysv - # windows - # mmap - # (change requires restart) -#min_dynamic_shared_memory = 0MB # (change requires restart) - -# - Disk - - -#temp_file_limit = -1 # limits per-process temp file space - # in kilobytes, or -1 for no limit - -# - Kernel Resources - - -#max_files_per_process = 1000 # min 64 - # (change requires restart) - -# - Cost-Based Vacuum Delay - - -#vacuum_cost_delay = 0 # 0-100 milliseconds (0 disables) -#vacuum_cost_page_hit = 1 # 0-10000 credits -#vacuum_cost_page_miss = 2 # 0-10000 credits -#vacuum_cost_page_dirty = 20 # 0-10000 credits -#vacuum_cost_limit = 200 # 1-10000 credits - -# - Background Writer - - -#bgwriter_delay = 200ms # 10-10000ms between rounds -#bgwriter_lru_maxpages = 100 # max buffers written/round, 0 disables -#bgwriter_lru_multiplier = 2.0 # 0-10.0 multiplier on buffers scanned/round -#bgwriter_flush_after = 512kB # measured in pages, 0 disables - -# - Asynchronous Behavior - - -#backend_flush_after = 0 # measured in pages, 0 disables -effective_io_concurrency = 1000 # 1-1000; 0 disables prefetching -#maintenance_io_concurrency = 10 # 1-1000; 0 disables prefetching -#max_worker_processes = 8 # (change requires restart) -#max_parallel_workers_per_gather = 2 # taken from max_parallel_workers -#max_parallel_maintenance_workers = 2 # taken from max_parallel_workers -#max_parallel_workers = 8 # maximum number of max_worker_processes that - # can be used in parallel operations -#parallel_leader_participation = on -#old_snapshot_threshold = -1 # 1min-60d; -1 disables; 0 is immediate - # (change requires restart) - - -#------------------------------------------------------------------------------ -# WRITE-AHEAD LOG -#------------------------------------------------------------------------------ - -# - Settings - - -wal_level = minimal # minimal, replica, or logical - # (change requires restart) -fsync = off # flush data to disk for crash safety - # (turning this off can cause - # unrecoverable data corruption) -synchronous_commit = off # synchronization level; - # off, local, remote_write, remote_apply, or on -#wal_sync_method = fsync # the default is the first option - # supported by the operating system: - # open_datasync - # fdatasync (default on Linux and FreeBSD) - # fsync - # fsync_writethrough - # open_sync -full_page_writes = off # recover from partial page writes -#wal_log_hints = off # also do full page writes of non-critical updates - # (change requires restart) -#wal_compression = off # enable compression of full-page writes -#wal_init_zero = on # zero-fill new WAL files -#wal_recycle = on # recycle WAL files -#wal_buffers = -1 # min 32kB, -1 sets based on shared_buffers - # (change requires restart) -#wal_writer_delay = 200ms # 1-10000 milliseconds -#wal_writer_flush_after = 1MB # measured in pages, 0 disables -#wal_skip_threshold = 2MB - -#commit_delay = 0 # range 0-100000, in microseconds -#commit_siblings = 5 # range 1-1000 - -# - Checkpoints - - -#checkpoint_timeout = 5min # range 30s-1d -#checkpoint_completion_target = 0.9 # checkpoint target duration, 0.0 - 1.0 -#checkpoint_flush_after = 256kB # measured in pages, 0 disables -#checkpoint_warning = 30s # 0 disables -max_wal_size = 1GB -min_wal_size = 80MB - -# - Archiving - - -#archive_mode = off # enables archiving; off, on, or always - # (change requires restart) -#archive_command = '' # command to use to archive a logfile segment - # placeholders: %p = path of file to archive - # %f = file name only - # e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f' -#archive_timeout = 0 # force a logfile segment switch after this - # number of seconds; 0 disables - -# - Archive Recovery - - -# These are only used in recovery mode. - -#restore_command = '' # command to use to restore an archived logfile segment - # placeholders: %p = path of file to restore - # %f = file name only - # e.g. 'cp /mnt/server/archivedir/%f %p' -#archive_cleanup_command = '' # command to execute at every restartpoint -#recovery_end_command = '' # command to execute at completion of recovery - -# - Recovery Target - - -# Set these only when performing a targeted recovery. - -#recovery_target = '' # 'immediate' to end recovery as soon as a - # consistent state is reached - # (change requires restart) -#recovery_target_name = '' # the named restore point to which recovery will proceed - # (change requires restart) -#recovery_target_time = '' # the time stamp up to which recovery will proceed - # (change requires restart) -#recovery_target_xid = '' # the transaction ID up to which recovery will proceed - # (change requires restart) -#recovery_target_lsn = '' # the WAL LSN up to which recovery will proceed - # (change requires restart) -#recovery_target_inclusive = on # Specifies whether to stop: - # just after the specified recovery target (on) - # just before the recovery target (off) - # (change requires restart) -#recovery_target_timeline = 'latest' # 'current', 'latest', or timeline ID - # (change requires restart) -#recovery_target_action = 'pause' # 'pause', 'promote', 'shutdown' - # (change requires restart) - - -#------------------------------------------------------------------------------ -# REPLICATION -#------------------------------------------------------------------------------ - -# - Sending Servers - - -# Set these on the primary and on any standby that will send replication data. - -max_wal_senders = 0 # max number of walsender processes - # (change requires restart) -#max_replication_slots = 10 # max number of replication slots - # (change requires restart) -#wal_keep_size = 0 # in megabytes; 0 disables -#max_slot_wal_keep_size = -1 # in megabytes; -1 disables -#wal_sender_timeout = 60s # in milliseconds; 0 disables -#track_commit_timestamp = off # collect timestamp of transaction commit - # (change requires restart) - -# - Primary Server - - -# These settings are ignored on a standby server. - -#synchronous_standby_names = '' # standby servers that provide sync rep - # method to choose sync standbys, number of sync standbys, - # and comma-separated list of application_name - # from standby(s); '*' = all -#vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed - -# - Standby Servers - - -# These settings are ignored on a primary server. - -#primary_conninfo = '' # connection string to sending server -#primary_slot_name = '' # replication slot on sending server -#promote_trigger_file = '' # file name whose presence ends recovery -#hot_standby = on # "off" disallows queries during recovery - # (change requires restart) -#max_standby_archive_delay = 30s # max delay before canceling queries - # when reading WAL from archive; - # -1 allows indefinite delay -#max_standby_streaming_delay = 30s # max delay before canceling queries - # when reading streaming WAL; - # -1 allows indefinite delay -#wal_receiver_create_temp_slot = off # create temp slot if primary_slot_name - # is not set -#wal_receiver_status_interval = 10s # send replies at least this often - # 0 disables -#hot_standby_feedback = off # send info from standby to prevent - # query conflicts -#wal_receiver_timeout = 60s # time that receiver waits for - # communication from primary - # in milliseconds; 0 disables -#wal_retrieve_retry_interval = 5s # time to wait before retrying to - # retrieve WAL after a failed attempt -#recovery_min_apply_delay = 0 # minimum delay for applying changes during recovery - -# - Subscribers - - -# These settings are ignored on a publisher. - -#max_logical_replication_workers = 4 # taken from max_worker_processes - # (change requires restart) -#max_sync_workers_per_subscription = 2 # taken from max_logical_replication_workers - - -#------------------------------------------------------------------------------ -# QUERY TUNING -#------------------------------------------------------------------------------ - -# - Planner Method Configuration - - -#enable_async_append = on -#enable_bitmapscan = on -#enable_gathermerge = on -#enable_hashagg = on -#enable_hashjoin = on -#enable_incremental_sort = on -#enable_indexscan = on -#enable_indexonlyscan = on -#enable_material = on -#enable_memoize = on -#enable_mergejoin = on -#enable_nestloop = on -#enable_parallel_append = on -#enable_parallel_hash = on -#enable_partition_pruning = on -#enable_partitionwise_join = off -#enable_partitionwise_aggregate = off -#enable_seqscan = on -#enable_sort = on -#enable_tidscan = on - -# - Planner Cost Constants - - -#seq_page_cost = 1.0 # measured on an arbitrary scale -#random_page_cost = 4.0 # same scale as above -#cpu_tuple_cost = 0.01 # same scale as above -#cpu_index_tuple_cost = 0.005 # same scale as above -#cpu_operator_cost = 0.0025 # same scale as above -#parallel_setup_cost = 1000.0 # same scale as above -#parallel_tuple_cost = 0.1 # same scale as above -#min_parallel_table_scan_size = 8MB -#min_parallel_index_scan_size = 512kB -#effective_cache_size = 4GB - -#jit_above_cost = 100000 # perform JIT compilation if available - # and query more expensive than this; - # -1 disables -#jit_inline_above_cost = 500000 # inline small functions if query is - # more expensive than this; -1 disables -#jit_optimize_above_cost = 500000 # use expensive JIT optimizations if - # query is more expensive than this; - # -1 disables - -# - Genetic Query Optimizer - - -#geqo = on -#geqo_threshold = 12 -#geqo_effort = 5 # range 1-10 -#geqo_pool_size = 0 # selects default based on effort -#geqo_generations = 0 # selects default based on effort -#geqo_selection_bias = 2.0 # range 1.5-2.0 -#geqo_seed = 0.0 # range 0.0-1.0 - -# - Other Planner Options - - -#default_statistics_target = 100 # range 1-10000 -#constraint_exclusion = partition # on, off, or partition -#cursor_tuple_fraction = 0.1 # range 0.0-1.0 -#from_collapse_limit = 8 -#jit = on # allow JIT compilation -#join_collapse_limit = 8 # 1 disables collapsing of explicit - # JOIN clauses -#plan_cache_mode = auto # auto, force_generic_plan or - # force_custom_plan - - -#------------------------------------------------------------------------------ -# REPORTING AND LOGGING -#------------------------------------------------------------------------------ - -# - Where to Log - - -#log_destination = 'stderr' # Valid values are combinations of - # stderr, csvlog, syslog, and eventlog, - # depending on platform. csvlog - # requires logging_collector to be on. - -# This is used when logging to stderr: -#logging_collector = off # Enable capturing of stderr and csvlog - # into log files. Required to be on for - # csvlogs. - # (change requires restart) - -# These are only used if logging_collector is on: -#log_directory = 'log' # directory where log files are written, - # can be absolute or relative to PGDATA -#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern, - # can include strftime() escapes -#log_file_mode = 0600 # creation mode for log files, - # begin with 0 to use octal notation -#log_rotation_age = 1d # Automatic rotation of logfiles will - # happen after that time. 0 disables. -#log_rotation_size = 10MB # Automatic rotation of logfiles will - # happen after that much log output. - # 0 disables. -#log_truncate_on_rotation = off # If on, an existing log file with the - # same name as the new log file will be - # truncated rather than appended to. - # But such truncation only occurs on - # time-driven rotation, not on restarts - # or size-driven rotation. Default is - # off, meaning append to existing files - # in all cases. - -# These are relevant when logging to syslog: -#syslog_facility = 'LOCAL0' -#syslog_ident = 'postgres' -#syslog_sequence_numbers = on -#syslog_split_messages = on - -# This is only relevant when logging to eventlog (Windows): -# (change requires restart) -#event_source = 'PostgreSQL' - -# - When to Log - - -#log_min_messages = warning # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # info - # notice - # warning - # error - # log - # fatal - # panic - -#log_min_error_statement = error # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # info - # notice - # warning - # error - # log - # fatal - # panic (effectively off) - -#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements - # and their durations, > 0 logs only - # statements running at least this number - # of milliseconds - -#log_min_duration_sample = -1 # -1 is disabled, 0 logs a sample of statements - # and their durations, > 0 logs only a sample of - # statements running at least this number - # of milliseconds; - # sample fraction is determined by log_statement_sample_rate - -#log_statement_sample_rate = 1.0 # fraction of logged statements exceeding - # log_min_duration_sample to be logged; - # 1.0 logs all such statements, 0.0 never logs - - -#log_transaction_sample_rate = 0.0 # fraction of transactions whose statements - # are logged regardless of their duration; 1.0 logs all - # statements from all transactions, 0.0 never logs - -# - What to Log - - -#debug_print_parse = off -#debug_print_rewritten = off -#debug_print_plan = off -#debug_pretty_print = on -#log_autovacuum_min_duration = -1 # log autovacuum activity; - # -1 disables, 0 logs all actions and - # their durations, > 0 logs only - # actions running at least this number - # of milliseconds. -#log_checkpoints = off -#log_connections = off -#log_disconnections = off -#log_duration = off -#log_error_verbosity = default # terse, default, or verbose messages -#log_hostname = off -log_line_prefix = '%m [%p] %q%u@%d ' # special values: - # %a = application name - # %u = user name - # %d = database name - # %r = remote host and port - # %h = remote host - # %b = backend type - # %p = process ID - # %P = process ID of parallel group leader - # %t = timestamp without milliseconds - # %m = timestamp with milliseconds - # %n = timestamp with milliseconds (as a Unix epoch) - # %Q = query ID (0 if none or not computed) - # %i = command tag - # %e = SQL state - # %c = session ID - # %l = session line number - # %s = session start timestamp - # %v = virtual transaction ID - # %x = transaction ID (0 if none) - # %q = stop here in non-session - # processes - # %% = '%' - # e.g. '<%u%%%d> ' -#log_lock_waits = off # log lock waits >= deadlock_timeout -#log_recovery_conflict_waits = off # log standby recovery conflict waits - # >= deadlock_timeout -#log_parameter_max_length = -1 # when logging statements, limit logged - # bind-parameter values to N bytes; - # -1 means print in full, 0 disables -#log_parameter_max_length_on_error = 0 # when logging an error, limit logged - # bind-parameter values to N bytes; - # -1 means print in full, 0 disables -#log_statement = 'none' # none, ddl, mod, all -#log_replication_commands = off -#log_temp_files = -1 # log temporary files equal or larger - # than the specified size in kilobytes; - # -1 disables, 0 logs all temp files -log_timezone = 'Etc/UTC' - - -#------------------------------------------------------------------------------ -# PROCESS TITLE -#------------------------------------------------------------------------------ - -cluster_name = '14/main' # added to process titles if nonempty - # (change requires restart) -#update_process_title = on - - -#------------------------------------------------------------------------------ -# STATISTICS -#------------------------------------------------------------------------------ - -# - Query and Index Statistics Collector - - -#track_activities = on -#track_activity_query_size = 1024 # (change requires restart) -#track_counts = on -#track_io_timing = off -#track_wal_io_timing = off -#track_functions = none # none, pl, all -stats_temp_directory = '/var/run/postgresql/14-main.pg_stat_tmp' - - -# - Monitoring - - -#compute_query_id = auto -#log_statement_stats = off -#log_parser_stats = off -#log_planner_stats = off -#log_executor_stats = off - - -#------------------------------------------------------------------------------ -# AUTOVACUUM -#------------------------------------------------------------------------------ - -#autovacuum = on # Enable autovacuum subprocess? 'on' - # requires track_counts to also be on. -#autovacuum_max_workers = 3 # max number of autovacuum subprocesses - # (change requires restart) -#autovacuum_naptime = 1min # time between autovacuum runs -#autovacuum_vacuum_threshold = 50 # min number of row updates before - # vacuum -#autovacuum_vacuum_insert_threshold = 1000 # min number of row inserts - # before vacuum; -1 disables insert - # vacuums -#autovacuum_analyze_threshold = 50 # min number of row updates before - # analyze -#autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum -#autovacuum_vacuum_insert_scale_factor = 0.2 # fraction of inserts over table - # size before insert vacuum -#autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze -#autovacuum_freeze_max_age = 200000000 # maximum XID age before forced vacuum - # (change requires restart) -#autovacuum_multixact_freeze_max_age = 400000000 # maximum multixact age - # before forced vacuum - # (change requires restart) -#autovacuum_vacuum_cost_delay = 2ms # default vacuum cost delay for - # autovacuum, in milliseconds; - # -1 means use vacuum_cost_delay -#autovacuum_vacuum_cost_limit = -1 # default vacuum cost limit for - # autovacuum, -1 means use - # vacuum_cost_limit - - -#------------------------------------------------------------------------------ -# CLIENT CONNECTION DEFAULTS -#------------------------------------------------------------------------------ - -# - Statement Behavior - - -#client_min_messages = notice # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # log - # notice - # warning - # error -#search_path = '"$user", public' # schema names -#row_security = on -#default_table_access_method = 'heap' -#default_tablespace = '' # a tablespace name, '' uses the default -#default_toast_compression = 'pglz' # 'pglz' or 'lz4' -#temp_tablespaces = '' # a list of tablespace names, '' uses - # only default tablespace -#check_function_bodies = on -#default_transaction_isolation = 'read committed' -#default_transaction_read_only = off -#default_transaction_deferrable = off -#session_replication_role = 'origin' -#statement_timeout = 0 # in milliseconds, 0 is disabled -#lock_timeout = 0 # in milliseconds, 0 is disabled -#idle_in_transaction_session_timeout = 0 # in milliseconds, 0 is disabled -#idle_session_timeout = 0 # in milliseconds, 0 is disabled -#vacuum_freeze_table_age = 150000000 -#vacuum_freeze_min_age = 50000000 -#vacuum_failsafe_age = 1600000000 -#vacuum_multixact_freeze_table_age = 150000000 -#vacuum_multixact_freeze_min_age = 5000000 -#vacuum_multixact_failsafe_age = 1600000000 -#bytea_output = 'hex' # hex, escape -#xmlbinary = 'base64' -#xmloption = 'content' -#gin_pending_list_limit = 4MB - -# - Locale and Formatting - - -datestyle = 'iso, mdy' -#intervalstyle = 'postgres' -timezone = 'Etc/UTC' -#timezone_abbreviations = 'Default' # Select the set of available time zone - # abbreviations. Currently, there are - # Default - # Australia (historical usage) - # India - # You can create your own file in - # share/timezonesets/. -#extra_float_digits = 1 # min -15, max 3; any value >0 actually - # selects precise output mode -#client_encoding = sql_ascii # actually, defaults to database - # encoding - -# These settings are initialized by initdb, but they can be changed. -lc_messages = 'C.UTF-8' # locale for system error message - # strings -lc_monetary = 'C.UTF-8' # locale for monetary formatting -lc_numeric = 'C.UTF-8' # locale for number formatting -lc_time = 'C.UTF-8' # locale for time formatting - -# default configuration for text search -default_text_search_config = 'pg_catalog.english' - -# - Shared Library Preloading - - -#local_preload_libraries = '' -#session_preload_libraries = '' -#shared_preload_libraries = '' # (change requires restart) -#jit_provider = 'llvmjit' # JIT library to use - -# - Other Defaults - - -#dynamic_library_path = '$libdir' -#extension_destdir = '' # prepend path when loading extensions - # and shared objects (added by Debian) -#gin_fuzzy_search_limit = 0 - - -#------------------------------------------------------------------------------ -# LOCK MANAGEMENT -#------------------------------------------------------------------------------ - -#deadlock_timeout = 1s -#max_locks_per_transaction = 64 # min 10 - # (change requires restart) -#max_pred_locks_per_transaction = 64 # min 10 - # (change requires restart) -#max_pred_locks_per_relation = -2 # negative values mean - # (max_pred_locks_per_transaction - # / -max_pred_locks_per_relation) - 1 -#max_pred_locks_per_page = 2 # min 0 - - -#------------------------------------------------------------------------------ -# VERSION AND PLATFORM COMPATIBILITY -#------------------------------------------------------------------------------ - -# - Previous PostgreSQL Versions - - -#array_nulls = on -#backslash_quote = safe_encoding # on, off, or safe_encoding -#escape_string_warning = on -#lo_compat_privileges = off -#quote_all_identifiers = off -#standard_conforming_strings = on -#synchronize_seqscans = on - -# - Other Platforms and Clients - - -#transform_null_equals = off - - -#------------------------------------------------------------------------------ -# ERROR HANDLING -#------------------------------------------------------------------------------ - -#exit_on_error = off # terminate session on any error? -#restart_after_crash = on # reinitialize after backend crash? -#data_sync_retry = off # retry or panic on failure to fsync - # data? - # (change requires restart) -#recovery_init_sync_method = fsync # fsync, syncfs (Linux 5.8+) - - -#------------------------------------------------------------------------------ -# CONFIG FILE INCLUDES -#------------------------------------------------------------------------------ - -# These options allow settings to be loaded from files other than the -# default postgresql.conf. Note that these are directives, not variable -# assignments, so they can usefully be given more than once. - -include_dir = 'conf.d' # include files ending in '.conf' from - # a directory, e.g., 'conf.d' -#include_if_exists = '...' # include file only if it exists -#include = '...' # include file - - -#------------------------------------------------------------------------------ -# CUSTOMIZED OPTIONS -#------------------------------------------------------------------------------ - -# Add settings for extensions here \ No newline at end of file diff --git a/accountsdb-plugin-postgres/src/accounts_selector.rs b/accountsdb-plugin-postgres/src/accounts_selector.rs deleted file mode 100644 index 77398b76c13e38..00000000000000 --- a/accountsdb-plugin-postgres/src/accounts_selector.rs +++ /dev/null @@ -1,74 +0,0 @@ -use {log::*, std::collections::HashSet}; - -#[derive(Debug)] -pub(crate) struct AccountsSelector { - pub accounts: HashSet>, - pub owners: HashSet>, - pub select_all_accounts: bool, -} - -impl AccountsSelector { - pub fn default() -> Self { - AccountsSelector { - accounts: HashSet::default(), - owners: HashSet::default(), - select_all_accounts: true, - } - } - - pub fn new(accounts: &[String], owners: &[String]) -> Self { - info!( - "Creating AccountsSelector from accounts: {:?}, owners: {:?}", - accounts, owners - ); - - let select_all_accounts = accounts.iter().any(|key| key == "*"); - if select_all_accounts { - return AccountsSelector { - accounts: HashSet::default(), - owners: HashSet::default(), - select_all_accounts, - }; - } - let accounts = accounts - .iter() - .map(|key| bs58::decode(key).into_vec().unwrap()) - .collect(); - let owners = owners - .iter() - .map(|key| bs58::decode(key).into_vec().unwrap()) - .collect(); - AccountsSelector { - accounts, - owners, - select_all_accounts, - } - } - - pub fn is_account_selected(&self, account: &[u8], owner: &[u8]) -> bool { - self.select_all_accounts || self.accounts.contains(account) || self.owners.contains(owner) - } - - /// Check if any account is of interested at all - pub fn is_enabled(&self) -> bool { - self.select_all_accounts || !self.accounts.is_empty() || !self.owners.is_empty() - } -} - -#[cfg(test)] -pub(crate) mod tests { - use super::*; - - #[test] - fn test_create_accounts_selector() { - AccountsSelector::new( - &["9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin".to_string()], - &[], - ); - - AccountsSelector::new( - &[], - &["9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin".to_string()], - ); - } -} diff --git a/accountsdb-plugin-postgres/src/accountsdb_plugin_postgres.rs b/accountsdb-plugin-postgres/src/accountsdb_plugin_postgres.rs deleted file mode 100644 index 45bb441bd9100d..00000000000000 --- a/accountsdb-plugin-postgres/src/accountsdb_plugin_postgres.rs +++ /dev/null @@ -1,466 +0,0 @@ -use solana_measure::measure::Measure; -/// Main entry for the PostgreSQL plugin -use { - crate::{ - accounts_selector::AccountsSelector, - postgres_client::{ParallelPostgresClient, PostgresClientBuilder}, - transaction_selector::TransactionSelector, - }, - bs58, - log::*, - serde_derive::{Deserialize, Serialize}, - serde_json, - solana_accountsdb_plugin_interface::accountsdb_plugin_interface::{ - AccountsDbPlugin, AccountsDbPluginError, ReplicaAccountInfoVersions, - ReplicaBlockInfoVersions, ReplicaTransactionInfoVersions, Result, SlotStatus, - }, - solana_metrics::*, - std::{fs::File, io::Read}, - thiserror::Error, -}; - -#[derive(Default)] -pub struct AccountsDbPluginPostgres { - client: Option, - accounts_selector: Option, - transaction_selector: Option, -} - -impl std::fmt::Debug for AccountsDbPluginPostgres { - fn fmt(&self, _: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - Ok(()) - } -} - -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] -pub struct AccountsDbPluginPostgresConfig { - pub host: Option, - pub user: Option, - pub port: Option, - pub connection_str: Option, - pub threads: Option, - pub batch_size: Option, - pub panic_on_db_errors: Option, - /// Indicates if to store historical data for accounts - pub store_account_historical_data: Option, -} - -#[derive(Error, Debug)] -pub enum AccountsDbPluginPostgresError { - #[error("Error connecting to the backend data store. Error message: ({msg})")] - DataStoreConnectionError { msg: String }, - - #[error("Error preparing data store schema. Error message: ({msg})")] - DataSchemaError { msg: String }, - - #[error("Error preparing data store schema. Error message: ({msg})")] - ConfigurationError { msg: String }, -} - -impl AccountsDbPlugin for AccountsDbPluginPostgres { - fn name(&self) -> &'static str { - "AccountsDbPluginPostgres" - } - - /// Do initialization for the PostgreSQL plugin. - /// - /// # Format of the config file: - /// * The `accounts_selector` section allows the user to controls accounts selections. - /// "accounts_selector" : { - /// "accounts" : \["pubkey-1", "pubkey-2", ..., "pubkey-n"\], - /// } - /// or: - /// "accounts_selector" = { - /// "owners" : \["pubkey-1", "pubkey-2", ..., "pubkey-m"\] - /// } - /// Accounts either satisyfing the accounts condition or owners condition will be selected. - /// When only owners is specified, - /// all accounts belonging to the owners will be streamed. - /// The accounts field supports wildcard to select all accounts: - /// "accounts_selector" : { - /// "accounts" : \["*"\], - /// } - /// * "host", optional, specifies the PostgreSQL server. - /// * "user", optional, specifies the PostgreSQL user. - /// * "port", optional, specifies the PostgreSQL server's port. - /// * "connection_str", optional, the custom PostgreSQL connection string. - /// Please refer to https://docs.rs/postgres/0.19.2/postgres/config/struct.Config.html for the connection configuration. - /// When `connection_str` is set, the values in "host", "user" and "port" are ignored. If `connection_str` is not given, - /// `host` and `user` must be given. - /// "store_account_historical_data", optional, set it to 'true', to store historical account data to account_audit - /// table. - /// * "threads" optional, specifies the number of worker threads for the plugin. A thread - /// maintains a PostgreSQL connection to the server. The default is '10'. - /// * "batch_size" optional, specifies the batch size of bulk insert when the AccountsDb is created - /// from restoring a snapshot. The default is '10'. - /// * "panic_on_db_errors", optional, contols if to panic when there are errors replicating data to the - /// PostgreSQL database. The default is 'false'. - /// * "transaction_selector", optional, controls if and what transaction to store. If this field is missing - /// None of the transction is stored. - /// "transaction_selector" : { - /// "mentions" : \["pubkey-1", "pubkey-2", ..., "pubkey-n"\], - /// } - /// The `mentions` field support wildcard to select all transaction or all 'vote' transactions: - /// For example, to select all transactions: - /// "transaction_selector" : { - /// "mentions" : \["*"\], - /// } - /// To select all vote transactions: - /// "transaction_selector" : { - /// "mentions" : \["all_votes"\], - /// } - /// # Examples - /// - /// { - /// "libpath": "/home/solana/target/release/libsolana_accountsdb_plugin_postgres.so", - /// "host": "host_foo", - /// "user": "solana", - /// "threads": 10, - /// "accounts_selector" : { - /// "owners" : ["9oT9R5ZyRovSVnt37QvVoBttGpNqR3J7unkb567NP8k3"] - /// } - /// } - - fn on_load(&mut self, config_file: &str) -> Result<()> { - solana_logger::setup_with_default("info"); - info!( - "Loading plugin {:?} from config_file {:?}", - self.name(), - config_file - ); - let mut file = File::open(config_file)?; - let mut contents = String::new(); - file.read_to_string(&mut contents)?; - - let result: serde_json::Value = serde_json::from_str(&contents).unwrap(); - self.accounts_selector = Some(Self::create_accounts_selector_from_config(&result)); - self.transaction_selector = Some(Self::create_transaction_selector_from_config(&result)); - - let result: serde_json::Result = - serde_json::from_str(&contents); - match result { - Err(err) => { - return Err(AccountsDbPluginError::ConfigFileReadError { - msg: format!( - "The config file is not in the JSON format expected: {:?}", - err - ), - }) - } - Ok(config) => { - let client = PostgresClientBuilder::build_pararallel_postgres_client(&config)?; - self.client = Some(client); - } - } - - Ok(()) - } - - fn on_unload(&mut self) { - info!("Unloading plugin: {:?}", self.name()); - - match &mut self.client { - None => {} - Some(client) => { - client.join().unwrap(); - } - } - } - - fn update_account( - &mut self, - account: ReplicaAccountInfoVersions, - slot: u64, - is_startup: bool, - ) -> Result<()> { - let mut measure_all = Measure::start("accountsdb-plugin-postgres-update-account-main"); - match account { - ReplicaAccountInfoVersions::V0_0_1(account) => { - let mut measure_select = - Measure::start("accountsdb-plugin-postgres-update-account-select"); - if let Some(accounts_selector) = &self.accounts_selector { - if !accounts_selector.is_account_selected(account.pubkey, account.owner) { - return Ok(()); - } - } else { - return Ok(()); - } - measure_select.stop(); - inc_new_counter_debug!( - "accountsdb-plugin-postgres-update-account-select-us", - measure_select.as_us() as usize, - 100000, - 100000 - ); - - debug!( - "Updating account {:?} with owner {:?} at slot {:?} using account selector {:?}", - bs58::encode(account.pubkey).into_string(), - bs58::encode(account.owner).into_string(), - slot, - self.accounts_selector.as_ref().unwrap() - ); - - match &mut self.client { - None => { - return Err(AccountsDbPluginError::Custom(Box::new( - AccountsDbPluginPostgresError::DataStoreConnectionError { - msg: "There is no connection to the PostgreSQL database." - .to_string(), - }, - ))); - } - Some(client) => { - let mut measure_update = - Measure::start("accountsdb-plugin-postgres-update-account-client"); - let result = { client.update_account(account, slot, is_startup) }; - measure_update.stop(); - - inc_new_counter_debug!( - "accountsdb-plugin-postgres-update-account-client-us", - measure_update.as_us() as usize, - 100000, - 100000 - ); - - if let Err(err) = result { - return Err(AccountsDbPluginError::AccountsUpdateError { - msg: format!("Failed to persist the update of account to the PostgreSQL database. Error: {:?}", err) - }); - } - } - } - } - } - - measure_all.stop(); - - inc_new_counter_debug!( - "accountsdb-plugin-postgres-update-account-main-us", - measure_all.as_us() as usize, - 100000, - 100000 - ); - - Ok(()) - } - - fn update_slot_status( - &mut self, - slot: u64, - parent: Option, - status: SlotStatus, - ) -> Result<()> { - info!("Updating slot {:?} at with status {:?}", slot, status); - - match &mut self.client { - None => { - return Err(AccountsDbPluginError::Custom(Box::new( - AccountsDbPluginPostgresError::DataStoreConnectionError { - msg: "There is no connection to the PostgreSQL database.".to_string(), - }, - ))); - } - Some(client) => { - let result = client.update_slot_status(slot, parent, status); - - if let Err(err) = result { - return Err(AccountsDbPluginError::SlotStatusUpdateError{ - msg: format!("Failed to persist the update of slot to the PostgreSQL database. Error: {:?}", err) - }); - } - } - } - - Ok(()) - } - - fn notify_end_of_startup(&mut self) -> Result<()> { - info!("Notifying the end of startup for accounts notifications"); - match &mut self.client { - None => { - return Err(AccountsDbPluginError::Custom(Box::new( - AccountsDbPluginPostgresError::DataStoreConnectionError { - msg: "There is no connection to the PostgreSQL database.".to_string(), - }, - ))); - } - Some(client) => { - let result = client.notify_end_of_startup(); - - if let Err(err) = result { - return Err(AccountsDbPluginError::SlotStatusUpdateError{ - msg: format!("Failed to notify the end of startup for accounts notifications. Error: {:?}", err) - }); - } - } - } - Ok(()) - } - - fn notify_transaction( - &mut self, - transaction_info: ReplicaTransactionInfoVersions, - slot: u64, - ) -> Result<()> { - match &mut self.client { - None => { - return Err(AccountsDbPluginError::Custom(Box::new( - AccountsDbPluginPostgresError::DataStoreConnectionError { - msg: "There is no connection to the PostgreSQL database.".to_string(), - }, - ))); - } - Some(client) => match transaction_info { - ReplicaTransactionInfoVersions::V0_0_1(transaction_info) => { - if let Some(transaction_selector) = &self.transaction_selector { - if !transaction_selector.is_transaction_selected( - transaction_info.is_vote, - transaction_info.transaction.message().account_keys_iter(), - ) { - return Ok(()); - } - } else { - return Ok(()); - } - - let result = client.log_transaction_info(transaction_info, slot); - - if let Err(err) = result { - return Err(AccountsDbPluginError::SlotStatusUpdateError{ - msg: format!("Failed to persist the transaction info to the PostgreSQL database. Error: {:?}", err) - }); - } - } - }, - } - - Ok(()) - } - - fn notify_block_metadata(&mut self, block_info: ReplicaBlockInfoVersions) -> Result<()> { - match &mut self.client { - None => { - return Err(AccountsDbPluginError::Custom(Box::new( - AccountsDbPluginPostgresError::DataStoreConnectionError { - msg: "There is no connection to the PostgreSQL database.".to_string(), - }, - ))); - } - Some(client) => match block_info { - ReplicaBlockInfoVersions::V0_0_1(block_info) => { - let result = client.update_block_metadata(block_info); - - if let Err(err) = result { - return Err(AccountsDbPluginError::SlotStatusUpdateError{ - msg: format!("Failed to persist the update of block metadata to the PostgreSQL database. Error: {:?}", err) - }); - } - } - }, - } - - Ok(()) - } - - /// Check if the plugin is interested in account data - /// Default is true -- if the plugin is not interested in - /// account data, please return false. - fn account_data_notifications_enabled(&self) -> bool { - self.accounts_selector - .as_ref() - .map_or_else(|| false, |selector| selector.is_enabled()) - } - - /// Check if the plugin is interested in transaction data - fn transaction_notifications_enabled(&self) -> bool { - self.transaction_selector - .as_ref() - .map_or_else(|| false, |selector| selector.is_enabled()) - } -} - -impl AccountsDbPluginPostgres { - fn create_accounts_selector_from_config(config: &serde_json::Value) -> AccountsSelector { - let accounts_selector = &config["accounts_selector"]; - - if accounts_selector.is_null() { - AccountsSelector::default() - } else { - let accounts = &accounts_selector["accounts"]; - let accounts: Vec = if accounts.is_array() { - accounts - .as_array() - .unwrap() - .iter() - .map(|val| val.as_str().unwrap().to_string()) - .collect() - } else { - Vec::default() - }; - let owners = &accounts_selector["owners"]; - let owners: Vec = if owners.is_array() { - owners - .as_array() - .unwrap() - .iter() - .map(|val| val.as_str().unwrap().to_string()) - .collect() - } else { - Vec::default() - }; - AccountsSelector::new(&accounts, &owners) - } - } - - fn create_transaction_selector_from_config(config: &serde_json::Value) -> TransactionSelector { - let transaction_selector = &config["transaction_selector"]; - - if transaction_selector.is_null() { - TransactionSelector::default() - } else { - let accounts = &transaction_selector["mentions"]; - let accounts: Vec = if accounts.is_array() { - accounts - .as_array() - .unwrap() - .iter() - .map(|val| val.as_str().unwrap().to_string()) - .collect() - } else { - Vec::default() - }; - TransactionSelector::new(&accounts) - } - } - - pub fn new() -> Self { - Self::default() - } -} - -#[no_mangle] -#[allow(improper_ctypes_definitions)] -/// # Safety -/// -/// This function returns the AccountsDbPluginPostgres pointer as trait AccountsDbPlugin. -pub unsafe extern "C" fn _create_plugin() -> *mut dyn AccountsDbPlugin { - let plugin = AccountsDbPluginPostgres::new(); - let plugin: Box = Box::new(plugin); - Box::into_raw(plugin) -} - -#[cfg(test)] -pub(crate) mod tests { - use {super::*, serde_json}; - - #[test] - fn test_accounts_selector_from_config() { - let config = "{\"accounts_selector\" : { \ - \"owners\" : [\"9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin\"] \ - }}"; - - let config: serde_json::Value = serde_json::from_str(config).unwrap(); - AccountsDbPluginPostgres::create_accounts_selector_from_config(&config); - } -} diff --git a/accountsdb-plugin-postgres/src/lib.rs b/accountsdb-plugin-postgres/src/lib.rs deleted file mode 100644 index a2d78c1eefcad2..00000000000000 --- a/accountsdb-plugin-postgres/src/lib.rs +++ /dev/null @@ -1,4 +0,0 @@ -pub mod accounts_selector; -pub mod accountsdb_plugin_postgres; -pub mod postgres_client; -pub mod transaction_selector; diff --git a/accountsdb-plugin-postgres/src/postgres_client/postgres_client_block_metadata.rs b/accountsdb-plugin-postgres/src/postgres_client/postgres_client_block_metadata.rs deleted file mode 100644 index a882e6767c7d42..00000000000000 --- a/accountsdb-plugin-postgres/src/postgres_client/postgres_client_block_metadata.rs +++ /dev/null @@ -1,97 +0,0 @@ -use { - crate::{ - accountsdb_plugin_postgres::{ - AccountsDbPluginPostgresConfig, AccountsDbPluginPostgresError, - }, - postgres_client::{ - postgres_client_transaction::DbReward, SimplePostgresClient, UpdateBlockMetadataRequest, - }, - }, - chrono::Utc, - log::*, - postgres::{Client, Statement}, - solana_accountsdb_plugin_interface::accountsdb_plugin_interface::{ - AccountsDbPluginError, ReplicaBlockInfo, - }, -}; - -#[derive(Clone, Debug)] -pub struct DbBlockInfo { - pub slot: i64, - pub blockhash: String, - pub rewards: Vec, - pub block_time: Option, - pub block_height: Option, -} - -impl<'a> From<&ReplicaBlockInfo<'a>> for DbBlockInfo { - fn from(block_info: &ReplicaBlockInfo) -> Self { - Self { - slot: block_info.slot as i64, - blockhash: block_info.blockhash.to_string(), - rewards: block_info.rewards.iter().map(DbReward::from).collect(), - block_time: block_info.block_time, - block_height: block_info - .block_height - .map(|block_height| block_height as i64), - } - } -} - -impl SimplePostgresClient { - pub(crate) fn build_block_metadata_upsert_statement( - client: &mut Client, - config: &AccountsDbPluginPostgresConfig, - ) -> Result { - let stmt = - "INSERT INTO block (slot, blockhash, rewards, block_time, block_height, updated_on) \ - VALUES ($1, $2, $3, $4, $5, $6)"; - - let stmt = client.prepare(stmt); - - match stmt { - Err(err) => { - return Err(AccountsDbPluginError::Custom(Box::new(AccountsDbPluginPostgresError::DataSchemaError { - msg: format!( - "Error in preparing for the block metadata update PostgreSQL database: ({}) host: {:?} user: {:?} config: {:?}", - err, config.host, config.user, config - ), - }))); - } - Ok(stmt) => Ok(stmt), - } - } - - pub(crate) fn update_block_metadata_impl( - &mut self, - block_info: UpdateBlockMetadataRequest, - ) -> Result<(), AccountsDbPluginError> { - let client = self.client.get_mut().unwrap(); - let statement = &client.update_block_metadata_stmt; - let client = &mut client.client; - let updated_on = Utc::now().naive_utc(); - - let block_info = block_info.block_info; - let result = client.query( - statement, - &[ - &block_info.slot, - &block_info.blockhash, - &block_info.rewards, - &block_info.block_time, - &block_info.block_height, - &updated_on, - ], - ); - - if let Err(err) = result { - let msg = format!( - "Failed to persist the update of block metadata to the PostgreSQL database. Error: {:?}", - err); - error!("{}", msg); - return Err(AccountsDbPluginError::AccountsUpdateError { msg }); - } - - Ok(()) - } -} diff --git a/accountsdb-plugin-postgres/src/transaction_selector.rs b/accountsdb-plugin-postgres/src/transaction_selector.rs deleted file mode 100644 index 7c256f3c07b6a9..00000000000000 --- a/accountsdb-plugin-postgres/src/transaction_selector.rs +++ /dev/null @@ -1,194 +0,0 @@ -/// The transaction selector is responsible for filtering transactions -/// in the plugin framework. -use {log::*, solana_sdk::pubkey::Pubkey, std::collections::HashSet}; - -pub(crate) struct TransactionSelector { - pub mentioned_addresses: HashSet>, - pub select_all_transactions: bool, - pub select_all_vote_transactions: bool, -} - -#[allow(dead_code)] -impl TransactionSelector { - pub fn default() -> Self { - Self { - mentioned_addresses: HashSet::default(), - select_all_transactions: false, - select_all_vote_transactions: false, - } - } - - /// Create a selector based on the mentioned addresses - /// To select all transactions use ["*"] or ["all"] - /// To select all vote transactions, use ["all_votes"] - /// To select transactions mentioning specific addresses use ["", "", ...] - pub fn new(mentioned_addresses: &[String]) -> Self { - info!( - "Creating TransactionSelector from addresses: {:?}", - mentioned_addresses - ); - - let select_all_transactions = mentioned_addresses - .iter() - .any(|key| key == "*" || key == "all"); - if select_all_transactions { - return Self { - mentioned_addresses: HashSet::default(), - select_all_transactions, - select_all_vote_transactions: true, - }; - } - let select_all_vote_transactions = mentioned_addresses.iter().any(|key| key == "all_votes"); - if select_all_vote_transactions { - return Self { - mentioned_addresses: HashSet::default(), - select_all_transactions, - select_all_vote_transactions: true, - }; - } - - let mentioned_addresses = mentioned_addresses - .iter() - .map(|key| bs58::decode(key).into_vec().unwrap()) - .collect(); - - Self { - mentioned_addresses, - select_all_transactions: false, - select_all_vote_transactions: false, - } - } - - /// Check if a transaction is of interest. - pub fn is_transaction_selected( - &self, - is_vote: bool, - mentioned_addresses: Box + '_>, - ) -> bool { - if !self.is_enabled() { - return false; - } - - if self.select_all_transactions || (self.select_all_vote_transactions && is_vote) { - return true; - } - for address in mentioned_addresses { - if self.mentioned_addresses.contains(address.as_ref()) { - return true; - } - } - false - } - - /// Check if any transaction is of interest at all - pub fn is_enabled(&self) -> bool { - self.select_all_transactions - || self.select_all_vote_transactions - || !self.mentioned_addresses.is_empty() - } -} - -#[cfg(test)] -pub(crate) mod tests { - use super::*; - - #[test] - fn test_select_transaction() { - let pubkey1 = Pubkey::new_unique(); - let pubkey2 = Pubkey::new_unique(); - - let selector = TransactionSelector::new(&[pubkey1.to_string()]); - - assert!(selector.is_enabled()); - - let addresses = [pubkey1]; - - assert!(selector.is_transaction_selected(false, Box::new(addresses.iter()))); - - let addresses = [pubkey2]; - assert!(!selector.is_transaction_selected(false, Box::new(addresses.iter()))); - - let addresses = [pubkey1, pubkey2]; - assert!(selector.is_transaction_selected(false, Box::new(addresses.iter()))); - } - - #[test] - fn test_select_all_transaction_using_wildcard() { - let pubkey1 = Pubkey::new_unique(); - let pubkey2 = Pubkey::new_unique(); - - let selector = TransactionSelector::new(&["*".to_string()]); - - assert!(selector.is_enabled()); - - let addresses = [pubkey1]; - - assert!(selector.is_transaction_selected(false, Box::new(addresses.iter()))); - - let addresses = [pubkey2]; - assert!(selector.is_transaction_selected(false, Box::new(addresses.iter()))); - - let addresses = [pubkey1, pubkey2]; - assert!(selector.is_transaction_selected(false, Box::new(addresses.iter()))); - } - - #[test] - fn test_select_all_transaction_all() { - let pubkey1 = Pubkey::new_unique(); - let pubkey2 = Pubkey::new_unique(); - - let selector = TransactionSelector::new(&["all".to_string()]); - - assert!(selector.is_enabled()); - - let addresses = [pubkey1]; - - assert!(selector.is_transaction_selected(false, Box::new(addresses.iter()))); - - let addresses = [pubkey2]; - assert!(selector.is_transaction_selected(false, Box::new(addresses.iter()))); - - let addresses = [pubkey1, pubkey2]; - assert!(selector.is_transaction_selected(false, Box::new(addresses.iter()))); - } - - #[test] - fn test_select_all_vote_transaction() { - let pubkey1 = Pubkey::new_unique(); - let pubkey2 = Pubkey::new_unique(); - - let selector = TransactionSelector::new(&["all_votes".to_string()]); - - assert!(selector.is_enabled()); - - let addresses = [pubkey1]; - - assert!(!selector.is_transaction_selected(false, Box::new(addresses.iter()))); - - let addresses = [pubkey2]; - assert!(selector.is_transaction_selected(true, Box::new(addresses.iter()))); - - let addresses = [pubkey1, pubkey2]; - assert!(selector.is_transaction_selected(true, Box::new(addresses.iter()))); - } - - #[test] - fn test_select_no_transaction() { - let pubkey1 = Pubkey::new_unique(); - let pubkey2 = Pubkey::new_unique(); - - let selector = TransactionSelector::new(&[]); - - assert!(!selector.is_enabled()); - - let addresses = [pubkey1]; - - assert!(!selector.is_transaction_selected(false, Box::new(addresses.iter()))); - - let addresses = [pubkey2]; - assert!(!selector.is_transaction_selected(true, Box::new(addresses.iter()))); - - let addresses = [pubkey1, pubkey2]; - assert!(!selector.is_transaction_selected(true, Box::new(addresses.iter()))); - } -}