Merge branch 'main' into citus_shards-test

.circleci/config.yml

@@ -6,7 +6,7 @@ orbs:
 parameters:
  image_suffix:
  type: string
- default: '-v87fd773'
+ default: '-v9d71045'
  pg14_version:
  type: string
  default: '14.9'
@@ -698,7 +698,6 @@ jobs:
 workflows:
  version: 2
  flaky_test_debugging:
- when: << pipeline.parameters.flaky_test >>
  jobs:
  - build:
  name: build-flaky-15
@@ -714,8 +713,6 @@ workflows:
  runs: << pipeline.parameters.flaky_test_runs_per_job >>
 
  build_and_test:
- when:
- not: << pipeline.parameters.flaky_test >>
  jobs:
  - build:
  name: build-14

.devcontainer/.gdbinit

@@ -0,0 +1,5 @@
+# gdbpg.py contains scripts to nicely print the postgres datastructures
+# while in a gdb session. Since the vscode debugger is based on gdb this
+# actually also works when debugging with vscode. Providing nice tools
+# to understand the internal datastructures we are working with.
+source /root/gdbpg.py

.devcontainer/.gitignore

@@ -0,0 +1 @@
+postgresql-*.tar.bz2

.devcontainer/.psqlrc

@@ -0,0 +1,7 @@
+\timing on
+\pset linestyle unicode
+\pset border 2
+\setenv PAGER 'pspg --no-mouse -bX --no-commandbar --no-topbar'
+\set HISTSIZE 100000
+\set PROMPT1 '\n%[%033[1m%]%M %n@%/:%>-%p%R%[%033[0m%]%# '
+\set PROMPT2 ' '

.devcontainer/.vscode/Pipfile

@@ -0,0 +1,12 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+docopt = "*"
+
+[dev-packages]
+
+[requires]
+python_version = "3.9"

.devcontainer/.vscode/generate_c_cpp_properties-json.py

@@ -0,0 +1,84 @@
+#! /usr/bin/env pipenv-shebang
+"""Generate C/C++ properties file for VSCode.
+
+Uses pgenv to iterate postgres versions and generate
+a C/C++ properties file for VSCode containing the
+include paths for the postgres headers.
+
+Usage:
+ generate_c_cpp_properties-json.py <target_path>
+ generate_c_cpp_properties-json.py (-h | --help)
+ generate_c_cpp_properties-json.py --version
+
+Options:
+ -h --help Show this screen.
+ --version Show version.
+
+"""
+import json
+import subprocess
+
+from docopt import docopt
+
+
+def main(args):
+ target_path = args['<target_path>']
+
+ output = subprocess.check_output(['pgenv', 'versions'])
+ # typical output is:
+ # 14.8 pgsql-14.8
+ # * 15.3 pgsql-15.3
+ # 16beta2 pgsql-16beta2
+ # where the line marked with a * is the currently active version
+ #
+ # we are only interested in the first word of each line, which is the version number
+ # thus we strip the whitespace and the * from the line and split it into words
+ # and take the first word
+ versions = [line.strip('* ').split()[0] for line in output.decode('utf-8').splitlines()]
+
+ # create the list of configurations per version
+ configurations = []
+ for version in versions:
+ configurations.append(generate_configuration(version))
+
+ # create the json file
+ c_cpp_properties = {
+ "configurations": configurations,
+ "version": 4
+ }
+
+ # write the c_cpp_properties.json file
+ with open(target_path, 'w') as f:
+ json.dump(c_cpp_properties, f, indent=4)
+
+
+def generate_configuration(version):
+ """Returns a configuration for the given postgres version.
+
+ >>> generate_configuration('14.8')
+ {
+ "name": "Citus Development Configuration - Postgres 14.8",
+ "includePath": [
+ "/usr/local/include",
+ "/home/citus/.pgenv/src/postgresql-14.8/src/**",
+ "${workspaceFolder}/**",
+ "${workspaceFolder}/src/include/",
+ ],
+ "configurationProvider": "ms-vscode.makefile-tools"
+ }
+ """
+ return {
+ "name": f"Citus Development Configuration - Postgres {version}",
+ "includePath": [
+ "/usr/local/include",
+ f"/home/citus/.pgenv/src/postgresql-{version}/src/**",
+ "${workspaceFolder}/**",
+ "${workspaceFolder}/src/include/",
+ ],
+ "configurationProvider": "ms-vscode.makefile-tools"
+ }
+
+
+if __name__ == '__main__':
+ arguments = docopt(__doc__, version='0.1.0')
+ main(arguments)

.devcontainer/.vscode/launch.json

@@ -0,0 +1,20 @@
+{
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "Attach Citus (devcontainer)",
+ "type": "cppdbg",
+ "request": "attach",
+ "processId": "${command:pickProcess}",
+ "program": "/home/citus/.pgenv/pgsql/bin/postgres",
+ "additionalSOLibSearchPath": "/home/citus/.pgenv/pgsql/lib",
+ "setupCommands": [
+ {
+ "text": "handle SIGUSR1 noprint nostop pass",
+ "description": "let gdb not stop when SIGUSR1 is sent to process",
+ "ignoreFailures": true
+ }
+ ],
+ },
+ ]
+}