on master help sign in
.appveyor.yml−1
since splitsnapshots
unifiedsplit
@@ -17,7 +17,6 @@ environment:
17 global:
17 global:
18 STACK_ROOT: "c:\\sr"
18 STACK_ROOT: "c:\\sr"
19 matrix:
19 matrix:
20− - YAML: "stack.ghc8.2.yaml"
21 - YAML: "stack.ghc8.6.yaml"
20 - YAML: "stack.ghc8.6.yaml"
22
21
23platform:
22platform:
.github/workflows/ci.yaml+62−11
@@ -3,16 +3,67 @@ on:
3 pull_request:
3 pull_request:
4 push:
4 push:
5jobs:
5jobs:
6− tests:
6+ dockerimage:
7 runs-on: ubuntu-latest
7 runs-on: ubuntu-latest
8 steps:
8 steps:
9− - uses: actions/checkout@v2.3.1
9+ - uses: actions/checkout@v2.3.1
10− - uses: cachix/install-nix-action@v10
10+ - uses: cachix/install-nix-action@v12
11− with:
11+ with:
12− skip_adding_nixpkgs_channel: true
12+ nix_path: nixpkgs=channel:nixos-unstable
13− - uses: cachix/cachix-action@v6
13+ - uses: cachix/cachix-action@v8
14− with:
14+ with:
15− name: project-m36
15+ name: project-m36
16− signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
16+ signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
17− - run: cachix use iohk
17+ - run: cachix use iohk
18− - run: nix-build -A project-m36.components.all
18+ - name: docker load
19+ run: docker load < $(nix-build docker.nix)
20+ - name: docker login
21+ if: ${{ github.ref == 'refs/heads/master' }}
22+ run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login --username ${{secrets.DOCKERHUB_USER}} --password-stdin
23+ - name: docker tag with version
24+ run: docker tag project-m36:latest projectm36/project-m36:$(awk '/^Version:/ {print $2}' project-m36.cabal)
25+ if: ${{ github.ref == 'refs/heads/master' }}
26+ - name: docker tag latest
27+ run: docker tag project-m36:latest projectm36/project-m36:latest
28+ if: ${{ github.ref == 'refs/heads/master' }}
29+ - run: docker push projectm36/project-m36
30+ if: ${{ github.ref == 'refs/heads/master' }}
31+
32+ stack-build:
33+ runs-on: ${{ matrix.os }}
34+ strategy:
35+ matrix:
36+ os: [ubuntu-latest]
37+ ghc:
38+ - ghc8.10
39+ - ghc8.8
40+ - ghc8.6
41+ include:
42+ - os: macos-latest
43+ ghc: ghc8.10
44+ env:
45+ STACK_YAML: stack.${{ matrix.ghc }}.yaml
46+ steps:
47+ - uses: actions/checkout@v2
48+ - name: Cache
49+ uses: actions/cache@v1
50+ with:
51+ path: ~/.stack
52+ key: ${{ runner.os }}-build-stack-${{ matrix.ghc }}-${{ hashFiles(env.STACK_YAML) }}-${{ hashFiles('**/*.cabal') }}
53+ restore-keys: |
54+ ${{ runner.os }}-build-stack-${{ matrix.ghc }}-${{ hashFiles(env.STACK_YAML) }}
55+ ${{ runner.os }}-build-stack-${{ matrix.ghc }}
56+ - name: Fix macOS cache bug
57+ run: rm -rf ~/.stack/setup-exe-cache
58+ - name: Build
59+ run: stack build --ghc-options -O2 --local-bin-path out --copy-bins
60+ - name: Test
61+ run: stack test --stack-yaml=${{ env.STACK_YAML }}
62+ - name: HLint
63+ run: curl -sSL https://raw.github.com/ndmitchell/hlint/master/misc/run.sh | sh -s .
64+ - name: Haddock
65+ run: stack --no-install-ghc --system-ghc --no-haddock-deps haddock
66+ - uses: actions/upload-artifact@v2
67+ with:
68+ name: project-m36-${{ matrix.os }}-${{ matrix.ghc }}
69+ path: out/
.gitignore+3−1
@@ -18,4 +18,6 @@ persistence-notes
18jupyter/itutd.egg-info
18jupyter/itutd.egg-info
19jupyter/build
19jupyter/build
20juyter/dist
20juyter/dist
21−.ipynb_checkpoints
21+.ipynb_checkpoints
22+project-m36.nix
23+stack.yaml
.travis.yml.olddeleted−52
@@ -1,52 +0,0 @@
1−# For more information, see https://github.com/ChrisPenner/haskell-stack-travis-ci
2−language: c
3−# sudo: true -- this is deprecated
4−
5−git:
6− submodules: false # whether to recursively clone submodules
7−
8−os: linux
9−dist: bionic
10−
11−jobs:
12− fast_finish: true
13− include:
14− # disable because some of the travis-ci osx images would ask password for sudo
15− # - env: BUILD_NAME=OSX
16− # os: osx
17− # osx_image: xcode11.4
18−
19− - env: BUILD_NAME=LINUX-AMD64
20− os: linux
21− dist: bionic
22− arch: amd64
23−
24− # disable due to it takes too long. For a successful build, it may take over 20 hours!
25− # - env: BUILD_NAME=LINUX-ARM64
26− # os: linux
27− # dist: bionic
28− # arch: arm64
29−
30−before_script:
31− - unset CC
32− - sudo -n true || echo "sudo password needed, may fail"
33− - sudo -v
34−
35−# Here starts the actual work to be performed for the package under test;
36−# any command which exits with a non-zero exit code causes the build to fail.
37−script:
38− - |
39− # Run tests
40− ./ci/DevOps/local/test/cb.sh
41−
42−after_success:
43− - |
44− # Build and ship binary
45− # cd.sh will deploy the built image locally and push it to the docker hub
46− # Because it needs to login to docker hub, you should define the following
47− # two env variables in the travis-ci.org setting page of this repository
48− # project_m36_DOCKER_HUB_USERNAME
49− # project_m36_DOCKER_HUB_PASSWORD
50− ./ci/DevOps/local/test/cd.sh
51−
52−# EOF
.travis.yml.origdeleted−68
@@ -1,68 +0,0 @@
1−# For more information, see https://github.com/ChrisPenner/haskell-stack-travis-ci
2−language: c
3−sudo: false
4−
5−git:
6− submodules: false # whether to recursively clone submodules
7−
8−cache:
9− directories:
10− - $HOME/.ghc
11− - $HOME/.cabal
12− - $HOME/.stack
13− - .stack-work
14− timeout: 1000
15−
16−matrix:
17− fast_finish: true
18− include:
19− - env: CACHE_NAME=8.2.2 STACK_YAML=stack.ghc8.2.yaml
20− compiler: ": #stack 8.2.2"
21−
22− - env: CACHE_NAME=osx-8.2.2 STACK_YAML=stack.ghc8.2.yaml
23− os: osx
24− osx_image: xcode7.3
25− compiler: ": #stack 8.2.2"
26−
27− - env: CACHE_NAME=8.4.4 STACK_YAML=stack.ghc8.4.yaml
28− compiler: ": #stack 8.4.4"
29−
30− - env: CACHE_NAME=8.6.5 STACK_YAML=stack.ghc8.6.yaml
31− compiler: ": #stack 8.6.5"
32−
33− - env: CACHE_NAME=osx-8.6.5 STACK_YAML=stack.ghc8.6.yaml
34− os: osx
35− osx_image: xcode11
36− compiler: ": #stack 8.6.5"
37−
38−before_script:
39− - unset CC
40− - export PATH=$HOME/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH
41− - ./.travis/install-ghr.sh
42− - ./.travis/install-stack.sh
43−
44−# Here starts the actual work to be performed for the package under test;
45−# any command which exits with a non-zero exit code causes the build to fail.
46−script:
47− - |
48− # Run tests
49− set -e
50− ./.travis/install-dependencies.sh
51− stack --no-terminal --jobs=2 --system-ghc test
52− - |
53− #Run HLint
54− if [[ "$(uname)" = "Linux" ]]; then
55− curl -sL https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh | sh -s lint src test examples --cpp-define VERSION_project_m36=HLINT
56− fi
57− - |
58− #Run Haddock
59− if [[ "$(uname)" = "Linux" ]]; then
60− stack --no-install-ghc --system-ghc --no-haddock-deps haddock
61− fi
62−
63−after_success:
64− - |
65− # Build and ship binary
66− #./.travis/attach-binary.sh
67−
68−# EOF
.travis/attach-binary.shdeleted−25
@@ -1,25 +0,0 @@
1−#!/bin/sh
2−set -o errexit -o verbose
3−
4−if test ! "$BUILD_BINARY" || test ! "$TRAVIS_TAG"
5−then
6− echo 'This is not a release build.'
7−elif test ! "$GITHUB_TOKEN"
8−then
9− echo 'The GITHUB_TOKEN environment variable is not set!'
10− exit 1
11−else
12− echo "Building binary for $TRAVIS_OS_NAME to $TRAVIS_TAG..."
13− stack build --ghc-options -O2 --pedantic
14− echo "Attaching binary for $TRAVIS_OS_NAME to $TRAVIS_TAG..."
15− OWNER="$(echo "$TRAVIS_REPO_SLUG" | cut -f1 -d/)"
16− REPO="$(echo "$TRAVIS_REPO_SLUG" | cut -f2 -d/)"
17− BIN="$(stack path --local-install-root)/bin/$REPO"
18− BUNDLE_NAME="$REPO-$TRAVIS_TAG-$TRAVIS_OS_NAME.tar.gz"
19− cp "$BIN" "./$REPO"
20− chmod +x "./$REPO"
21− tar -czf "$BUNDLE_NAME" "$REPO"
22− echo "SHA256:"
23− shasum -a 256 "$BUNDLE_NAME"
24− ghr -t "$GITHUB_TOKEN" -u "$OWNER" -r "$REPO" --replace "$(git describe --tags)" "$BUNDLE_NAME"
25−fi
.travis/install-dependencies.shdeleted−22
@@ -1,22 +0,0 @@
1−# Run tests
2−if [[ "$(uname)" = "Darwin" ]]; then
3− timeout_cmd="gtimeout"
4−else
5− timeout_cmd="timeout"
6−fi
7−$timeout_cmd 40m stack --no-terminal --jobs=2 --install-ghc --system-ghc build --only-dependencies --fast
8−ret=$?
9−case "$ret" in
10− 0)
11− # continue
12− ;;
13− 124)
14− echo "Timed out while installing dependencies."
15− echo "Try building again by pushing a new commit."
16− exit 1
17− ;;
18− *)
19− echo "Failed to install dependencies; stack exited with $ret"
20− exit "$ret"
21− ;;
22−esac
.travis/install-ghc.shdeleted−16
@@ -1,16 +0,0 @@
1−#!/bin/sh
2−set -eux
3−#assume stack is installed
4−STACK=~/.local/bin/stack
5−
6−fetch_ghc_osx() {
7− echo "Using stack to install GHC $GHC_VERSION"
8− $STACK setup $GHC_VERSION
9−}
10−
11−if [ "$(uname)" = "Darwin" ]; then
12− fetch_ghc_osx
13−else
14− #installed by apt
15− echo "Linux GHC $GHC_VERSION via APT already installed."
16−fi
.travis/install-ghr.shdeleted−21
@@ -1,21 +0,0 @@
1−#!/bin/sh
2−set -o errexit -o verbose
3−
4−if test ! "$BUILD_BINARY" || test ! "$TRAVIS_TAG"
5−then
6− echo 'This is not a release build.'
7−else
8− if [ "$TRAVIS_OS_NAME" = "linux" ]
9− then
10− ARCH="linux"
11− else
12− ARCH="darwin"
13− fi
14− echo "Installing ghr"
15− URL="https://github.com/tcnksm/ghr/releases/download/v0.5.4/ghr_v0.5.4_${ARCH}_386.zip"
16− curl -L ${URL} > ghr.zip
17− mkdir -p "$HOME/bin"
18− export PATH="$HOME/bin:$PATH"
19− unzip ghr.zip -d "$HOME/bin"
20− rm ghr.zip
21−fi
.travis/install-stack.shdeleted−27
@@ -1,27 +0,0 @@
1−#!/bin/sh
2−
3−# Adapted from https://github.com/commercialhaskell/stack
4−
5−set -eux
6−
7−travis_retry() {
8− cmd=$*
9− $cmd || (sleep 2 && $cmd) || (sleep 10 && $cmd)
10−}
11−
12−fetch_stack_osx() {
13− curl -skL https://get.haskellstack.org/stable/osx-x86_64.tar.gz | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin;
14−}
15−
16−fetch_stack_linux() {
17− curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack';
18−}
19−
20−# We need stack to generate cabal files with precise bounds, even for cabal
21−# builds.
22−mkdir -p ~/.local/bin;
23−if [ "$(uname)" = "Darwin" ]; then
24− travis_retry fetch_stack_osx
25−else
26− travis_retry fetch_stack_linux
27−fi
Changelog.markdown+21
@@ -1,3 +1,24 @@
1+# 2021-04-01 (v0.9.3)
2+
3+* add new ":importtutd <URI> <SHA256 hash>" feature to import TutorialD from a local file or a HTTP/HTTPS URI
4+
5+# 2020-12-27 (v0.9.0)
6+
7+* replace unmaintained distributed-process-client-server RPC package with new curryer RPC package
8+* drop support for GHC 8.2 and GHC 8.4 due to dependency on DerivingVia extension
9+
10+# 2020-11-21 (v0.8.2)
11+
12+* support multiple extend expressions in TutorialD
13+* fix parsing of Bool atoms in TutorialD
14+* fix database context expressions which include self-references such as `s:=s union s`
15+* show constraints as TutorialD when using tutd console
16+* add `RelationalExprAtom` data type useful for storing `RelationalExpr` within the database
17+
18+# 2020-10-05 (v0.8.1)
19+
20+* support GHC 8.10
21+
1# 2020-05-25 (v0.8)
22# 2020-05-25 (v0.8)
2
23
3* refactor backend to maximize laziness: [An Architecture for Data Independence](docs/data_independence.markdown)
24* refactor backend to maximize laziness: [An Architecture for Data Independence](docs/data_independence.markdown)
DevOps/common/common.shdeleted−148
@@ -1,148 +0,0 @@
1−#!/usr/bin/env bash
2−set -Eeuo pipefail
3−
4−guard_bash_error () {
5− set -Eeuo pipefail
6−}
7−
8−# Log levels
9−INFO=0
10−WARN=1
11−ERROR=2
12−FATAL=3
13−DEBUG=4
14−DEFAULT_LOG_LEVEL=${ERROR}
15−
16−my_exit () {
17− echo "EXIT: - [HOST:$(hostname)]: - $(date +"%Y-%m-%d %H:%M:%S") - $1"
18− exit "$2"
19−}
20−
21−msg () {
22− if [ $1 -le ${DEFAULT_LOG_LEVEL} ]; then
23− echo "[HOST:$(hostname)]: - $(date +"%Y-%m-%d %H:%M:%S") - $2"
24− fi
25−}
26−
27−info () {
28− msg ${INFO} "INFO: - $1"
29−}
30−
31−warn () {
32− msg ${WARN} "WARNING: - $1"
33−}
34−
35−error () {
36− msg ${ERROR} "ERROR: - $1"
37−}
38−
39−fatal () {
40− msg ${FATAL} "FATAL: - $1"
41−}
42−
43−debug () {
44− msg ${DEBUG} "DEBUG: - $1"
45−}
46−
47−begin_banner () {
48− info "$1 - $2 phase - begin"
49−}
50−
51−done_banner () {
52− info "$1 - $2 phase - done"
53−}
54−
55−### turn path within script into absolute path
56−### must pass the calling string of the script as the first parameter
57−### e.g., ./path_to_script/script.sh
58−### or, /root/path_to_script/script.sh
59−### return the absolute path to the script with "echo" command
60−turn_to_absolute_path () {
61− local SCRIPT_ABS_PATH_RAW="$(dirname "$1")"
62− # turn SCRIPT_ABS_PATH into absolute path
63− case ${SCRIPT_ABS_PATH_RAW} in
64− /*) echo "${SCRIPT_ABS_PATH_RAW}" ;;
65− \.\.*) echo "$PWD/${SCRIPT_ABS_PATH_RAW}" ;;
66− \.*) echo "$PWD/${SCRIPT_ABS_PATH_RAW}" ;;
67− *) echo "$PWD" ;;
68− esac
69−}
70−
71−### change CD to up to the project root directory
72−### must pass the absolute path to the script as the first parameter
73−change_CD_to_project_root () {
74− cd "$1"
75− local up_level=..
76− local my_loop=10 # guard not to loop forever
77− until ls "${up_level}"|grep -w DevOps > /dev/null 2>&1 && [ ${my_loop} -gt 0 ]
78− do
79− up_level=${up_level}/..
80− my_loop=$(expr ${my_loop} - 1)
81− done
82− if [ ${my_loop} -eq 0 ]; then
83− my_exit "Too many level up within the searching for DevOps directory,abort." 1
84− fi
85− cd "$1/${up_level}"
86−}
87−
88−### check OS and distribution
89−### return the OS distribution and ID with "echo" command
90−check_dist_or_OS () {
91− local MY_THE_DISTRIBUTION_ID=""
92− local MY_THE_DISTRIBUTION_VERSION=""
93− if [ -e /etc/os-release ]; then
94− MY_THE_DISTRIBUTION_ID=$(grep -w "ID" /etc/os-release |awk -F"=" '{print $NF}'|sed 's/"//g')
95− if [ "${MY_THE_DISTRIBUTION_ID}" == "ubuntu" ]; then
96− MY_THE_DISTRIBUTION_VERSION=$(grep -w "VERSION_ID" /etc/os-release |awk -F"=" '{print $NF}'|sed 's/"//g')
97− else
98− MY_THE_DISTRIBUTION_VERSION=$(grep -w "VERSION_ID" /etc/os-release |awk -F"=" '{print $NF}'|awk -F"." '{print $1}'|sed 's/"//g')
99− fi
100− echo "${MY_THE_DISTRIBUTION_ID} ${MY_THE_DISTRIBUTION_VERSION}"
101− else if type uname > /dev/null 2>&1; then
102− MY_THE_DISTRIBUTION_ID=$(uname -s)
103− MY_THE_DISTRIBUTION_VERSION=$(uname -r)
104− echo "${MY_THE_DISTRIBUTION_ID} ${MY_THE_DISTRIBUTION_VERSION}"
105− else
106− echo ""
107− fi
108− fi
109−}
110−
111−### guard that the caller of the script must be root or has sudo right
112−guard_root_or_sudo () {
113− if [[ $EUID > 0 ]] && ! sudo -v >/dev/null 2>&1; then
114− return 1
115− else
116− return 0
117− fi
118−}
119−
120−### init script with check if root or sudo
121−init_with_root_or_sudo () {
122− guard_bash_error
123−
124− if ! guard_root_or_sudo; then
125− my_exit "You must be root or you must be sudoer to prepare the env for CI/CD." 1
126− fi
127−
128− SCRIPT_ABS_PATH=$(turn_to_absolute_path $0)
129−
130− change_CD_to_project_root ${SCRIPT_ABS_PATH}
131−
132− THE_DISTRIBUTION_ID_VERSION=$(check_dist_or_OS)
133− THE_DISTRIBUTION_ID=$(echo ${THE_DISTRIBUTION_ID_VERSION}|awk '{print $1}')
134− THE_DISTRIBUTION_VERSION=$(echo ${THE_DISTRIBUTION_ID_VERSION}|awk '{print $2}')
135−}
136−
137−### init script without check if root or sudo
138−init_without_root_or_sudo () {
139− guard_bash_error
140−
141− SCRIPT_ABS_PATH=$(turn_to_absolute_path $0)
142−
143− change_CD_to_project_root ${SCRIPT_ABS_PATH}
144−
145− THE_DISTRIBUTION_ID_VERSION=$(check_dist_or_OS)
146− THE_DISTRIBUTION_ID=$(echo ${THE_DISTRIBUTION_ID_VERSION}|awk '{print $1}')
147− THE_DISTRIBUTION_VERSION=$(echo ${THE_DISTRIBUTION_ID_VERSION}|awk '{print $2}')
148−}
DevOps/local/test/build/build.shdeleted−18
@@ -1,18 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "build build"
12−
13−#set +u to temp work around the nix script
14−set +u
15−[[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]] && . $HOME/.nix-profile/etc/profile.d/nix.sh
16−set -u
17−
18−done_banner "Top level" "build build"
DevOps/local/test/build/finishing.shdeleted−14
@@ -1,14 +0,0 @@
1−#!/usr/bin/env bash
2−
3−if ! type dirname > /dev/null 2>&1; then
4− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
5− exit 1
6−fi
7−
8−. "$(dirname "$0")"/../../../common/common.sh
9−
10−init_with_root_or_sudo "$0"
11−
12−begin_banner "Top level" "build finishing"
13−
14−done_banner "Top level" "build finishing"
DevOps/local/test/build/prepare.shdeleted−81
@@ -1,81 +0,0 @@
1−#!/usr/bin/env bash
2−
3−if ! type dirname > /dev/null 2>&1; then
4− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
5− exit 1
6−fi
7−
8−. "$(dirname "$0")"/../../../common/common.sh
9−
10−init_with_root_or_sudo "$0"
11−
12−begin_banner "Top level" "build prepare"
13−
14−get_last_stable_nix_channel () {
15− local MY_CHANNEL_NAME_REGEX=""
16− case ${THE_DISTRIBUTION_ID} in
17− debian|ubuntu|rhel|centos) MY_CHANNEL_NAME_REGEX='s/.*\(nixos-[0-9][0-9].[0-9][0-9]\).*/\1/p' ;;
18− Darwin) MY_CHANNEL_NAME_REGEX='s/.*\(nixpkgs-[0-9][0-9].[0-9][0-9]-darwin\).*/\1/p' ;;
19− *) ;;
20− esac
21− local MY_LAST_NIX_STABLE_CHANNEL=$(git ls-remote --heads https://github.com/NixOS/nixpkgs-channels | awk '{print $NF}' | awk -F"/" '{print $NF}' | grep -v "\-unstable" | grep -v "\-small" | sed -n ${MY_CHANNEL_NAME_REGEX} | sort | tail -2 | head -1)
22− echo ${MY_LAST_NIX_STABLE_CHANNEL}
23−}
24−
25−switch_to_last_stable_nix_channel () {
26− nix-channel --remove nixpkgs
27− nix-channel --add "https://nixos.org/channels/$(get_last_stable_nix_channel)" nixpkgs
28− nix-channel --update
29−}
30−
31−set +u
32−[[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]] && . $HOME/.nix-profile/etc/profile.d/nix.sh
33−set -u
34−
35−if ! type nix-build >/dev/null 2>&1; then
36− info "no nix-build found, trying to install it"
37− case ${THE_DISTRIBUTION_ID} in
38− debian)
39− [[ -e /proc/sys/kernel/unprivileged_userns_clone ]] && sudo sysctl kernel.unprivileged_userns_clone=1
40− curl https://nixos.org/nix/install | sh
41− ;;
42− ubuntu)
43− [[ -e /proc/sys/kernel/unprivileged_userns_clone ]] && sudo sysctl kernel.unprivileged_userns_clone=1
44− curl https://nixos.org/nix/install | sh
45− ;;
46− Darwin)
47− curl https://nixos.org/nix/install | sh
48− ;;
49− rhel|centos)
50− curl https://nixos.org/releases/nix/nix-2.1.3/install | sh
51− ;;
52− *) ;;
53− esac
54− set +u
55− . $HOME/.nix-profile/etc/profile.d/nix.sh
56− set -u
57− switch_to_last_stable_nix_channel
58−fi
59−
60−if ! type patchelf >/dev/null 2>&1; then
61− info "no patchelf found, trying to install it"
62− nix-env --install patchelf
63−fi
64−
65−if ! type cabal2nix >/dev/null 2>&1; then
66− info "no cabal2nix found, trying to install it"
67−
68− nix-env --install cabal2nix
69−fi
70−
71−if ! type nix-prefetch-git >/dev/null 2>&1; then
72− info "no nix-prefetch-git found, trying to install it"
73− nix-env --install nix-prefetch-git
74−fi
75−
76−if ! type cabal >/dev/null 2>&1; then
77− info "no cabal-install found, trying to install it"
78− nix-env --install cabal-install
79−fi
80−
81−done_banner "Top level" "build prepare"
DevOps/local/test/build/unbuild.shdeleted−14
@@ -1,14 +0,0 @@
1−#!/usr/bin/env bash
2−
3−if ! type dirname > /dev/null 2>&1; then
4− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
5− exit 1
6−fi
7−
8−. "$(dirname "$0")"/../../../common/common.sh
9−
10−init_with_root_or_sudo "$0"
11−
12−begin_banner "Top level" "build unbuild"
13−
14−done_banner "Top level" "build unbuild"
DevOps/local/test/build/unfinishing.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "build unfinishing"
12−
13−done_banner "Top level" "build unfinishing"
DevOps/local/test/build/unprepare.shdeleted−34
@@ -1,34 +0,0 @@
1−#!/usr/bin/env bash
2−
3−if ! type dirname > /dev/null 2>&1; then
4− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
5− exit 1
6−fi
7−
8−. "$(dirname "$0")"/../../../common/common.sh
9−
10−init_with_root_or_sudo "$0"
11−
12−begin_banner "Top level" "build unprepare"
13−
14−set +u
15−[[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]] && . $HOME/.nix-profile/etc/profile.d/nix.sh
16−set -u
17−
18−if type nix-build >/dev/null 2>&1; then
19− info "nix-build found, trying to uninstall it"
20− if [ "${THE_DISTRIBUTION_ID}" == "debian" ] || [ "${THE_DISTRIBUTION_ID}" == "ubuntu" ]; then
21− [[ -e /proc/sys/kernel/unprivileged_userns_clone ]] && sudo sysctl kernel.unprivileged_userns_clone=1
22− fi
23− set +e
24− sudo rm -fr /nix > /dev/null 2>&1
25− set -e
26− sudo rm -fr $HOME/.nix-channels
27− sudo rm -fr $HOME/.nix-defexpr
28− sudo rm -fr $HOME/.nix-profile
29− [[ -f $HOME/.profile ]] && sed -i.nix.uninstall.bak '/.nix-profile/d' $HOME/.profile
30− [[ -f $HOME/.bash_profile ]] && sed -i.nix.uninstall.bak '/.nix-profile/d' $HOME/.bash_profile
31− [[ -f $HOME/.bashrc ]] && sed -i.nix.uninstall.bak '/.nix-profile/d' $HOME/.bashrc
32−fi
33−
34−done_banner "Top level" "build unprepare"
DevOps/local/test/cb-cd-ct.shdeleted−63
@@ -1,63 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "Cont. Build, Deploy and Test"
12−
13−warn "Nothing can be filled by default, you must build the top level CB-CD-CT pipeline yourself."
14−warn "Refer to the cb-cd-ct.sh for some example"
15−
16−#${SCRIPT_ABS_PATH}/prepare.sh
17−#${SCRIPT_ABS_PATH}/build/prepare.sh
18−
19−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unfinishing.sh
20−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unbuild.sh
21−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unprepare.sh
22−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
23−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
24−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
25−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/prepare.sh
26−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/build.sh
27−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/finishing.sh
28−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
29−
30−#${SCRIPT_ABS_PATH}/build/build.sh
31−#${SCRIPT_ABS_PATH}/build/finishing.sh
32−
33−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unfinishing.sh
34−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/undeploy.sh
35−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unprepare.sh
36−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
37−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
38−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
39−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/prepare.sh
40−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/deploy.sh
41−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/finishing.sh
42−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
43−
44−#${SCRIPT_ABS_PATH}/deploy/deploy.sh
45−#${SCRIPT_ABS_PATH}/deploy/finishing.sh
46−
47−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/unfinishing.sh
48−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/untest.sh
49−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/unprepare.sh
50−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
51−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
52−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
53−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/prepare.sh
54−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/test.sh
55−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/finishing.sh
56−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
57−
58−#${SCRIPT_ABS_PATH}/test/test.sh
59−#${SCRIPT_ABS_PATH}/test/finishing.sh
60−
61−#${SCRIPT_ABS_PATH}/finishing.sh
62−
63−done_banner "Top level" "Cont. Build, Deploy and Test"
DevOps/local/test/cb-cd.shdeleted−49
@@ -1,49 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "Cont. Build and Deploy"
12−
13−warn "Nothing can be filled by default, you must build the top level CB-CD pipeline yourself."
14−warn "Refer to the cb-cd.sh for some example"
15−
16−#${SCRIPT_ABS_PATH}/prepare.sh
17−#${SCRIPT_ABS_PATH}/build/prepare.sh
18−
19−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unfinishing.sh
20−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unbuild.sh
21−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unprepare.sh
22−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
23−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
24−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
25−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/prepare.sh
26−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/build.sh
27−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/finishing.sh
28−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
29−
30−#${SCRIPT_ABS_PATH}/build/build.sh
31−#${SCRIPT_ABS_PATH}/build/finishing.sh
32−
33−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unfinishing.sh
34−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/undeploy.sh
35−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unprepare.sh
36−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
37−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
38−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
39−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/prepare.sh
40−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/deploy.sh
41−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/finishing.sh
42−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
43−
44−#${SCRIPT_ABS_PATH}/deploy/deploy.sh
45−#${SCRIPT_ABS_PATH}/deploy/finishing.sh
46−
47−#${SCRIPT_ABS_PATH}/finishing.sh
48−
49−done_banner "Top level" "Cont. Build and Deploy"
DevOps/local/test/cb.shdeleted−34
@@ -1,34 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "Cont. Build"
12−
13−warn "Nothing can be filled by default, you must build the top level CB pipeline yourself."
14−warn "Refer to the cb.sh for some example"
15−
16−#${SCRIPT_ABS_PATH}/prepare.sh
17−#${SCRIPT_ABS_PATH}/build/prepare.sh
18−
19−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unfinishing.sh
20−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unbuild.sh
21−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unprepare.sh
22−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
23−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
24−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
25−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/prepare.sh
26−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/build.sh
27−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/finishing.sh
28−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
29−
30−#${SCRIPT_ABS_PATH}/build/build.sh
31−#${SCRIPT_ABS_PATH}/build/finishing.sh
32−#${SCRIPT_ABS_PATH}/finishing.sh
33−
34−done_banner "Top level" "Cont. Build"
DevOps/local/test/cd-ct.shdeleted−49
@@ -1,49 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "Cont. Deploy and Test"
12−
13−warn "Nothing can be filled by default, you must build the top level CD-CT pipeline yourself."
14−warn "Refer to the cd-ct.sh for some example"
15−
16−#${SCRIPT_ABS_PATH}/prepare.sh
17−#${SCRIPT_ABS_PATH}/deploy/prepare.sh
18−
19−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unfinishing.sh
20−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/undeploy.sh
21−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unprepare.sh
22−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
23−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
24−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
25−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/prepare.sh
26−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/deploy.sh
27−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/finishing.sh
28−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
29−
30−#${SCRIPT_ABS_PATH}/deploy/deploy.sh
31−#${SCRIPT_ABS_PATH}/deploy/finishing.sh
32−
33−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/unfinishing.sh
34−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/untest.sh
35−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/unprepare.sh
36−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
37−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
38−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
39−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/prepare.sh
40−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/test.sh
41−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/finishing.sh
42−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
43−
44−#${SCRIPT_ABS_PATH}/test/test.sh
45−#${SCRIPT_ABS_PATH}/test/finishing.sh
46−
47−#${SCRIPT_ABS_PATH}/finishing.sh
48−
49−done_banner "Top level" "Cont. Deploy and Test"
DevOps/local/test/cd.shdeleted−34
@@ -1,34 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "Cont. Deploy"
12−
13−warn "Nothing can be filled by default, you must build the top level CD pipeline yourself."
14−warn "Refer to the cd.sh for some example"
15−
16−#${SCRIPT_ABS_PATH}/prepare.sh
17−#${SCRIPT_ABS_PATH}/deploy/prepare.sh
18−
19−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unfinishing.sh
20−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/undeploy.sh
21−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unprepare.sh
22−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
23−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
24−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
25−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/prepare.sh
26−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/deploy.sh
27−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/finishing.sh
28−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
29−
30−#${SCRIPT_ABS_PATH}/deploy/deploy.sh
31−#${SCRIPT_ABS_PATH}/deploy/finishing.sh
32−#${SCRIPT_ABS_PATH}/finishing.sh
33−
34−done_banner "Top level" "Cont. Deploy"
DevOps/local/test/ct.shdeleted−34
@@ -1,34 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "Cont. Test"
12−
13−warn "Nothing can be filled by default, you must build the top level CT pipeline yourself."
14−warn "Refer to the ct.sh for some example"
15−
16−#${SCRIPT_ABS_PATH}/prepare.sh
17−#${SCRIPT_ABS_PATH}/test/prepare.sh
18−
19−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/unfinishing.sh
20−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/untest.sh
21−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/unprepare.sh
22−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
23−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
24−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
25−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/prepare.sh
26−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/test.sh
27−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/finishing.sh
28−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
29−
30−#${SCRIPT_ABS_PATH}/test/test.sh
31−#${SCRIPT_ABS_PATH}/test/finishing.sh
32−#${SCRIPT_ABS_PATH}/finishing.sh
33−
34−done_banner "Top level" "Cont. Test"
DevOps/local/test/deploy/deploy.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "deploy deploy"
12−
13−done_banner "Top level" "deploy deploy"
DevOps/local/test/deploy/finishing.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "deploy finishing"
12−
13−done_banner "Top level" "deploy finishing"
DevOps/local/test/deploy/prepare.shdeleted−116
@@ -1,116 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "deploy prepare"
12−
13−if ! type docker >/dev/null 2>&1; then
14− info "no docker found, trying to install it"
15− case ${THE_DISTRIBUTION_ID} in
16− rhel) my_exit "Don't know how to install docker-ce on RHEL, will abort." 1
17− ;;
18− debian) THE_DISTRIBUTION_VERSION_CODENAME=$(grep -w "VERSION_CODENAME" /etc/os-release |awk -F"=" '{print $NF}'|sed 's/"//g')
19− my_arch=$(uname -m)
20− if [ ${my_arch} = "aarch64" ]; then
21− docker_arm="arm64"
22− else
23− docker_arm="amd64"
24− fi
25− if dpkg-query -l | grep docker.io ; then
26− sudo apt-get purge -y docker.io
27− fi
28− if dpkg-query -l | grep docker-engine ; then
29− sudo apt-get purge -y docker-engine
30− fi
31− if dpkg-query -l | grep docker ; then
32− sudo apt-get purge -y docker
33− fi
34− if dpkg-query -l | grep runc ; then
35− sudo apt-get purge -y runc
36− fi
37− sudo apt-get update
38− sudo apt-get install -y apt-transport-https ca-certificates curl gnupg2 software-properties-common
39− curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
40− sudo add-apt-repository "deb [arch=${docker_arm}] https://download.docker.com/linux/debian ${THE_DISTRIBUTION_VERSION_CODENAME} stable"
41− sudo apt-get update
42− sudo apt-get install -y docker-ce docker-ce-cli containerd.io
43− sudo /usr/sbin/usermod -a -G docker $(whoami)
44− ;;
45− ubuntu) THE_DISTRIBUTION_VERSION_CODENAME=$(grep -w "VERSION_CODENAME" /etc/os-release |awk -F"=" '{print $NF}'|sed 's/"//g')
46− my_arch=$(uname -m)
47− if [ ${my_arch} = "aarch64" ]; then
48− docker_arm="arm64"
49− else
50− docker_arm="amd64"
51− fi
52− if dpkg-query -l | grep docker.io ; then
53− sudo apt-get purge -y docker.io
54− fi
55− if dpkg-query -l | grep docker-engine ; then
56− sudo apt-get purge -y docker-engine
57− fi
58− if dpkg-query -l | grep docker ; then
59− sudo apt-get purge -y docker
60− fi
61− if dpkg-query -l | grep runc ; then
62− sudo apt-get purge -y runc
63− fi
64− sudo apt-get update
65− sudo apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common
66− curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
67− sudo add-apt-repository "deb [arch=${docker_arm}] https://download.docker.com/linux/ubuntu ${THE_DISTRIBUTION_VERSION_CODENAME} stable"
68− sudo apt-get update
69− sudo apt-get install -y docker-ce docker-ce-cli containerd.io
70− sudo /usr/sbin/usermod -a -G docker $(whoami)
71− ;;
72− centos) sudo yum install -y yum-utils device-mapper-persistent-data lvm2
73− sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
74− sudo yum install -y docker-ce docker-ce-cli containerd.io
75− sudo systemctl enable docker
76− sudo systemctl start docker
77− sudo /usr/sbin/usermod -a -G docker $(whoami)
78− ;;
79− Darwin) if type brew > /dev/null 2>&1; then
80− brew cask install docker
81− else
82− #wget -c https://download.docker.com/mac/stable/Docker.dmg
83− warn "Cannot install docker desktop for MacOS automatically without homebrew,"
84− warn "please go to following web page to download and isntall the package."
85− warn "https://hub.docker.com/?overlay=onboarding"
86− fi
87− ;;
88− *) my_exit "Not supported distribution OS" 1
89− ;;
90− esac
91−fi
92−
93−if ! type docker-compose >/dev/null 2>&1; then
94− info "no docker-compose found, trying to install it"
95− case ${THE_DISTRIBUTION_ID} in
96− rhel) my_exit "docker-compose depends on docker, yet don't know how to install docker-ce on RHEL, so abord." 1
97− ;;
98− debian|ubuntu) sudo apt-get update
99− sudo apt-get install -y docker-compose
100− # following is for docker login
101− sudo apt-get install -y gnupg pass
102− ;;
103− centos) sudo curl -L "https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
104− sudo chmod +x /usr/local/bin/docker-compose
105− sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
106− # following is for docker login
107− sudo yum install -y gnupg pass
108− ;;
109− Darwin) info "docker-compose will installed with docker desktop for macos. skip."
110− ;;
111− *) my_exit "Not supported distribution OS" 1
112− ;;
113− esac
114−fi
115−
116−done_banner "Top level" "deploy prepare"
DevOps/local/test/deploy/undeploy.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "deploy undeploy"
12−
13−done_banner "Top level" "deploy undeploy"
DevOps/local/test/deploy/unfinishing.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "deploy unfinishing"
12−
13−done_banner "Top level" "deploy unfinishing"
DevOps/local/test/deploy/unprepare.shdeleted−59
@@ -1,59 +0,0 @@
1−#!/usr/bin/env bash
2−
3−if ! type dirname > /dev/null 2>&1; then
4− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
5− exit 1
6−fi
7−
8−. "$(dirname "$0")"/../../../common/common.sh
9−
10−init_with_root_or_sudo "$0"
11−
12−begin_banner "Top level" "deploy unprepare"
13−
14−if type docker >/dev/null 2>&1; then
15− info "docker found, trying to uninstall it"
16− case ${THE_DISTRIBUTION_ID} in
17− rhel) info "This script not know how to install docker-ce on RHEL, so that docker cna't be installed by this script. Ignore."
18− ;;
19− debian|ubuntu) my_arch=$(uname -m)
20− if [ ${my_arch} = "aarch64" ]; then
21− docker_arm="arm64"
22− else
23− docker_arm="amd64"
24− fi
25− sudo apt-get purge -y docker-ce docker-ce-cli containerd.io
26− ;;
27− centos) sudo yum erase -y docker-ce docker-ce-cli containerd.io
28− ;;
29− Darwin) if type brew > /dev/null 2>&1; then
30− brew cask uninstall docker
31− brew cask unlink docker
32− else
33− info "Don't know how to uninstall the docker desktop for macOS package."
34− info "please refer to the installation web page for uninstallation instructions."
35− fi
36− ;;
37− *) warn "Not supported distribution OS."
38− ;;
39− esac
40−fi
41−
42−if type docker-compose >/dev/null 2>&1; then
43− info "docker-compose found, trying to uninstall it"
44− case ${THE_DISTRIBUTION_ID} in
45− rhel) info "This script not know how to install docker-compose on RHEL, so that docker-compose cna't be installed by this script. Ignore."
46− ;;
47− debian|ubuntu) sudo apt-get purge -y docker-compose
48− ;;
49− centos) [[ -e /usr/local/bin/docker-compose ]] && sudo rm /usr/local/bin/docker-compose
50− [[ -L /usr/bin/docker-compose ]] && sudo rm /usr/bin/docker-compose
51− ;;
52− Darwin) info "docker-compose will be uninstalled with docker for desktop package. skip."
53− ;;
54− *) warn "Not supported distribution OS"
55− ;;
56− esac
57−fi
58−
59−done_banner "Top level" "deploy unprepare"
DevOps/local/test/finishing.shdeleted−36
@@ -1,36 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "finishing"
12−
13−case ${THE_DISTRIBUTION_ID} in
14− rhel) if [ "${THE_DISTRIBUTION_VERSION}" != "7" ]; then
15− my_exit "This CI/CD script only supports RHEL 7.x, will abort." 1
16− fi
17− ;;
18− debian) if [ "${THE_DISTRIBUTION_VERSION}" != "9" ] && [ "${THE_DISTRIBUTION_VERSION}" != "10" ]; then
19− my_exit "This CI/CD script only supports debian 9.x and 10.x, will abort" 1
20− fi
21− ;;
22− ubuntu) if [ "${THE_DISTRIBUTION_VERSION}" != "16.04" ] && [ "${THE_DISTRIBUTION_VERSION}" != "18.04" ]; then
23− my_exit "This CI/CD script only supports ubuntu 16.04 and 18.04, will abort" 1
24− fi
25− ;;
26− centos) if [ "${THE_DISTRIBUTION_VERSION}" != "7" ]; then
27− my_exit "This CI/CD script only support Centos 7.x, will abort" 1
28− fi
29− ;;
30− Darwin) info "Please note that MacOS ony support as a development environment."
31− ;;
32− *) my_exit "Unsupported linux distribution, will abort" 1
33− ;;
34−esac
35−
36−done_banner "Top level" "finishing"
DevOps/local/test/prepare.shdeleted−39
@@ -1,39 +0,0 @@
1−#!/usr/bin/env bash
2−
3−if ! type dirname > /dev/null 2>&1; then
4− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
5− exit 1
6−fi
7−
8−. "$(dirname "$0")"/../../common/common.sh
9−
10−init_with_root_or_sudo "$0"
11−
12−begin_banner "Top level" "prepare"
13−
14−case ${THE_DISTRIBUTION_ID} in
15− rhel) if [ "${THE_DISTRIBUTION_VERSION}" != "7" ]; then
16− my_exit "This CI/CD script only supports RHEL 7.x, will abort." 1
17− fi
18− ;;
19− debian) if [ "${THE_DISTRIBUTION_VERSION}" != "9" ] && [ "${THE_DISTRIBUTION_VERSION}" != "10" ]; then
20− my_exit "This CI/CD script only supports debian 9.x and 10.x, will abort" 1
21− fi
22− ;;
23− ubuntu) if [ "${THE_DISTRIBUTION_VERSION}" != "16.04" ] && [ "${THE_DISTRIBUTION_VERSION}" != "18.04" ]; then
24− my_exit "This CI/CD script only supports ubuntu 16.04 and 18.04, will abort" 1
25− fi
26− ;;
27− centos) if [ "${THE_DISTRIBUTION_VERSION}" != "7" ]; then
28− my_exit "This CI/CD script only support Centos 7.x, will abort" 1
29− fi
30− ;;
31− Darwin) warn "Please note that MacOS only use as a development environment."
32− ;;
33− *) my_exit "Unsupported linux distribution, will abort" 1
34− ;;
35−esac
36−
37−done_banner "Top level" "prepare"
38−
39−# for development env, git should had already be installed.
DevOps/local/test/test/finishing.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "test finishing"
12−
13−done_banner "Top level" "test finishing"
DevOps/local/test/test/prepare.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "test prepare"
12−
13−done_banner "Top level" "test prepare"
DevOps/local/test/test/test.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "test test"
12−
13−done_banner "Top level" "test test"
DevOps/local/test/test/unfinishing.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "test unfinishing"
12−
13−done_banner "Top level" "test unfinishing"
DevOps/local/test/test/unprepare.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "test unprepare"
12−
13−done_banner "Top level" "test unprepare"
DevOps/local/test/test/untest.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "test untest"
12−
13−done_banner "Top level" "test untest"
DevOps/local/test/uncb-uncd-unct.shdeleted−63
@@ -1,63 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "Cont. UnBuild, UnDeploy and UnTest"
12−
13−warn "Nothing can be filled by default, you must build the top level UnCB-UnCD-UnCT pipeline yourself."
14−warn "Refer to the uncb-uncd-unct.sh of some specific sub project for some example"
15−
16−#${SCRIPT_ABS_PATH}/prepare.sh
17−#${SCRIPT_ABS_PATH}/build/prepare.sh
18−
19−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unfinishing.sh
20−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unbuild.sh
21−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unprepare.sh
22−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
23−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
24−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
25−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/prepare.sh
26−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/build.sh
27−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/finishing.sh
28−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
29−
30−#${SCRIPT_ABS_PATH}/build/build.sh
31−#${SCRIPT_ABS_PATH}/build/finishing.sh
32−
33−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unfinishing.sh
34−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/undeploy.sh
35−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unprepare.sh
36−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
37−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
38−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
39−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/prepare.sh
40−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/deploy.sh
41−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/finishing.sh
42−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
43−
44−#${SCRIPT_ABS_PATH}/deploy/deploy.sh
45−#${SCRIPT_ABS_PATH}/deploy/finishing.sh
46−
47−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/unfinishing.sh
48−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/untest.sh
49−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/unprepare.sh
50−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
51−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
52−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
53−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/prepare.sh
54−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/test.sh
55−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/finishing.sh
56−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
57−
58−#${SCRIPT_ABS_PATH}/test/test.sh
59−#${SCRIPT_ABS_PATH}/test/finishing.sh
60−
61−#${SCRIPT_ABS_PATH}/finishing.sh
62−
63−done_banner "Top level" "Cont. UnBuild, UnDeploy and UnTest"
DevOps/local/test/uncb-uncd.shdeleted−49
@@ -1,49 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "Cont. UnBuild and UnDeploy"
12−
13−warn "Nothing can be filled by default, you must build the top level UnCB-UnCD pipeline yourself."
14−warn "Refer to the uncb-uncd.sh of some specific sub project for some example"
15−
16−#${SCRIPT_ABS_PATH}/prepare.sh
17−#${SCRIPT_ABS_PATH}/build/prepare.sh
18−
19−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unfinishing.sh
20−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unbuild.sh
21−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unprepare.sh
22−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
23−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
24−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
25−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/prepare.sh
26−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/build.sh
27−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/finishing.sh
28−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
29−
30−#${SCRIPT_ABS_PATH}/build/build.sh
31−#${SCRIPT_ABS_PATH}/build/finishing.sh
32−
33−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unfinishing.sh
34−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/undeploy.sh
35−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unprepare.sh
36−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
37−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
38−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
39−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/prepare.sh
40−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/deploy.sh
41−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/finishing.sh
42−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
43−
44−#${SCRIPT_ABS_PATH}/deploy/deploy.sh
45−#${SCRIPT_ABS_PATH}/deploy/finishing.sh
46−
47−#${SCRIPT_ABS_PATH}/finishing.sh
48−
49−done_banner "Top level" "Cont. UnBuild and UnDeploy"
DevOps/local/test/uncb.shdeleted−34
@@ -1,34 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "Cont. UnBuild"
12−
13−warn "Nothing can be filled by default, you must build the top level UNCB pipeline yourself."
14−warn "Refer to the uncb.sh under some specific sub project for some example"
15−
16−#${SCRIPT_ABS_PATH}/prepare.sh
17−#${SCRIPT_ABS_PATH}/build/prepare.sh
18−
19−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unfinishing.sh
20−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unbuild.sh
21−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/unprepare.sh
22−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
23−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
24−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
25−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/prepare.sh
26−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/build.sh
27−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/build/finishing.sh
28−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
29−
30−#${SCRIPT_ABS_PATH}/build/build.sh
31−#${SCRIPT_ABS_PATH}/build/finishing.sh
32−#${SCRIPT_ABS_PATH}/finishing.sh
33−
34−done_banner "Top level" "Cont. UnBuild"
DevOps/local/test/uncd-unct.shdeleted−49
@@ -1,49 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "Cont. UnDeploy and UnTest"
12−
13−warn "Nothing can be filled by default, you must build the top level UnCD-UnCT pipeline yourself."
14−warn "Refer to the cd-ct.sh of some specific sub project for some example"
15−
16−#${SCRIPT_ABS_PATH}/prepare.sh
17−#${SCRIPT_ABS_PATH}/deploy/prepare.sh
18−
19−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unfinishing.sh
20−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/undeploy.sh
21−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unprepare.sh
22−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
23−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
24−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
25−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/prepare.sh
26−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/deploy.sh
27−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/finishing.sh
28−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
29−
30−#${SCRIPT_ABS_PATH}/deploy/deploy.sh
31−#${SCRIPT_ABS_PATH}/deploy/finishing.sh
32−
33−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/unfinishing.sh
34−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/untest.sh
35−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/unprepare.sh
36−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
37−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
38−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
39−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/prepare.sh
40−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/test.sh
41−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/finishing.sh
42−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
43−
44−#${SCRIPT_ABS_PATH}/test/test.sh
45−#${SCRIPT_ABS_PATH}/test/finishing.sh
46−
47−#${SCRIPT_ABS_PATH}/finishing.sh
48−
49−done_banner "Top level" "Cont. UnDeploy and UnTest"
DevOps/local/test/uncd.shdeleted−34
@@ -1,34 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "Cont. UnDeploy"
12−
13−warn "Nothing can be filled by default, you must build the top level UnCD pipeline yourself."
14−warn "Refer to the uncd.sh of some specific sub project for some example"
15−
16−#${SCRIPT_ABS_PATH}/prepare.sh
17−#${SCRIPT_ABS_PATH}/deploy/prepare.sh
18−
19−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unfinishing.sh
20−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/undeploy.sh
21−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/unprepare.sh
22−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
23−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
24−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
25−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/prepare.sh
26−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/deploy.sh
27−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/deploy/finishing.sh
28−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
29−
30−#${SCRIPT_ABS_PATH}/deploy/deploy.sh
31−#${SCRIPT_ABS_PATH}/deploy/finishing.sh
32−#${SCRIPT_ABS_PATH}/finishing.sh
33−
34−done_banner "Top level" "Cont. UnDeploy"
DevOps/local/test/unct.shdeleted−34
@@ -1,34 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "Cont. UnTest"
12−
13−warn "Nothing can be filled by default, you must build the top level UnCT pipeline yourself."
14−warn "Refer to the unct.sh of some specific sub project for some example"
15−
16−#${SCRIPT_ABS_PATH}/prepare.sh
17−#${SCRIPT_ABS_PATH}/test/prepare.sh
18−
19−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/unfinishing.sh
20−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/untest.sh
21−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/unprepare.sh
22−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unfinishing.sh
23−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/unprepare.sh
24−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/prepare.sh
25−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/prepare.sh
26−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/test.sh
27−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/test/finishing.sh
28−#${SCRIPT_ABS_PATH}/../../../MY_SUB_PROJECT_NAME/DevOps/MY_LOCATION_NAME/MY_PHASE_NAME/finishing.sh
29−
30−#${SCRIPT_ABS_PATH}/test/test.sh
31−#${SCRIPT_ABS_PATH}/test/finishing.sh
32−#${SCRIPT_ABS_PATH}/finishing.sh
33−
34−done_banner "Top level" "Cont. UnTest"
DevOps/local/test/unfinishing.shdeleted−37
@@ -1,37 +0,0 @@
1−#!/usr/bin/env bash
2−
3−if ! type dirname > /dev/null 2>&1; then
4− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
5− exit 1
6−fi
7−
8−. "$(dirname "$0")"/../../common/common.sh
9−
10−init_with_root_or_sudo "$0"
11−
12−begin_banner "Top level" "unfinishing"
13−
14−case ${THE_DISTRIBUTION_ID} in
15− rhel) if [ "${THE_DISTRIBUTION_VERSION}" != "7" ]; then
16− my_exit "This CI/CD script only supports RHEL 7.x, will abort." 1
17− fi
18− ;;
19− debian) if [ "${THE_DISTRIBUTION_VERSION}" != "9" ] && [ "${THE_DISTRIBUTION_VERSION}" != "10" ]; then
20− my_exit "This CI/CD script only supports debian 9.x and 10.x, will abort" 1
21− fi
22− ;;
23− ubuntu) if [ "${THE_DISTRIBUTION_VERSION}" != "16.04" ] && [ "${THE_DISTRIBUTION_VERSION}" != "18.04" ]; then
24− my_exit "This CI/CD script only supports ubuntu 16.04 and 18.04, will abort" 1
25− fi
26− ;;
27− centos) if [ "${THE_DISTRIBUTION_VERSION}" != "7" ]; then
28− my_exit "This CI/CD script only support Centos 7.x, will abort" 1
29− fi
30− ;;
31− Darwin) info "Please note that MacOS only support as a development environment."
32− ;;
33− *) my_exit "Unsupported linux distribution, will abort" 1
34− ;;
35−esac
36−
37−done_banner "Top level" "unfinishing"
DevOps/local/test/unprepare.shdeleted−36
@@ -1,36 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "Top level" "unprepare"
12−
13−case ${THE_DISTRIBUTION_ID} in
14− rhel) if [ "${THE_DISTRIBUTION_VERSION}" != "7" ]; then
15− my_exit "This CI/CD script only supports RHEL 7.x, will abort." 1
16− fi
17− ;;
18− debian) if [ "${THE_DISTRIBUTION_VERSION}" != "9" ] && [ "${THE_DISTRIBUTION_VERSION}" != "10" ]; then
19− my_exit "This CI/CD script only supports debian 9.x and 10.x, will abort" 1
20− fi
21− ;;
22− ubuntu) if [ "${THE_DISTRIBUTION_VERSION}" != "16.04" ] && [ "${THE_DISTRIBUTION_VERSION}" != "18.04" ]; then
23− my_exit "This CI/CD script only supports ubuntu 16.04 and 18.04, will abort" 1
24− fi
25− ;;
26− centos) if [ "${THE_DISTRIBUTION_VERSION}" != "7" ]; then
27− my_exit "This CI/CD script only support Centos 7.x, will abort" 1
28− fi
29− ;;
30− Darwin) info "Please note that MacOS only support as a develoment environment."
31− ;;
32− *) my_exit "Unsupported linux distribution, will abort" 1
33− ;;
34−esac
35−
36−done_banner "Top level" "unprepare"
README.markdown+9−3
@@ -4,8 +4,8 @@
4[![Public Domain](https://img.shields.io/badge/license-Public%20Domain-brightgreen.svg)](http://unlicense.org)
4[![Public Domain](https://img.shields.io/badge/license-Public%20Domain-brightgreen.svg)](http://unlicense.org)
5[![Hackage](https://img.shields.io/hackage/v/project-m36.svg)](http://hackage.haskell.org/package/project-m36)
5[![Hackage](https://img.shields.io/hackage/v/project-m36.svg)](http://hackage.haskell.org/package/project-m36)
6[![Hackage dependency status](https://img.shields.io/hackage-deps/v/project-m36.svg)](http://packdeps.haskellers.com/feed?needle=project-m36)
6[![Hackage dependency status](https://img.shields.io/hackage-deps/v/project-m36.svg)](http://packdeps.haskellers.com/feed?needle=project-m36)
7−[![Build status](https://travis-ci.org/agentm/project-m36.svg?branch=master)](https://travis-ci.org/agentm/project-m36)
8[![Windows Build status](https://ci.appveyor.com/api/projects/status/q7jyddd6dy1ibqdo/branch/master?svg=true)](https://ci.appveyor.com/project/agentm/project-m36)
7[![Windows Build status](https://ci.appveyor.com/api/projects/status/q7jyddd6dy1ibqdo/branch/master?svg=true)](https://ci.appveyor.com/project/agentm/project-m36)
8+[![Github Workflow status](https://github.com/agentm/project-m36/workflows/CI/badge.svg)](https://github.com/agentm/project-m36/actions?query=workflow%3ACI)
9
9
10
10
11*Software can always be made faster, but rarely can it be made more correct.*
11*Software can always be made faster, but rarely can it be made more correct.*
@@ -14,6 +14,12 @@
14
14
15Project:M36 implements a relational algebra engine as inspired by the writings of Chris Date.
15Project:M36 implements a relational algebra engine as inspired by the writings of Chris Date.
16
16
17+## Quick Install
18+
19+Project:M36 can be downloaded and run via docker, which supports Windows 10, macOS, and Linux.
20+
21+Run `docker run -it projectm36/project-m36 tutd` to start the TutorialD command line interface.
22+
17## Description
23## Description
18
24
19Unlike most database management systems (DBMS), Project:M36 is opinionated software which adheres strictly to the mathematics of the relational algebra. The purpose of this adherence is to prove that software which implements mathematically-sound design principles reaps benefits in the form of code clarity, consistency, performance, and future-proofing.
25Unlike most database management systems (DBMS), Project:M36 is opinionated software which adheres strictly to the mathematics of the relational algebra. The purpose of this adherence is to prove that software which implements mathematically-sound design principles reaps benefits in the form of code clarity, consistency, performance, and future-proofing.
@@ -38,7 +44,7 @@ Project:M36 supports multiple frontends which target different audiences.
38
44
39* [Developer's Blog](https://agentm.github.io/project-m36/)
45* [Developer's Blog](https://agentm.github.io/project-m36/)
40* [Mailing List/Discussion Group](https://groups.google.com/d/forum/project-m36)
46* [Mailing List/Discussion Group](https://groups.google.com/d/forum/project-m36)
41−* IRC Channel: chat.freenode.net #project-m36
47+* IRC Channel: irc.libera.chat #project-m36 -- [Chat via Web Client](http://kiwiirc.com/nextclient/irc.libera.chat:+6697/#project-m36)
42* [Hackage](https://hackage.haskell.org/package/project-m36)
48* [Hackage](https://hackage.haskell.org/package/project-m36)
43* [Diogo Biazus' Project:M36 Video Tutorial](https://www.youtube.com/watch?v=_GC_lxlVEnE)
49* [Diogo Biazus' Project:M36 Video Tutorial](https://www.youtube.com/watch?v=_GC_lxlVEnE)
44
50
@@ -88,7 +94,7 @@ Project:M36 supports multiple frontends which target different audiences.
88
94
89## Development
95## Development
90
96
91−Project:M36 is developed in Haskell and compiled with GHC 8.2.2 or later.
97+Project:M36 is developed in Haskell and compiled with GHC 8.6 or later.
92
98
93## Related Projects
99## Related Projects
94
100
cabal.project+7−6
@@ -1,9 +1,10 @@
1−-- this is needed for GHC8 until distributed-process-extras is updated on Hackage with increased upper bounds
2packages: project-m36.cabal
1packages: project-m36.cabal
3−allow-newer: distributed-process-extras:time,distributed-process-extras:binary,distributed-process-client-server:binary,distributed-process-client-server:time,distributed-process-async:time,distributed-process-async:binary,distributed-process-extras:stm,distributed-process-extras:containers,network-transport-tcp:containers,distributed-process-client-server:stm,distributed-process-client-server:containers,distributed-process-async:stm,distributed-process-async:containers,distributed-process:hashable,distributed-process-extras:hashable,distributed-process-client-server:hashable,distributed-process-async:hashable
4
2
5−--necessary for GHC 8.6 support :/
3+package *
4+ split-sections: True
5+
6+--high-performance streaming library
6source-repository-package
7source-repository-package
7− type: git
8+ type: git
8− location: https://github.com/agentm/distributed-process.git
9+ location: https://github.com/composewell/streamly.git
9− tag: f352e097fbe494ad648b4e09249f865893ae90a3
10+ tag: ac3af8749194f1788704dda8667d0b3807075cc2
ci/DevOps/common/common.shdeleted−144
@@ -1,144 +0,0 @@
1−#!/usr/bin/env bash
2−set -Eeuo pipefail
3−
4−guard_bash_error () {
5− set -Eeuo pipefail
6−}
7−
8−# Log levels
9−INFO=0
10−WARN=1
11−ERROR=2
12−FATAL=3
13−DEBUG=4
14−DEFAULT_LOG_LEVEL=${ERROR}
15−
16−my_exit () {
17− echo "EXIT: - [HOST:$(hostname)]: - $(date +"%Y-%m-%d %H:%M:%S") - $1"
18− exit "$2"
19−}
20−
21−msg () {
22− if [ $1 -le ${DEFAULT_LOG_LEVEL} ]; then
23− echo "[HOST:$(hostname)]: - $(date +"%Y-%m-%d %H:%M:%S") - $2"
24− fi
25−}
26−
27−info () {
28− msg ${INFO} "INFO: - $1"
29−}
30−
31−warn () {
32− msg ${WARN} "WARNING: - $1"
33−}
34−
35−error () {
36− msg ${ERROR} "ERROR: - $1"
37−}
38−
39−fatal () {
40− msg ${FATAL} "FATAL: - $1"
41−}
42−
43−debug () {
44− msg ${DEBUG} "DEBUG: - $1"
45−}
46−
47−begin_banner () {
48− info "$1 - $2 phase - begin"
49−}
50−
51−done_banner () {
52− info "$1 - $2 phase - done"
53−}
54−
55−### turn path within script into absolute path
56−### must pass the calling string of the script as the first parameter
57−### e.g., ./path_to_script/script.sh
58−### or, /root/path_to_script/script.sh
59−### return the absolute path to the script with "echo" command
60−turn_to_absolute_path () {
61− local SCRIPT_ABS_PATH_RAW="$(dirname "$1")"
62− # turn SCRIPT_ABS_PATH into absolute path
63− case ${SCRIPT_ABS_PATH_RAW} in
64− /*) echo "${SCRIPT_ABS_PATH_RAW}" ;;
65− \.\.*) echo "$PWD/${SCRIPT_ABS_PATH_RAW}" ;;
66− \.*) echo "$PWD/${SCRIPT_ABS_PATH_RAW}" ;;
67− *) echo "$PWD" ;;
68− esac
69−}
70−
71−### change CD to up to the project root directory
72−### must pass the absolute path to the script as the first parameter
73−change_CD_to_project_root () {
74− cd "$1"
75− local up_level=..
76− local my_loop=10 # guard not to loop forever
77− until ls "${up_level}"|grep -w DevOps > /dev/null 2>&1 && [ ${my_loop} -gt 0 ]
78− do
79− up_level=${up_level}/..
80− my_loop=$(expr ${my_loop} - 1)
81− done
82− if [ ${my_loop} -eq 0 ]; then
83− my_exit "Too many level up within the searching for DevOps directory,abort." 1
84− fi
85− cd "$1/${up_level}"
86−}
87−
88−### check OS and distribution
89−### return the OS distribution and ID with "echo" command
90−check_dist_or_OS () {
91− local MY_THE_DISTRIBUTION_ID=""
92− local MY_THE_DISTRIBUTION_VERSION=""
93− if [ -e /etc/os-release ]; then
94− MY_THE_DISTRIBUTION_ID=$(grep -w "ID" /etc/os-release |awk -F"=" '{print $NF}'|sed 's/"//g')
95− MY_THE_DISTRIBUTION_VERSION=$(grep -w "VERSION_ID" /etc/os-release |awk -F"=" '{print $NF}'|awk -F"." '{print $1}'|sed 's/"//g')
96− echo "${MY_THE_DISTRIBUTION_ID} ${MY_THE_DISTRIBUTION_VERSION}"
97− else if type uname > /dev/null 2>&1; then
98− MY_THE_DISTRIBUTION_ID=$(uname -s)
99− MY_THE_DISTRIBUTION_VERSION=$(uname -r)
100− echo "${MY_THE_DISTRIBUTION_ID} ${MY_THE_DISTRIBUTION_VERSION}"
101− else
102− echo ""
103− fi
104− fi
105−}
106−
107−### guard that the caller of the script must be root or has sudo right
108−guard_root_or_sudo () {
109− if [[ $EUID > 0 ]] && ! sudo -v >/dev/null 2>&1; then
110− return 1
111− else
112− return 0
113− fi
114−}
115−
116−### init script with check if root or sudo
117−init_with_root_or_sudo () {
118− guard_bash_error
119−
120− if ! guard_root_or_sudo; then
121− my_exit "You must be root or you must be sudoer to prepare the env for CI/CD." 1
122− fi
123−
124− SCRIPT_ABS_PATH=$(turn_to_absolute_path $0)
125−
126− change_CD_to_project_root ${SCRIPT_ABS_PATH}
127−
128− THE_DISTRIBUTION_ID_VERSION=$(check_dist_or_OS)
129− THE_DISTRIBUTION_ID=$(echo ${THE_DISTRIBUTION_ID_VERSION}|awk '{print $1}')
130− THE_DISTRIBUTION_VERSION=$(echo ${THE_DISTRIBUTION_ID_VERSION}|awk '{print $2}')
131−}
132−
133−### init script without check if root or sudo
134−init_without_root_or_sudo () {
135− guard_bash_error
136−
137− SCRIPT_ABS_PATH=$(turn_to_absolute_path $0)
138−
139− change_CD_to_project_root ${SCRIPT_ABS_PATH}
140−
141− THE_DISTRIBUTION_ID_VERSION=$(check_dist_or_OS)
142− THE_DISTRIBUTION_ID=$(echo ${THE_DISTRIBUTION_ID_VERSION}|awk '{print $1}')
143− THE_DISTRIBUTION_VERSION=$(echo ${THE_DISTRIBUTION_ID_VERSION}|awk '{print $2}')
144−}
ci/DevOps/local/test/build/build.shdeleted−32
@@ -1,32 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "build build"
12−
13−#set +u to workaround the nix script temperlately.
14−set +u
15−. $HOME/.nix-profile/etc/profile.d/nix.sh
16−set -u
17−
18−if [ -f ${SCRIPT_ABS_PATH}/nix/project-m36.nix ]; then
19− if [ -e ${SCRIPT_ABS_PATH}/../../dev ] && [ -e ${SCRIPT_ABS_PATH}/../../../local ]; then
20− # for doom-emacs
21− [ -x ~/.emacs.d/bin/doom ] && echo "((nil . ((dante-target . \"project-m36\"))))" > ${SCRIPT_ABS_PATH}/../../../../.dir-locals.el && nix-shell --run "~/.emacs.d/bin/doom env > /dev/null 2>&1" ${SCRIPT_ABS_PATH}/nix/shell.nix
22− nix-shell ${SCRIPT_ABS_PATH}/nix/shell.nix
23− else
24− nix-shell --run "cd ${SCRIPT_ABS_PATH}/../../../../.. ; cabal new-update ; cabal new-clean ; cabal new-test" ${SCRIPT_ABS_PATH}/nix/shell.nix
25− nix-shell --run "cd ${SCRIPT_ABS_PATH}/../../../../.. ; cabal new-clean" ${SCRIPT_ABS_PATH}/nix/shell.nix
26− nix-build -A project-m36-docker ${SCRIPT_ABS_PATH}/nix/default.nix
27− fi
28−else
29− info "No ${SCRIPT_ABS_PATH}/nix/project-m36.nix found, skip building"
30−fi
31−
32−done_banner "project-m36" "build build"
ci/DevOps/local/test/build/finishing.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "build finishing"
12−
13−done_banner "project-m36" "build finishing"
ci/DevOps/local/test/build/nix/data-interval.nixdeleted−19
@@ -1,19 +0,0 @@
1−{ mkDerivation, base, ChasingBottoms, containers, deepseq
2−, extended-reals, hashable, HUnit, lattices, QuickCheck, stdenv
3−, syb, tasty, tasty-hunit, tasty-quickcheck, tasty-th
4−}:
5−mkDerivation {
6− pname = "data-interval";
7− version = "2.0.1";
8− sha256 = "5331e2df31eba3f5eb1d097a38fc5428dae56af0c0a7d71bd00491bcf81ee76f";
9− libraryHaskellDepends = [
10− base containers deepseq extended-reals hashable lattices
11− ];
12− testHaskellDepends = [
13− base ChasingBottoms containers deepseq hashable HUnit lattices
14− QuickCheck syb tasty tasty-hunit tasty-quickcheck tasty-th
15− ];
16− doCheck = false;
17− description = "Interval datatype, interval arithmetic and interval-based containers";
18− license = stdenv.lib.licenses.bsd3;
19−}
ci/DevOps/local/test/build/nix/default.nixdeleted−474
@@ -1,474 +0,0 @@
1−{ compiler ? "ghc865" }:
2−
3−let
4− config = {
5− packageOverrides = pkgs: rec {
6− haskell = pkgs.haskell // {
7− packages = pkgs.haskell.packages // {
8− "${compiler}" = pkgs.haskell.packages."${compiler}".override {
9− overrides = haskellPackagesNew: haskellPackagesOld: rec {
10−
11− /*primitive-unlifted =
12− haskellPackagesNew.callPackage ./primitive-unlifted.nix { };*/
13− distributed-process-extras =
14− haskellPackagesNew.callPackage ./distributed-process-extras.nix { };
15− distributed-process-client-server =
16− haskellPackagesNew.callPackage ./distributed-process-client-server.nix { };
17− distributed-process-async =
18− haskellPackagesNew.callPackage ./distributed-process-async.nix { };
19− rank1dynamic =
20− haskellPackagesNew.callPackage ./rank1dynamic.nix { };
21− distributed-static =
22− haskellPackagesNew.callPackage ./distributed-static.nix { };
23− distributed-process =
24− haskellPackagesNew.callPackage ./distributed-process.nix { };
25− stm-hamt =
26− haskellPackagesNew.callPackage ./stm-hamt.nix { };
27− stm-containers =
28− haskellPackagesNew.callPackage ./stm-containers.nix { };
29− network-transport-tcp =
30− haskellPackagesNew.callPackage ./network-transport-tcp.nix { };
31− data-interval =
32− haskellPackagesNew.callPackage ./data-interval.nix { };
33− project-m36 =
34− haskellPackagesNew.callPackage ./project-m36.nix { };
35− };
36− };
37− };
38− };
39− };
40− };
41−
42− pkgs = if builtins.pathExists ./nixpkgs then
43− import (builtins.fetchGit (import ./nixpkgs)) { inherit config; }
44− else
45− import <nixpkgs> { inherit config; };
46−
47− inherit (pkgs) dockerTools stdenv buildEnv writeText runCommand jq lib writeReferencesToFile jshon pigz coreutils findutils moreutils;
48−
49− project-m36 = pkgs.haskell.packages.${compiler}.project-m36;
50−
51− static-project-m36 = pkgs.haskell.lib.justStaticExecutables pkgs.haskell.packages.${compiler}.project-m36;
52−
53− passwd = ''
54− root:x:0:0::/root:/run/current-system/sw/bin/bash
55− project-m36:x:90001:90001::/var/empty:/run/current-system/sw/bin/nologin
56− '';
57−
58− group = ''
59− root:x:0:
60− nogroup:x:65534:
61− project-m36:x:90001:project-m36
62− '';
63−
64− nsswitch = ''
65− hosts: files dns myhostname mymachines
66− '';
67−
68−
69− protocols = ''
70−ip 0 IP # internet protocol, pseudo protocol number
71−#hopopt 0 HOPOPT # hop-by-hop options for ipv6
72−icmp 1 ICMP # internet control message protocol
73−igmp 2 IGMP # internet group management protocol
74−ggp 3 GGP # gateway-gateway protocol
75−ipencap 4 IP-ENCAP # IP encapsulated in IP
76−st2 5 ST2 # ST2 datagram mode
77−tcp 6 TCP # transmission control protocol
78−cbt 7 CBT # CBT, Tony Ballardie
79−egp 8 EGP # exterior gateway protocol
80−igp 9 IGP # any private interior gateway
81−bbn-rcc 10 BBN-RCC-MON # BBN RCC Monitoring
82−nvp 11 NVP-II # Network Voice Protocol
83−pup 12 PUP # PARC universal packet protocol
84−argus 13 ARGUS # ARGUS
85−emcon 14 EMCON # EMCON
86−xnet 15 XNET # Cross Net Debugger
87−chaos 16 CHAOS # Chaos
88−udp 17 UDP # user datagram protocol
89−mux 18 MUX # Multiplexing protocol
90−dcn 19 DCN-MEAS # DCN Measurement Subsystems
91−hmp 20 HMP # host monitoring protocol
92−prm 21 PRM # packet radio measurement protocol
93−xns-idp 22 XNS-IDP # Xerox NS IDP
94−trunk-1 23 TRUNK-1 # Trunk-1
95−trunk-2 24 TRUNK-2 # Trunk-2
96−leaf-1 25 LEAF-1 # Leaf-1
97−leaf-2 26 LEAF-2 # Leaf-2
98−rdp 27 RDP # "reliable datagram" protocol
99−irtp 28 IRTP # Internet Reliable Transaction Protocol
100−iso-tp4 29 ISO-TP4 # ISO Transport Protocol Class 4
101−netblt 30 NETBLT # Bulk Data Transfer Protocol
102−mfe-nsp 31 MFE-NSP # MFE Network Services Protocol
103−merit-inp 32 MERIT-INP # MERIT Internodal Protocol
104−dccp 33 DCCP # Datagram Congestion Control Protocol
105−3pc 34 3PC # Third Party Connect Protocol
106−idpr 35 IDPR # Inter-Domain Policy Routing Protocol
107−xtp 36 XTP # Xpress Tranfer Protocol
108−ddp 37 DDP # Datagram Delivery Protocol
109−idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport Proto
110−tp++ 39 TP++ # TP++ Transport Protocol
111−il 40 IL # IL Transport Protocol
112−ipv6 41 IPV6 # ipv6
113−sdrp 42 SDRP # Source Demand Routing Protocol
114−ipv6-route 43 IPV6-ROUTE # routing header for ipv6
115−ipv6-frag 44 IPV6-FRAG # fragment header for ipv6
116−idrp 45 IDRP # Inter-Domain Routing Protocol
117−rsvp 46 RSVP # Resource ReSerVation Protocol
118−gre 47 GRE # Generic Routing Encapsulation
119−dsr 48 DSR # Dynamic Source Routing Protocol
120−bna 49 BNA # BNA
121−esp 50 ESP # encapsulating security payload
122−ah 51 AH # authentication header
123−i-nlsp 52 I-NLSP # Integrated Net Layer Security TUBA
124−swipe 53 SWIPE # IP with Encryption
125−narp 54 NARP # NBMA Address Resolution Protocol
126−mobile 55 MOBILE # IP Mobility
127−tlsp 56 TLSP # Transport Layer Security Protocol
128−skip 57 SKIP # SKIP
129−ipv6-icmp 58 IPV6-ICMP icmp6 # ICMP for IPv6
130−ipv6-nonxt 59 IPV6-NONXT # no next header for ipv6
131−ipv6-opts 60 IPV6-OPTS # destination options for ipv6
132−# 61 # any host internal protocol
133−cftp 62 CFTP # CFTP
134−# 63 # any local network
135−sat-expak 64 SAT-EXPAK # SATNET and Backroom EXPAK
136−kryptolan 65 KRYPTOLAN # Kryptolan
137−rvd 66 RVD # MIT Remote Virtual Disk Protocol
138−ippc 67 IPPC # Internet Pluribus Packet Core
139−# 68 # any distributed filesystem
140−sat-mon 69 SAT-MON # SATNET Monitoring
141−visa 70 VISA # VISA Protocol
142−ipcv 71 IPCV # Internet Packet Core Utility
143−cpnx 72 CPNX # Computer Protocol Network Executive
144−cphb 73 CPHB # Computer Protocol Heart Beat
145−wsn 74 WSN # Wang Span Network
146−pvp 75 PVP # Packet Video Protocol
147−br-sat-mon 76 BR-SAT-MON # Backroom SATNET Monitoring
148−sun-nd 77 SUN-ND # SUN ND PROTOCOL-Temporary
149−wb-mon 78 WB-MON # WIDEBAND Monitoring
150−wb-expak 79 WB-EXPAK # WIDEBAND EXPAK
151−iso-ip 80 ISO-IP # ISO Internet Protocol
152−vmtp 81 VMTP # Versatile Message Transport
153−secure-vmtp 82 SECURE-VMTP # SECURE-VMTP
154−vines 83 VINES # VINES
155−ttp 84 TTP # TTP
156−#iptm 84 IPTM # Protocol Internet Protocol Traffic
157−nsfnet-igp 85 NSFNET-IGP # NSFNET-IGP
158−dgp 86 DGP # Dissimilar Gateway Protocol
159−tcf 87 TCF # TCF
160−eigrp 88 EIGRP # Enhanced Interior Routing Protocol
161−ospf 89 OSPFIGP # Open Shortest Path First IGP
162−sprite-rpc 90 Sprite-RPC # Sprite RPC Protocol
163−larp 91 LARP # Locus Address Resolution Protocol
164−mtp 92 MTP # Multicast Transport Protocol
165−ax.25 93 AX.25 # AX.25 Frames
166−ipip 94 IPIP # Yet Another IP encapsulation
167−micp 95 MICP # Mobile Internetworking Control Pro.
168−scc-sp 96 SCC-SP # Semaphore Communications Sec. Pro.
169−etherip 97 ETHERIP # Ethernet-within-IP Encapsulation
170−encap 98 ENCAP # Yet Another IP encapsulation
171−# 99 # any private encryption scheme
172−gmtp 100 GMTP # GMTP
173−ifmp 101 IFMP # Ipsilon Flow Management Protocol
174−pnni 102 PNNI # PNNI over IP
175−pim 103 PIM # Protocol Independent Multicast
176−aris 104 ARIS # ARIS
177−scps 105 SCPS # SCPS
178−qnx 106 QNX # QNX
179−a/n 107 A/N # Active Networks
180−ipcomp 108 IPComp # IP Payload Compression Protocol
181−snp 109 SNP # Sitara Networks Protocol
182−compaq-peer 110 Compaq-Peer # Compaq Peer Protocol
183−ipx-in-ip 111 IPX-in-IP # IPX in IP
184−carp 112 CARP vrrp # Common Address Redundancy Protocol
185−pgm 113 PGM # PGM Reliable Transport Protocol
186−# 114 # any 0-hop protocol
187−l2tp 115 L2TP # Layer Two Tunneling Protocol
188−ddx 116 DDX # D-II Data Exchange
189−iatp 117 IATP # Interactive Agent Transfer Protocol
190−stp 118 STP # Schedule Transfer Protocol
191−srp 119 SRP # SpectraLink Radio Protocol
192−uti 120 UTI # UTI
193−smp 121 SMP # Simple Message Protocol
194−sm 122 SM # SM
195−ptp 123 PTP # Performance Transparency Protocol
196−isis 124 ISIS # ISIS over IPv4
197−fire 125 FIRE
198−crtp 126 CRTP # Combat Radio Transport Protocol
199−crudp 127 CRUDP # Combat Radio User Datagram
200−sscopmce 128 SSCOPMCE
201−iplt 129 IPLT
202−sps 130 SPS # Secure Packet Shield
203−pipe 131 PIPE # Private IP Encapsulation within IP
204−sctp 132 SCTP # Stream Control Transmission Protocol
205−fc 133 FC # Fibre Channel
206−rsvp-e2e-ignore 134 RSVP-E2E-IGNORE # Aggregation of RSVP for IP reservations
207−mobility-header 135 Mobility-Header # Mobility Support in IPv6
208−udplite 136 UDPLite # The UDP-Lite Protocol
209−mpls-in-ip 137 MPLS-IN-IP # Encapsulating MPLS in IP
210−manet 138 MANET # MANET Protocols
211−hip 139 HIP # Host Identity Protocol
212−shim6 140 SHIM6 # Shim6 Protocol
213−wesp 141 WESP # Wrapped Encapsulating Security Payload
214−rohc 142 ROHC # Robust Header Compression
215−# 138-254 # Unassigned
216−pfsync 240 PFSYNC # PF Synchronization
217−# 253-254 # Use for experimentation and testing
218−# 255 # Reserved
219−divert 258 DIVERT # Divert pseudo-protocol
220−'';
221−
222− project-m36-conf = ''
223− para1 = "$(PARA1)"
224− para2 = "$(PARA2)"
225− '';
226−
227− project-m36-env = stdenv.mkDerivation {
228− name = "project-m36-env";
229− phases = [ "installPhase" "fixupPhase" ];
230−
231− installPhase = ''
232− mkdir -p $out/etc/project-m36
233− echo '${project-m36-conf}' > $out/etc/project-m36/project-m36.conf
234− echo '${passwd}' > $out/etc/passwd
235− echo '${group}' > $out/etc/group
236− echo '${protocols}' > $out/etc/ptotocols
237− echo '${nsswitch}' > $out/etc/nsswitch.conf
238− '';
239− };
240−
241− # following buildImage is copied from nixpkgs-20.03
242− # to fix the arch always amd64 issue
243− myarch = platform: {
244− i686 = "386";
245− x86_64 = "amd64";
246− aarch64 = "arm64";
247− arm = "arm";
248− armv5tel = "arm";
249− armv6l = "arm";
250− armv7l = "arm";
251− }.${platform.parsed.cpu.name} or (throw "Unsupported system");
252−
253− MYTARGETARCH = myarch stdenv.targetPlatform;
254−
255− # 1. extract the base image
256− # 2. create the layer
257− # 3. add layer deps to the layer itself, diffing with the base image
258− # 4. compute the layer id
259− # 5. put the layer in the image
260− # 6. repack the image
261− mybuildImage = with dockerTools; args@{
262− # Image name.
263− name,
264− # Image tag, when null then the nix output hash will be used.
265− tag ? null,
266− # Parent image, to append to.
267− fromImage ? null,
268− # Name of the parent image; will be read from the image otherwise.
269− fromImageName ? null,
270− # Tag of the parent image; will be read from the image otherwise.
271− fromImageTag ? null,
272− # Files to put on the image (a nix store path or list of paths).
273− contents ? null,
274− # When copying the contents into the image, preserve symlinks to
275− # directories (see `rsync -K`). Otherwise, transform those symlinks
276− # into directories.
277− keepContentsDirlinks ? false,
278− # Docker config; e.g. what command to run on the container.
279− config ? null,
280− # Optional bash script to run on the files prior to fixturizing the layer.
281− extraCommands ? "", uid ? 0, gid ? 0,
282− # Optional bash script to run as root on the image when provisioning.
283− runAsRoot ? null,
284− # Size of the virtual machine disk to provision when building the image.
285− diskSize ? 1024,
286− # Time of creation of the image.
287− created ? "1970-01-01T00:00:01Z",
288− }:
289−
290− let
291− baseName = baseNameOf name;
292−
293− # Create a JSON blob of the configuration. Set the date to unix zero.
294− baseJson = let
295− pure = writeText "${baseName}-config.json" (builtins.toJSON {
296− inherit created config;
297− architecture = MYTARGETARCH;
298− os = "linux";
299− });
300− impure = runCommand "${baseName}-config.json"
301− { nativeBuildInputs = [ jq ]; }
302− ''
303− jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out
304− '';
305− in if created == "now" then impure else pure;
306−
307− layer =
308− if runAsRoot == null
309− then mkPureLayer {
310− name = baseName;
311− inherit baseJson contents keepContentsDirlinks extraCommands uid gid;
312− } else mkRootLayer {
313− name = baseName;
314− inherit baseJson fromImage fromImageName fromImageTag
315− contents keepContentsDirlinks runAsRoot diskSize
316− extraCommands;
317− };
318− result = runCommand "docker-image-${baseName}.tar.gz" {
319− nativeBuildInputs = [ jshon pigz coreutils findutils jq moreutils ];
320− # Image name and tag must be lowercase
321− imageName = lib.toLower name;
322− imageTag = if tag == null then "" else lib.toLower tag;
323− inherit fromImage baseJson;
324− layerClosure = writeReferencesToFile layer;
325− passthru.buildArgs = args;
326− passthru.layer = layer;
327− } ''
328− ${lib.optionalString (tag == null) ''
329− outName="$(basename "$out")"
330− outHash=$(echo "$outName" | cut -d - -f 1)
331− imageTag=$outHash
332− ''}
333− # Print tar contents:
334− # 1: Interpreted as relative to the root directory
335− # 2: With no trailing slashes on directories
336− # This is useful for ensuring that the output matches the
337− # values generated by the "find" command
338− ls_tar() {
339− for f in $(tar -tf $1 | xargs realpath -ms --relative-to=.); do
340− if [[ "$f" != "." ]]; then
341− echo "/$f"
342− fi
343− done
344− }
345− mkdir image
346− touch baseFiles
347− if [[ -n "$fromImage" ]]; then
348− echo "Unpacking base image..."
349− tar -C image -xpf "$fromImage"
350− cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list
351− # Do not import the base image configuration and manifest
352− chmod a+w image image/*.json
353− rm -f image/*.json
354− if [[ -z "$fromImageName" ]]; then
355− fromImageName=$(jshon -k < image/repositories|head -n1)
356− fi
357− if [[ -z "$fromImageTag" ]]; then
358− fromImageTag=$(jshon -e $fromImageName -k \
359− < image/repositories|head -n1)
360− fi
361− parentID=$(jshon -e $fromImageName -e $fromImageTag -u \
362− < image/repositories)
363− for l in image/*/layer.tar; do
364− ls_tar $l >> baseFiles
365− done
366− else
367− touch layer-list
368− fi
369− chmod -R ug+rw image
370− mkdir temp
371− cp ${layer}/* temp/
372− chmod ug+w temp/*
373− for dep in $(cat $layerClosure); do
374− find $dep >> layerFiles
375− done
376− echo "Adding layer..."
377− # Record the contents of the tarball with ls_tar.
378− ls_tar temp/layer.tar >> baseFiles
379− # Append nix/store directory to the layer so that when the layer is loaded in the
380− # image /nix/store has read permissions for non-root users.
381− # nix/store is added only if the layer has /nix/store paths in it.
382− if [ $(wc -l < $layerClosure) -gt 1 ] && [ $(grep -c -e "^/nix/store$" baseFiles) -eq 0 ]; then
383− mkdir -p nix/store
384− chmod -R 555 nix
385− echo "./nix" >> layerFiles
386− echo "./nix/store" >> layerFiles
387− fi
388− # Get the files in the new layer which were *not* present in
389− # the old layer, and record them as newFiles.
390− comm <(sort -n baseFiles|uniq) \
391− <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles
392− # Append the new files to the layer.
393− tar -rpf temp/layer.tar --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" \
394− --owner=0 --group=0 --no-recursion --files-from newFiles
395− echo "Adding meta..."
396− # If we have a parentID, add it to the json metadata.
397− if [[ -n "$parentID" ]]; then
398− cat temp/json | jshon -s "$parentID" -i parent > tmpjson
399− mv tmpjson temp/json
400− fi
401− # Take the sha256 sum of the generated json and use it as the layer ID.
402− # Compute the size and add it to the json under the 'Size' field.
403− layerID=$(sha256sum temp/json|cut -d ' ' -f 1)
404− size=$(stat --printf="%s" temp/layer.tar)
405− cat temp/json | jshon -s "$layerID" -i id -n $size -i Size > tmpjson
406− mv tmpjson temp/json
407− # Use the temp folder we've been working on to create a new image.
408− mv temp image/$layerID
409− # Add the new layer ID to the end of the layer list
410− (
411− cat layer-list
412− # originally this used `sed -i "1i$layerID" layer-list`, but
413− # would fail if layer-list was completely empty.
414− echo "$layerID/layer.tar"
415− ) | sponge layer-list
416− # Create image json and image manifest
417− imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
418− manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
419− for layerTar in $(cat ./layer-list); do
420− layerChecksum=$(sha256sum image/$layerTar | cut -d ' ' -f1)
421− imageJson=$(echo "$imageJson" | jq ".history |= . + [{\"created\": \"$(jq -r .created ${baseJson})\"}]")
422− # diff_ids order is from the bottom-most to top-most layer
423− imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= . + [\"sha256:$layerChecksum\"]")
424− manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= . + [\"$layerTar\"]")
425− done
426− imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
427− echo "$imageJson" > "image/$imageJsonChecksum.json"
428− manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"$imageJsonChecksum.json\"")
429− echo "$manifestJson" > image/manifest.json
430− # Store the json under the name image/repositories.
431− jshon -n object \
432− -n object -s "$layerID" -i "$imageTag" \
433− -i "$imageName" > image/repositories
434− # Make the image read-only.
435− chmod -R a-w image
436− echo "Cooking the image..."
437− tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | pigz -nT > $out
438− echo "Finished."
439− '';
440−
441− in
442− result;
443−
444− project-m36-docker = mybuildImage {
445− name = "project-m36";
446− tag = project-m36.version;
447− created = "now";
448−
449− contents = [ static-project-m36
450− project-m36-env ];
451− config = {
452− Env = [
453− "PATH=${static-project-m36}/bin:$PATH"
454− "DATABASE=mytestdb"
455− "DATABASE_DIRECTORY=/var/project-m36/data"
456− "HOSTNAME=localhost"
457− "PORT=54321"
458− ];
459− User = "project-m36";
460− Cmd = [ "project-m36-server" ];
461− ExposedPorts = {
462− "54321/tcp" = {};
463− };
464− WorkingDir = "/var/project-m36/data";
465− Volumes = {
466− "/var/project-m36/data" = {};
467− };
468− };
469−};
470−in {
471− inherit project-m36;
472− inherit static-project-m36;
473− inherit project-m36-docker;
474−}
ci/DevOps/local/test/build/nix/distributed-process-async.nixdeleted−32
@@ -1,32 +0,0 @@
1−{ mkDerivation, ansi-terminal, base, binary, containers
2−, data-accessor, deepseq, distributed-process
3−, distributed-process-systest, exceptions, fetchgit, fingertree
4−, hashable, mtl, network, network-transport, network-transport-tcp
5−, rematch, stdenv, stm, test-framework, test-framework-hunit, time
6−, transformers, unordered-containers
7−}:
8−mkDerivation {
9− pname = "distributed-process-async";
10− version = "0.2.6";
11− src = fetchgit {
12− url = "https://github.com/hughjfchen/distributed-process-async";
13− sha256 = "00sh8glxf21l56s07v5jp13gxq2v5cp8w2b7snq3dc405mrl2jk9";
14− rev = "73fcda3c254538db2386184530203c8aac26b905";
15− fetchSubmodules = true;
16− };
17− libraryHaskellDepends = [
18− base binary containers data-accessor deepseq distributed-process
19− exceptions fingertree hashable mtl stm time transformers
20− unordered-containers
21− ];
22− testHaskellDepends = [
23− ansi-terminal base binary deepseq distributed-process
24− distributed-process-systest exceptions network network-transport
25− network-transport-tcp rematch stm test-framework
26− test-framework-hunit transformers
27− ];
28− doCheck = false;
29− homepage = "http://github.com/haskell-distributed/distributed-process-async";
30− description = "Cloud Haskell Async API";
31− license = stdenv.lib.licenses.bsd3;
32−}
ci/DevOps/local/test/build/nix/distributed-process-client-server.nixdeleted−34
@@ -1,34 +0,0 @@
1−{ mkDerivation, ansi-terminal, base, binary, containers, deepseq
2−, distributed-process, distributed-process-async
3−, distributed-process-extras, distributed-process-systest
4−, exceptions, fetchgit, fingertree, ghc-prim, hashable, HUnit, mtl
5−, network, network-transport, network-transport-tcp, rematch
6−, stdenv, stm, test-framework, test-framework-hunit, time
7−, transformers, unordered-containers
8−}:
9−mkDerivation {
10− pname = "distributed-process-client-server";
11− version = "0.2.5.1";
12− src = fetchgit {
13− url = "https://github.com/hughjfchen/distributed-process-client-server";
14− sha256 = "1ld4madf8fbv640rv0gyp1sbfac687k9iikaqj23rdvr2bi22h2v";
15− rev = "4648b7f7cce67c0af47bd0f56915bc6d59131225";
16− fetchSubmodules = true;
17− };
18− libraryHaskellDepends = [
19− base binary containers deepseq distributed-process
20− distributed-process-async distributed-process-extras exceptions
21− fingertree hashable mtl stm time transformers unordered-containers
22− ];
23− testHaskellDepends = [
24− ansi-terminal base binary containers deepseq distributed-process
25− distributed-process-async distributed-process-extras
26− distributed-process-systest exceptions fingertree ghc-prim HUnit
27− mtl network network-transport network-transport-tcp rematch stm
28− test-framework test-framework-hunit transformers
29− ];
30− doCheck = false;
31− homepage = "http://github.com/haskell-distributed/distributed-process-client-server";
32− description = "The Cloud Haskell Application Platform";
33− license = stdenv.lib.licenses.bsd3;
34−}
ci/DevOps/local/test/build/nix/distributed-process-extras.nixdeleted−35
@@ -1,35 +0,0 @@
1−{ mkDerivation, ansi-terminal, base, binary, bytestring, containers
2−, data-accessor, deepseq, distributed-process
3−, distributed-process-systest, distributed-static, exceptions
4−, fetchgit, fingertree, ghc-prim, hashable, HUnit, mtl, network
5−, network-transport, network-transport-tcp, QuickCheck, rematch
6−, stdenv, stm, test-framework, test-framework-hunit
7−, test-framework-quickcheck2, time, transformers
8−, unordered-containers
9−}:
10−mkDerivation {
11− pname = "distributed-process-extras";
12− version = "0.3.5";
13− src = fetchgit {
14− url = "https://github.com/hughjfchen/distributed-process-extras";
15− sha256 = "1fk3sxk9953wp3ya0c21l2d3yn18931bsny5d01wpn14khdy7mfj";
16− rev = "5f75e9ff6d1df2c12f28d99adb15ea4267f02017";
17− fetchSubmodules = true;
18− };
19− libraryHaskellDepends = [
20− base binary containers deepseq distributed-process exceptions
21− fingertree hashable mtl stm time transformers unordered-containers
22− ];
23− testHaskellDepends = [
24− ansi-terminal base binary bytestring containers data-accessor
25− deepseq distributed-process distributed-process-systest
26− distributed-static fingertree ghc-prim hashable HUnit mtl network
27− network-transport network-transport-tcp QuickCheck rematch stm
28− test-framework test-framework-hunit test-framework-quickcheck2 time
29− transformers unordered-containers
30− ];
31− doCheck = false;
32− homepage = "http://github.com/haskell-distributed/distributed-process-extras";
33− description = "Cloud Haskell Extras";
34− license = stdenv.lib.licenses.bsd3;
35−}
ci/DevOps/local/test/build/nix/distributed-process.nixdeleted−27
@@ -1,27 +0,0 @@
1−{ mkDerivation, base, binary, bytestring, containers, data-accessor
2−, deepseq, distributed-static, exceptions, fetchgit, hashable, mtl
3−, network-transport, network-transport-tcp, random, rank1dynamic
4−, stdenv, stm, syb, template-haskell, time, transformers
5−}:
6−mkDerivation {
7− pname = "distributed-process";
8− version = "0.7.4";
9− src = fetchgit {
10− url = "https://github.com/haskell-distributed/distributed-process";
11− sha256 = "0c71b3nc19zic9xiirkc41znv93f9j9qlf2kn89mjjyh9w7dazsn";
12− rev = "660d554f6acd2dba8b605c84e8fa69e45708bc14";
13− fetchSubmodules = true;
14− };
15− libraryHaskellDepends = [
16− base binary bytestring containers data-accessor deepseq
17− distributed-static exceptions hashable mtl network-transport random
18− rank1dynamic stm syb template-haskell time transformers
19− ];
20− benchmarkHaskellDepends = [
21− base binary bytestring network-transport-tcp
22− ];
23− doCheck = false;
24− homepage = "http://haskell-distributed.github.com/";
25− description = "Cloud Haskell: Erlang-style concurrency in Haskell";
26− license = stdenv.lib.licenses.bsd3;
27−}
ci/DevOps/local/test/build/nix/distributed-static.nixdeleted−15
@@ -1,15 +0,0 @@
1−{ mkDerivation, base, binary, bytestring, containers, deepseq
2−, rank1dynamic, stdenv
3−}:
4−mkDerivation {
5− pname = "distributed-static";
6− version = "0.3.9";
7− sha256 = "ee9a9595c20c6456b2b14e579349546f2e0cda46706a72858ec651dbd01490d9";
8− libraryHaskellDepends = [
9− base binary bytestring containers deepseq rank1dynamic
10− ];
11− doCheck = false;
12− homepage = "http://haskell-distributed.github.com";
13− description = "Compositional, type-safe, polymorphic static values and closures";
14− license = stdenv.lib.licenses.bsd3;
15−}
ci/DevOps/local/test/build/nix/extended-reals.nixdeleted−19
@@ -1,19 +0,0 @@
1−{ mkDerivation, base, deepseq, hashable, HUnit, QuickCheck, stdenv
2−, tasty, tasty-hunit, tasty-quickcheck, tasty-th
3−}:
4−mkDerivation {
5− pname = "extended-reals";
6− version = "0.2.3.0";
7− sha256 = "7c8ac733ef09cb37c0a9816e7765ab6fe46551ee58445c00fc6c52a37eef169c";
8− revision = "5";
9− editedCabalFile = "1qm0xrlklg0849a2ydg2gh1fimxknmwpy7xmh4p9qsy5dlyj7516";
10− libraryHaskellDepends = [ base deepseq hashable ];
11− testHaskellDepends = [
12− base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
13− tasty-th
14− ];
15− doCheck = false;
16− homepage = "https://github.com/msakai/extended-reals/";
17− description = "Extension of real numbers with positive/negative infinities";
18− license = stdenv.lib.licenses.bsd3;
19−}
ci/DevOps/local/test/build/nix/hashable-time.nixdeleted−12
@@ -1,12 +0,0 @@
1−{ mkDerivation, base, hashable, stdenv, time }:
2−mkDerivation {
3− pname = "hashable-time";
4− version = "0.2.0.2";
5− sha256 = "fa61f7fbd493b5a54f2aeb10e0c1c4144111ecf34e74080d12c5738ce925fee0";
6− revision = "3";
7− editedCabalFile = "1dr7ak803ngrhpv43dy25jm18gfzn02gzd3hm31dzcjv3mxsmbrk";
8− libraryHaskellDepends = [ base hashable time ];
9− doCheck = false;
10− description = "Hashable instances for Data.Time";
11− license = stdenv.lib.licenses.bsd3;
12−}
ci/DevOps/local/test/build/nix/megaparsec.nixdeleted−20
@@ -1,20 +0,0 @@
1−{ mkDerivation, base, bytestring, case-insensitive, containers
2−, criterion, deepseq, mtl, parser-combinators, scientific, stdenv
3−, text, transformers, weigh
4−}:
5−mkDerivation {
6− pname = "megaparsec";
7− version = "7.0.5";
8− sha256 = "f2dc2ea9da25f726c0650051f4fe3cec0003a97dfa37b62a3f1acdba580c1d2f";
9− libraryHaskellDepends = [
10− base bytestring case-insensitive containers deepseq mtl
11− parser-combinators scientific text transformers
12− ];
13− benchmarkHaskellDepends = [
14− base containers criterion deepseq text weigh
15− ];
16− doCheck = false;
17− homepage = "https://github.com/mrkkrp/megaparsec";
18− description = "Monadic parser combinators";
19− license = stdenv.lib.licenses.bsd2;
20−}
ci/DevOps/local/test/build/nix/network-transport-tcp.nixdeleted−19
@@ -1,19 +0,0 @@
1−{ mkDerivation, async, base, bytestring, containers, data-accessor
2−, network, network-transport, network-transport-tests, stdenv, uuid
3−}:
4−mkDerivation {
5− pname = "network-transport-tcp";
6− version = "0.7.0";
7− sha256 = "5630250afbf08b71b321fd1038183d1947b02d39c4e52800fbe17df29a62b993";
8− libraryHaskellDepends = [
9− async base bytestring containers data-accessor network
10− network-transport uuid
11− ];
12− testHaskellDepends = [
13− base bytestring network network-transport network-transport-tests
14− ];
15− doCheck = false;
16− homepage = "http://haskell-distributed.github.com";
17− description = "TCP instantiation of Network.Transport";
18− license = stdenv.lib.licenses.bsd3;
19−}
ci/DevOps/local/test/build/nix/nixpkgsdeleted−10
@@ -1,10 +0,0 @@
1−# nixpkgs-19.09 at 2020-04-05T15:13:59Z
2−{
3− # Descriptive name to make the store path easier to identify
4− name = "nixos-19.09-2020-04-05";
5− url = "https://github.com/nixos/nixpkgs-channels/";
6− # Commit hash for nixos-19.09 as of 2020-04-05
7− # `git ls-remote https://github.com/nixos/nixpkgs-channels nixos-unstable`
8− ref = "refs/heads/nixos-19.09";
9− rev = "f6c1d3b113ce9e7c908991df2e8eed02f03df1bc";
10−}
ci/DevOps/local/test/build/nix/nixpkgs.templatedeleted−6
@@ -1,6 +0,0 @@
1−nixpkgs = fetchFromGitHub {
2− owner = "NixOS";
3− repo = "nixpkgs-channels";
4− rev = "2f6440eb09b7e6e3322720ac91ce7e2cdeb413f9";
5− sha256 = "0vb7ikjscrp2rw0dfw6pilxqpjm50l5qg2x2mn1vfh93dkl2aan7";
6−};
ci/DevOps/local/test/build/nix/primitive-unlifted.nixdeleted−12
@@ -1,12 +0,0 @@
1−{ mkDerivation, base, primitive, stdenv, stm }:
2−mkDerivation {
3− pname = "primitive-unlifted";
4− version = "0.1.2.0";
5− sha256 = "031932b9958adabcb27ef1017a42266f3589b44cd25338c4d41d6a31407705ff";
6− libraryHaskellDepends = [ base primitive ];
7− testHaskellDepends = [ base primitive stm ];
8− doCheck = false;
9− homepage = "https://github.com/haskell-primitive/primitive-unlifted";
10− description = "Primitive GHC types with unlifted types inside";
11− license = stdenv.lib.licenses.bsd3;
12−}
ci/DevOps/local/test/build/nix/project-m36.nixdeleted−72
@@ -1,72 +0,0 @@
1−{ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
2−, blaze-html, bytestring, Cabal, cassava, conduit, containers
3−, criterion, cryptohash-sha256, data-interval, deepseq
4−, deepseq-generics, deferred-folds, directory, distributed-process
5−, distributed-process-async, distributed-process-client-server
6−, distributed-process-extras, either, exceptions, extended-reals
7−, filepath, foldl, ghc, ghc-paths, Glob, gnuplot, hashable
8−, hashable-time, haskeline, http-api-data, http-types, HUnit
9−, list-t, megaparsec, monad-parallel, MonadRandom, mtl, network
10−, network-transport, network-transport-tcp, old-locale
11−, optparse-applicative, parallel, parser-combinators, path-pieces
12−, QuickCheck, quickcheck-instances, random, random-shuffle
13−, resourcet, rset, scotty, semigroups, stdenv, stm, stm-containers
14−, template-haskell, temporary, text, time, transformers, unix
15−, unordered-containers, uuid, vector, vector-binary-instances
16−, websockets, zlib
17−}:
18−mkDerivation {
19− pname = "project-m36";
20− version = "0.7";
21− src = /home/chenjf/projects/project-m36/ci/DevOps/local/test/build/../../../../..;
22− configureFlags = [ "-f-haskell-scripting" ];
23− isLibrary = true;
24− isExecutable = true;
25− libraryHaskellDepends = [
26− aeson attoparsec base base64-bytestring binary bytestring cassava
27− conduit containers cryptohash-sha256 data-interval deepseq
28− deepseq-generics deferred-folds directory distributed-process
29− distributed-process-async distributed-process-client-server
30− distributed-process-extras either exceptions extended-reals
31− filepath foldl ghc-paths Glob gnuplot hashable hashable-time
32− haskeline http-api-data list-t monad-parallel MonadRandom mtl
33− network-transport network-transport-tcp old-locale
34− optparse-applicative parallel path-pieces QuickCheck
35− quickcheck-instances random-shuffle resourcet rset semigroups stm
36− stm-containers temporary text time transformers unix
37− unordered-containers uuid vector vector-binary-instances zlib
38− ];
39− executableHaskellDepends = [
40− aeson attoparsec base base64-bytestring binary blaze-html
41− bytestring Cabal cassava conduit containers data-interval deepseq
42− deepseq-generics directory either filepath ghc ghc-paths gnuplot
43− hashable hashable-time haskeline http-api-data http-types HUnit
44− list-t megaparsec MonadRandom mtl network-transport-tcp
45− optparse-applicative parallel parser-combinators path-pieces random
46− scotty semigroups stm stm-containers template-haskell temporary
47− text time transformers unordered-containers uuid vector
48− vector-binary-instances websockets
49− ];
50− testHaskellDepends = [
51− aeson attoparsec base base64-bytestring binary bytestring Cabal
52− cassava conduit containers data-interval deepseq deepseq-generics
53− directory either filepath gnuplot hashable hashable-time haskeline
54− http-api-data HUnit list-t megaparsec MonadRandom mtl network
55− network-transport network-transport-tcp optparse-applicative
56− parallel parser-combinators path-pieces random semigroups stm
57− stm-containers template-haskell temporary text time transformers
58− unordered-containers uuid vector vector-binary-instances websockets
59− ];
60− benchmarkHaskellDepends = [
61− attoparsec base base64-bytestring binary bytestring Cabal cassava
62− containers criterion data-interval deepseq deepseq-generics
63− directory filepath gnuplot hashable hashable-time haskeline HUnit
64− megaparsec mtl parallel stm stm-containers temporary text time
65− transformers unordered-containers uuid vector
66− vector-binary-instances
67− ];
68− doCheck = false;
69− homepage = "https://github.com/agentm/project-m36";
70− description = "Relational Algebra Engine";
71− license = stdenv.lib.licenses.publicDomain;
72−}
ci/DevOps/local/test/build/nix/rank1dynamic.nixdeleted−18
@@ -1,18 +0,0 @@
1−{ mkDerivation, base, binary, HUnit, stdenv, test-framework
2−, test-framework-hunit
3−}:
4−mkDerivation {
5− pname = "rank1dynamic";
6− version = "0.4.0";
7− sha256 = "3c424bfe52b7d4766fd66ea34c204cf920b146455711d8d10d580ca6c175ab1d";
8− revision = "1";
9− editedCabalFile = "1idh1iz15pzdhrhy19584i9ahz41ijbmf56wbb2wns2kipy6w9lr";
10− libraryHaskellDepends = [ base binary ];
11− testHaskellDepends = [
12− base HUnit test-framework test-framework-hunit
13− ];
14− doCheck = false;
15− homepage = "http://haskell-distributed.github.com";
16− description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
17− license = stdenv.lib.licenses.bsd3;
18−}
ci/DevOps/local/test/build/nix/rset.nixdeleted−13
@@ -1,13 +0,0 @@
1−{ mkDerivation, base, QuickCheck, safe, stdenv }:
2−mkDerivation {
3− pname = "rset";
4− version = "1.0.0";
5− sha256 = "f80e4f1092be752e7fc6ba965626d616b477a812c4425cab0c1456342e4c39b4";
6− libraryHaskellDepends = [ base safe ];
7− testHaskellDepends = [ base QuickCheck safe ];
8− doCheck = false;
9− homepage = "https://github.com/lovasko/rset";
10− description = "Range set";
11− license = "unknown";
12− hydraPlatforms = stdenv.lib.platforms.none;
13−}
ci/DevOps/local/test/build/nix/shell.nixdeleted−1
@@ -1 +0,0 @@
1−(import ./default.nix {}).project-m36.env
ci/DevOps/local/test/build/nix/stm-containers.nixdeleted−20
@@ -1,20 +0,0 @@
1−{ mkDerivation, base, deferred-folds, focus, foldl, free, hashable
2−, HTF, list-t, QuickCheck, quickcheck-text, rerebase, stdenv
3−, stm-hamt, transformers
4−}:
5−mkDerivation {
6− pname = "stm-containers";
7− version = "1.1.0.4";
8− sha256 = "d43346bfadbe5ccc33c0903a7dfbce8f48657184176fcefa11174ff9d2269655";
9− libraryHaskellDepends = [
10− base deferred-folds focus hashable list-t stm-hamt transformers
11− ];
12− testHaskellDepends = [
13− deferred-folds focus foldl free HTF list-t QuickCheck
14− quickcheck-text rerebase
15− ];
16− doCheck = false;
17− homepage = "https://github.com/nikita-volkov/stm-containers";
18− description = "Containers for STM";
19− license = stdenv.lib.licenses.mit;
20−}
ci/DevOps/local/test/build/nix/stm-hamt.nixdeleted−27
@@ -1,27 +0,0 @@
1−{ mkDerivation, async, base, criterion, deferred-folds, focus, free
2−, hashable, list-t, mwc-random, mwc-random-monad, primitive
3−, primitive-extras, QuickCheck, quickcheck-instances, rebase
4−, rerebase, stdenv, tasty, tasty-hunit, tasty-quickcheck
5−, transformers
6−}:
7−mkDerivation {
8− pname = "stm-hamt";
9− version = "1.2.0.3";
10− sha256 = "2389eae079a7c80013c1ac028ee4750cdfec1f192f521561f3078f80c4c4d72f";
11− libraryHaskellDepends = [
12− base deferred-folds focus hashable list-t primitive
13− primitive-extras transformers
14− ];
15− testHaskellDepends = [
16− deferred-folds focus QuickCheck quickcheck-instances rerebase tasty
17− tasty-hunit tasty-quickcheck
18− ];
19− benchmarkHaskellDepends = [
20− async criterion focus free list-t mwc-random mwc-random-monad
21− rebase
22− ];
23− doCheck = false;
24− homepage = "https://github.com/nikita-volkov/stm-hamt";
25− description = "STM-specialised Hash Array Mapped Trie";
26− license = stdenv.lib.licenses.mit;
27−}
ci/DevOps/local/test/build/prepare.shdeleted−21
@@ -1,21 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "build prepare"
12−
13−#set +u to workaround the nix script temperlately.
14−set +u
15−. $HOME/.nix-profile/etc/profile.d/nix.sh
16−set -u
17−
18−# generate nix file for the project
19−ls ${SCRIPT_ABS_PATH}/../../../../../*.cabal > /dev/null 2>&1 || ls ${SCRIPT_ABS_PATH}/../../../../../package.yaml > /dev/null 2>&1 && cabal2nix --no-check -f-haskell-scripting ${SCRIPT_ABS_PATH}/../../../../.. > ${SCRIPT_ABS_PATH}/nix/project-m36.nix
20−
21−done_banner "project-m36" "build prepare"
ci/DevOps/local/test/build/unbuild.shdeleted−18
@@ -1,18 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−#set +u to workaround the nix script temperlately.
12−set +u
13−. $HOME/.nix-profile/etc/profile.d/nix.sh
14−set -u
15−
16−begin_banner "project-m36" "build unbuild"
17−
18−done_banner "project-m36" "build unbuild"
ci/DevOps/local/test/build/unfinishing.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "build unfinishing"
12−
13−done_banner "project-m36" "build unfinishing"
ci/DevOps/local/test/build/unprepare.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "build unprepare"
12−
13−done_banner "project-m36" "build unprepare"
ci/DevOps/local/test/cb-cd-ct.shdeleted−40
@@ -1,40 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "Cont. Build, Deploy and Test"
12−
13−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/prepare.sh
14−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/build/prepare.sh
15−
16−${SCRIPT_ABS_PATH}/prepare.sh
17−${SCRIPT_ABS_PATH}/build/prepare.sh
18−${SCRIPT_ABS_PATH}/build/build.sh
19−${SCRIPT_ABS_PATH}/build/finishing.sh
20−
21−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/build/finishing.sh
22−
23−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/prepare.sh
24−
25−${SCRIPT_ABS_PATH}/deploy/prepare.sh
26−${SCRIPT_ABS_PATH}/deploy/deploy.sh
27−${SCRIPT_ABS_PATH}/deploy/finishing.sh
28−
29−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/finishing.sh
30−
31−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/test/prepare.sh
32−
33−${SCRIPT_ABS_PATH}/test/prepare.sh
34−${SCRIPT_ABS_PATH}/test/test.sh
35−${SCRIPT_ABS_PATH}/test/finishing.sh
36−${SCRIPT_ABS_PATH}/finishing.sh
37−
38−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/finishing.sh
39−
40−done_banner "project-m36" "Cont. Build, Deploy and Test"
ci/DevOps/local/test/cb-cd.shdeleted−33
@@ -1,33 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "Cont. Build and Deploy"
12−
13−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/prepare.sh
14−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/build/prepare.sh
15−
16−${SCRIPT_ABS_PATH}/prepare.sh
17−${SCRIPT_ABS_PATH}/build/prepare.sh
18−${SCRIPT_ABS_PATH}/build/build.sh
19−${SCRIPT_ABS_PATH}/build/finishing.sh
20−
21−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/build/finishing.sh
22−
23−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/prepare.sh
24−
25−${SCRIPT_ABS_PATH}/deploy/prepare.sh
26−${SCRIPT_ABS_PATH}/deploy/deploy.sh
27−${SCRIPT_ABS_PATH}/deploy/finishing.sh
28−${SCRIPT_ABS_PATH}/finishing.sh
29−
30−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/finishing.sh
31−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/finishing.sh
32−
33−done_banner "project-m36" "Cont. Build and Deploy"
ci/DevOps/local/test/cb.shdeleted−25
@@ -1,25 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "Cont. Build"
12−
13−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/prepare.sh
14−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/build/prepare.sh
15−
16−${SCRIPT_ABS_PATH}/prepare.sh
17−${SCRIPT_ABS_PATH}/build/prepare.sh
18−${SCRIPT_ABS_PATH}/build/build.sh
19−${SCRIPT_ABS_PATH}/build/finishing.sh
20−${SCRIPT_ABS_PATH}/finishing.sh
21−
22−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/build/finishing.sh
23−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/finishing.sh
24−
25−done_banner "project-m36" "Cont. Build"
ci/DevOps/local/test/cd-ct.shdeleted−31
@@ -1,31 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "Cont. Deploy and Test"
12−
13−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/prepare.sh
14−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/prepare.sh
15−
16−${SCRIPT_ABS_PATH}/deploy/prepare.sh
17−${SCRIPT_ABS_PATH}/deploy/deploy.sh
18−${SCRIPT_ABS_PATH}/deploy/finishing.sh
19−
20−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/finishing.sh
21−
22−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/test/prepare.sh
23−
24−${SCRIPT_ABS_PATH}/test/prepare.sh
25−${SCRIPT_ABS_PATH}/test/test.sh
26−${SCRIPT_ABS_PATH}/test/finishing.sh
27−${SCRIPT_ABS_PATH}/finishing.sh
28−
29−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/finishing.sh
30−
31−done_banner "project-m36" "Cont. Deploy and Test"
ci/DevOps/local/test/cd.shdeleted−25
@@ -1,25 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "Cont. Deploy"
12−
13−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/prepare.sh
14−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/prepare.sh
15−
16−${SCRIPT_ABS_PATH}/prepare.sh
17−${SCRIPT_ABS_PATH}/deploy/prepare.sh
18−${SCRIPT_ABS_PATH}/deploy/deploy.sh
19−${SCRIPT_ABS_PATH}/deploy/finishing.sh
20−${SCRIPT_ABS_PATH}/finishing.sh
21−
22−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/finishing.sh
23−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/finishing.sh
24−
25−done_banner "project-m36" "Cont. Deploy"
ci/DevOps/local/test/ct.shdeleted−25
@@ -1,25 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "Cont. Test"
12−
13−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/prepare.sh
14−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/test/prepare.sh
15−
16−${SCRIPT_ABS_PATH}/prepare.sh
17−${SCRIPT_ABS_PATH}/test/prepare.sh
18−${SCRIPT_ABS_PATH}/test/test.sh
19−${SCRIPT_ABS_PATH}/test/finishing.sh
20−${SCRIPT_ABS_PATH}/finishing.sh
21−
22−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/test/finishing.sh
23−${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/finishing.sh
24−
25−done_banner "project-m36" "Cont. Test"
ci/DevOps/local/test/deploy/config/some-sub-project.dhalldeleted

No changes to the content.

ci/DevOps/local/test/deploy/deploy.shdeleted−15
@@ -1,15 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "deploy deploy"
12−
13−sudo sg docker -c "docker-compose -f /var/project-m36/docker-compose-project-m36.yml up -d"
14−
15−done_banner "project-m36" "deploy deploy"
ci/DevOps/local/test/deploy/docker-compose.ymldeleted−21
@@ -1,21 +0,0 @@
1−# docker-compose.yml
2−
3−version: '2'
4−services:
5− project-m36:
6− image: DOCKER_HUB_IMAGE_TAG
7− ports:
8− - "54321:54321"
9− # links:
10− # - depend_service:depend_service
11− user: project-m36
12− environment:
13− DATABASE: mytestdb
14− DATABASE_DIRECTORY: /var/project-m36/data
15− command: project-m36-server --database $DATABASE --database-directory $DATABASE_DIRECTORY
16− volumes:
17− - "project-m36_config_path:/var/project-m36/config"
18− - "project-m36_data_path:/var/project-m36/data"
19− # depends_on:
20− # - depend_service
21− restart: unless-stopped
ci/DevOps/local/test/deploy/finishing.shdeleted−16
@@ -1,16 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "deploy finishing"
12−
13−# clean up the docker login info
14−[[ -d ~/.docker ]] && sudo rm -fr ~/.docker
15−
16−done_banner "project-m36" "deploy finishing"
ci/DevOps/local/test/deploy/non-docker-dependencies/some-sub-project-non-docker-dependencies-list.dhalldeleted

No changes to the content.

ci/DevOps/local/test/deploy/prepare.shdeleted−56
@@ -1,56 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "deploy prepare"
12−
13−if [ ! -L ${SCRIPT_ABS_PATH}/../../../../result ]; then
14− warn "no project-m36 build result found, suppose that the image would be pull from registry"
15−else
16− LOCAL_IMAGE_LOAD_RESULT=$(sudo sg docker -c "docker load -i ${SCRIPT_ABS_PATH}/../../../../result")
17− LOCAL_IMAGE_TAG=$(echo ${LOCAL_IMAGE_LOAD_RESULT} | awk -F"image: " '{print $NF}')
18− info "local image tag: ${LOCAL_IMAGE_TAG}"
19− info "tagging the image as projectm36/${LOCAL_IMAGE_TAG}"
20− sudo sg docker -c "docker tag ${LOCAL_IMAGE_TAG} projectm36/${LOCAL_IMAGE_TAG}"
21− info "pushing the tag projectm36/${LOCAL_IMAGE_TAG} to docker.io hub"
22− sudo sg docker -c "docker login -u \"${project_m36_DOCKER_HUB_USERNAME}\" -p \"${project_m36_DOCKER_HUB_PASSWORD}\""
23− sudo sg docker -c "docker push projectm36/${LOCAL_IMAGE_TAG}"
24−fi
25−
26−set +e
27−myGroup2=$(awk -F":" '{print $1}' /etc/group | grep -w project-m36)
28−set -e
29−if [ "X${myGroup2}" = "X" ]; then
30− info "no project-m36 group defined yet, create it..."
31− sudo groupadd -f --gid 90009 project-m36
32−fi
33−
34−set +e
35−myUser2=$(awk -F":" '{print $1}' /etc/passwd | grep -w project-m36)
36−set -e
37−if [ "X${myUser2}" = "X" ]; then
38− info "no project-m36 user defined yet, create it..."
39− sudo useradd -G docker -m -p Passw0rd --uid 90009 --gid 90009 project-m36
40−fi
41−
42−if [ ! -d /var/project-m36 ]; then
43− info "no /var/project-m36 directory found, create it..."
44− sudo mkdir -p /var/project-m36/data
45− sudo mkdir -p /var/project-m36/config
46− sudo chown -R project-m36:project-m36 /var/project-m36
47−fi
48−
49−sudo cp ${SCRIPT_ABS_PATH}/docker-compose.yml /var/project-m36/docker-compose-project-m36.yml.orig
50−sudo chown project-m36:project-m36 /var/project-m36/docker-compose-project-m36.yml.orig
51−
52−sudo sed "s:project-m36_config_path:/var/project-m36/config:g" < /var/project-m36/docker-compose-project-m36.yml.orig | sudo su -p -c "dd of=/var/project-m36/docker-compose-project-m36.yml.01" project-m36
53−sudo sed "s:project-m36_data_path:/var/project-m36/data:g" < /var/project-m36/docker-compose-project-m36.yml.01 | sudo su -p -c "dd of=/var/project-m36/docker-compose-project-m36.yml.02" project-m36
54−sudo sed "s/DOCKER_HUB_IMAGE_TAG/projectm36\/${LOCAL_IMAGE_TAG}/g" < /var/project-m36/docker-compose-project-m36.yml.02 | sudo su -p -c "dd of=/var/project-m36/docker-compose-project-m36.yml" project-m36
55−
56−done_banner "project-m36" "deploy prepare"
ci/DevOps/local/test/deploy/undeploy.shdeleted−15
@@ -1,15 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "deploy undeploy"
12−
13−sudo sg docker -c "docker-compose -f /var/project-m36/docker-compose-project-m36.yml down"
14−
15−done_banner "project-m36" "deploy undeploy"
ci/DevOps/local/test/deploy/unfinishing.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "deploy unfinishing"
12−
13−done_banner "project-m36" "deploy unfinishing"
ci/DevOps/local/test/deploy/unprepare.shdeleted−38
@@ -1,38 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "deploy unprepare"
12−
13−if [ -d /var/project-m36 ]; then
14− info "/var/project-m36 directory found, delete it..."
15− sudo rm -fr /var/project-m36
16−fi
17−
18−set +e
19−myUser2=$(awk -F":" '{print $1}' /etc/passwd | grep -w project-m36)
20−if [ "X${myUser2}" != "X" ]; then
21− info "project-m36 user defined, delete it..."
22− sudo userdel -fr project-m36
23−fi
24−
25−myGroup2=$(awk -F":" '{print $1}' /etc/group | grep -w project-m36)
26−if [ "X${myGroup2}" != "X" ]; then
27− info "project-m36 group defined, delete it..."
28− sudo groupdel -f project-m36
29−fi
30−set -e
31−
32−MY_TO_REMOVE_IMAGES=$(sudo sg docker -c "docker images"|grep -w project-m36|awk '{print $3}')
33−for MY_TO_REMOVE_IMAGE in ${MY_TO_REMOVE_IMAGES}
34−do
35− sudo sg docker -c "docker image rm -f ${MY_TO_REMOVE_IMAGE}"
36−done
37−
38−done_banner "project-m36" "deploy unprepare"
ci/DevOps/local/test/finishing.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "finishing"
12−
13−done_banner "project-m36" "finishing"
ci/DevOps/local/test/prepare.shdeleted−14
@@ -1,14 +0,0 @@
1−#!/usr/bin/env bash
2−
3−if ! type dirname > /dev/null 2>&1; then
4− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
5− exit 1
6−fi
7−
8−. "$(dirname "$0")"/../../common/common.sh
9−
10−init_with_root_or_sudo "$0"
11−
12−begin_banner "project-m36" "prepare"
13−
14−done_banner "project-m36" "prepare"
ci/DevOps/local/test/test/finishing.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "test finishing"
12−
13−done_banner "project-m36" "test finishing"
ci/DevOps/local/test/test/prepare.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "test prepare"
12−
13−done_banner "project-m36" "test prepare"
ci/DevOps/local/test/test/test.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "test test"
12−
13−done_banner "project-m36" "test test"
ci/DevOps/local/test/test/unfinishing.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "test unfinishing"
12−
13−done_banner "project-m36" "test unfinishing"
ci/DevOps/local/test/test/unprepare.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "test unprepare"
12−
13−done_banner "project-m36" "test unprepare"
ci/DevOps/local/test/test/untest.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "test untest"
12−
13−done_banner "project-m36" "test untest"
ci/DevOps/local/test/uncb-uncd-unct.shdeleted−45
@@ -1,45 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "Cont. UnBuild, UnDeploy and UnTest"
12−
13−# I don't think we need to undo the top-level finishing and prepare
14−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/unfinishing.sh
15−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/test/unfinishing.sh
16−
17−${SCRIPT_ABS_PATH}/unfinishing.sh
18−${SCRIPT_ABS_PATH}/test/unfinishing.sh
19−${SCRIPT_ABS_PATH}/test/untest.sh
20−${SCRIPT_ABS_PATH}/test/unprepare.sh
21−
22−# I don't think we need this either
23−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/test/unprepare.sh
24−
25−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/unfinishing.sh
26−
27−${SCRIPT_ABS_PATH}/deploy/unfinishing.sh
28−${SCRIPT_ABS_PATH}/deploy/undeploy.sh
29−${SCRIPT_ABS_PATH}/deploy/unprepare.sh
30−
31−# I don't think we need this either
32−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/unprepare.sh
33−
34−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/build/unfinishing.sh
35−
36−${SCRIPT_ABS_PATH}/build/unfinishing.sh
37−${SCRIPT_ABS_PATH}/build/unbuild.sh
38−${SCRIPT_ABS_PATH}/build/unprepare.sh
39−${SCRIPT_ABS_PATH}/unprepare.sh
40−
41−# I don't think we need this either
42−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/build/unprepare.sh
43−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/unprepare.sh
44−
45−done_banner "project-m36" "Cont. UnBuild, UnDeploy and UnTest"
ci/DevOps/local/test/uncb-uncd.shdeleted−36
@@ -1,36 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "Cont. UnBuild and UnDeploy"
12−
13−# I don't think we need to undo the top-level finishing and prepare
14−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/unfinishing.sh
15−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/unfinishing.sh
16−
17−${SCRIPT_ABS_PATH}/unfinishing.sh
18−${SCRIPT_ABS_PATH}/deploy/unfinishing.sh
19−${SCRIPT_ABS_PATH}/deploy/undeploy.sh
20−${SCRIPT_ABS_PATH}/deploy/unprepare.sh
21−
22−# I don't think we need this either
23−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/unprepare.sh
24−
25−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/build/unfinishing.sh
26−
27−${SCRIPT_ABS_PATH}/build/unfinishing.sh
28−${SCRIPT_ABS_PATH}/build/unbuild.sh
29−${SCRIPT_ABS_PATH}/build/unprepare.sh
30−${SCRIPT_ABS_PATH}/unprepare.sh
31−
32−# I don't think we need this either
33−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/build/unprepare.sh
34−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/unprepare.sh
35−
36−done_banner "project-m36" "Cont. UnBuild and UnDeploy"
ci/DevOps/local/test/uncb.shdeleted−27
@@ -1,27 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "Cont. UnBuild"
12−
13−# I don't think we need to undo the top-level finishing and prepare
14−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/unfinishing.sh
15−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/build/unfinishing.sh
16−
17−${SCRIPT_ABS_PATH}/unfinishing.sh
18−${SCRIPT_ABS_PATH}/build/unfinishing.sh
19−${SCRIPT_ABS_PATH}/build/unbuild.sh
20−${SCRIPT_ABS_PATH}/build/unprepare.sh
21−${SCRIPT_ABS_PATH}/unprepare.sh
22−
23−# I don't think we need this either
24−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/build/unprepare.sh
25−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/unprepare.sh
26−
27−done_banner "project-m36" "Cont. UnBuild"
ci/DevOps/local/test/uncd-unct.shdeleted−36
@@ -1,36 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "Cont. UnDeploy and UnTest"
12−
13−# I don't think we need to undo the top-level finishing and prepare
14−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/unfinishing.sh
15−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/test/unfinishing.sh
16−
17−${SCRIPT_ABS_PATH}/unfinishing.sh
18−${SCRIPT_ABS_PATH}/test/unfinishing.sh
19−${SCRIPT_ABS_PATH}/test/untest.sh
20−${SCRIPT_ABS_PATH}/test/unprepare.sh
21−
22−# I don't think we need this either
23−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/test/unprepare.sh
24−
25−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/unfinishing.sh
26−
27−${SCRIPT_ABS_PATH}/deploy/unfinishing.sh
28−${SCRIPT_ABS_PATH}/deploy/undeploy.sh
29−${SCRIPT_ABS_PATH}/deploy/unprepare.sh
30−${SCRIPT_ABS_PATH}/unprepare.sh
31−
32−# I don't think we need this either
33−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/unprepare.sh
34−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/unprepare.sh
35−
36−done_banner "project-m36" "Cont. UnDeploy and UnTest"
ci/DevOps/local/test/uncd.shdeleted−27
@@ -1,27 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "Cont. UnDeploy"
12−
13−# I don't think we need to undo the top-level finishing and prepare
14−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/unfinishing.sh
15−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/unfinishing.sh
16−
17−${SCRIPT_ABS_PATH}/unfinishing.sh
18−${SCRIPT_ABS_PATH}/deploy/unfinishing.sh
19−${SCRIPT_ABS_PATH}/deploy/undeploy.sh
20−${SCRIPT_ABS_PATH}/deploy/unprepare.sh
21−${SCRIPT_ABS_PATH}/unprepare.sh
22−
23−# I don't think we need this either
24−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/deploy/unprepare.sh
25−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/unprepare.sh
26−
27−done_banner "project-m36" "Cont. UnDeploy"
ci/DevOps/local/test/unct.shdeleted−27
@@ -1,27 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "Cont. UnTest"
12−
13−# I don't think we need to undo the top-level finishing and prepare
14−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/unfinishing.sh
15−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/test/unfinishing.sh
16−
17−${SCRIPT_ABS_PATH}/unfinishing.sh
18−${SCRIPT_ABS_PATH}/test/unfinishing.sh
19−${SCRIPT_ABS_PATH}/test/untest.sh
20−${SCRIPT_ABS_PATH}/test/unprepare.sh
21−${SCRIPT_ABS_PATH}/unprepare.sh
22−
23−# I don't think we need this either
24−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/test/unprepare.sh
25−#${SCRIPT_ABS_PATH}/../../../../DevOps/local/test/unprepare.sh
26−
27−done_banner "project-m36" "Cont. UnTest"
ci/DevOps/local/test/unfinishing.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "unfinishing"
12−
13−done_banner "project-m36" "unfinishing"
ci/DevOps/local/test/unprepare.shdeleted−13
@@ -1,13 +0,0 @@
1−#!/usr/bin/env bash
2−if ! type dirname > /dev/null 2>&1; then
3− echo "Not even a linux or macOS, Windoze? We don't support it. Abort."
4− exit 1
5−fi
6−
7−. "$(dirname "$0")"/../../common/common.sh
8−
9−init_with_root_or_sudo "$0"
10−
11−begin_banner "project-m36" "unprepare"
12−
13−done_banner "project-m36" "unprepare"
docker.nix+16−8
@@ -1,10 +1,18 @@
1−{ pkgs ? import ./pkgs.nix }:
1+{ compiler ? "ghc8104"
2+, sources ? import ./nix/sources.nix
3+, pkgs ? import sources.nixpkgs { }
4+}:
2let
5let
3− release = import ./release.nix { inherit pkgs; };
6+ release = import ./release.nix { inherit pkgs compiler sources; };
4− static-project-m36 = pkgs.haskell.lib.justStaticExecutables release.project;
7+ static-project-m36 = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.justStaticExecutables release.project);
5in
8in
6− pkgs.dockerTools.buildImage {
9+pkgs.dockerTools.buildImage {
7− name = "project-m36";
10+ name = "project-m36";
11+ tag = "latest";
8− contents = [static-project-m36];
12+ contents = [ static-project-m36 ];
13+ # expose default project-m36 and websocket server ports
14+ config = {
9− config = { Env = ["LC_ALL=en_US.UTF-8"]; };
15+ Env = [ "LC_ALL=en_US.UTF-8" ];
16+ ExposedPorts = { "6543/tcp" = { }; "8000/tcp" = { }; };
17+ };
10− }
18+}
docs/15_minute_tutorial.markdown+64−67
@@ -4,17 +4,19 @@ Thank you for evaluating Project:M36, a new relational algebra engine written in
4
4
5## Prerequisites
5## Prerequisites
6
6
7−* any Linux
7+* any Linux, MacOS, or Windows computer with Docker installed
8−* GHC 8.2 or later version (Haskell compiler)
9−* cabal (package downloader) installed
10
8
11## Download and Install
9## Download and Install
12
10
11+Run a pre-built docker image:
12+
13+```docker run -it projectm36/project-m36 tutd```
14+
15+or build it yourself with GHC >= 8.6:
16+
13```bash
17```bash
14git clone https://github.com/agentm/project-m36.git
18git clone https://github.com/agentm/project-m36.git
15−cabal sandbox init
16−cabal install --dependencies-only
17−cabal run tutd
19+cabal new-run tutd
18```
20```
19
21
20## Some Basic TutorialD
22## Some Basic TutorialD
@@ -26,18 +28,10 @@ Note that TutorialD is strongly-typed- no type coercions take place automaticall
26### Load the Canonical Chris Date Example
28### Load the Canonical Chris Date Example
27
29
28```
30```
29−TutorialD (master/main): :importexample date
31+TutorialD (master/main): :importexample cjdate
30−```
31−
32−or
33−
34−```
35−TutorialD (master/main): :importtud "scripts/DateExamples.tutd"
36```
32```
37
33
38−```:importtutd``` (do not skip typing the preceding colon), loads a file which contains a script written in the TutorialD dialect used by Project:M36 and executes it to change the state of the database. In this case, the relations "s" (supplier), "p" (product), and "sp" (suppliers-products) are now loaded.
34+```:importexample``` (do not skip typing the preceding colon), loads a built-in example schema and executes it to change the state of the database. In this case, the relations "s" (supplier), "p" (product), and "sp" (suppliers-products) are now loaded.
39−
40−```:importexample date``` loads the date example directly without any file I/O, so it is safe to use with the websocket server.
41
35
42### Execute Relational Expressions
36### Execute Relational Expressions
43
37
@@ -164,7 +158,7 @@ Database context expressions change the state of the database, much like "CREATE
164#### Create a Relation Variable
158#### Create a Relation Variable
165
159
166```
160```
167−TutorialD (master/main): x:=relation{name Text, age Int}{tuple{name "Steve", age 40},tuple{name "Mike", age 31}}
161+TutorialD (master/main): x:=relation{name Text, age Integer}{tuple{name "Steve", age 40},tuple{name "Mike", age 31}}
168TutorialD (master/main): :showexpr x
162TutorialD (master/main): :showexpr x
169┌────────┬──────────┐
163┌────────┬──────────┐
170│age::Int│name::Text│
164│age::Int│name::Text│
@@ -179,23 +173,25 @@ This is similar to SQL's "CREATE TABLE" operator.
179#### Insert Additional Tuples
173#### Insert Additional Tuples
180
174
181```
175```
182−TutorialD (master/main): x:=relation{name Text, age Int}{tuple{name "Steve", age 40},tuple{name "Mike", age 31}}
176+TutorialD (master/main): x:=relation{name Text, age Integer}{tuple{name "Steve", age 40},tuple{name "Mike", age 31}}
183TutorialD (master/main): :showexpr x
177TutorialD (master/main): :showexpr x
184−┌────────┬──────────┐
178+┌────────────┬──────────┐
185−│age::Int│name::Text│
179+│age::Integer│name::Text│
186−├────────┼──────────┤
180+├────────────┼──────────┤
181+│31 │"Mike" │
187−│40 │"Steve" │
182+│40 │"Steve" │
188−│31 │"Mike" │
189−└────────┴──────────┘
183+└────────────┴──────────┘
184+
190TutorialD (master/main): insert x relation{tuple{name "Bob", age 24}}
185TutorialD (master/main): insert x relation{tuple{name "Bob", age 24}}
191TutorialD (master/main): :showexpr x
186TutorialD (master/main): :showexpr x
192−┌────────┬──────────┐
187+┌────────────┬──────────┐
193−│age::Int│name::Text│
188+│age::Integer│name::Text│
194−├────────┼──────────┤
189+├────────────┼──────────┤
190+│31 │"Mike" │
195−│40 │"Steve" │
191+│40 │"Steve" │
196−│24 │"Bob" │
192+│24 │"Bob" │
197−│31 │"Mike" │
198−└────────┴──────────┘
193+└────────────┴──────────┘
194+
199```
195```
200
196
201Note that the relational insertion is identical to "x:=x union relation{...}".
197Note that the relational insertion is identical to "x:=x union relation{...}".
@@ -204,50 +200,51 @@ Note that the relational insertion is identical to "x:=x union relation{...}".
204
200
205```
201```
206TutorialD (master/main): :showexpr s
202TutorialD (master/main): :showexpr s
207−┌──────────┬────────┬───────────┬───────────┐
203+┌──────────┬────────┬───────────┬───────────────┐
208−│city::Text│s#::Text│sname::Text│status::Int│
204+│city::Text│s#::Text│sname::Text│status::Integer│
209−├──────────┼────────┼───────────┼───────────┤
205+├──────────┼────────┼───────────┼───────────────┤
210−│"Paris" │"S2" │"Jones" │10 │
211−│"Paris" │"S3" │"Blake" │30 │
212−│"London" │"S1" │"Smith" │20 │
206+│"London" │"S1" │"Smith" │20 │
213−│"London" │"S4" │"Clark" │20 │
214−│"Athens" │"S5" │"Adams" │30 │
207+│"Athens" │"S5" │"Adams" │30 │
208+│"Paris" │"S3" │"Blake" │30 │
209+│"London" │"S4" │"Clark" │20 │
210+│"Paris" │"S2" │"Jones" │10 │
215−└──────────┴────────┴───────────┴───────────┘
211+└──────────┴────────┴───────────┴───────────────┘
216TutorialD (master/main): update s where city="London" (status:=35)
212TutorialD (master/main): update s where city="London" (status:=35)
217TutorialD (master/main): :showexpr s
213TutorialD (master/main): :showexpr s
218−┌──────────┬────────┬───────────┬───────────┐
214+┌──────────┬────────┬───────────┬───────────────┐
219−│city::Text│s#::Text│sname::Text│status::Int│
215+│city::Text│s#::Text│sname::Text│status::Integer│
220−├──────────┼────────┼───────────┼───────────┤
216+├──────────┼────────┼───────────┼───────────────┤
217+│"Athens" │"S5" │"Adams" │30 │
218+│"London" │"S1" │"Smith" │35 │
221−│"London" │"S4" │"Clark" │35 │
219+│"London" │"S4" │"Clark" │35 │
222−│"London" │"S1" │"Smith" │35 │
220+│"Paris" │"S3" │"Blake" │30 │
223−│"Paris" │"S2" │"Jones" │10 │
221+│"Paris" │"S2" │"Jones" │10 │
224−│"Paris" │"S3" │"Blake" │30 │
225−│"Athens" │"S5" │"Adams" │30 │
226−└──────────┴────────┴───────────┴───────────┘
222+└──────────┴────────┴───────────┴───────────────┘
223+
227```
224```
228#### Deleting Tuples from a Relation Variable
225#### Deleting Tuples from a Relation Variable
229
226
230```
227```
231TutorialD (master/main): :showexpr s
228TutorialD (master/main): :showexpr s
232−┌──────────┬────────┬───────────┬───────────┐
229+┌──────────┬────────┬───────────┬───────────────┐
233−│city::Text│s#::Text│sname::Text│status::Int│
230+│city::Text│s#::Text│sname::Text│status::Integer│
234−├──────────┼────────┼───────────┼───────────┤
231+├──────────┼────────┼───────────┼───────────────┤
235−│"Paris" │"S2" │"Jones" │10 │
232+│"Paris" │"S2" │"Jones" │10 │
236−│"Paris" │"S3" │"Blake" │30 │
233+│"Paris" │"S3" │"Blake" │30 │
237−│"London" │"S1" │"Smith" │20 │
234+│"London" │"S1" │"Smith" │20 │
238−│"London" │"S4" │"Clark" │20 │
239−│"Athens" │"S5" │"Adams" │30 │
235+│"Athens" │"S5" │"Adams" │30 │
236+│"London" │"S4" │"Clark" │20 │
240−└──────────┴────────┴───────────┴───────────┘
237+└──────────┴────────┴───────────┴───────────────┘
241TutorialD (master/main): delete s where sname="Adams"
238TutorialD (master/main): delete s where sname="Adams"
242TutorialD (master/main): :showexpr s
239TutorialD (master/main): :showexpr s
243−┌──────────┬────────┬───────────┬───────────┐
240+┌──────────┬────────┬───────────┬───────────────┐
244−│city::Text│s#::Text│sname::Text│status::Int│
241+│city::Text│s#::Text│sname::Text│status::Integer│
245−├──────────┼────────┼───────────┼───────────┤
242+├──────────┼────────┼───────────┼───────────────┤
246−│"Paris" │"S2" │"Jones" │10 │
243+│"Paris" │"S2" │"Jones" │10 │
244+│"London" │"S4" │"Clark" │20 │
247−│"Paris" │"S3" │"Blake" │30 │
245+│"Paris" │"S3" │"Blake" │30 │
248−│"London" │"S1" │"Smith" │20 │
246+│"London" │"S1" │"Smith" │20 │
249−│"London" │"S4" │"Clark" │20 │
250−└──────────┴────────┴───────────┴───────────┘
247+└──────────┴────────┴───────────┴───────────────┘
251```
248```
252
249
253### Execute Transaction Graph Expressions
250### Execute Transaction Graph Expressions
@@ -270,7 +267,7 @@ TutorialD (master/main): :rollback
270
267
271```
268```
272TutorialD (master/main): :branch experimental
269TutorialD (master/main): :branch experimental
273−TutorialD (experimental): employee:=relation{name Text, salary Int}
270+TutorialD (experimental): employee:=relation{name Text, salary Integer}
274TutorialD (experimental): :commit
271TutorialD (experimental): :commit
275```
272```
276
273
docs/import_export_csv.markdown+2−2
@@ -9,7 +9,7 @@ If a relation variable cannot be exported due to data types which are not suppor
9### Example Export
9### Example Export
10
10
11```
11```
12−TutorialD (master/main): :importexample date
12+TutorialD (master/main): :importexample cjdate
13TutorialD (master/main): :exportcsv s "/tmp/csv"
13TutorialD (master/main): :exportcsv s "/tmp/csv"
14```
14```
15```
15```
@@ -37,7 +37,7 @@ s#,sname,status,city
37S6,Samson,100,New York
37S6,Samson,100,New York
38```
38```
39```
39```
40−TutorialD (master/main): :importexample date
40+TutorialD (master/main): :importexample cjdate
41TutorialD (master/main): :showexpr s
41TutorialD (master/main): :showexpr s
42┌──────────┬────────┬───────────┬───────────────┐
42┌──────────┬────────┬───────────┬───────────────┐
43│city::Text│s#::Text│sname::Text│status::Integer│
43│city::Text│s#::Text│sname::Text│status::Integer│
docs/introduction_to_projectm36.markdown+27−8
@@ -15,16 +15,35 @@ The relational algebra is the mathematical model underpinning Project:M36. When
15
15
16## Binary Releases
16## Binary Releases
17
17
18−### Windows
18+The quickest and preferred method of installation is via docker, which works on Linux, macOS, and Windows. Docker downloads and runs preconfigured software in secure, sandboxed containers, preventing third-party software from altering the host system without your permission.
19−Project:M36 now provides binary installations for Windows. Check the (releases page)[https://github.com/agentm/project-m36/releases] for downloads.
20
19
21−### MacOS X
20+### Install Docker:
22
21
23−Binary releases are not yet available for MacOS X, but compiling from source is easy.
22+* [Windows 10 Docker Installation](https://docs.docker.com/docker-for-windows/wsl/)
23+* [MacOS Docker Installation](https://docs.docker.com/docker-for-mac/install/)
24+* [Linux Docker Installation](https://docs.docker.com/engine/install/#server)
24
25
25−### Linux
26+### Run TutorialD from Docker Image
26
27
27−The currently-preferred method of installation is from source. A future enhancement would be installation from deb or rpm.
28+This downloads the docker image tagged "latest" and runs `tutd`, the TutorialD command line interface. Try the [15-Minute TutorialD Tutorial](15_minute_tutorial.markdown) and try some expressions.
29+
30+```bash
31+docker run -it projectm36/project-m36 tutd
32+```
33+
34+### Run Project:M36 Server
35+
36+The default port for the project-m36 server is 6543.
37+
38+```bash
39+docker run --network host projectm36/project-m36 project-m36-server -n <database_name>
40+```
41+
42+### Connect to Project:M36 Server
43+
44+```bash
45+docker run --network host projectm36/project-m36
46+```
28
47
29## Source Installation
48## Source Installation
30
49
@@ -32,7 +51,7 @@ Requirements:
32
51
33To build with stack:
52To build with stack:
34
53
35−* [GHC 8.4.4 or greater](https://www.haskell.org/downloads)
54+* [GHC 8.6.5 or greater](https://www.haskell.org/downloads)
36* [Haskell stack](https://docs.haskellstack.org/en/stable/README/)
55* [Haskell stack](https://docs.haskellstack.org/en/stable/README/)
37* Linux, macOS, or Microsoft Windows
56* Linux, macOS, or Microsoft Windows
38
57
@@ -44,7 +63,7 @@ Compilation steps:
44
63
45At this point, the TutorialD interactive interpreter can be run using ```stack exec tutd```.
64At this point, the TutorialD interactive interpreter can be run using ```stack exec tutd```.
46
65
47−Alternative building with GHC 8.4.4 or greater:
66+Alternative building with GHC 8.6.5 or greater:
48
67
49* ```cabal new-build```
68* ```cabal new-build```
50
69
docs/introduction_to_the_relational_algebra.markdown+1−1
@@ -202,7 +202,7 @@ Join (Instructor relation)
202
202
203(Course Relation)
203(Course Relation)
204
204
205−|(Course Name, Course Name Type)|(Instructor, Instructor Name Type)|(Course Room Number, Room Number Type)|
205+|(Course Name, Course Name Type)|(Instructor Name, Instructor Name Type)|(Course Room Number, Room Number Type)|
206|-------------------------------|----------------------------------|--------------------------------------|
206|-------------------------------|----------------------------------|--------------------------------------|
207|English 1|Steve|Room 104|
207|English 1|Steve|Room 104|
208|French 2|Bob|Room 103|
208|French 2|Bob|Room 103|
docs/reaching_out_of_the_tarpit.markdown+1−1
@@ -57,7 +57,7 @@ Project:M36 implements multiple interfaces:
57To understand how Project:M36 stacks up against the fictional programming language shown in the paper, we have implemented the [example from the paper](/examples/out_of_the_tarpit.tutd). The language used in the script is a dialect of Chris Date's TutorialD language. It can be loaded into an interactive ```tutd``` session like so:
57To understand how Project:M36 stacks up against the fictional programming language shown in the paper, we have implemented the [example from the paper](/examples/out_of_the_tarpit.tutd). The language used in the script is a dialect of Chris Date's TutorialD language. It can be loaded into an interactive ```tutd``` session like so:
58
58
59```
59```
60−TutorialD (master/main): :importexample date
60+TutorialD (master/main): :importexample cjdate
61TutorialD (master/main): :showexpr p
61TutorialD (master/main): :showexpr p
62┌───────────────────┬────────────┬───────────────────┬────────────┬────────────┐
62┌───────────────────┬────────────┬───────────────────┬────────────┬────────────┐
63│address::Address │agent::Agent│dateRegistered::Day│photo::Text │price::Price│
63│address::Address │agent::Agent│dateRegistered::Day│photo::Text │price::Price│
docs/tupleable.markdown+19
@@ -23,6 +23,25 @@ instance Tupleable Person
23
23
24Now, ```Person``` values can be marshaled between the database and the client. The attribute names appearing in the Haskell data type will appear identically in the server with the same types.
24Now, ```Person``` values can be marshaled between the database and the client. The attribute names appearing in the Haskell data type will appear identically in the server with the same types.
25
25
26+### Changing Options
27+
28+If our field names don't exactly match attribute names, but follow a common pattern, we can derive Tupleable with custom options. Let's say each field on person has a prefix "person", but we still want to use the attribute names without the prefix. We can make use of the ProjectM36.Tupleable module to accomplish our goal like so:
29+
30+```haskell
31+import ProjectM36.Tupleable.Deriving
32+
33+data Person = Person {
34+ personName :: Text,
35+ personEmployeeNumber :: Int,
36+ personLikesHorses :: Bool
37+ }
38+ deriving stock Generic
39+ deriving Tupleable
40+ via Codec (Field (DropPrefix "person" >>> CamelCase)) Person
41+```
42+
43+The extensions DerivingGeneric, DerivingVia, TypeOperators, and DataKinds must be enabled for this code to compile. See the documentation on Hackage for all available options.
44+
26## Usage
45## Usage
27
46
28The ```Tupleable``` module includes the following functions:
47The ```Tupleable``` module includes the following functions:
docs/tutd_cheatsheet.markdown+3−1
@@ -47,7 +47,9 @@ Database context expressions take the current database context as input and alte
47
47
48|Database Context Expression |Description |
48|Database Context Expression |Description |
49|------------------------------------------------------|---------------------------------------|
49|------------------------------------------------------|---------------------------------------|
50−|`:importexample date`|Imports a precooked schema from Chris Date's books resulting in relvars `s`, `sp`, and `p`|
50+|`:importexample cjdate`|Imports a precooked schema from Chris Date's books resulting in relvars `s`, `sp`, and `p`|
51+|`:importtutd "file:///home/agentm/project-m36/scripts/emp.tutd"`|Imports TutorialD from file URI|
52+|`:importtutd "https://raw.githubusercontent.com/agentm/project-m36/master/scripts/emp.tutd" "effe32b247586dc3ac0079fc241b9618d41d189afcaeb7907edbe5a8b45992a4"`| Imports TutorialD from HTTP or HTTPS URI|
51|`newrelvar:=relation{tuple{age 3}}`|Assign a new relation variable named `newrelvar`|
53|`newrelvar:=relation{tuple{age 3}}`|Assign a new relation variable named `newrelvar`|
52|`undefine s`|Remove a relation variable|
54|`undefine s`|Remove a relation variable|
53|`insert s relation{tuple{city "Boston",s# "S10",sname "Gonzalez",status 10}}`| Append to an existing relation variable with another relational expression|
55|`insert s relation{tuple{city "Boston",s# "S10",sname "Gonzalez",status 10}}`| Append to an existing relation variable with another relational expression|
docs/tutd_tutorial.markdown+56−2
@@ -19,7 +19,7 @@ TutorialD (master/main):
19The examples in this tutorial can be executed after loading Chris Date's sample relations using:
19The examples in this tutorial can be executed after loading Chris Date's sample relations using:
20
20
21```
21```
22−:importexample date
22+:importexample cjdate
23```
23```
24
24
25Each section assumes a fresh instance of the Date examples. The relation variables created in the script are:
25Each section assumes a fresh instance of the Date examples. The relation variables created in the script are:
@@ -30,6 +30,24 @@ Each section assumes a fresh instance of the Date examples. The relation variabl
30|p|parts|
30|p|parts|
31|sp|contains mapping of which suppliers supply which parts|
31|sp|contains mapping of which suppliers supply which parts|
32
32
33+### Importing TutorialD from Other Sources
34+
35+The `tutd` console can also run TutorialD from a local file or from a web server.
36+
37+To import TutorialD from a file:
38+
39+```
40+:importtutd "file:///home/agentm/project-m36/scripts/emp.tutd"
41+```
42+
43+or from a web server:
44+
45+```
46+:importtutd "https://raw.githubusercontent.com/agentm/project-m36/master/scripts/DateExamples.tutd" "db9f3d9fe06d0a29b8355e045b89ec94d6428e3a3de93def7ca77bf0298b7010"
47+```
48+
49+The second argument is an optional SHA256 hash in hexadecimal form. This can be used to validate that the script has not changed since the last import. Importing TutorialD from the web is in general safe because it is effectively sandboxed with "Safe Haskell" for functions, so the script is contained security-wise, however, nothing prevents the script from running forever. Downloading a schema from the web is a great way to share schemas and to kick start your project without starting from scratch.
50+
33### Types
51### Types
34
52
35TutorialD is strongly-typed. The basic built-in types are:
53TutorialD is strongly-typed. The basic built-in types are:
@@ -197,7 +215,7 @@ TutorialD (master/main): :showexpr s{all but city}
197└────────┴───────────┴───────────────┘
215└────────┴───────────┴───────────────┘
198```
216```
199
217
200−Projection attributes can also be derived from a relational expression using `all from`:
218+Projection attributes can be derived from a relational expression using `all from`:
201
219
202```
220```
203TutorialD (master/main): :showexpr (s join sp){all from s}
221TutorialD (master/main): :showexpr (s join sp){all from s}
@@ -213,6 +231,42 @@ TutorialD (master/main): :showexpr (s join sp){all from s}
213
231
214Above, we join `s` and `sp` but project the result back onto the attributes of `s`.
232Above, we join `s` and `sp` but project the result back onto the attributes of `s`.
215
233
234+Projection attributes can be unioned from multiple sources using `union of`:
235+
236+```
237+TutorialD (master/main): :showexpr (s join sp){union of {all from s} {all but p#}}
238+┌──────────┬────────────┬────────┬───────────┬───────────────┐
239+│city::Text│qty::Integer│s#::Text│sname::Text│status::Integer│
240+├──────────┼────────────┼────────┼───────────┼───────────────┤
241+│"Paris" │400 │"S2" │"Jones" │10 │
242+│"London" │400 │"S1" │"Smith" │20 │
243+│"Paris" │200 │"S3" │"Blake" │30 │
244+│"London" │200 │"S4" │"Clark" │20 │
245+│"London" │200 │"S1" │"Smith" │20 │
246+│"Paris" │300 │"S2" │"Jones" │10 │
247+│"London" │100 │"S1" │"Smith" │20 │
248+│"London" │300 │"S4" │"Clark" │20 │
249+│"London" │300 │"S1" │"Smith" │20 │
250+│"London" │400 │"S4" │"Clark" │20 │
251+└──────────┴────────────┴────────┴───────────┴───────────────┘
252+```
253+
254+Here, after joining `s` and `p`, the union of all attributes from `s` and all attributes from `p` except for `p#` are returned.all
255+
256+Finally, projection attributes can be intersected using `intersection of`:
257+
258+```
259+TutorialD (master/main): :showexpr (s join sp){intersection of {all from s} {all from p}}
260+┌──────────┐
261+│city::Text│
262+├──────────┤
263+│"London" │
264+│"Paris" │
265+└──────────┘
266+```
267+
268+Here, after joining `s` and `p`, we project on the intersection of attributes from `s` and `p` which happens to be `city`.
269+
216#### Restriction
270#### Restriction
217
271
218Restriction is applied using a "where" clause, much like in SQL.
272Restriction is applied using a "where" clause, much like in SQL.
examples/DerivingCustomTupleable.hsnew file+54
@@ -0,0 +1,54 @@
1+{-# LANGUAGE DeriveGeneric, DerivingVia, GeneralizedNewtypeDeriving, TypeOperators, DataKinds, OverloadedStrings #-}
2+
3+import ProjectM36.Tupleable.Deriving
4+import ProjectM36.Atomable (Atomable)
5+import Control.DeepSeq (NFData)
6+import Data.Text (Text)
7+import GHC.Generics (Generic)
8+import Codec.Winery
9+
10+newtype BlogId = BlogId { getBlogId :: Int }
11+ deriving stock (Eq, Ord, Show, Generic)
12+ deriving newtype (Num)
13+ deriving Serialise via WineryRecord BlogId
14+
15+instance NFData BlogId
16+instance Atomable BlogId
17+
18+data Blog = Blog
19+ { blogId :: BlogId
20+ , blogTitle :: Text
21+ , blogAuthorName :: Text
22+ }
23+ deriving stock (Show, Generic)
24+ deriving (Tupleable)
25+ via Codec (Field (DropPrefix "blog" >>> CamelCase)) Blog
26+ deriving Serialise via WineryRecord Blog
27+
28+data Comment = Comment
29+ { commentAuthorName :: Text
30+ , commentComment :: Text
31+ , commentFor :: BlogId
32+ }
33+ deriving stock (Show, Generic)
34+ deriving (Tupleable)
35+ via Codec (Field (DropPrefix "comment" >>> CamelCase)) Comment
36+ deriving Serialise via WineryRecord Comment
37+
38+main :: IO ()
39+main = do
40+ let exampleBlog = Blog
41+ { blogId = 0
42+ , blogTitle = "Cat Pics"
43+ , blogAuthorName = "Alice"
44+ }
45+ exampleComment = Comment
46+ { commentAuthorName = "Bob"
47+ , commentComment = "great"
48+ , commentFor = 0
49+ }
50+ print exampleBlog
51+ print (toTuple exampleBlog)
52+ putStrLn ""
53+ print exampleComment
54+ print (toTuple exampleComment)
examples/Plantfarm.hsnew file+446
@@ -0,0 +1,446 @@
1+{-# LANGUAGE DeriveGeneric #-}
2+
3+{-# LANGUAGE OverloadedStrings #-}
4+
5+{-# LANGUAGE DeriveAnyClass #-}
6+
7+{-# LANGUAGE DerivingVia #-}
8+
9+
10+import Codec.Winery (Serialise, WineryVariant(WineryVariant))
11+import Control.DeepSeq (NFData)
12+import Data.Aeson (FromJSON, ToJSON(toEncoding, toJSON))
13+import Data.Data (Proxy(Proxy))
14+import Data.Either (lefts, rights)
15+import Data.Functor (($>))
16+import Data.Text as T (Text)
17+import qualified Data.Text.Lazy as TL (pack)
18+import GHC.Generics (Generic)
19+import qualified ProjectM36.Base as Base
20+import ProjectM36.Client
21+ ( AtomExprBase(NakedAtomExpr)
22+ , Atomable(toAddTypeExpr, toAtom)
23+ , AttributeName
24+ , Connection
25+ , ConnectionInfo(InProcessConnectionInfo)
26+ , DatabaseContextExpr
27+ , DatabaseContextExprBase(Delete)
28+ , PersistenceStrategy(NoPersistence)
29+ , RelationalError
30+ , RelationalExprBase(RelationVariable, Restrict)
31+ , RestrictionPredicateExprBase(AttributeEqualityPredicate)
32+ , SessionId
33+ , close
34+ , commit
35+ , connectProjectM36
36+ , createSessionAtHead
37+ , databaseContextExprForUniqueKey
38+ , defaultHeadName
39+ , emptyNotificationCallback
40+ , executeDatabaseContextExpr
41+ , executeRelationalExpr
42+ , withTransaction
43+ )
44+import qualified ProjectM36.Relation as Relation
45+import ProjectM36.Tupleable
46+ ( Tupleable(fromTuple)
47+ , toDefineExpr
48+ , toDeleteExpr
49+ , toInsertExpr
50+ , toUpdateExpr
51+ )
52+import qualified System.Random as R
53+
54+
55+import Control.Monad.IO.Class (MonadIO(liftIO))
56+import qualified Web.Scotty as S
57+
58+-- | This is an example showcasing the updating of data
59+-- with the help of plants. \\
60+-- This is a very simple example and of course not how
61+-- plants grow in nature. \\
62+-- The main goal of this example is to showcase the updating
63+-- of data and the different options of persistence.
64+-- You can just pipe the output from curl into jq:
65+--
66+-- curl -X POST -H 'Accept: application/json' http://localhost:8001/plant/water/angu | jq -r '.stage'
67+
68+
69+data Stage = Seed | Sprout | Seedling | Adult | Dead
70+ deriving (Show, Eq, Ord, Generic, NFData, Atomable)
71+ deriving Serialise via WineryVariant Stage
72+
73+
74+instance ToJSON Stage where -- The where can be removed and the implementation commented out
75+ -- if the ascii values are not wanted
76+ toJSON s = toJSON $ show s <> "\nascii only provided for visualisation:\n" <> stagetoAscii s
77+
78+ toEncoding s = toEncoding $ show s <> "\nascii only provided for visualisation:\n" <> stagetoAscii s
79+
80+instance FromJSON Stage
81+
82+instance S.Parsable Stage where
83+ parseParam t
84+ | t == "seed" || t == "Seed" = Right Seed
85+ | t == "sprout" || t == "Sprout" = Right Sprout
86+ | t == "seedling" || t == "Seedling" = Right Seedling
87+ | t == "adult" || t == "Adult" = Right Adult
88+ | t == "dead" || t == "Dead" = Right Dead
89+ | otherwise = Left t
90+
91+
92+-- Just for ToJSON for ilustration of stage
93+type ASCIIStage = String
94+
95+seedStr :: ASCIIStage
96+seedStr = "<>\n\
97+ \'''\n"
98+sproutStr :: ASCIIStage
99+sproutStr = " ..\n\
100+ \<|>\n\
101+ \''''\n"
102+seedlingStr :: ASCIIStage
103+seedlingStr = " `\\⁄o \n\
104+ \ v|/\n\
105+ \'´;'''\n"
106+adultStr :: ASCIIStage
107+adultStr = "*~(#)~\n\
108+ \ \\,Y,e\n\
109+ \ \\|/\n\
110+ \''+'\\''\n"
111+deadStr :: ASCIIStage
112+deadStr = " ,__:<\n\
113+ \'/'''''\n"
114+
115+-- Just used for ToJSON illustration of stages
116+stagetoAscii :: Stage -> ASCIIStage
117+stagetoAscii Seed = seedStr
118+stagetoAscii Sprout = sproutStr
119+stagetoAscii Seedling = seedlingStr
120+stagetoAscii Adult = adultStr
121+stagetoAscii Dead = deadStr
122+
123+-- used for update stage
124+next :: Stage -> Stage
125+next Seed = Sprout
126+next Sprout = Seedling
127+next Seedling = Adult
128+next s = s
129+
130+data Plant = Plant { name :: Text, species :: Text, stage :: Stage, waterings:: Integer } deriving (Show, Generic)
131+instance Tupleable Plant
132+instance ToJSON Plant
133+instance FromJSON Plant
134+
135+
136+main :: IO ()
137+main = do
138+ putStrLn "Connecting to plant farm"
139+ c <- dbConnection
140+ _ <- createSchema c
141+ putStrLn "Planting some plants"
142+ _ <- insertSampleData c
143+ let port = 8001
144+ putStrLn $ "Started Plant farm at " <> show port
145+ S.scotty port $ do
146+
147+ -- retrieve a plant by name
148+ S.get "/plant/:name" $ do
149+ n <- S.param "name"
150+ e <- liftIO $ getPlant c n
151+ p <- handleWebError e
152+ S.json p
153+
154+
155+ -- save a plant providing it as json data
156+ S.post "/plant" $ do
157+ pl <- S.jsonData :: S.ActionM Plant
158+ e <- liftIO $ savePlant c [pl]
159+ p <- handleWebError e
160+ S.json p
161+
162+ -- updating a plant providing it as json data
163+ S.put "/plant" $ do
164+ pl <- S.jsonData :: S.ActionM Plant
165+ e <- liftIO $ updatePlantFst c pl
166+ p <- handleWebError e
167+ S.json p
168+
169+ -- watering the plant having the provided name.
170+ -- This will water the plant and might let it progress to the next stage. It might also die.
171+ S.post "/plant/water/:name" $ do
172+ n <- S.param "name"
173+ e <- liftIO $ waterPlant c n
174+ p <- handleWebError e
175+ S.json p
176+
177+ -- retriving all the plants as json data
178+ S.get "/plants" $ do
179+ e <- liftIO $ getAllPlants c
180+ ps <- handleWebErrors e
181+ S.json ps
182+
183+ -- saving many plants at the same time
184+ S.post "/plants" $ do
185+ pl <- S.jsonData :: S.ActionM [Plant]
186+ e <- liftIO $ savePlant c pl
187+ p <- handleWebError e
188+ S.json p
189+
190+ -- deleting all plants at a specific stage
191+ S.delete "/plants?stage=:stage" $ do
192+ s <- S.param "stage"
193+ e <- liftIO $ deletePlantsByStage c s
194+ p <- handleWebError e
195+ S.json p
196+
197+ -- deleting all plants at a specific stage
198+ S.delete "/plants" $ do
199+ s <- S.param "name"
200+ e <- liftIO $ deletePlantByName c s
201+ p <- handleWebError e
202+ S.json p
203+
204+ -- deleting all dead plants
205+ S.delete "/plants/clear" $ do
206+ e <- liftIO $ clearDeadPlants c
207+ ps <- handleWebErrors e
208+ S.json ps
209+
210+handleWebError :: Either Err b -> S.ActionM b
211+handleWebError (Left e) = S.raise (TL.pack $ "An error occurred:\n" <> show e)
212+handleWebError (Right v) = pure v
213+
214+handleWebErrors :: [Either Err b] -> S.ActionM [b]
215+handleWebErrors e = do
216+ case lefts e of
217+ [] -> pure (rights e)
218+ l -> S.raise (TL.pack $ "Errors occurred:\n" <> concatMap ((<>"\n") . show) l)
219+
220+
221+-- | watering a plant and thereby possibly updating its stage
222+waterPlant :: DBConnection -> Text -> IO (Either Err Plant)
223+waterPlant db n = do
224+ p <- getPlant db n
225+ case p of
226+ Left e -> pure $ Left e
227+ Right v -> updateStage db $ v { waterings = waterings v + 1 }
228+
229+-- | used by 'waterPlant' updates the stage depending on random numbers
230+updateStage :: DBConnection -> Plant -> IO (Either Err Plant)
231+updateStage db p@(Plant _ _ Dead _ ) = do
232+ tmp <- updatePlantFst db p
233+ case tmp of
234+ Left e -> pure $ Left e
235+ Right _ -> pure $ Right p
236+updateStage db p = do
237+ res <- calculateStage p
238+ tmp <- updatePlantFst db res
239+ case tmp of
240+ Left e -> pure $ Left e
241+ Right _ -> pure $ Right res
242+ where calculateStage p' = do
243+ r1 <- R.randomRIO (1, 10) :: IO Integer
244+ let np = if r1 < waterings p' then p' { stage = next $ stage p', waterings = 0 } else p'
245+ r2 <- R.randomRIO (1, 20)
246+ pure $ if r2 < waterings np then np { stage = Dead, waterings = 0 } else np
247+
248+-- | deletes all plants with Stage = Dead
249+clearDeadPlants :: DBConnection -> IO [Either Err Plant]
250+clearDeadPlants db = do
251+ _ <- deletePlantsByStage db Dead
252+ getAllPlants db
253+
254+
255+-- ****************************
256+-- | *Database functions* :
257+-- ****************************
258+
259+
260+-- | Error type for passing. It is not very specific.
261+-- Just minimal and non optimal for this example.
262+data Err = NotSpecified | NotFound deriving (Show ,Generic)
263+
264+instance ToJSON Err
265+
266+-- | Just for convinience for passing around the SessionId
267+-- and the Connection
268+data DBConnection = DB SessionId Connection
269+
270+
271+-- | Getting plants by their name.\
272+-- Because plant has name as primary key \
273+-- we can assume will get at most one result. \
274+-- Alternatively we could return a list.
275+getPlant :: DBConnection -> Text -> IO (Either Err Plant)
276+getPlant db n = defaultHead (Left NotFound) <$> (
277+ get db
278+ ( Restrict -- Restrict can be thought of as similar to "WITH" in SQL
279+ (AttributeEqualityPredicate "name" (NakedAtomExpr (toAtom n))) -- This is the Predicate we are "restricting" our RelationalExprBase with
280+ (RelationVariable "plants" ())
281+ )
282+ :: IO [Either Err Plant] -- this is needed because our 'get' function is
283+ )
284+
285+defaultHead :: a -> [a] -> a
286+defaultHead d [] = d
287+defaultHead _ (x:_) = x
288+
289+-- | Getting all the plants
290+getAllPlants :: DBConnection -> IO [Either Err Plant]
291+getAllPlants db = get db (RelationVariable "plants" ())
292+
293+-- | Getting all the plants that satisfy the restrictions
294+getAllPlantsWith :: DBConnection -> Base.RestrictionPredicateExpr -> IO [Either Err Plant]
295+getAllPlantsWith db ex = get db (Restrict ex (RelationVariable "plants" ()))
296+
297+
298+-- | Saving a plant
299+savePlant :: (Traversable t) => DBConnection -> t Plant -> IO (Either Err ())
300+savePlant db sps = insert db sps "plants"
301+
302+-- | An alternative to update alone because due to updates
303+-- not being cached yet \
304+-- they have to be calculated every update. \
305+-- This seems like an alternative until caching is implemented.
306+updatePlantFst :: DBConnection -> Plant -> IO (Either Err ())
307+updatePlantFst db pln = do
308+ _ <- delete db pln ["name"] "plants"
309+ savePlant db [pln]
310+
311+-- | Updating a plant. Due to the way project 36 works, \
312+-- updates have to be executed every time.\
313+-- This is slow but won't be an issue soon because they will
314+-- be cached.\
315+-- But because of this project 36 can provide O(1) commits.
316+updatePlant :: DBConnection -> Plant -> IO (Either Err ())
317+updatePlant db sps = update
318+ db -- db connection
319+ sps -- plant value
320+ ["name"] -- the attributes to be updated by (in case of unique key)
321+ "plants" -- the relation we want to update on
322+
323+
324+-- | deleting all plants that have given name.
325+deletePlantByName :: DBConnection -> Text -> IO (Either Err ())
326+deletePlantByName db s = executeWithTransaction db $ Right $ Delete "plants" $ AttributeEqualityPredicate "name" (NakedAtomExpr (toAtom s))
327+
328+-- | deleting all plants that have given stage.
329+deletePlantsByStage :: DBConnection -> Stage -> IO (Either Err ())
330+deletePlantsByStage db s = executeWithTransaction db $ Right $ Delete "plants" $ AttributeEqualityPredicate "stage" (NakedAtomExpr (toAtom s))
331+
332+
333+-- | Inserting the schema into the DB
334+createSchema :: DBConnection -> IO ()
335+createSchema (DB sessionId conn) = do
336+ _ <- handleIOErrorsAndQuit $ mapM (executeDatabaseContextExpr sessionId conn) [
337+ toAddTypeExpr (Proxy :: Proxy Stage) -- Adds the Type Stage as data to the DB
338+ , toDefineExpr (Proxy :: Proxy Plant) "plants" -- Creates the plants relation
339+ , databaseContextExprForUniqueKey "plants" ["name"] -- Makes name of the plants relation a uniqe Key,
340+ -- Foreign Key restrictions are available too
341+ ]
342+ pure ()
343+
344+
345+-- | inserting some sample data
346+insertSampleData :: DBConnection -> IO (Either Err ())
347+insertSampleData (DB sid conn) = do
348+ insert (DB sid conn) [
349+ Plant "angu" "Caladenia angustata" Seed 0
350+ , Plant "thely" "Thelymitra alcockiae" Seed 0
351+ , Plant "monstera" "Araceae" Seed 0
352+ ] "plants"
353+
354+dbConnection :: IO DBConnection
355+dbConnection = do
356+ -- connect to the database
357+ let connInfo = InProcessConnectionInfo NoPersistence emptyNotificationCallback []
358+ -- The code below persists the data in a DB with the name "base". \\
359+-- let connInfo = InProcessConnectionInfo (CrashSafePersistence "base") emptyNotificationCallback [] \\
360+ -- In addition minimal persistance is available. \\
361+-- let connInfo = InProcessConnectionInfo (MinimalPersistence "base") emptyNotificationCallback []
362+ conn <- handleIOErrorAndQuit $ connectProjectM36 connInfo
363+ --create a database session at the default branch of the database
364+ sessionId <- handleIOErrorAndQuit $ createSessionAtHead conn defaultHeadName
365+ pure (DB sessionId conn)
366+
367+
368+-- | A polymorphic function to insert data (a traversable of data) into the DB
369+insert :: (Tupleable a, Traversable t) => DBConnection -> t a -> Base.RelVarName -> IO (Either Err ())
370+insert db rlv rlvName = executeWithTransaction db $ toInsertExpr rlv rlvName
371+
372+-- | A polymorphic function to update data in the DB.
373+-- An update in one funtion would take:
374+--
375+-- - SessionId
376+-- - Connection
377+-- - Tuplable a -- the Tuplable you want to update
378+-- - [AttributeName] -- the Attributes of the Tuplable you want to update those are of StringType
379+-- - RelVarName -- the name of the relation
380+--
381+-- With that you can via 'toUpdateExpr' create a 'DatabaseContextExpr' to be executed. \\
382+-- For inserting its very similarly done with 'toInsertExpr'.
383+update :: (Tupleable a) => DBConnection -> a -> [AttributeName]-> Base.RelVarName -> IO (Either Err ())
384+update db rlv attr rlvName = executeWithTransaction db $ toUpdateExpr rlvName attr rlv
385+
386+-- | A polymorphic function to delete data in the DB
387+delete :: (Tupleable a) => DBConnection -> a -> [AttributeName]-> Base.RelVarName -> IO (Either Err ())
388+delete db rlv attr rlvName = executeWithTransaction db $ toDeleteExpr rlvName attr rlv
389+
390+-- | A convenience function to make executing DBContextExpr with commiting simpler. \\
391+-- In particular for expr that just insert, delete and update.
392+-- Therefor ultimately return Either _ ()
393+executeWithTransaction :: DBConnection -> Either RelationalError DatabaseContextExpr -> IO (Either Err ())
394+executeWithTransaction (DB sid conn) expr = do
395+ iEx <- handleError expr
396+ case iEx of
397+ Left e -> pure $ Left e
398+ Right v -> handleIOError $ withTransaction sid conn (executeDatabaseContextExpr sid conn v) (commit sid conn)
399+
400+-- | A polymorphic function to get data (a list of data and possibly errors) from the DB
401+get :: Tupleable b => DBConnection -> Base.RelationalExpr -> IO [Either Err b]
402+get (DB sessionId conn) q = do
403+ eRel <- executeRelationalExpr sessionId conn q
404+ e <- handleError eRel
405+ case e of
406+ Left err -> pure [Left err]
407+ Right pRel -> do
408+ ws <- Relation.toList pRel
409+ mapM (handleError . fromTuple) ws
410+
411+-- | for closing the DB connection.
412+-- Not really needed when using in-memory DB
413+closeConn :: DBConnection -> IO ()
414+closeConn (DB _ conn) = close conn
415+
416+
417+-- | Error handling is heavily inspired by 'blog.hs' the blog example \\
418+-- by (agentm)[https://github.com/agentm] (https://github.com/agentm/project-m36, commit: f8432522adaafeae7c32bc2b8b6cb09c00396fc6). \\
419+-- As stated there, your application should have proper error handling.
420+handleIOErrorAndQuit :: Show e => IO (Either e a) -> IO a
421+handleIOErrorAndQuit m = do
422+ v <- m
423+ handleErrorAndQuit v
424+
425+handleError :: Show e => Either e a -> IO (Either Err a)
426+handleError eErr = case eErr of
427+ Left err -> print err $> Left NotSpecified
428+ Right v -> pure $ Right v
429+
430+handleIOError :: Show e => IO (Either e a) -> IO (Either Err a)
431+handleIOError m = do
432+ v <- m
433+ handleError v
434+
435+handleErrorAndQuit :: Show e => Either e a -> IO a
436+handleErrorAndQuit eErr = case eErr of
437+ Left err -> print err >> error "Quit."
438+ Right v -> pure v
439+
440+handleIOErrorsAndQuit :: Show e => IO [Either e a] -> IO [a]
441+handleIOErrorsAndQuit m = do
442+ eErrs <- m
443+ case lefts eErrs of
444+ [] -> pure (rights eErrs)
445+ err:_ -> handleErrorAndQuit (Left err)
446+
examples/SimpleClient.hs+1−1
@@ -6,7 +6,7 @@ import Data.Text.IO as TIO
6main :: IO ()
6main :: IO ()
7main = do
7main = do
8 -- 1. create a ConnectionInfo
8 -- 1. create a ConnectionInfo
9− let connInfo = RemoteProcessConnectionInfo "mytestdb" (createNodeId "127.0.0.1" defaultServerPort) emptyNotificationCallback
9+ let connInfo = RemoteConnectionInfo "mytestdb" "127.0.0.1" (show defaultServerPort) emptyNotificationCallback
10 -- 2. conncted to the remote database
10 -- 2. conncted to the remote database
11 eConn <- connectProjectM36 connInfo
11 eConn <- connectProjectM36 connInfo
12 case eConn of
12 case eConn of
examples/blog.hs+4−3
@@ -1,5 +1,5 @@
1-- a simple example of a blog schema
1-- a simple example of a blog schema
2−{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings, CPP #-}
2+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings, CPP, DerivingVia #-}
3
3
4import ProjectM36.Client
4import ProjectM36.Client
5import ProjectM36.Base
5import ProjectM36.Base
@@ -10,7 +10,6 @@ import ProjectM36.Tuple (atomForAttributeName)
10
10
11import Data.Either
11import Data.Either
12import GHC.Generics
12import GHC.Generics
13−import Data.Binary
14import qualified Data.Text as T
13import qualified Data.Text as T
15import qualified Data.Text.Lazy as TL
14import qualified Data.Text.Lazy as TL
16import Data.Time.Clock
15import Data.Time.Clock
@@ -22,6 +21,7 @@ import Data.Monoid
22#endif
21#endif
23import Data.List
22import Data.List
24import Control.Monad (when, forM_)
23import Control.Monad (when, forM_)
24+import Codec.Winery
25
25
26import Web.Scotty as S
26import Web.Scotty as S
27import Text.Blaze.Html5 (h1, h2, h3, p, form, input, (!), toHtml, Html, a, toValue, hr, textarea)
27import Text.Blaze.Html5 (h1, h2, h3, p, form, input, (!), toHtml, Html, a, toValue, hr, textarea)
@@ -52,7 +52,8 @@ data Comment = Comment {
52instance Tupleable Comment
52instance Tupleable Comment
53
53
54data Category = Food | Cats | Photos | Other T.Text -- note that this data type could not be represented by an "enumeration" as found in SQL databases
54data Category = Food | Cats | Photos | Other T.Text -- note that this data type could not be represented by an "enumeration" as found in SQL databases
55− deriving (Atomable, Eq, Show, NFData, Binary, Generic) -- derive Atomable so that values of this type can be stored as a database value
55+ deriving (Atomable, Eq, Show, NFData, Generic) -- derive Atomable so that values of this type can be stored as a database value
56+ deriving Serialise via WineryVariant Category -- derive Serialisable to be able to transmit this data remotely
56
57
57-- add some short-hand error handling- your application should have proper handling
58-- add some short-hand error handling- your application should have proper handling
58handleIOError :: Show e => IO (Either e a) -> IO a
59handleIOError :: Show e => IO (Either e a) -> IO a
examples/hair.hs+4−3
@@ -1,16 +1,17 @@
1−{-# LANGUAGE DeriveGeneric, DeriveAnyClass, OverloadedStrings #-}
1+{-# LANGUAGE DeriveGeneric, DeriveAnyClass, OverloadedStrings, DerivingVia #-}
2import ProjectM36.Client
2import ProjectM36.Client
3import ProjectM36.Relation.Show.Term
3import ProjectM36.Relation.Show.Term
4import GHC.Generics
4import GHC.Generics
5import Data.Text
5import Data.Text
6−import Data.Binary
7import Control.DeepSeq
6import Control.DeepSeq
8import qualified Data.Map as M
7import qualified Data.Map as M
9import qualified Data.Text.IO as TIO
8import qualified Data.Text.IO as TIO
10import Data.Proxy
9import Data.Proxy
10+import Codec.Winery
11
11
12data Hair = Bald | Brown | Blond | OtherColor Text
12data Hair = Bald | Brown | Blond | OtherColor Text
13− deriving (Generic, Show, Eq, Binary, NFData, Atomable)
13+ deriving (Generic, Show, Eq, NFData, Atomable)
14+ deriving Serialise via WineryVariant Hair
14
15
15main :: IO ()
16main :: IO ()
16main = do
17main = do
examples/out_of_the_tarpit.hs+11−7
@@ -1,5 +1,5 @@
1-- the Out-of-the-Tarpit example in Haskell and Project:M36
1-- the Out-of-the-Tarpit example in Haskell and Project:M36
2−{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings #-}
2+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings, DerivingVia #-}
3import ProjectM36.Client
3import ProjectM36.Client
4import ProjectM36.DataTypes.Primitive
4import ProjectM36.DataTypes.Primitive
5import ProjectM36.Tupleable
5import ProjectM36.Tupleable
@@ -7,11 +7,11 @@ import ProjectM36.Relation
7import ProjectM36.Error
7import ProjectM36.Error
8import Data.Either
8import Data.Either
9import GHC.Generics
9import GHC.Generics
10−import Data.Binary
11import Control.DeepSeq
10import Control.DeepSeq
12import qualified Data.Text as T
11import qualified Data.Text as T
13import Data.Time.Calendar
12import Data.Time.Calendar
14import Data.Proxy
13import Data.Proxy
14+import Codec.Winery
15
15
16--create various database value (atom) types
16--create various database value (atom) types
17type Price = Double
17type Price = Double
@@ -21,16 +21,20 @@ type Name = T.Text
21type Address = T.Text
21type Address = T.Text
22
22
23data RoomType = Kitchen | Bathroom | LivingRoom
23data RoomType = Kitchen | Bathroom | LivingRoom
24− deriving (Generic, Atomable, Eq, Show, Binary, NFData)
24+ deriving (Generic, Atomable, Eq, Show, NFData)
25+ deriving Serialise via WineryVariant RoomType
25
26
26data PriceBand = Low | Medium | High | Premium
27data PriceBand = Low | Medium | High | Premium
27− deriving (Generic, Atomable, Eq, Show, Binary, NFData)
28+ deriving (Generic, Atomable, Eq, Show, NFData)
29+ deriving Serialise via WineryVariant PriceBand
28
30
29data AreaCode = City | Suburban | Rural
31data AreaCode = City | Suburban | Rural
30− deriving (Generic, Atomable, Eq, Show, Binary, NFData)
32+ deriving (Generic, Atomable, Eq, Show, NFData)
33+ deriving Serialise via WineryVariant AreaCode
31
34
32data SpeedBand = VeryFastBand | FastBand | MediumBand | SlowBand
35data SpeedBand = VeryFastBand | FastBand | MediumBand | SlowBand
33− deriving (Generic, Atomable, Eq, Show, Binary, NFData)
36+ deriving (Generic, Atomable, Eq, Show, NFData)
37+ deriving Serialise via WineryVariant SpeedBand
34
38
35main :: IO ()
39main :: IO ()
36main = do
40main = do
@@ -257,4 +261,4 @@ handleIOErrors m = do
257 [] -> pure (rights eErrs)
261 [] -> pure (rights eErrs)
258 errs -> handleError (Left (someErrors errs))
262 errs -> handleError (Left (someErrors errs))
259
263
260−
264+
examples/out_of_the_tarpit.tutd+4−4
@@ -3,9 +3,9 @@
3data Address = Address Text
3data Address = Address Text
4data Agent = Agent Text
4data Agent = Agent Text
5data Name = Name Text
5data Name = Name Text
6−data Price = Price Double
6+data Price = Price Integer --dollars
7data RoomType = Kitchen | Bathroom | LivingRoom
7data RoomType = Kitchen | Bathroom | LivingRoom
8−data PriceBand = Low | Medium | High | Premium
8+data PriceBand = Low | Med | High | Premium
9data AreaCode = City | Suburban | Rural
9data AreaCode = City | Suburban | Rural
10data SpeedBand = VeryFast | Fast | Medium | Slow
10data SpeedBand = VeryFast | Fast | Medium | Slow
11
11
@@ -57,9 +57,9 @@ constraint noOffersAfterSale (offer join decision where ^dayEarlierThan(@offerDa
57--1. identify offerPrices > 2000 (arbitrarily-chosen high price band which is not specified in the paper)
57--1. identify offerPrices > 2000 (arbitrarily-chosen high price band which is not specified in the paper)
58--2. remove the properties which have been sold
58--2. remove the properties which have been sold
59--3. group and count sub-relation and restrict by greater than 50
59--3. group and count sub-relation and restrict by greater than 50
60−constraint noMoreThan50PremiumProperties ((((property where ^gt(offerPrice,2000.0)) minus ((property join decision){address,agent,dateRegistered,photo,price})) group ({} as x) : {z:=gt(count(@x),50)}) {z}){} equals false
60+constraint noMoreThan50PremiumProperties ((((property where ^gt(@price,Price 2000)) minus ((property join decision){address,agent,dateRegistered,photo,price})) group ({} as x) : {z:=gt(count(@x),50)}) {z}){} equals false
61
61
62−constraint noBidderCanMakeMoreThan10BidsOnAProperty (((offer group ({all but bidderAddress} as bidder)) : {bidCount:=gt(count(@bidder),10)}) where ^gt(bidCount,10)) {} equals false
62+constraint noBidderCanMakeMoreThan10BidsOnAProperty (((offer group ({all but bidderAddress} as bidder)) : {bidCount:=gt(count(@bidder),10)}) where ^gt(@bidCount,10)) {} equals false
63
63
64-- sample data
64-- sample data
65
65
jupyter/TutorialD Notebook Walkthrough.ipynb+1−1
@@ -38,7 +38,7 @@
38 }
38 }
39 ],
39 ],
40 "source": [
40 "source": [
41− ":importexample date"
41+ ":importexample cjdate"
42 ]
42 ]
43 },
43 },
44 {
44 {
nix/sources.jsonnew file+50
@@ -0,0 +1,50 @@
1+{
2+ "curryer": {
3+ "branch": "master",
4+ "description": "Fast Haskell RPC",
5+ "homepage": null,
6+ "owner": "agentm",
7+ "repo": "curryer",
8+ "rev": "74ecaac619ad1165a4517d5c0f4e530493bda130",
9+ "sha256": "1izdvzj00k0y76ixm7dfgvq2fzphb8h4nzqgwkl3p0bg0806rsn1",
10+ "type": "tarball",
11+ "url": "https://github.com/agentm/curryer/archive/74ecaac619ad1165a4517d5c0f4e530493bda130.tar.gz",
12+ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
13+ },
14+ "niv": {
15+ "branch": "master",
16+ "description": "Easy dependency management for Nix projects",
17+ "homepage": "https://github.com/nmattia/niv",
18+ "owner": "nmattia",
19+ "repo": "niv",
20+ "rev": "1819632b5823e0527da28ad82fecd6be5136c1e9",
21+ "sha256": "08jz17756qchq0zrqmapcm33nr4ms9f630mycc06i6zkfwl5yh5i",
22+ "type": "tarball",
23+ "url": "https://github.com/nmattia/niv/archive/1819632b5823e0527da28ad82fecd6be5136c1e9.tar.gz",
24+ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
25+ },
26+ "nixpkgs": {
27+ "branch": "master",
28+ "description": "Nix Packages collection",
29+ "homepage": "",
30+ "owner": "NixOS",
31+ "repo": "nixpkgs",
32+ "rev": "429c23aad0fce9ef38b0e60d55d7459c19d53ddc",
33+ "sha256": "1nj8sh1fnxp07jdlvjkijwfd1pnsi2zj0ivy7a0dhx02g63byhg3",
34+ "type": "tarball",
35+ "url": "https://github.com/NixOS/nixpkgs/archive/429c23aad0fce9ef38b0e60d55d7459c19d53ddc.tar.gz",
36+ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
37+ },
38+ "streamly": {
39+ "branch": "ac3af8749194f1788704dda8667d0b3807075cc2",
40+ "description": "Beautiful Streaming, Concurrent and Reactive Composition (Haskell)",
41+ "homepage": "https://hackage.haskell.org/package/streamly",
42+ "owner": "composewell",
43+ "repo": "streamly",
44+ "rev": "ac3af8749194f1788704dda8667d0b3807075cc2",
45+ "sha256": "04d8fk654vawdfs0dfidmq2awwgwi8x44iv8r7vqz70zkcsd5fij",
46+ "type": "tarball",
47+ "url": "https://github.com/composewell/streamly/archive/ac3af8749194f1788704dda8667d0b3807075cc2.tar.gz",
48+ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
49+ }
50+}
nix/sources.nixnew file+171
@@ -0,0 +1,171 @@
1+# This file has been generated by Niv.
2+
3+let
4+
5+ #
6+ # The fetchers. fetch_<type> fetches specs of type <type>.
7+ #
8+
9+ fetch_file = pkgs: name: spec:
10+ let
11+ name' = sanitizeName name + "-src";
12+ in
13+ if spec.builtin or true then
14+ builtins_fetchurl { inherit (spec) url sha256; name = name'; }
15+ else
16+ pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
17+
18+ fetch_tarball = pkgs: name: spec:
19+ let
20+ name' = sanitizeName name + "-src";
21+ in
22+ if spec.builtin or true then
23+ builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
24+ else
25+ pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
26+
27+ fetch_git = name: spec:
28+ let
29+ ref =
30+ if spec ? ref then spec.ref else
31+ if spec ? branch then "refs/heads/${spec.branch}" else
32+ if spec ? tag then "refs/tags/${spec.tag}" else
33+ abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
34+ in
35+ builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
36+
37+ fetch_local = spec: spec.path;
38+
39+ fetch_builtin-tarball = name: throw
40+ ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
41+ $ niv modify ${name} -a type=tarball -a builtin=true'';
42+
43+ fetch_builtin-url = name: throw
44+ ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
45+ $ niv modify ${name} -a type=file -a builtin=true'';
46+
47+ #
48+ # Various helpers
49+ #
50+
51+ # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
52+ sanitizeName = name:
53+ (
54+ concatMapStrings (s: if builtins.isList s then "-" else s)
55+ (
56+ builtins.split "[^[:alnum:]+._?=-]+"
57+ ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
58+ )
59+ );
60+
61+ # The set of packages used when specs are fetched using non-builtins.
62+ mkPkgs = sources: system:
63+ let
64+ sourcesNixpkgs =
65+ import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
66+ hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
67+ hasThisAsNixpkgsPath = <nixpkgs> == ./.;
68+ in
69+ if builtins.hasAttr "nixpkgs" sources
70+ then sourcesNixpkgs
71+ else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
72+ import <nixpkgs> {}
73+ else
74+ abort
75+ ''
76+ Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
77+ add a package called "nixpkgs" to your sources.json.
78+ '';
79+
80+ # The actual fetching function.
81+ fetch = pkgs: name: spec:
82+
83+ if ! builtins.hasAttr "type" spec then
84+ abort "ERROR: niv spec ${name} does not have a 'type' attribute"
85+ else if spec.type == "file" then fetch_file pkgs name spec
86+ else if spec.type == "tarball" then fetch_tarball pkgs name spec
87+ else if spec.type == "git" then fetch_git name spec
88+ else if spec.type == "local" then fetch_local spec
89+ else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
90+ else if spec.type == "builtin-url" then fetch_builtin-url name
91+ else
92+ abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
93+
94+ # If the environment variable NIV_OVERRIDE_${name} is set, then use
95+ # the path directly as opposed to the fetched source.
96+ replace = name: drv:
97+ let
98+ saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
99+ ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
100+ in
101+ if ersatz == "" then drv else ersatz;
102+
103+ # Ports of functions for older nix versions
104+
105+ # a Nix version of mapAttrs if the built-in doesn't exist
106+ mapAttrs = builtins.mapAttrs or (
107+ f: set: with builtins;
108+ listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
109+ );
110+
111+ # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
112+ range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
113+
114+ # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
115+ stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
116+
117+ # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
118+ stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
119+ concatMapStrings = f: list: concatStrings (map f list);
120+ concatStrings = builtins.concatStringsSep "";
121+
122+ # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
123+ optionalAttrs = cond: as: if cond then as else {};
124+
125+ # fetchTarball version that is compatible between all the versions of Nix
126+ builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
127+ let
128+ inherit (builtins) lessThan nixVersion fetchTarball;
129+ in
130+ if lessThan nixVersion "1.12" then
131+ fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
132+ else
133+ fetchTarball attrs;
134+
135+ # fetchurl version that is compatible between all the versions of Nix
136+ builtins_fetchurl = { url, name ? null, sha256 }@attrs:
137+ let
138+ inherit (builtins) lessThan nixVersion fetchurl;
139+ in
140+ if lessThan nixVersion "1.12" then
141+ fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
142+ else
143+ fetchurl attrs;
144+
145+ # Create the final "sources" from the config
146+ mkSources = config:
147+ mapAttrs (
148+ name: spec:
149+ if builtins.hasAttr "outPath" spec
150+ then abort
151+ "The values in sources.json should not have an 'outPath' attribute"
152+ else
153+ spec // { outPath = replace name (fetch config.pkgs name spec); }
154+ ) config.sources;
155+
156+ # The "config" used by the fetchers
157+ mkConfig =
158+ { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
159+ , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
160+ , system ? builtins.currentSystem
161+ , pkgs ? mkPkgs sources system
162+ }: rec {
163+ # The sources, i.e. the attribute set of spec name to spec
164+ inherit sources;
165+
166+ # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
167+ inherit pkgs;
168+ };
169+
170+in
171+mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
pkgs.nixdeleted−7
@@ -1,7 +0,0 @@
1−let
2−nixpkgs = builtins.fetchGit {
3− url = "https://github.com/NixOS/nixpkgs";
4− rev = "f58482658eabf7d695f45904ecbc5f49c19fef98";
5−};
6−in
7−import nixpkgs { config.allowBroken = true; }
project-m36.cabal+136−156
@@ -1,6 +1,8 @@
1+Cabal-Version: 2.2
1Name: project-m36
2Name: project-m36
2−Version: 0.8
3+Version: 0.9.3
3−License: PublicDomain
4+License: MIT
5+--note that this license specification is erroneous and only labeled MIT to appease hackage which does not recognize public domain packages in cabal >2.2- Project:M36 is dedicated to the public domain
4Build-Type: Simple
6Build-Type: Simple
5Homepage: https://github.com/agentm/project-m36
7Homepage: https://github.com/agentm/project-m36
6Bug-Reports: https://github.com/agentm/project-m36/issues
8Bug-Reports: https://github.com/agentm/project-m36/issues
@@ -8,7 +10,6 @@ Author: AgentM
8Stability: experimental
10Stability: experimental
9Category: Relational Algebra
11Category: Relational Algebra
10Maintainer: agentm@themactionfaction.com
12Maintainer: agentm@themactionfaction.com
11−Cabal-Version: >= 1.10
12Synopsis: Relational Algebra Engine
13Synopsis: Relational Algebra Engine
13Description: A relational algebra engine which can be used to persist and query Haskell data types.
14Description: A relational algebra engine which can be used to persist and query Haskell data types.
14Extra-Source-Files: Changelog.markdown README.markdown
15Extra-Source-Files: Changelog.markdown README.markdown
@@ -34,9 +35,9 @@ Flag haskell-scripting
34 Default: True
35 Default: True
35
36
36Library
37Library
37− Build-Depends: base>=4.8 && < 4.14, ghc-paths, mtl, containers, unordered-containers, hashable, haskeline, directory, MonadRandom, random-shuffle, uuid >= 1.3.12, cassava >= 0.4.5.1 && < 0.6, text, bytestring, deepseq, deepseq-generics, vector, parallel, monad-parallel, exceptions, transformers, gnuplot, binary, filepath, zlib, directory, vector-binary-instances, temporary, stm, time, hashable-time, old-locale, rset, attoparsec, either, base64-bytestring, data-interval, extended-reals, network-transport, aeson >= 1.1, path-pieces, conduit, resourcet, http-api-data, semigroups, QuickCheck, quickcheck-instances, distributed-process-client-server >= 0.2.3, distributed-process >= 0.7.4, distributed-process-extras >= 0.3.2, distributed-process-async >= 0.2.4.1, network-transport-tcp >= 0.6.0, network-transport, list-t, stm-containers >= 0.2.15, foldl, optparse-applicative, Glob, cryptohash-sha256
38+ Build-Depends: base>=4.8 && < 4.15, ghc-paths, mtl, containers, unordered-containers, hashable, haskeline, directory, MonadRandom, random-shuffle, uuid >= 1.3.12, cassava >= 0.4.5.1 && < 0.6, text, bytestring, deepseq, deepseq-generics, vector, parallel, monad-parallel, exceptions, transformers, gnuplot, filepath, zlib, directory, temporary, stm, time, hashable-time, old-locale, rset, attoparsec, either, base64-bytestring, data-interval, extended-reals, aeson >= 1.1, path-pieces, conduit, resourcet, http-api-data, semigroups, QuickCheck, quickcheck-instances, list-t, stm-containers >= 0.2.15, foldl, optparse-applicative, Glob, cryptohash-sha256, text-manipulate >= 0.2.0.1 && < 0.4, winery, curryer-rpc, network, async, vector-instances, recursion-schemes, streamly >= 0.7.2, convertible
38 if flag(haskell-scripting)
39 if flag(haskell-scripting)
39− Build-Depends: ghc >= 8.2 && < 8.9
40+ Build-Depends: ghc >= 8.2 && < 8.11
40 CPP-Options: -DPM36_HASKELL_SCRIPTING
41 CPP-Options: -DPM36_HASKELL_SCRIPTING
41 if impl(ghc>= 8) && flag(haskell-scripting)
42 if impl(ghc>= 8) && flag(haskell-scripting)
42 build-depends:
43 build-depends:
@@ -51,6 +52,8 @@ Library
51 ProjectM36.TransactionGraph.Merge,
52 ProjectM36.TransactionGraph.Merge,
52 ProjectM36.TransGraphRelationalExpression,
53 ProjectM36.TransGraphRelationalExpression,
53 ProjectM36.Base,
54 ProjectM36.Base,
55+ ProjectM36.Serialise.Base,
56+ ProjectM36.Serialise.Error,
54 ProjectM36.DataFrame,
57 ProjectM36.DataFrame,
55 ProjectM36.Attribute,
58 ProjectM36.Attribute,
56 ProjectM36.AttributeNames,
59 ProjectM36.AttributeNames,
@@ -60,6 +63,7 @@ Library
60 ProjectM36.AtomFunction,
63 ProjectM36.AtomFunction,
61 ProjectM36.AtomFunctionError,
64 ProjectM36.AtomFunctionError,
62 ProjectM36.ScriptSession,
65 ProjectM36.ScriptSession,
66+ ProjectM36.Shortcuts,
63 ProjectM36.DatabaseContextFunction,
67 ProjectM36.DatabaseContextFunction,
64 ProjectM36.DatabaseContextFunctionError,
68 ProjectM36.DatabaseContextFunctionError,
65 ProjectM36.DatabaseContextFunctionUtils,
69 ProjectM36.DatabaseContextFunctionUtils,
@@ -89,6 +93,7 @@ Library
89 ProjectM36.AtomFunctions.Primitive,
93 ProjectM36.AtomFunctions.Primitive,
90 ProjectM36.Atomable,
94 ProjectM36.Atomable,
91 ProjectM36.Tupleable,
95 ProjectM36.Tupleable,
96+ ProjectM36.Tupleable.Deriving,
92 ProjectM36.DataConstructorDef,
97 ProjectM36.DataConstructorDef,
93 ProjectM36.DataTypes.Basic,
98 ProjectM36.DataTypes.Basic,
94 ProjectM36.DataTypes.Sorting,
99 ProjectM36.DataTypes.Sorting,
@@ -109,6 +114,10 @@ Library
109 ProjectM36.Server.EntryPoints,
114 ProjectM36.Server.EntryPoints,
110 ProjectM36.Server.ParseArgs,
115 ProjectM36.Server.ParseArgs,
111 ProjectM36.Server.RemoteCallTypes,
116 ProjectM36.Server.RemoteCallTypes,
117+ ProjectM36.Serialise.AtomFunctionError,
118+ ProjectM36.Serialise.DataFrame,
119+ ProjectM36.Serialise.DatabaseContextFunctionError,
120+ ProjectM36.Serialise.IsomorphicSchema,
112 ProjectM36.Session,
121 ProjectM36.Session,
113 ProjectM36.Sessions,
122 ProjectM36.Sessions,
114 ProjectM36.Transaction.Persist,
123 ProjectM36.Transaction.Persist,
@@ -127,19 +136,19 @@ Library
127 Other-Modules: ProjectM36.Win32Handle
136 Other-Modules: ProjectM36.Win32Handle
128 else
137 else
129 --219- too many exported symbols under Windows and GHC 8.4
138 --219- too many exported symbols under Windows and GHC 8.4
130− GHC-Options: -rdynamic
139+ GHC-Options: -rdynamic -fexternal-interpreter
131 C-sources: cbits/DirectoryFsync.c, cbits/darwin_statfs.c
140 C-sources: cbits/DirectoryFsync.c, cbits/darwin_statfs.c
132 Build-Depends: unix
141 Build-Depends: unix
133 CC-Options: -fPIC
142 CC-Options: -fPIC
134 Hs-Source-Dirs: ./src/lib
143 Hs-Source-Dirs: ./src/lib
135 Default-Language: Haskell2010
144 Default-Language: Haskell2010
136 Default-Extensions: OverloadedStrings, CPP
145 Default-Extensions: OverloadedStrings, CPP
137− if !flag(stack)
146+ if !flag(stack)
138 Build-Depends: deferred-folds
147 Build-Depends: deferred-folds
139
148
140Executable tutd
149Executable tutd
141 if flag(haskell-scripting)
150 if flag(haskell-scripting)
142− Build-Depends: ghc >= 8.2 && < 8.9
151+ Build-Depends: ghc >= 8.2 && < 8.11
143 Build-Depends: base >=4.8 && <5.0,
152 Build-Depends: base >=4.8 && <5.0,
144 ghc-paths,
153 ghc-paths,
145 project-m36,
154 project-m36,
@@ -154,13 +163,11 @@ Executable tutd
154 MonadRandom, MonadRandom,
163 MonadRandom, MonadRandom,
155 vector,
164 vector,
156 text,
165 text,
157− vector-binary-instances,
158 time,
166 time,
159 hashable-time,
167 hashable-time,
160 bytestring,
168 bytestring,
161 stm,
169 stm,
162 deepseq,
170 deepseq,
163− binary,
164 data-interval,
171 data-interval,
165 parallel,
172 parallel,
166 cassava,
173 cassava,
@@ -168,7 +175,7 @@ Executable tutd
168 directory,
175 directory,
169 filepath,
176 filepath,
170 temporary,
177 temporary,
171− megaparsec >= 5.2.0 && < 9,
178+ megaparsec >= 5.2.0 && < 10,
172 haskeline,
179 haskeline,
173 random, MonadRandom,
180 random, MonadRandom,
174 base64-bytestring,
181 base64-bytestring,
@@ -176,7 +183,15 @@ Executable tutd
176 attoparsec,
183 attoparsec,
177 stm-containers >= 1.0.0,
184 stm-containers >= 1.0.0,
178 list-t,
185 list-t,
179− parser-combinators
186+ parser-combinators,
187+ curryer-rpc,
188+ prettyprinter,
189+ cryptohash-sha256,
190+ --due to decode signature change
191+ base16-bytestring >= 1.0.0.0,
192+ http-conduit,
193+ modern-uri,
194+ http-types
180 Other-Modules: TutorialD.Interpreter,
195 Other-Modules: TutorialD.Interpreter,
181 TutorialD.Interpreter.Base,
196 TutorialD.Interpreter.Base,
182 TutorialD.Interpreter.DatabaseContextExpr,
197 TutorialD.Interpreter.DatabaseContextExpr,
@@ -195,6 +210,7 @@ Executable tutd
195 TutorialD.Interpreter.SchemaOperator,
210 TutorialD.Interpreter.SchemaOperator,
196 TutorialD.Interpreter.TransGraphRelationalOperator,
211 TutorialD.Interpreter.TransGraphRelationalOperator,
197 TutorialD.Interpreter.SchemaOperator
212 TutorialD.Interpreter.SchemaOperator
213+ TutorialD.Printer
198 main-is: TutorialD/tutd.hs
214 main-is: TutorialD/tutd.hs
199 CC-Options: -fPIC
215 CC-Options: -fPIC
200 GHC-Options: -Wall -threaded
216 GHC-Options: -Wall -threaded
@@ -204,12 +220,11 @@ Executable tutd
204
220
205Executable project-m36-server
221Executable project-m36-server
206 if flag(haskell-scripting)
222 if flag(haskell-scripting)
207− Build-Depends: ghc >= 8.2 && < 8.9
223+ Build-Depends: ghc >= 8.2 && < 8.11
208 Build-Depends: base,
224 Build-Depends: base,
209 ghc-paths,
225 ghc-paths,
210− project-m36,
211− binary,
212 transformers,
226 transformers,
227+ project-m36,
213 temporary,
228 temporary,
214 data-interval,
229 data-interval,
215 deepseq,
230 deepseq,
@@ -222,7 +237,6 @@ Executable project-m36-server
222 optparse-applicative,
237 optparse-applicative,
223 hashable-time,
238 hashable-time,
224 time,
239 time,
225− vector-binary-instances,
226 text,
240 text,
227 deepseq-generics,
241 deepseq-generics,
228 mtl,
242 mtl,
@@ -244,7 +258,7 @@ Executable project-m36-server
244Executable bigrel
258Executable bigrel
245 Default-Language: Haskell2010
259 Default-Language: Haskell2010
246 Default-Extensions: OverloadedStrings
260 Default-Extensions: OverloadedStrings
247− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, optparse-applicative, stm-containers, list-t, ghc, ghc-paths, transformers, project-m36, random, MonadRandom, semigroups, parser-combinators
261+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, optparse-applicative, stm-containers, list-t, ghc, ghc-paths, transformers, project-m36, random, MonadRandom, semigroups, parser-combinators
248 Other-Modules: TutorialD.Interpreter.Base,
262 Other-Modules: TutorialD.Interpreter.Base,
249 TutorialD.Interpreter.DatabaseContextExpr,
263 TutorialD.Interpreter.DatabaseContextExpr,
250 TutorialD.Interpreter.RelationalExpr,
264 TutorialD.Interpreter.RelationalExpr,
@@ -255,6 +269,13 @@ Executable bigrel
255 if flag(profiler)
269 if flag(profiler)
256 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall
270 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall
257
271
272+Common commontest
273+ Default-Language: Haskell2010
274+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, websockets, optparse-applicative, network, aeson, project-m36, random, MonadRandom, semigroups, parser-combinators, winery, curryer-rpc, prettyprinter, base64-bytestring, modern-uri, http-types, http-conduit, base16-bytestring,cryptohash-sha256
275+ Default-Extensions: OverloadedStrings
276+ GHC-Options: -Wall -threaded
277+ Hs-Source-Dirs: test, src/bin
278+
258Benchmark basic-benchmark
279Benchmark basic-benchmark
259 Default-Language: Haskell2010
280 Default-Language: Haskell2010
260 Default-Extensions: OverloadedStrings
281 Default-Extensions: OverloadedStrings
@@ -266,240 +287,202 @@ Benchmark basic-benchmark
266 if flag(profiler)
287 if flag(profiler)
267 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall
288 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall
268
289
290+--benchmark inserts, updates, deletes for a basic use-case to shake out any space leaks
291+Benchmark update-exprs
292+ Default-Language: Haskell2010
293+ Default-Extensions: OverloadedStrings
294+ Build-Depends: base, criterion, project-m36, text, winery
295+ Main-Is: benchmark/Server.hs
296+ Type: exitcode-stdio-1.0
297+ GHC-Options: -Wall -threaded -rtsopts
298+ HS-Source-Dirs: ./src/bin
299+ if flag(profiler)
300+ GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall -fexternal-interpreter
301+
269Test-Suite test-tutoriald
302Test-Suite test-tutoriald
270− Default-Language: Haskell2010
303+ import: commontest
271− Default-Extensions: OverloadedStrings
272 type: exitcode-stdio-1.0
304 type: exitcode-stdio-1.0
273− main-is: test/TutorialD/Interpreter.hs
305+ main-is: TutorialD/InterpreterTest.hs
306+ Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.SchemaOperator, TutorialD.Printer
274− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, stm-containers, list-t, project-m36, random, MonadRandom, semigroups, parser-combinators
307+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, stm-containers, list-t, project-m36, random, MonadRandom, semigroups, parser-combinators, prettyprinter
275− Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.SchemaOperator
276− GHC-Options: -Wall -threaded
277− Hs-Source-Dirs: ./src/bin, ., test
278
308
279Test-Suite test-tutoriald-atomfunctionscript
309Test-Suite test-tutoriald-atomfunctionscript
280− Default-Language: Haskell2010
310+ import: commontest
281− Default-Extensions: OverloadedStrings
282 type: exitcode-stdio-1.0
311 type: exitcode-stdio-1.0
283− Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Interpreter.SchemaOperator
312+ Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Interpreter.SchemaOperator, TutorialD.Printer
284− main-is: test/TutorialD/Interpreter/AtomFunctionScript.hs
313+ main-is: TutorialD/Interpreter/AtomFunctionScript.hs
285− Build-Depends: base, HUnit, project-m36, uuid, containers, megaparsec, text, vector, directory, bytestring, mtl, haskeline, random, MonadRandom, semigroups, time, parser-combinators
286− GHC-Options: -Wall -threaded
287− Hs-Source-Dirs: ./src/bin, ./test, .
288
314
289Test-Suite test-tutoriald-databasecontextfunctionscript
315Test-Suite test-tutoriald-databasecontextfunctionscript
290− Default-Language: Haskell2010
316+ import: commontest
291− Default-Extensions: OverloadedStrings
292 type: exitcode-stdio-1.0
317 type: exitcode-stdio-1.0
293− Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Interpreter.SchemaOperator
318+ Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Interpreter.SchemaOperator, TutorialD.Printer
294− main-is: test/TutorialD/Interpreter/DatabaseContextFunctionScript.hs
319+ main-is: TutorialD/Interpreter/DatabaseContextFunctionScript.hs
295− Build-Depends: base, HUnit, project-m36, uuid, containers, megaparsec, text, vector, directory, bytestring, mtl, haskeline, random, MonadRandom, semigroups, time, parser-combinators
296− GHC-Options: -Wall -threaded
297− Hs-Source-Dirs: ./src/bin, ./test, .
298
320
299Test-Suite test-relation
321Test-Suite test-relation
300− Default-Language: Haskell2010
322+ import: commontest
301− Default-Extensions: OverloadedStrings
302 type: exitcode-stdio-1.0
323 type: exitcode-stdio-1.0
303− main-is: test/Relation/Basic.hs
324+ main-is: Relation/Basic.hs
304− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, stm-containers, project-m36, transformers
305− GHC-Options: -Wall -threaded
306
325
307Test-Suite test-static-optimizer
326Test-Suite test-static-optimizer
308− Default-Language: Haskell2010
327+ import: commontest
309− Default-Extensions: OverloadedStrings
310 type: exitcode-stdio-1.0
328 type: exitcode-stdio-1.0
311− main-is: test/Relation/StaticOptimizer.hs
329+ main-is: Relation/StaticOptimizer.hs
312− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, stm-containers, project-m36, transformers
313− GHC-Options: -Wall -threaded
314
330
315Test-Suite test-transactiongraph-persist
331Test-Suite test-transactiongraph-persist
316− Default-Language: Haskell2010
332+ import: commontest
317− Default-Extensions: OverloadedStrings
318 type: exitcode-stdio-1.0
333 type: exitcode-stdio-1.0
319− main-is: test/TransactionGraph/Persist.hs
334+ main-is: TransactionGraph/Persist.hs
320− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, stm-containers, project-m36, random, MonadRandom, semigroups, parser-combinators
321− Other-Modules: TutorialD.Interpreter.Base, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.BasicExamples
335+ Other-Modules: TutorialD.Interpreter.Base, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Printer
322− Hs-Source-Dirs: ., ./src/bin
323− GHC-Options: -Wall -threaded
324
336
325Test-Suite test-relation-import-csv
337Test-Suite test-relation-import-csv
326− Default-Language: Haskell2010
338+ import: commontest
327− Default-Extensions: OverloadedStrings
328 type: exitcode-stdio-1.0
339 type: exitcode-stdio-1.0
329− main-is: test/Relation/Import/CSV.hs
340+ main-is: Relation/Import/CSV.hs
330− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, stm-containers, project-m36
331− GHC-Options: -Wall -threaded
332
341
333Test-Suite test-tutoriald-import-tutoriald
342Test-Suite test-tutoriald-import-tutoriald
334− Default-Language: Haskell2010
343+ import: commontest
335− Default-Extensions: OverloadedStrings
336 type: exitcode-stdio-1.0
344 type: exitcode-stdio-1.0
337− main-is: test/TutorialD/Interpreter/Import/TutorialD.hs
345+ main-is: TutorialD/Interpreter/Import/ImportTest.hs
338− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, stm-containers, project-m36, random, MonadRandom, semigroups, parser-combinators
339− Other-Modules: TutorialD.Interpreter.Base, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.BasicExamples
346+ Other-Modules: TutorialD.Interpreter.Base, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Printer
340− GHC-Options: -Wall -threaded
341− Hs-Source-Dirs: ., ./src/bin
342
347
343Test-Suite test-relation-export-csv
348Test-Suite test-relation-export-csv
344− Default-Language: Haskell2010
349+ import: commontest
345− Default-Extensions: OverloadedStrings
346 type: exitcode-stdio-1.0
350 type: exitcode-stdio-1.0
347− main-is: test/Relation/Export/CSV.hs
351+ main-is: Relation/Export/CSV.hs
348− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, stm-containers, project-m36
349− GHC-Options: -Wall -threaded
350
352
351Test-Suite test-transactiongraph-merge
353Test-Suite test-transactiongraph-merge
352− Default-Language: Haskell2010
354+ import: commontest
353− Default-Extensions: OverloadedStrings
354 type: exitcode-stdio-1.0
355 type: exitcode-stdio-1.0
355− main-is: test/TransactionGraph/Merge.hs
356+ main-is: TransactionGraph/Merge.hs
356− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, template-haskell, transformers, aeson, conduit, either, path-pieces, http-api-data, stm-containers, list-t, project-m36
357+
357− GHC-Options: -Wall -threaded
358+
359+Test-Suite test-prettyprinter
360+ import: commontest
361+ type: exitcode-stdio-1.0
362+ main-is: TutorialD/PrinterTest.hs
363+ Other-Modules: TutorialD.Printer, TutorialD.Interpreter.Base, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types
358
364
359benchmark bench
365benchmark bench
360− Default-Language: Haskell2010
366+ import: commontest
361− Default-Extensions: OverloadedStrings
362 type: exitcode-stdio-1.0
367 type: exitcode-stdio-1.0
363 main-is: benchmark/Relation.hs
368 main-is: benchmark/Relation.hs
364− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, criterion, stm-containers, project-m36
365− GHC-Options: -Wall -rtsopts -threaded
366− Hs-Source-Dirs: ./src/bin
367
369
368Test-Suite test-server
370Test-Suite test-server
369− Default-Language: Haskell2010
371+ import: commontest
370− Default-Extensions: OverloadedStrings
371 type: exitcode-stdio-1.0
372 type: exitcode-stdio-1.0
372− main-is: test/Server/Main.hs
373+ main-is: Server/Main.hs
373− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, project-m36, network-transport, semigroups
374+
374− HS-Source-Dirs: ., ./src/bin
375− GHC-Options: -Wall -threaded
376
375
377Executable Example-SimpleClient
376Executable Example-SimpleClient
378 Default-Language: Haskell2010
377 Default-Language: Haskell2010
379 Default-Extensions: OverloadedStrings
378 Default-Extensions: OverloadedStrings
380− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, ghc, ghc-paths, project-m36, random, MonadRandom
379+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, ghc, ghc-paths, project-m36, random, MonadRandom
381 Main-Is: examples/SimpleClient.hs
380 Main-Is: examples/SimpleClient.hs
382 GHC-Options: -Wall -threaded
381 GHC-Options: -Wall -threaded
383
382
384Executable Example-OutOfTheTarpit
383Executable Example-OutOfTheTarpit
385 Default-Language: Haskell2010
384 Default-Language: Haskell2010
386 Default-Extensions: OverloadedStrings
385 Default-Extensions: OverloadedStrings
387− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36
386+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36, winery
388 Main-Is: examples/out_of_the_tarpit.hs
387 Main-Is: examples/out_of_the_tarpit.hs
389 GHC-Options: -Wall -threaded
388 GHC-Options: -Wall -threaded
390
389
391Executable Example-Blog
390Executable Example-Blog
392 Default-Language: Haskell2010
391 Default-Language: Haskell2010
393 Default-Extensions: OverloadedStrings
392 Default-Extensions: OverloadedStrings
394− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36, scotty, blaze-html, http-types
393+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36, scotty, blaze-html, http-types, winery
395 Main-Is: examples/blog.hs
394 Main-Is: examples/blog.hs
396 GHC-Options: -Wall -threaded
395 GHC-Options: -Wall -threaded
397
396
398−
399Executable Example-Hair
397Executable Example-Hair
400 Default-Language: Haskell2010
398 Default-Language: Haskell2010
401 Default-Extensions: OverloadedStrings
399 Default-Extensions: OverloadedStrings
402− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36
400+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36, winery
403 Main-Is: examples/hair.hs
401 Main-Is: examples/hair.hs
404 GHC-Options: -Wall -threaded
402 GHC-Options: -Wall -threaded
405
403
404+Executable Example-Plantfarm
405+ Default-Language: Haskell2010
406+ Default-Extensions: OverloadedStrings
407+ Build-Depends: aeson, barbies, base, binary, containers, deepseq, hashable, project-m36, random, scotty, text, winery
408+ Main-Is: examples/Plantfarm.hs
409+ GHC-Options: -Wall -threaded
410+
406Executable Example-CustomTupleable
411Executable Example-CustomTupleable
407 Default-Language: Haskell2010
412 Default-Language: Haskell2010
408 Default-Extensions: OverloadedStrings
413 Default-Extensions: OverloadedStrings
409− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36
414+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36, winery
410 Main-Is: examples/CustomTupleable.hs
415 Main-Is: examples/CustomTupleable.hs
411 GHC-Options: -Wall -threaded
416 GHC-Options: -Wall -threaded
412
417
413−Test-Suite test-scripts
418+Executable Example-DerivingCustomTupleable
419+ if impl(ghc>=8.6)
420+ Buildable: True
421+ else
422+ Buildable: False
414 Default-Language: Haskell2010
423 Default-Language: Haskell2010
415− Default-Extensions: OverloadedStrings
424+ Build-Depends: base, text, deepseq, project-m36, winery
416− type: exitcode-stdio-1.0
425+ Main-Is: examples/DerivingCustomTupleable.hs
417− main-is: test/scripts.hs
418− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, project-m36, random, MonadRandom, semigroups, parser-combinators
419− Other-Modules: TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.Import.BasicExamples
420 GHC-Options: -Wall -threaded
426 GHC-Options: -Wall -threaded
421− Hs-Source-Dirs: ., ./src/bin
427+
428+Test-Suite test-scripts
429+ import: commontest
430+ type: exitcode-stdio-1.0
431+ main-is: scripts.hs
432+ Other-Modules: TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Printer
422
433
423Executable project-m36-websocket-server
434Executable project-m36-websocket-server
424 Default-Language: Haskell2010
435 Default-Language: Haskell2010
425− Build-Depends: base, aeson, path-pieces, either, conduit, http-api-data, template-haskell, websockets, aeson, optparse-applicative, project-m36, containers, bytestring, text, vector, uuid, megaparsec, haskeline, mtl, directory, base64-bytestring, random, MonadRandom, time, network-transport-tcp, semigroups, attoparsec, parser-combinators
436+ Build-Depends: base, aeson, path-pieces, either, conduit, http-api-data, template-haskell, websockets, aeson, optparse-applicative, project-m36, containers, bytestring, text, vector, uuid, megaparsec, haskeline, mtl, directory, base64-bytestring, random, MonadRandom, time, semigroups, attoparsec, parser-combinators, prettyprinter, network, modern-uri, http-conduit, base16-bytestring, http-types, cryptohash-sha256, wai, wai-websockets, warp, warp-tls
426 Main-Is: ProjectM36/Server/WebSocket/websocket-server.hs
437 Main-Is: ProjectM36/Server/WebSocket/websocket-server.hs
427− Other-Modules: ProjectM36.Client.Json, ProjectM36.Server.RemoteCallTypes.Json, ProjectM36.Server.WebSocket, TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.SchemaOperator
438+ Other-Modules: ProjectM36.Client.Json, ProjectM36.Server.RemoteCallTypes.Json, ProjectM36.Server.WebSocket, TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.SchemaOperator, TutorialD.Printer
428 GHC-Options: -Wall -threaded
439 GHC-Options: -Wall -threaded
429 Hs-Source-Dirs: ./src/bin
440 Hs-Source-Dirs: ./src/bin
430 Default-Extensions: OverloadedStrings
441 Default-Extensions: OverloadedStrings
431
442
432Test-Suite test-websocket-server
443Test-Suite test-websocket-server
433− Default-Language: Haskell2010
444+ import: commontest
434 type: exitcode-stdio-1.0
445 type: exitcode-stdio-1.0
435− main-is: test/Server/WebSocket.hs
446+ main-is: Server/WebSocket.hs
436− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, websockets, optparse-applicative, network, aeson, project-m36, random, MonadRandom, network-transport-tcp, semigroups, parser-combinators
437− Other-Modules: TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.TransactionGraphOperator, ProjectM36.Client.Json, ProjectM36.Server.RemoteCallTypes.Json, ProjectM36.Server.WebSocket, TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.SchemaOperator
447+ Other-Modules: TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.TransactionGraphOperator, ProjectM36.Client.Json, ProjectM36.Server.RemoteCallTypes.Json, ProjectM36.Server.WebSocket, TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.SchemaOperator, TutorialD.Printer
438− Default-Extensions: OverloadedStrings
439− GHC-Options: -Wall -threaded
440− Hs-Source-Dirs: ./src/bin, .
441
448
442Test-Suite test-isomorphic-schemas
449Test-Suite test-isomorphic-schemas
443− Default-Language: Haskell2010
450+ import: commontest
444 type: exitcode-stdio-1.0
451 type: exitcode-stdio-1.0
445− main-is: test/IsomorphicSchema.hs
452+ main-is: IsomorphicSchema.hs
446− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, websockets, optparse-applicative, network, aeson, project-m36
447− Default-Extensions: OverloadedStrings
448− GHC-Options: -Wall -threaded
449− Hs-Source-Dirs: ./src/bin, .
450
453
451Test-Suite test-atomable
454Test-Suite test-atomable
452− Default-Language: Haskell2010
455+ import: commontest
453 type: exitcode-stdio-1.0
456 type: exitcode-stdio-1.0
454− main-is: test/Relation/Atomable.hs
457+ main-is: Relation/Atomable.hs
455− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, websockets, optparse-applicative, network, aeson, project-m36, random, MonadRandom, semigroups, parser-combinators
456− Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.SchemaOperator, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types
458+ Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.SchemaOperator, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Printer
457− Default-Extensions: OverloadedStrings
458− GHC-Options: -Wall -threaded
459− Hs-Source-Dirs: ./src/bin, ., test/
460
459
461Test-Suite test-multiprocess-access
460Test-Suite test-multiprocess-access
462− Default-Language: Haskell2010
461+ import: commontest
463 type: exitcode-stdio-1.0
462 type: exitcode-stdio-1.0
464− main-is: test/MultiProcessDatabaseAccess.hs
463+ main-is: MultiProcessDatabaseAccess.hs
465− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, websockets, optparse-applicative, network, aeson, project-m36, random, MonadRandom
466− Default-Extensions: OverloadedStrings
467− GHC-Options: -Wall -threaded
468− Hs-Source-Dirs: ./src/bin, ., test/
469
464
470Test-Suite test-transactiongraph-automerge
465Test-Suite test-transactiongraph-automerge
471− Default-Language: Haskell2010
466+ import: commontest
472 type: exitcode-stdio-1.0
467 type: exitcode-stdio-1.0
473− main-is: test/TransactionGraph/Automerge.hs
468+ main-is: TransactionGraph/Automerge.hs
474− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, websockets, optparse-applicative, network, aeson, project-m36, random, MonadRandom, semigroups, parser-combinators
475− Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.SchemaOperator, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types
469+ Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.SchemaOperator, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Printer
476− Default-Extensions: OverloadedStrings
477− GHC-Options: -Wall -threaded
478− Hs-Source-Dirs: ./src/bin, ., test/
479
470
480Test-Suite test-tupleable
471Test-Suite test-tupleable
481− Default-Language: Haskell2010
472+ import: commontest
482 type: exitcode-stdio-1.0
473 type: exitcode-stdio-1.0
483− main-is: test/Relation/Tupleable.hs
474+ main-is: Relation/Tupleable.hs
484− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, websockets, optparse-applicative, network, aeson, project-m36, random, MonadRandom, semigroups
485− Default-Extensions: OverloadedStrings
486− GHC-Options: -Wall -threaded
487− Hs-Source-Dirs: ./src/bin, ., test/
488
475
489Test-Suite test-client-simple
476Test-Suite test-client-simple
490− Default-Language: Haskell2010
477+ import: commontest
491− Main-Is: test/Client/Simple.hs
478+ Main-Is: Client/Simple.hs
492 type: exitcode-stdio-1.0
479 type: exitcode-stdio-1.0
493− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, websockets, optparse-applicative, network, aeson, project-m36, random, MonadRandom, semigroups
494− Default-Extensions: OverloadedStrings
495− GHC-Options: -Wall -threaded
496− Hs-Source-Dirs: ./src/bin, ., test/
497
480
498-- test for file handle leaks
481-- test for file handle leaks
499Executable handles
482Executable handles
500 Default-Language: Haskell2010
483 Default-Language: Haskell2010
501 Default-Extensions: OverloadedStrings
484 Default-Extensions: OverloadedStrings
502− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, optparse-applicative, stm-containers, list-t, ghc, ghc-paths, transformers, project-m36, random, MonadRandom, semigroups, parser-combinators
485+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, optparse-applicative, stm-containers, list-t, ghc, ghc-paths, transformers, project-m36, random, MonadRandom, semigroups, parser-combinators, prettyprinter, modern-uri, http-types, http-conduit, base16-bytestring, cryptohash-sha256
503 main-is: benchmark/Handles.hs
486 main-is: benchmark/Handles.hs
504 Other-Modules: TutorialD.Interpreter,
487 Other-Modules: TutorialD.Interpreter,
505 TutorialD.Interpreter.Base,
488 TutorialD.Interpreter.Base,
@@ -518,17 +501,14 @@ Executable handles
518 TutorialD.Interpreter.TransGraphRelationalOperator,
501 TutorialD.Interpreter.TransGraphRelationalOperator,
519 TutorialD.Interpreter.TransactionGraphOperator,
502 TutorialD.Interpreter.TransactionGraphOperator,
520 TutorialD.Interpreter.Types
503 TutorialD.Interpreter.Types
504+ TutorialD.Printer
521 GHC-Options: -Wall -threaded -rtsopts
505 GHC-Options: -Wall -threaded -rtsopts
522 HS-Source-Dirs: ./src/bin
506 HS-Source-Dirs: ./src/bin
523 if flag(profiler)
507 if flag(profiler)
524 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall
508 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall
525
509
526Test-Suite test-dataframe
510Test-Suite test-dataframe
527− Default-Language: Haskell2010
511+ import: commontest
528− Main-Is: test/DataFrame.hs
529 type: exitcode-stdio-1.0
512 type: exitcode-stdio-1.0
513+ Main-Is: DataFrame.hs
530− Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.SchemaOperator, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types
514+ Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.SchemaOperator, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Printer
531− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, websockets, optparse-applicative, network, aeson, project-m36, random, MonadRandom, semigroups, parser-combinators
532− Default-Extensions: OverloadedStrings
533− GHC-Options: -Wall -threaded
534− Hs-Source-Dirs: ./src/bin, ., test/
release.nix+17−94
@@ -1,107 +1,30 @@
1−{ compiler ? "ghc865"
1+{ compiler ? "ghc8104"
2−, pkgs ? import ./pkgs.nix
2+, sources ? import ./nix/sources.nix
3+, pkgs ? import sources.nixpkgs { }
3}:
4}:
4−
5let
5let
6− inherit (pkgs.lib.trivial) flip pipe;
7− inherit (pkgs.haskell.lib) appendPatch appendConfigureFlags;
8 doJailbreak = pkgs.haskell.lib.doJailbreak;
6 doJailbreak = pkgs.haskell.lib.doJailbreak;
9− dontHaddock = pkgs.haskell.lib.dontHaddock;
7+ needsCocoa = drv:
10− dontCheck = pkgs.haskell.lib.dontCheck;
8+ if pkgs.stdenv.isDarwin
11− #distributed-process packages are no longer maintained- until we replace it entirely, add some hacks to build on newer GHC and packages
9+ then drv.overrideDerivation (old:
12− distProcessPkg = pkg : dontHaddock (doJailbreak (dontCheck pkg));
10+ { buildInputs = [ pkgs.darwin.apple_sdk.frameworks.Cocoa ] ++ old.buildInputs; }
13− callHackageDirectWithOptions = {pkg,ver, sha256, options}:
11+ )
14− let pkgver = "${pkg}-${ver}";
12+ else drv;
15− in
13+
16− haskellPackages.callCabal2nixWithOptions pkg (pkgs.fetchzip {
17− url = "mirror://hackage/${pkgver}/${pkgver}.tar.gz";
18− inherit sha256;
19− }) options;
20−
21 haskellPackages = pkgs.haskell.packages.${compiler}.override {
14 haskellPackages = pkgs.haskell.packages.${compiler}.override {
22 overrides = self: super: {
15 overrides = self: super: {
23− distributed-process-extras =
16+ curryer-rpc = self.callCabal2nix "curryer-rpc" sources.curryer { };
24− distProcessPkg (self.callHackageDirect {
17+ streamly = doJailbreak (needsCocoa (self.callCabal2nix "streamly" sources.streamly { }));
25− pkg = "distributed-process-extras";
26− ver = "0.3.5";
27− sha256 = "13clq3alymcvknp7q8gz0i1hzx8im855lzmyrfffl8gglnlbi2w9";
28− }{});
29−
30− distributed-process-client-server =
31− distProcessPkg (self.callHackageDirect {
32− pkg = "distributed-process-client-server";
33− ver = "0.2.5.1";
34− sha256 = "0gkd8awapq7vy14vpnzawnwb67jvvcjaqg7imm0bp1wb6rw6x5x4";
35− }{});
36−
37− distributed-process-async =
38− distProcessPkg (callHackageDirectWithOptions {
39− pkg = "distributed-process-async";
40− ver = "0.2.6";
41− sha256 = "15wyfq115r6xjaz1h00sjh1v0fv498kkxr3xx6w84d8wdp2gxbn1";
42− options = "--no-check";
43− }{});
44−
45− distributed-process =
46− dontHaddock (self.callCabal2nix "distributed-process" (pkgs.fetchFromGitHub {
47− owner = "agentm";
48− repo = "distributed-process";
49− rev = "f352e097fbe494ad648b4e09249f865893ae90a3";
50− sha256 = "0xa2v77c9idmi89bky2wq1fykrn8grpk4rk7gcd5bkicxvdbcrym";}){});
51−
52− distributed-static =
53− self.callHackageDirect {
54− pkg = "distributed-static";
55− ver = "0.3.9";
56− sha256 = "0hibpzqwklnq335m7fwgk1bghz0lgxnd7ym10pbvxlcf7ly3nr6v";
57−}{};
58− rank1dynamic =
59− distProcessPkg (self.callHackageDirect {
60− pkg = "rank1dynamic";
61− ver = "0.4.0";
62− sha256 = "1x6p9z53s7xwp93jp4n1lq6m5xspcn6w62p461v8vqnp9600328b";
63−}{});
64− stm-hamt =
65− self.callHackageDirect {
66− pkg = "stm-hamt";
67− ver = "1.2.0.3";
68− sha256 = "1i8j7q8nhx3l7gydrjlsyhkvllr6bppgrjf0hp38zpm7p6xcv2bb";
69− }{};
70−
71− stm-containers =
72− self.callHackageDirect {
73− pkg = "stm-containers";
74− ver = "1.1.0.4";
75− sha256 = "0h9z6lawdm44minx9spvdb7sp645l36ri5cnxvhrcxwzr64s7qb5";
76− }{};
77−
78− network-transport-tcp =
79− dontCheck (self.callHackageDirect {
80− pkg = "network-transport-tcp";
81− ver = "0.7.0";
82− sha256 = "0kfzrcynf34xsxx4rccg4qfy7jvinwqd8baian8ifqad9lfcapsb";
83− }{});
84−
85− data-interval =
86− self.callHackageDirect {
87− pkg = "data-interval";
88− ver = "2.0.1";
89− sha256 = "085j4yjr8wimxampxqdrg47p577whwg2mjxgfdl44yfck52fb6an";
90− }{};
91−
92− project-m36 = dontCheck (self.callCabal2nixWithOptions "project-m36" ./. "-f-haskell-scripting" { });
18+ project-m36 = ((self.callCabal2nixWithOptions "project-m36" ./. "-f-haskell-scripting" { }));
93−
94 };
19 };
95 };
20 };
96−
97− project = haskellPackages.project-m36;
98in
21in
99{
22{
100− project = project;
23+ project = haskellPackages.project-m36;
101
24
102 shell = haskellPackages.shellFor {
25 shell = haskellPackages.shellFor {
103− packages = p: with p; [
26+ packages = p: [
104− project
27+ p.project-m36
105 ];
28 ];
106 buildInputs = [
29 buildInputs = [
107 haskellPackages.ghcid
30 haskellPackages.ghcid
@@ -110,4 +33,4 @@ in
110 ];
33 ];
111 withHoogle = true;
34 withHoogle = true;
112 };
35 };
113−}
36+}
scripts/DateExamples.tutd+2−2
@@ -20,7 +20,7 @@ sp := relation{tuple{s# "S1",p# "P1",qty 300},
20 tuple{s# "S3",p# "P2",qty 200},
20 tuple{s# "S3",p# "P2",qty 200},
21 tuple{s# "S4",p# "P4",qty 300},
21 tuple{s# "S4",p# "P4",qty 300},
22 tuple{s# "S4",p# "P5",qty 400}};
22 tuple{s# "S4",p# "P5",qty 400}};
23−key s_pkey {s#} s
23+key s_pkey {s#} s;
24−key p_key {p#} p
24+key p_key {p#} p;
25foreign key s_sp_fk sp{s#} in s{s#};
25foreign key s_sp_fk sp{s#} in s{s#};
26foreign key p_sp_fk sp{p#} in p{p#};
26foreign key p_sp_fk sp{p#} in p{p#};
scripts/multiline.tutdnew file+2
@@ -0,0 +1,2 @@
1+x:=relation{
2+tuple{ x 2}} -- nice
src/bin/ProjectM36/Server/RemoteCallTypes/Json.hs+20−2
@@ -11,6 +11,7 @@ import ProjectM36.Error
11import ProjectM36.IsomorphicSchema
11import ProjectM36.IsomorphicSchema
12import ProjectM36.Server.RemoteCallTypes
12import ProjectM36.Server.RemoteCallTypes
13import ProjectM36.MerkleHash
13import ProjectM36.MerkleHash
14+import ProjectM36.Attribute as A
14
15
15import Data.Aeson
16import Data.Aeson
16import Data.ByteString.Base64 as B64
17import Data.ByteString.Base64 as B64
@@ -44,8 +45,11 @@ instance FromJSON ExecuteRelationalExpr
44instance ToJSON Relation
45instance ToJSON Relation
45instance FromJSON Relation
46instance FromJSON Relation
46
47
47−instance ToJSON Attribute
48+instance ToJSON Attribute where
49+ toJSON (Attribute attrName aType) = object [ "name" .= attrName
50+ , "type" .= toJSON aType ]
48−instance FromJSON Attribute
51+instance FromJSON Attribute where
52+ parseJSON = withObject "Attribute" $ \v -> Attribute <$> v .: "name" <*> v .: "type"
49
53
50instance ToJSON ExtendTupleExpr
54instance ToJSON ExtendTupleExpr
51instance FromJSON ExtendTupleExpr
55instance FromJSON ExtendTupleExpr
@@ -99,6 +103,8 @@ instance ToJSON Atom where
99 "val" .= i ]
103 "val" .= i ]
100 toJSON atom@(RelationAtom i) = object [ "type" .= atomTypeForAtom atom,
104 toJSON atom@(RelationAtom i) = object [ "type" .= atomTypeForAtom atom,
101 "val" .= i ]
105 "val" .= i ]
106+ toJSON atom@(RelationalExprAtom i) = object [ "type" .= atomTypeForAtom atom,
107+ "val" .= i ]
102 toJSON (ConstructedAtom dConsName atomtype atomlist) = object [
108 toJSON (ConstructedAtom dConsName atomtype atomlist) = object [
103 "dataconstructorname" .= dConsName,
109 "dataconstructorname" .= dConsName,
104 "type" .= toJSON atomtype,
110 "type" .= toJSON atomtype,
@@ -126,6 +132,7 @@ instance FromJSON Atom where
126 Left err -> fail ("Failed to parse base64-encoded ByteString: " ++ err)
132 Left err -> fail ("Failed to parse base64-encoded ByteString: " ++ err)
127 Right bs -> pure (ByteStringAtom bs)
133 Right bs -> pure (ByteStringAtom bs)
128 BoolAtomType -> BoolAtom <$> o .: "val"
134 BoolAtomType -> BoolAtom <$> o .: "val"
135+ RelationalExprAtomType -> RelationalExprAtom <$> o .: "val"
129
136
130instance ToJSON Notification
137instance ToJSON Notification
131instance FromJSON Notification
138instance FromJSON Notification
@@ -142,6 +149,12 @@ instance FromJSON MerkleHash where
142 Left err -> fail ("Failed to parse merkle hash: " ++ err)
149 Left err -> fail ("Failed to parse merkle hash: " ++ err)
143 Right bs -> pure (MerkleHash bs)
150 Right bs -> pure (MerkleHash bs)
144
151
152+instance ToJSON Attributes where
153+ toJSON attrs = object ["attributes" .= map toJSON (A.toList attrs)]
154+instance FromJSON Attributes where
155+ parseJSON = withObject "Attributes" $ \o ->
156+ A.attributesFromList <$> o .: "attributes"
157+
145instance ToJSON RelationalError
158instance ToJSON RelationalError
146instance FromJSON RelationalError
159instance FromJSON RelationalError
147
160
@@ -151,6 +164,9 @@ instance FromJSON SchemaError
151instance ToJSON MergeError
164instance ToJSON MergeError
152instance FromJSON MergeError
165instance FromJSON MergeError
153
166
167+instance ToJSON ImportError'
168+instance FromJSON ImportError'
169+
154instance ToJSON DatabaseContextFunctionError
170instance ToJSON DatabaseContextFunctionError
155instance FromJSON DatabaseContextFunctionError
171instance FromJSON DatabaseContextFunctionError
156
172
@@ -165,3 +181,5 @@ instance FromJSON AtomFunctionError
165
181
166instance ToJSON WithNameExpr
182instance ToJSON WithNameExpr
167instance FromJSON WithNameExpr
183instance FromJSON WithNameExpr
184+
185+
src/bin/ProjectM36/Server/WebSocket.hs+3−2
@@ -22,6 +22,7 @@ import Data.Attoparsec.Text
22import Control.Applicative
22import Control.Applicative
23import Text.Megaparsec.Error
23import Text.Megaparsec.Error
24import Data.Functor
24import Data.Functor
25+import Data.Either (fromRight)
25
26
26#if MIN_VERSION_megaparsec(7,0,0)
27#if MIN_VERSION_megaparsec(7,0,0)
27import Data.List.NonEmpty as NE
28import Data.List.NonEmpty as NE
@@ -85,7 +86,7 @@ notificationCallback conn notifName evaldNotif = WS.sendTextData conn (encode (o
85
86
86--this creates a new database for each connection- perhaps not what we want (?)
87--this creates a new database for each connection- perhaps not what we want (?)
87createConnection :: WS.Connection -> DatabaseName -> Port -> Hostname -> IO (Either ConnectionError Connection)
88createConnection :: WS.Connection -> DatabaseName -> Port -> Hostname -> IO (Either ConnectionError Connection)
88−createConnection wsconn dbname port host = connectProjectM36 (RemoteProcessConnectionInfo dbname (createNodeId host port) (notificationCallback wsconn))
89+createConnection wsconn dbname port host = connectProjectM36 (RemoteConnectionInfo dbname host (show port) (notificationCallback wsconn))
89
90
90sendError :: (ToJSON a) => WS.Connection -> a -> IO ()
91sendError :: (ToJSON a) => WS.Connection -> a -> IO ()
91sendError conn err = WS.sendTextData conn (encode (object ["displayerror" .= err]))
92sendError conn err = WS.sendTextData conn (encode (object ["displayerror" .= err]))
@@ -117,7 +118,7 @@ promptInfo :: SessionId -> Connection -> IO (HeadName, SchemaName)
117promptInfo sessionId conn = do
118promptInfo sessionId conn = do
118 eHeadName <- headName sessionId conn
119 eHeadName <- headName sessionId conn
119 eSchemaName <- currentSchemaName sessionId conn
120 eSchemaName <- currentSchemaName sessionId conn
120− pure (either (const "<unknown>") id eHeadName, either (const "<no schema>") id eSchemaName)
121+ pure (fromRight "<unknown>" eHeadName, fromRight "<no schema>" eSchemaName)
121
122
122sendPromptInfo :: (HeadName, SchemaName) -> WS.Connection -> IO ()
123sendPromptInfo :: (HeadName, SchemaName) -> WS.Connection -> IO ()
123sendPromptInfo (hName, sName) conn = WS.sendTextData conn (encode (object ["promptInfo" .= object ["headname" .= hName, "schemaname" .= sName]]))
124sendPromptInfo (hName, sName) conn = WS.sendTextData conn (encode (object ["promptInfo" .= object ["headname" .= hName, "schemaname" .= sName]]))
src/bin/ProjectM36/Server/WebSocket/websocket-client.html+1−1
@@ -126,7 +126,7 @@ margin-bottom: 5pt;
126 <li>:showrelvars</li>
126 <li>:showrelvars</li>
127 <li>:showexpr true</li>
127 <li>:showexpr true</li>
128 <li>:showexpr false</li>
128 <li>:showexpr false</li>
129− <li>:importexample date</li>
129+ <li>:importexample cjdate</li>
130 <li>:showexpr s join sp</li>
130 <li>:showexpr s join sp</li>
131 <li>update s where city=&quot;Paris&quot; (status:=10)</li>
131 <li>update s where city=&quot;Paris&quot; (status:=10)</li>
132 <li>:showexpr s</li>
132 <li>:showexpr s</li>
src/bin/ProjectM36/Server/WebSocket/websocket-server.hs+48−18
@@ -1,33 +1,63 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2−import ProjectM36.Server.WebSocket
3−import ProjectM36.Server.Config
4−import ProjectM36.Server.ParseArgs
5−import ProjectM36.Server
6−import Control.Concurrent
7−import qualified Network.WebSockets as WS
8−
9−#if MIN_VERSION_network_transport_tcp(0,6,0)
10−import Network.Transport.TCP.Internal (decodeEndPointAddress)
11−#else
12−import Network.Transport.TCP (decodeEndPointAddress)
13−#endif
14
2
3+import Control.Concurrent
15import Control.Exception
4import Control.Exception
5+import Control.Monad (when)
6+import Data.Maybe (isJust)
7+import Data.String (fromString)
8+import Network.HTTP.Types (status400)
9+import Network.Socket
10+import Network.Wai (Application, responseLBS)
11+import Network.Wai.Handler.Warp
12+import Network.Wai.Handler.WarpTLS (runTLS, tlsSettings)
13+import qualified Network.Wai.Handler.WebSockets as WS
14+import Network.WebSockets (defaultConnectionOptions)
15+import ProjectM36.Server
16+import ProjectM36.Server.Config
17+import ProjectM36.Server.ParseArgs
18+import ProjectM36.Server.WebSocket
16
19
17main :: IO ()
20main :: IO ()
18main = do
21main = do
19 -- launch normal project-m36-server
22 -- launch normal project-m36-server
20 addressMVar <- newEmptyMVar
23 addressMVar <- newEmptyMVar
21− serverConfig <- parseConfigWithDefaults (defaultServerConfig { bindPort = 8000, bindHost = "127.0.0.1" })
24+ wsConfig <- parseWSConfigWithDefaults (defaultServerConfig {bindPort = 8000, bindHost = "127.0.0.1"})
25+
22 --usurp the serverConfig for our websocket server and make the proxied server run locally
26 --usurp the serverConfig for our websocket server and make the proxied server run locally
27+ let serverConfig = wsServerConfig wsConfig
23− let wsHost = bindHost serverConfig
28+ wsHost = bindHost serverConfig
24 wsPort = bindPort serverConfig
29 wsPort = bindPort serverConfig
25 serverHost = "127.0.0.1"
30 serverHost = "127.0.0.1"
26 serverConfig' = serverConfig {bindPort = 0, bindHost = serverHost}
31 serverConfig' = serverConfig {bindPort = 0, bindHost = serverHost}
32+ configCertificateFile = tlsCertificatePath wsConfig
33+ configKeyFile = tlsKeyPath wsConfig
34+
35+ when (isJust configCertificateFile /= isJust configKeyFile) $
36+ throwIO $ ErrorCall "TLS_CERTIFICATE_PATH and TLS_KEY_PATH must be set in tandem"
37+
27 _ <- forkFinally (launchServer serverConfig' (Just addressMVar) >> pure ()) (either throwIO pure)
38 _ <- forkFinally (launchServer serverConfig' (Just addressMVar) >> pure ()) (either throwIO pure)
28 --wait for server to be listening
39 --wait for server to be listening
29− address <- takeMVar addressMVar
40+ addr <- takeMVar addressMVar
30− let Just (_, serverPort, _) = decodeEndPointAddress address
41+ let port =
31− --this built-in server is apparently not meant for production use, but it's easier to test than starting up the wai or snap interfaces
42+ case addr of
32− WS.runServer wsHost (fromIntegral wsPort) (websocketProxyServer (read serverPort) serverHost)
43+ SockAddrInet port' _ -> fromIntegral port'
44+ _ -> error "unsupported socket address (IPv4 only currently)"
45+ wsApp = websocketProxyServer port serverHost
46+ waiApp = WS.websocketsOr defaultConnectionOptions wsApp backupApp
47+ settings = warpSettings wsHost (fromIntegral wsPort)
48+
49+ case (configCertificateFile, configKeyFile) of
50+ (Just certificate, Just key) -> runTLS (tlsSettings certificate key) settings waiApp
51+ _ -> runSettings settings waiApp
52+
53+backupApp :: Application
54+backupApp _ respond = respond $ responseLBS status400 [] "Not a WebSocket request"
33
55
56+warpSettings :: HostName -> Port -> Settings
57+warpSettings host port =
58+ setHost (fromString host)
59+ . setPort port
60+ . setServerName "project-m36"
61+ . setTimeout 3600
62+ . setGracefulShutdownTimeout (Just 5)
63+ $ defaultSettings
src/bin/TutorialD/Interpreter.hs+4−2
@@ -34,6 +34,7 @@ import Data.Monoid
34import Data.List (isPrefixOf)
34import Data.List (isPrefixOf)
35import Control.Exception
35import Control.Exception
36import System.Exit
36import System.Exit
37+import Data.Either (fromRight)
37
38
38{-
39{-
39context ops are read-only operations which only operate on the database context (relvars and constraints)
40context ops are read-only operations which only operate on the database context (relvars and constraints)
@@ -77,7 +78,7 @@ safeInterpreterParserP = fmap RODatabaseContextOp (roDatabaseContextOperatorP <*
77promptText :: Either RelationalError HeadName -> Either RelationalError SchemaName -> StringType
78promptText :: Either RelationalError HeadName -> Either RelationalError SchemaName -> StringType
78promptText eHeadName eSchemaName = "TutorialD (" <> transInfo <> "): "
79promptText eHeadName eSchemaName = "TutorialD (" <> transInfo <> "): "
79 where
80 where
80− transInfo = either (const "<unknown>") id eHeadName <> "/" <> either (const "<no schema>") id eSchemaName
81+ transInfo = fromRight "<unknown>" eHeadName <> "/" <> fromRight "<no schema>" eSchemaName
81
82
82parseTutorialD :: T.Text -> Either ParserError ParsedOperation
83parseTutorialD :: T.Text -> Either ParserError ParsedOperation
83parseTutorialD = parse interpreterParserP ""
84parseTutorialD = parse interpreterParserP ""
@@ -215,6 +216,7 @@ evalTutorialDInteractive sessionId conn safe interactive expr = case expr of
215 unsafeError = pure $ DisplayErrorResult "File I/O operation prohibited."
216 unsafeError = pure $ DisplayErrorResult "File I/O operation prohibited."
216 barf :: RelationalError -> IO TutorialDOperatorResult
217 barf :: RelationalError -> IO TutorialDOperatorResult
217 barf (ScriptError (OtherScriptCompilationError errStr)) = pure (DisplayErrorResult (T.pack errStr))
218 barf (ScriptError (OtherScriptCompilationError errStr)) = pure (DisplayErrorResult (T.pack errStr))
219+ barf (ParseError err) = pure (DisplayErrorResult err)
218 barf err = return $ DisplayErrorResult (T.pack (show err))
220 barf err = return $ DisplayErrorResult (T.pack (show err))
219 eHandler io = do
221 eHandler io = do
220 eErr <- io
222 eErr <- io
@@ -227,7 +229,7 @@ type TutorialDExec = String
227type CheckFS = Bool
229type CheckFS = Bool
228
230
229data InterpreterConfig = LocalInterpreterConfig PersistenceStrategy HeadName (Maybe TutorialDExec) [GhcPkgPath] CheckFS |
231data InterpreterConfig = LocalInterpreterConfig PersistenceStrategy HeadName (Maybe TutorialDExec) [GhcPkgPath] CheckFS |
230− RemoteInterpreterConfig C.NodeId C.DatabaseName HeadName (Maybe TutorialDExec) CheckFS
232+ RemoteInterpreterConfig C.Hostname C.Port C.DatabaseName HeadName (Maybe TutorialDExec) CheckFS
231
233
232outputNotificationCallback :: C.NotificationCallback
234outputNotificationCallback :: C.NotificationCallback
233outputNotificationCallback notName evaldNot = hPutStrLn stderr $ "Notification received " ++ show notName ++ ":\n" ++ "\n" ++ prettyEvaluatedNotification evaldNot
235outputNotificationCallback notName evaldNot = hPutStrLn stderr $ "Notification received " ++ show notName ++ ":\n" ++ "\n" ++ prettyEvaluatedNotification evaldNot
src/bin/TutorialD/Interpreter/Base.hs+29−8
@@ -12,11 +12,12 @@ module TutorialD.Interpreter.Base (
12 where
12 where
13import ProjectM36.Base
13import ProjectM36.Base
14import ProjectM36.AtomType
14import ProjectM36.AtomType
15+import ProjectM36.Attribute as A
15import ProjectM36.Relation
16import ProjectM36.Relation
16import ProjectM36.DataFrame
17import ProjectM36.DataFrame
17
18
18#if MIN_VERSION_megaparsec(6,0,0)
19#if MIN_VERSION_megaparsec(6,0,0)
19−import Text.Megaparsec.Char
20+import Text.Megaparsec.Char
20import qualified Text.Megaparsec.Char.Lexer as Lex
21import qualified Text.Megaparsec.Char.Lexer as Lex
21import Text.Megaparsec
22import Text.Megaparsec
22import Data.Void
23import Data.Void
@@ -30,7 +31,6 @@ import Data.Text hiding (count)
30import System.Random
31import System.Random
31import qualified Data.Text as T
32import qualified Data.Text as T
32import qualified Data.List as L
33import qualified Data.List as L
33−import qualified Data.Vector as V
34import qualified Data.Text.IO as TIO
34import qualified Data.Text.IO as TIO
35import System.IO
35import System.IO
36import ProjectM36.Relation.Show.Term
36import ProjectM36.Relation.Show.Term
@@ -44,6 +44,7 @@ import Data.List.NonEmpty as NE
44import Data.Time.Clock
44import Data.Time.Clock
45import Data.Time.Format
45import Data.Time.Format
46import Control.Monad (void)
46import Control.Monad (void)
47+import Data.Char
47
48
48#if !MIN_VERSION_megaparsec(7,0,0)
49#if !MIN_VERSION_megaparsec(7,0,0)
49anySingle :: Parsec Void Text (Token Text)
50anySingle :: Parsec Void Text (Token Text)
@@ -81,8 +82,9 @@ type ParseStr = Text
81type ParseStr = String
82type ParseStr = String
82#endif
83#endif
83
84
85+-- consumes only horizontal spaces
84spaceConsumer :: Parser ()
86spaceConsumer :: Parser ()
85−spaceConsumer = Lex.space (void spaceChar) (Lex.skipLineComment "--") (Lex.skipBlockComment "{-" "-}")
87+spaceConsumer = Lex.space space1 (Lex.skipLineComment "--") (Lex.skipBlockComment "{-" "-}")
86
88
87opChar :: Parser Char
89opChar :: Parser Char
88opChar = oneOf (":!#$%&*+./<=>?\\^|-~" :: String)-- remove "@" so it can be used as attribute marker without spaces
90opChar = oneOf (":!#$%&*+./<=>?\\^|-~" :: String)-- remove "@" so it can be used as attribute marker without spaces
@@ -135,11 +137,14 @@ arrow = symbol "->"
135semi :: Parser Text
137semi :: Parser Text
136semi = symbol ";"
138semi = symbol ";"
137
139
140+nline :: Parser Text
141+nline = (T.singleton <$> newline) <|> crlf
142+
138integer :: Parser Integer
143integer :: Parser Integer
139#if MIN_VERSION_megaparsec(6,0,0)
144#if MIN_VERSION_megaparsec(6,0,0)
140−integer = Lex.signed spaceConsumer Lex.decimal
145+integer = Lex.signed (pure ()) Lex.decimal <* spaceConsumer
141#else
146#else
142−integer = Lex.signed spaceConsumer Lex.integer
147+integer = Lex.signed (pure ()) Lex.integer <* spaceConsumer
143#endif
148#endif
144
149
145natural :: Parser Integer
150natural :: Parser Integer
@@ -150,7 +155,7 @@ natural = Lex.integer <* spaceConsumer
150#endif
155#endif
151
156
152float :: Parser Double
157float :: Parser Double
153−float = Lex.float
158+float = Lex.float <* spaceConsumer
154
159
155capitalizedIdentifier :: Parser Text
160capitalizedIdentifier :: Parser Text
156capitalizedIdentifier =
161capitalizedIdentifier =
@@ -163,8 +168,8 @@ uncapitalizedIdentifier =
163showRelationAttributes :: Attributes -> Text
168showRelationAttributes :: Attributes -> Text
164showRelationAttributes attrs = "{" <> T.concat (L.intersperse ", " $ L.map showAttribute attrsL) <> "}"
169showRelationAttributes attrs = "{" <> T.concat (L.intersperse ", " $ L.map showAttribute attrsL) <> "}"
165 where
170 where
166− showAttribute (Attribute name atomType) = name <> " " <> prettyAtomType atomType
171+ showAttribute (Attribute name atomType') = name <> " " <> prettyAtomType atomType'
167− attrsL = V.toList attrs
172+ attrsL = A.toList attrs
168
173
169type PromptLength = Int
174type PromptLength = Int
170
175
@@ -200,6 +205,9 @@ normalQuotedString = quote *> (T.pack <$> manyTill Lex.charLiteral quote)
200quotedString :: Parser Text
205quotedString :: Parser Text
201quotedString = try tripleQuotedString <|> normalQuotedString
206quotedString = try tripleQuotedString <|> normalQuotedString
202
207
208+quoted :: Parser a -> Parser a
209+quoted = between quote quote
210+
203uuidP :: Parser U.UUID
211uuidP :: Parser U.UUID
204uuidP = do
212uuidP = do
205 uuidStart <- count 8 hexDigitChar
213 uuidStart <- count 8 hexDigitChar
@@ -222,3 +230,16 @@ utcTimeP = do
222 case parseTimeM True defaultTimeLocale "%Y-%m-%d %H:%M:%S" (T.unpack timeStr) of
230 case parseTimeM True defaultTimeLocale "%Y-%m-%d %H:%M:%S" (T.unpack timeStr) of
223 Nothing -> fail "invalid datetime input, use \"YYYY-MM-DD HH:MM:SS\""
231 Nothing -> fail "invalid datetime input, use \"YYYY-MM-DD HH:MM:SS\""
224 Just stamp' -> pure stamp'
232 Just stamp' -> pure stamp'
233+
234+
235+colonOp :: Text -> Parser ()
236+colonOp opStr = do
237+ _ <- string opStr <* (void spaceChar <|> eof) <* spaceConsumer
238+ pure ()
239+
240+hex :: Parser Text
241+hex = takeWhileP (Just "hexadecimal")
242+ (\c ->
243+ isDigit c
244+ || (c >= 'a' && c <= 'f'))
245+
src/bin/TutorialD/Interpreter/DatabaseContextExpr.hs+3−2
@@ -53,8 +53,9 @@ multilineSep :: Parser T.Text
53multilineSep = newline >> pure "\n"
53multilineSep = newline >> pure "\n"
54
54
55multipleDatabaseContextExprP :: Parser DatabaseContextExpr
55multipleDatabaseContextExprP :: Parser DatabaseContextExpr
56−multipleDatabaseContextExprP =
56+multipleDatabaseContextExprP = do
57− MultipleExpr <$> sepBy1 databaseContextExprP semi
57+ exprs <- filter (/= NoOperation) <$> sepBy1 databaseContextExprP semi
58+ pure (MultipleExpr exprs)
58
59
59insertP :: Parser DatabaseContextExpr
60insertP :: Parser DatabaseContextExpr
60insertP = do
61insertP = do
src/bin/TutorialD/Interpreter/Import/Base.hs+8−3
@@ -2,6 +2,8 @@
2module TutorialD.Interpreter.Import.Base where
2module TutorialD.Interpreter.Import.Base where
3import ProjectM36.Base
3import ProjectM36.Base
4import ProjectM36.Error
4import ProjectM36.Error
5+import Text.URI (URI)
6+import Data.Text (Text)
5#if __GLASGOW_HASKELL__ < 804
7#if __GLASGOW_HASKELL__ < 804
6import Data.Monoid
8import Data.Monoid
7#endif
9#endif
@@ -12,11 +14,14 @@ data RelVarDataImportOperator = RelVarDataImportOperator RelVarName FilePath (Re
12instance Show RelVarDataImportOperator where
14instance Show RelVarDataImportOperator where
13 show (RelVarDataImportOperator rv path _) = "RelVarDataImportOperator " <> show rv <> " " <> path
15 show (RelVarDataImportOperator rv path _) = "RelVarDataImportOperator " <> show rv <> " " <> path
14
16
17+type HashVerification = Maybe Text
18+
15-- | import data into a database context
19-- | import data into a database context
16−data DatabaseContextDataImportOperator = DatabaseContextDataImportOperator FilePath (FilePath -> IO (Either RelationalError DatabaseContextExpr))
20+data DatabaseContextDataImportOperator = DatabaseContextDataImportOperator URI HashVerification (URI -> HashVerification -> IO (Either RelationalError DatabaseContextExpr))
17
21
18instance Show DatabaseContextDataImportOperator where
22instance Show DatabaseContextDataImportOperator where
19− show (DatabaseContextDataImportOperator path _) = "DatabaseContextDataImportOperator " <> path
23+ show (DatabaseContextDataImportOperator uri hash _) =
24+ "DatabaseContextDataImportOperator " <> show uri <> " " <> show hash
20
25
21-- perhaps create a structure to import a whole transaction graph section in the future
26-- perhaps create a structure to import a whole transaction graph section in the future
22
27
@@ -24,4 +29,4 @@ evalRelVarDataImportOperator :: RelVarDataImportOperator -> TypeConstructorMappi
24evalRelVarDataImportOperator (RelVarDataImportOperator relVarName path importFunc) tConsMap attrs = importFunc relVarName tConsMap attrs path
29evalRelVarDataImportOperator (RelVarDataImportOperator relVarName path importFunc) tConsMap attrs = importFunc relVarName tConsMap attrs path
25
30
26evalDatabaseContextDataImportOperator :: DatabaseContextDataImportOperator -> IO (Either RelationalError DatabaseContextExpr)
31evalDatabaseContextDataImportOperator :: DatabaseContextDataImportOperator -> IO (Either RelationalError DatabaseContextExpr)
27−evalDatabaseContextDataImportOperator (DatabaseContextDataImportOperator path importFunc) = importFunc path
32+evalDatabaseContextDataImportOperator (DatabaseContextDataImportOperator uri hash importFunc) = importFunc uri hash
src/bin/TutorialD/Interpreter/Import/BasicExamples.hs+2−2
@@ -20,8 +20,8 @@ importBasicExampleOperatorP :: Parser ImportBasicExampleOperator
20importBasicExampleOperatorP = do
20importBasicExampleOperatorP = do
21 reservedOp ":importexample"
21 reservedOp ":importexample"
22 example <- identifier
22 example <- identifier
23− if example == "date" then
23+ if example == "cjdate" then
24 pure ImportBasicDateExampleOperator
24 pure ImportBasicDateExampleOperator
25 else
25 else
26 fail "Unknown example name"
26 fail "Unknown example name"
27−
27+
src/bin/TutorialD/Interpreter/Import/CSV.hs+3−3
@@ -14,10 +14,10 @@ importCSVRelation relVarName tConsMap attrs pathIn = do
14 --TODO: handle filesystem errors
14 --TODO: handle filesystem errors
15 csvData <- try (BS.readFile pathIn) :: IO (Either IOError BS.ByteString)
15 csvData <- try (BS.readFile pathIn) :: IO (Either IOError BS.ByteString)
16 case csvData of
16 case csvData of
17− Left err -> return $ Left (ImportError $ T.pack (show err))
17+ Left err -> pure $ Left (ImportError (ImportFileError (T.pack (show err))))
18 Right csvData' -> case csvAsRelation attrs tConsMap csvData' of
18 Right csvData' -> case csvAsRelation attrs tConsMap csvData' of
19− Left err -> return $ Left (ParseError $ T.pack (show err))
19+ Left err -> pure $ Left (ParseError $ T.pack (show err))
20− Right csvRel -> return $ Right (Insert relVarName (ExistingRelation csvRel))
20+ Right csvRel -> pure $ Right (Insert relVarName (ExistingRelation csvRel))
21
21
22importCSVP :: Parser RelVarDataImportOperator
22importCSVP :: Parser RelVarDataImportOperator
23importCSVP = do
23importCSVP = do
src/bin/TutorialD/Interpreter/Import/TutorialD.hs+70−17
@@ -9,25 +9,78 @@ import qualified Data.Text as T
9import Control.Exception
9import Control.Exception
10import qualified Data.ByteString as BS
10import qualified Data.ByteString as BS
11import qualified Data.Text.Encoding as TE
11import qualified Data.Text.Encoding as TE
12+import qualified Text.URI as URI
13+import Text.URI (URI)
14+import Crypto.Hash.SHA256
15+import Data.ByteString.Base16 as B16
16+import Network.HTTP.Simple
17+import Network.HTTP.Types
12−--import a file containing TutorialD database context expressions
18+--import a file containing TutorialD database context expressions via local files or HTTP/HTTPS
13
19
14−importTutorialD :: FilePath -> IO (Either RelationalError DatabaseContextExpr)
20+importTutorialDFromFile :: URI -> HashVerification -> IO (Either RelationalError DatabaseContextExpr)
15−importTutorialD pathIn = do
21+importTutorialDFromFile fileURI mHash = do
22+ case URI.uriPath fileURI of
23+ Just (False, _) -> do
16− eTutdBytes <- try (BS.readFile pathIn) :: IO (Either IOError BS.ByteString)
24+ eTutdBytes <- try (BS.readFile filePath) :: IO (Either IOError BS.ByteString)
17− case eTutdBytes of
25+ case eTutdBytes of
18− Left err -> return $ Left (ImportError $ T.pack (show err))
26+ Left err -> pure $ Left (ImportError (ImportFileError (T.pack (show err))))
27+ Right tutdBytes ->
28+ case validateBytes tutdBytes mHash of
29+ Left err -> pure (Left err)
19− Right tutdBytes ->
30+ Right tutdBytes' -> importTutorialDBytes tutdBytes'
31+ _ -> pure (Left (ImportError (InvalidFileURIError (URI.render fileURI))))
32+ where
33+ filePath = drop (length ("file://" :: String)) (URI.renderStr fileURI)
34+
35+
36+importTutorialDBytes :: BS.ByteString -> IO (Either RelationalError DatabaseContextExpr)
37+importTutorialDBytes tutdBytes =
20− case TE.decodeUtf8' tutdBytes of
38+ case TE.decodeUtf8' tutdBytes of
21− Left err -> pure (Left (ImportError $ T.pack (show err)))
39+ Left err -> pure (Left (ImportError (ImportFileDecodeError (T.pack (show err)))))
22− Right tutdUtf8 ->
40+ Right tutdUtf8 ->
23− case parse multipleDatabaseContextExprP "import" tutdUtf8 of
41+ case parse (multipleDatabaseContextExprP <* eof) "import" tutdUtf8 of
24− --parseErrorPretty is new in megaparsec 5
42+ --parseErrorPretty is new in megaparsec 5
25− Left err -> pure (Left (PM36E.ParseError (T.pack (show err))))
43+ Left err -> pure (Left (PM36E.ParseError (T.pack (errorBundlePretty err))))
26− Right expr -> pure (Right expr)
44+ Right expr -> pure (Right expr)
27−
45+
46+importTutorialDViaHTTP :: URI -> HashVerification -> IO (Either RelationalError DatabaseContextExpr)
47+importTutorialDViaHTTP uri mHash = do
48+ reqURI <- parseRequest (URI.renderStr uri)
49+ response <- httpBS reqURI
50+ let scode = getResponseStatus response
51+ if scode == ok200 then
52+ let byteBody = getResponseBody response in
53+ case validateBytes byteBody mHash of
54+ Right byteBody' -> do
55+ importTutorialDBytes byteBody'
56+ Left err -> pure (Left err)
57+ else
58+ pure (Left (ImportError (ImportDownloadError (T.pack ("download failed: " <> show scode)))))
59+
60+validateBytes :: BS.ByteString -> HashVerification -> Either RelationalError BS.ByteString
61+validateBytes tutdBytes mHash =
62+ case mHash of
63+ Nothing -> pure tutdBytes
64+ Just expectedHashText ->
65+ case B16.decode (TE.encodeUtf8 expectedHashText) of
66+ Left _ -> Left (ImportError (InvalidSHA256Error expectedHashText))
67+ Right expectedHash | hashBytes == expectedHash -> pure tutdBytes
68+ | otherwise ->
69+ let p = TE.decodeUtf8 . B16.encode in
70+ Left (ImportError (SHA256MismatchError (p expectedHash) (p hashBytes)))
71+ where
72+ hashBytes = hash tutdBytes
73+
74+
28tutdImportP :: Parser DatabaseContextDataImportOperator
75tutdImportP :: Parser DatabaseContextDataImportOperator
29tutdImportP = do
76tutdImportP = do
30 reserved ":importtutd"
77 reserved ":importtutd"
31− path <- quotedString
78+ uri <- quoted URI.parser
32 spaceConsumer
79 spaceConsumer
80+ mhash <- optional (quoted hex)
81+ handler <- case URI.unRText <$> URI.uriScheme uri of
82+ Nothing -> fail "URI scheme missing"
83+ Just "file" -> pure importTutorialDFromFile
84+ Just scheme | scheme `elem` ["http", "https"] -> pure importTutorialDViaHTTP
85+ | otherwise -> fail ( "unsupported URI scheme: " <> show scheme)
33− return $ DatabaseContextDataImportOperator (T.unpack path) importTutorialD
86+ pure $ DatabaseContextDataImportOperator uri mhash handler
src/bin/TutorialD/Interpreter/RODatabaseContextOperator.hs+33−16
@@ -1,13 +1,16 @@
1{-# LANGUAGE GADTs #-}
1{-# LANGUAGE GADTs #-}
2module TutorialD.Interpreter.RODatabaseContextOperator where
2module TutorialD.Interpreter.RODatabaseContextOperator where
3import ProjectM36.Base
3import ProjectM36.Base
4+import ProjectM36.Relation
4import qualified ProjectM36.DataFrame as DF
5import qualified ProjectM36.DataFrame as DF
5import ProjectM36.Error
6import ProjectM36.Error
7+import ProjectM36.Tuple
6import ProjectM36.InclusionDependency
8import ProjectM36.InclusionDependency
7import qualified ProjectM36.Client as C
9import qualified ProjectM36.Client as C
8import TutorialD.Interpreter.Base
10import TutorialD.Interpreter.Base
9import TutorialD.Interpreter.RelationalExpr
11import TutorialD.Interpreter.RelationalExpr
10import TutorialD.Interpreter.DatabaseContextExpr
12import TutorialD.Interpreter.DatabaseContextExpr
13+import TutorialD.Printer
11import Control.Monad.State
14import Control.Monad.State
12import qualified Data.Text as T
15import qualified Data.Text as T
13import ProjectM36.Relation.Show.Gnuplot
16import ProjectM36.Relation.Show.Gnuplot
@@ -19,7 +22,7 @@ data RODatabaseContextOperator where
19 ShowRelation :: RelationalExpr -> RODatabaseContextOperator
22 ShowRelation :: RelationalExpr -> RODatabaseContextOperator
20 PlotRelation :: RelationalExpr -> RODatabaseContextOperator
23 PlotRelation :: RelationalExpr -> RODatabaseContextOperator
21 ShowRelationType :: RelationalExpr -> RODatabaseContextOperator
24 ShowRelationType :: RelationalExpr -> RODatabaseContextOperator
22− ShowConstraint :: StringType -> RODatabaseContextOperator
25+ ShowConstraints :: StringType -> RODatabaseContextOperator
23 ShowPlan :: DatabaseContextExpr -> RODatabaseContextOperator
26 ShowPlan :: DatabaseContextExpr -> RODatabaseContextOperator
24 ShowTypes :: RODatabaseContextOperator
27 ShowTypes :: RODatabaseContextOperator
25 ShowRelationVariables :: RODatabaseContextOperator
28 ShowRelationVariables :: RODatabaseContextOperator
@@ -31,44 +34,44 @@ data RODatabaseContextOperator where
31
34
32typeP :: Parser RODatabaseContextOperator
35typeP :: Parser RODatabaseContextOperator
33typeP = do
36typeP = do
34− reservedOp ":type"
37+ colonOp ":type"
35 ShowRelationType <$> relExprP
38 ShowRelationType <$> relExprP
36
39
37showRelP :: Parser RODatabaseContextOperator
40showRelP :: Parser RODatabaseContextOperator
38showRelP = do
41showRelP = do
39− reservedOp ":showexpr"
42+ colonOp ":showexpr"
40 ShowRelation <$> relExprP
43 ShowRelation <$> relExprP
41
44
42showPlanP :: Parser RODatabaseContextOperator
45showPlanP :: Parser RODatabaseContextOperator
43showPlanP = do
46showPlanP = do
44− reservedOp ":showplan"
47+ colonOp ":showplan"
45 ShowPlan <$> databaseContextExprP
48 ShowPlan <$> databaseContextExprP
46
49
47showTypesP :: Parser RODatabaseContextOperator
50showTypesP :: Parser RODatabaseContextOperator
48−showTypesP = reserved ":showtypes" >> pure ShowTypes
51+showTypesP = colonOp ":showtypes" >> pure ShowTypes
49
52
50showRelationVariables :: Parser RODatabaseContextOperator
53showRelationVariables :: Parser RODatabaseContextOperator
51−showRelationVariables = reserved ":showrelvars" >> pure ShowRelationVariables
54+showRelationVariables = colonOp ":showrelvars" >> pure ShowRelationVariables
52
55
53showAtomFunctionsP :: Parser RODatabaseContextOperator
56showAtomFunctionsP :: Parser RODatabaseContextOperator
54−showAtomFunctionsP = reserved ":showatomfunctions" >> pure ShowAtomFunctions
57+showAtomFunctionsP = colonOp ":showatomfunctions" >> pure ShowAtomFunctions
55
58
56showDatabaseContextFunctionsP :: Parser RODatabaseContextOperator
59showDatabaseContextFunctionsP :: Parser RODatabaseContextOperator
57−showDatabaseContextFunctionsP = reserved ":showdatabasecontextfunctions" >> pure ShowDatabaseContextFunctions
60+showDatabaseContextFunctionsP = colonOp ":showdatabasecontextfunctions" >> pure ShowDatabaseContextFunctions
58
61
59quitP :: Parser RODatabaseContextOperator
62quitP :: Parser RODatabaseContextOperator
60quitP = do
63quitP = do
61− reservedOp ":quit"
64+ colonOp ":quit"
62 return Quit
65 return Quit
63
66
64showConstraintsP :: Parser RODatabaseContextOperator
67showConstraintsP :: Parser RODatabaseContextOperator
65showConstraintsP = do
68showConstraintsP = do
66− reservedOp ":constraints"
69+ colonOp ":constraints"
67− ShowConstraint <$> option "" identifier
70+ ShowConstraints <$> option "" identifier
68
71
69plotRelExprP :: Parser RODatabaseContextOperator
72plotRelExprP :: Parser RODatabaseContextOperator
70plotRelExprP = do
73plotRelExprP = do
71− reserved ":plotexpr"
74+ colonOp ":plotexpr"
72 PlotRelation <$> relExprP
75 PlotRelation <$> relExprP
73
76
74roDatabaseContextOperatorP :: Parser RODatabaseContextOperator
77roDatabaseContextOperatorP :: Parser RODatabaseContextOperator
@@ -106,15 +109,16 @@ evalRODatabaseContextOp sessionId conn (PlotRelation expr) = do
106 err <- plotRelation rel
109 err <- plotRelation rel
107 when (isJust err) $ print err
110 when (isJust err) $ print err
108
111
109−evalRODatabaseContextOp sessionId conn (ShowConstraint name) = do
112+evalRODatabaseContextOp sessionId conn (ShowConstraints name) = do
110 eIncDeps <- C.inclusionDependencies sessionId conn
113 eIncDeps <- C.inclusionDependencies sessionId conn
111 let val = case eIncDeps of
114 let val = case eIncDeps of
112 Left err -> Left err
115 Left err -> Left err
113 Right incDeps -> case name of
116 Right incDeps -> case name of
114− "" -> inclusionDependenciesAsRelation incDeps
117+ "" -> inclusionDependenciesAsRelation incDeps >>= renderRelExprsInIncDeps
115 depName -> case M.lookup depName incDeps of
118 depName -> case M.lookup depName incDeps of
116 Nothing -> Left (InclusionDependencyNameNotInUseError depName)
119 Nothing -> Left (InclusionDependencyNameNotInUseError depName)
120+ Just dep ->
117− Just dep -> inclusionDependenciesAsRelation (M.singleton depName dep)
121+ inclusionDependenciesAsRelation (M.singleton depName dep) >>= renderRelExprsInIncDeps
118 pure $ case val of
122 pure $ case val of
119 Left err -> DisplayErrorResult (T.pack (show err))
123 Left err -> DisplayErrorResult (T.pack (show err))
120 Right rel -> DisplayRelationResult rel
124 Right rel -> DisplayRelationResult rel
@@ -164,7 +168,7 @@ interpretRODatabaseContextOp sessionId conn tutdstring = case parse roDatabaseCo
164
168
165showDataFrameP :: Parser RODatabaseContextOperator
169showDataFrameP :: Parser RODatabaseContextOperator
166showDataFrameP = do
170showDataFrameP = do
167− reservedOp ":showdataframe"
171+ colonOp ":showdataframe"
168 relExpr <- relExprP
172 relExpr <- relExprP
169 reservedOp "orderby"
173 reservedOp "orderby"
170 attrOrdersExpr <- attrOrdersExprP
174 attrOrdersExpr <- attrOrdersExprP
@@ -191,3 +195,16 @@ attrOrderExprP = DF.AttributeOrderExpr <$> identifier <*> orderP
191
195
192orderP :: Parser DF.Order
196orderP :: Parser DF.Order
193orderP = try (reservedOp "ascending" >> pure DF.AscendingOrder) <|> try (reservedOp "descending" >> pure DF.DescendingOrder) <|> pure DF.AscendingOrder
197orderP = try (reservedOp "ascending" >> pure DF.AscendingOrder) <|> try (reservedOp "descending" >> pure DF.DescendingOrder) <|> pure DF.AscendingOrder
198+
199+-- render RelationalExprAtoms as TutorialD
200+renderRelExprsInIncDeps :: Relation -> Either RelationalError Relation
201+renderRelExprsInIncDeps = relMogrify tupMapper attrs
202+ where
203+ tupMapper tup = pure $ mkRelationTupleFromMap (M.map mapper (tupleToMap tup))
204+ mapper (RelationalExprAtom expr) = TextAtom (T.pack (show (prettyRelationalExpr expr)))
205+ mapper atom = atom
206+ attrs = C.attributesFromList [Attribute "name" TextAtomType,
207+ Attribute "sub" TextAtomType,
208+ Attribute "super" TextAtomType
209+ ]
210+
src/bin/TutorialD/Interpreter/RelationalExpr.hs+27−8
@@ -20,9 +20,18 @@ attributeListP :: RelationalMarkerExpr a => Parser (AttributeNamesBase a)
20attributeListP =
20attributeListP =
21 (reservedOp "all but" >>
21 (reservedOp "all but" >>
22 InvertedAttributeNames . S.fromList <$> sepBy attributeNameP comma) <|>
22 InvertedAttributeNames . S.fromList <$> sepBy attributeNameP comma) <|>
23+
23 (reservedOp "all from" >>
24 (reservedOp "all from" >>
24 RelationalExprAttributeNames <$> relExprP) <|>
25 RelationalExprAttributeNames <$> relExprP) <|>
26+
27+ (reservedOp "union of" >>
28+ UnionAttributeNames <$> braces attributeListP <*> braces attributeListP) <|>
29+
30+ (reservedOp "intersection of" >>
31+ IntersectAttributeNames <$> braces attributeListP <*> braces attributeListP) <|>
32+
25− (AttributeNames . S.fromList <$> sepBy attributeNameP comma)
33+ (AttributeNames . S.fromList <$> sepBy attributeNameP comma)
34+
26
35
27makeRelationP :: RelationalMarkerExpr a => Parser (RelationalExprBase a)
36makeRelationP :: RelationalMarkerExpr a => Parser (RelationalExprBase a)
28makeRelationP = do
37makeRelationP = do
@@ -102,7 +111,11 @@ ungroupP = do
102extendP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a)
111extendP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a)
103extendP = do
112extendP = do
104 reservedOp ":"
113 reservedOp ":"
105− Extend <$> braces extendTupleExpressionP
114+ extends <- braces (sepBy extendTupleExpressionP comma)
115+ case extends of
116+ [] -> pure (Restrict TruePredicate)
117+ extends' ->
118+ pure $ \expr -> foldl (flip Extend) expr extends'
106
119
107semijoinP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a -> RelationalExprBase a)
120semijoinP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a -> RelationalExprBase a)
108semijoinP = do
121semijoinP = do
@@ -129,7 +142,8 @@ relOperators = [
129 [InfixL antijoinP],
142 [InfixL antijoinP],
130 [InfixL (reservedOp "union" >> return Union)],
143 [InfixL (reservedOp "union" >> return Union)],
131 [InfixL (reservedOp "minus" >> return Difference)],
144 [InfixL (reservedOp "minus" >> return Difference)],
132− [InfixN (reservedOp "=" >> return Equals)],
145+ [InfixN (reservedOp "=" >> return Equals),
146+ InfixN (reservedOp "/=" >> return NotEquals)],
133 [Postfix extendP]
147 [Postfix extendP]
134 ]
148 ]
135
149
@@ -200,8 +214,9 @@ consumeAtomExprP consume = try functionAtomExprP <|>
200 try (parens (constructedAtomExprP True)) <|>
214 try (parens (constructedAtomExprP True)) <|>
201 constructedAtomExprP consume <|>
215 constructedAtomExprP consume <|>
202 attributeAtomExprP <|>
216 attributeAtomExprP <|>
203− nakedAtomExprP <|>
217+ try nakedAtomExprP <|>
204 relationalAtomExprP
218 relationalAtomExprP
219+
205
220
206attributeAtomExprP :: Parser (AtomExprBase a)
221attributeAtomExprP :: Parser (AtomExprBase a)
207attributeAtomExprP = do
222attributeAtomExprP = do
@@ -220,7 +235,7 @@ constructedAtomExprP consume = do
220-- used only for primitive type parsing ?
235-- used only for primitive type parsing ?
221atomP :: Parser Atom
236atomP :: Parser Atom
222atomP = stringAtomP <|>
237atomP = stringAtomP <|>
223− doubleAtomP <|>
238+ try doubleAtomP <|>
224 integerAtomP <|>
239 integerAtomP <|>
225 boolAtomP
240 boolAtomP
226
241
@@ -235,15 +250,19 @@ stringAtomP :: Parser Atom
235stringAtomP = TextAtom <$> quotedString
250stringAtomP = TextAtom <$> quotedString
236
251
237doubleAtomP :: Parser Atom
252doubleAtomP :: Parser Atom
238−doubleAtomP = DoubleAtom <$> try float
253+doubleAtomP = DoubleAtom <$> float
239
254
240integerAtomP :: Parser Atom
255integerAtomP :: Parser Atom
241integerAtomP = IntegerAtom <$> integer
256integerAtomP = IntegerAtom <$> integer
242
257
243boolAtomP :: Parser Atom
258boolAtomP :: Parser Atom
244boolAtomP = do
259boolAtomP = do
245− val <- char 't' <|> char 'f'
260+ v <- identifier
261+ if v == "t" || v == "f" then
246− return $ BoolAtom (val == 't')
262+ pure $ BoolAtom (v == "t")
263+ else
264+ fail "invalid boolAtom"
265+
247
266
248relationAtomExprP :: RelationalMarkerExpr a => Parser (AtomExprBase a)
267relationAtomExprP :: RelationalMarkerExpr a => Parser (AtomExprBase a)
249relationAtomExprP = RelationAtomExpr <$> makeRelationP
268relationAtomExprP = RelationAtomExpr <$> makeRelationP
src/bin/TutorialD/Printer.hsnew file+165
@@ -0,0 +1,165 @@
1+{-# OPTIONS_GHC -fno-warn-orphans #-}
2+{-# LANGUAGE FlexibleInstances #-}
3+{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE ScopedTypeVariables #-}
5+{-# LANGUAGE TypeApplications #-}
6+module TutorialD.Printer where
7+import ProjectM36.Base
8+import ProjectM36.Attribute as A hiding (null)
9+import Data.Text.Prettyprint.Doc
10+import qualified Data.Set as S hiding (fromList)
11+import qualified Data.Vector as V
12+import qualified Data.Map.Strict as M
13+import Data.Time.Calendar
14+import Data.Time.Clock.POSIX
15+import qualified Data.ByteString.Base64 as B64
16+import qualified Data.Text.Encoding as TE
17+
18+instance Pretty Atom where
19+ pretty (IntegerAtom x) = pretty x
20+ pretty (IntAtom x) = "int" <> parensList [pretty x]
21+ pretty (DoubleAtom x) = pretty x
22+ pretty (TextAtom x) = dquotes (pretty x)
23+ pretty (DayAtom x) = "fromGregorian" <> parensList [pretty a, pretty b, pretty c]
24+ where
25+ (a,b,c) = toGregorian x
26+ pretty (DateTimeAtom time) = "dateTimeFromEpochSeconds" <> parensList [pretty @Integer (round (utcTimeToPOSIXSeconds time))]
27+ pretty (ByteStringAtom bs) = "bytestring" <> parensList [dquotes (pretty (TE.decodeUtf8 (B64.encode bs)))]
28+ pretty (BoolAtom x) = if x then "t" else "f"
29+ pretty (RelationAtom x) = pretty x
30+ pretty (RelationalExprAtom re) = pretty re
31+ pretty (ConstructedAtom n _ as) = pretty n <+> prettyList as
32+
33+instance Pretty AtomExpr where
34+ pretty (AttributeAtomExpr attrName) = pretty attrName
35+ pretty (NakedAtomExpr atom) = pretty atom
36+ pretty (FunctionAtomExpr atomFuncName' atomExprs _) = pretty atomFuncName' <> prettyAtomExprsAsArguments atomExprs
37+ pretty (RelationAtomExpr relExpr) = pretty relExpr
38+ pretty (ConstructedAtomExpr dName [] _) = pretty dName
39+ pretty (ConstructedAtomExpr dName atomExprs _) = pretty dName <+> hsep (map prettyAtomExpr atomExprs)
40+
41+prettyAtomExpr :: AtomExpr -> Doc ann
42+prettyAtomExpr atomExpr =
43+ case atomExpr of
44+ AttributeAtomExpr attrName -> "@" <> pretty attrName
45+ ConstructedAtomExpr dConsName [] () -> pretty dConsName
46+ ConstructedAtomExpr dConsName atomExprs () -> parens (pretty dConsName <+> hsep (map prettyAtomExpr atomExprs))
47+ _ -> pretty atomExpr
48+
49+prettyAtomExprsAsArguments :: [AtomExpr] -> Doc ann
50+prettyAtomExprsAsArguments = align . parensList . map addAt
51+ where addAt (atomExpr :: AtomExpr) =
52+ case atomExpr of
53+ AttributeAtomExpr attrName -> "@" <> pretty attrName
54+ _ -> pretty atomExpr
55+
56+instance Pretty TupleExpr where
57+ pretty (TupleExpr map') = "tuple" <> bracesList (Prelude.map (\(attrName,atom)-> pretty attrName <+> pretty atom) (M.toList map'))
58+
59+instance Pretty RelationTuple where
60+ pretty (RelationTuple attrs atoms) = "tuple" <> bracesList (zipWith (\x y-> pretty x <+> pretty y) (V.toList (attributeNames attrs)) (V.toList atoms))
61+
62+instance Pretty Relation where
63+ pretty (Relation attrs tupSet) | attrs == mempty && null (asList tupSet) = "false"
64+ pretty (Relation attrs tupSet) | attrs == mempty && asList tupSet == [RelationTuple mempty mempty] = "true"
65+ pretty (Relation attrs tupSet) = "relation" <> prettyBracesList (A.toList attrs) <> prettyBracesList (asList tupSet)
66+
67+instance Pretty Attribute where
68+ pretty (Attribute n aTy) = pretty n <+> pretty (show aTy) -- workaround
69+
70+instance Pretty RelationalExpr where
71+ pretty (RelationVariable n _) = pretty n
72+ pretty (ExistingRelation r) = pretty r
73+ pretty (NotEquals a b) = pretty' a <+> "!=" <+> pretty' b
74+ pretty (Equals a b) = pretty' a <+> "==" <+> pretty' b
75+ pretty (Project ns r) = pretty' (ignoreProjects r) <> pretty ns
76+ pretty (Extend ext r) = collectExtends r <> pretty ext <> "}"
77+ pretty (MakeRelationFromExprs Nothing (TupleExprs () tupExprs)) = "relation" <> prettyBracesList tupExprs
78+ pretty (MakeRelationFromExprs (Just attrExprs) (TupleExprs () tupExprs)) = "relation" <> prettyBracesList attrExprs <> prettyBracesList tupExprs
79+ pretty (MakeStaticRelation attrs tupSet) = "relation" <> prettyBracesList (A.toList attrs) <> prettyBracesList (asList tupSet)
80+ pretty (Union a b) = parens $ pretty' a <+> "union" <+> pretty' b
81+ pretty (Join a b) = parens $ pretty' a <+> "join" <+> pretty' b
82+ pretty (Rename n1 n2 relExpr) = parens $ pretty relExpr <+> "rename" <+> braces (pretty n1 <+> "as" <+> pretty n2)
83+ pretty (Difference a b) = parens $ pretty' a <+> "minus" <+> pretty' b
84+ pretty (Group attrNames attrName relExpr) = parens $ pretty relExpr <+> "group" <+> parens (pretty attrNames <+> "as" <+> pretty attrName)
85+ pretty (Ungroup attrName relExpr) = parens $ pretty' relExpr <+> "ungroup" <+> pretty attrName
86+ pretty (Restrict resPreExpr relExpr) = parens $ pretty' relExpr <+> "where" <+> pretty resPreExpr
87+ pretty (With pairs a) = "with" <+> parensList (map (\(name,expr)-> pretty name <+> "as" <+> pretty expr) pairs) <+> pretty' a
88+
89+-- relvar:{a:=?}:{b:=?}:... in ADTs => relvar:{a:=?, b:=?, ...} in Doc ann
90+collectExtends :: RelationalExpr -> Doc ann
91+collectExtends (Extend ext r) = collectExtends r <> pretty ext <> ", "
92+collectExtends r = pretty r <> ":{"
93+
94+--relvar{a,b,c,...}{a,b,...}..{a} => relvar{a}
95+ignoreProjects :: RelationalExpr -> RelationalExpr
96+ignoreProjects (Project _ r) = ignoreProjects r
97+ignoreProjects r = r
98+
99+prettyRelationalExpr :: RelationalExpr -> Doc n
100+prettyRelationalExpr (RelationVariable n _) = pretty n
101+prettyRelationalExpr r = parens (pretty r)
102+
103+pretty' :: RelationalExpr -> Doc n
104+pretty' = prettyRelationalExpr
105+
106+instance Pretty AttributeNames where
107+ pretty (AttributeNames attrNames) = prettyBracesList (S.toList attrNames)
108+ pretty (InvertedAttributeNames attrNames) = braces $ "all but" <+> concatWith (surround ", ") (map pretty (S.toList attrNames))
109+ pretty (RelationalExprAttributeNames relExpr) = braces $ "all from" <+> pretty relExpr
110+ pretty (UnionAttributeNames aAttrNames bAttrNames) = braces ("union of" <+> pretty aAttrNames <+> pretty bAttrNames)
111+ pretty (IntersectAttributeNames aAttrNames bAttrNames) = braces ("intersection of" <+> pretty aAttrNames <+> pretty bAttrNames)
112+
113+instance Pretty AttributeExpr where
114+ pretty (NakedAttributeExpr attr) = pretty attr
115+ pretty (AttributeAndTypeNameExpr name typeCons _) = pretty name <+> pretty typeCons
116+
117+instance Pretty TypeConstructor where
118+ pretty (ADTypeConstructor tcName []) = pretty tcName
119+ pretty (ADTypeConstructor tcName tConsArgs) = pretty tcName <+> hsep (map pretty tConsArgs)
120+ pretty (PrimitiveTypeConstructor tcName atomType') = pretty tcName <+> pretty atomType'
121+ pretty (RelationAtomTypeConstructor attrExprs) = "relation" <> prettyBracesList attrExprs
122+ pretty (TypeVariable x) = pretty x
123+
124+instance Pretty AtomType where
125+ pretty IntAtomType = "Int"
126+ pretty IntegerAtomType = "Integer"
127+ pretty DoubleAtomType = "Double"
128+ pretty TextAtomType = "Text"
129+ pretty DayAtomType = "Day"
130+ pretty DateTimeAtomType = "DateTime"
131+ pretty ByteStringAtomType = "ByteString"
132+ pretty BoolAtomType = "Bool"
133+ pretty (RelationAtomType attrs) = "relation " <+> prettyBracesList (A.toList attrs)
134+ pretty (ConstructedAtomType tcName tvMap) = pretty tcName <+> hsep (map pretty (M.toList tvMap)) --order matters
135+ pretty RelationalExprAtomType = "RelationalExpr"
136+ pretty (TypeVariableType x) = pretty x
137+
138+instance Pretty ExtendTupleExpr where
139+ pretty (AttributeExtendTupleExpr attrName atomExpr) = pretty attrName <> ":=" <> pretty atomExpr
140+
141+
142+instance Pretty RestrictionPredicateExpr where
143+ pretty TruePredicate = "true"
144+ pretty (AndPredicate a b) = pretty a <+> "and" <+> pretty b
145+ pretty (OrPredicate a b) = pretty a <+> "or" <+> pretty b
146+ pretty (NotPredicate a) = "not" <+> pretty a
147+ pretty (RelationalExprPredicate relExpr) = pretty relExpr
148+ pretty (AtomExprPredicate atomExpr) = pretty atomExpr
149+ pretty (AttributeEqualityPredicate attrName atomExpr) = pretty attrName <> "=" <> pretty atomExpr
150+
151+instance Pretty WithNameExpr where
152+ pretty (WithNameExpr name _) = pretty name
153+
154+bracesList :: [Doc ann] -> Doc ann
155+bracesList = group . encloseSep (flatAlt "{ " "{") (flatAlt " }" "}") ", "
156+
157+prettyBracesList :: Pretty a => [a] -> Doc ann
158+prettyBracesList = align . bracesList . map pretty
159+
160+parensList :: [Doc ann] -> Doc ann
161+parensList = group . encloseSep (flatAlt "( " "(") (flatAlt " )" ")") ", "
162+
163+prettyParensList :: Pretty a => [a] -> Doc ann
164+prettyParensList = align . parensList . map pretty
165+
src/bin/TutorialD/tutd.hs+5−19
@@ -8,7 +8,6 @@ import System.IO
8import GHC.IO.Encoding
8import GHC.IO.Encoding
9import Options.Applicative
9import Options.Applicative
10import System.Exit
10import System.Exit
11−import System.Environment
12import Control.Monad
11import Control.Monad
13#if __GLASGOW_HASKELL__ < 804
12#if __GLASGOW_HASKELL__ < 804
14import Data.Monoid
13import Data.Monoid
@@ -23,7 +22,7 @@ import qualified Data.Text as T
23
22
24parseArgs :: Parser InterpreterConfig
23parseArgs :: Parser InterpreterConfig
25parseArgs = LocalInterpreterConfig <$> parsePersistenceStrategy <*> parseHeadName <*> parseTutDExec <*> many parseGhcPkgPath <*> parseCheckFS <|>
24parseArgs = LocalInterpreterConfig <$> parsePersistenceStrategy <*> parseHeadName <*> parseTutDExec <*> many parseGhcPkgPath <*> parseCheckFS <|>
26− RemoteInterpreterConfig <$> parseNodeId <*> parseDatabaseName <*> parseHeadName <*> parseTutDExec <*> parseCheckFS
25+ RemoteInterpreterConfig <$> parseHostname "127.0.0.1" <*> parsePort defaultServerPort <*> parseDatabaseName <*> parseHeadName <*> parseTutDExec <*> parseCheckFS
27
26
28parseHeadName :: Parser HeadName
27parseHeadName :: Parser HeadName
29parseHeadName = option auto (long "head" <>
28parseHeadName = option auto (long "head" <>
@@ -32,19 +31,6 @@ parseHeadName = option auto (long "head" <>
32 value "master"
31 value "master"
33 )
32 )
34
33
35−parseNodeId :: Parser NodeId
36−parseNodeId = createNodeId <$>
37− strOption (long "host" <>
38− short 'h' <>
39− help "Remote host name" <>
40− metavar "HOSTNAME" <>
41− value "127.0.0.1") <*>
42− option auto (long "port" <>
43− metavar "PORT NUMBER" <>
44− short 'p' <>
45− help "Remote port" <>
46− value defaultServerPort)
47−
48--just execute some tutd and exit
34--just execute some tutd and exit
49parseTutDExec :: Parser (Maybe TutorialDExec)
35parseTutDExec :: Parser (Maybe TutorialDExec)
50parseTutDExec = optional $ strOption (long "exec-tutd" <>
36parseTutDExec = optional $ strOption (long "exec-tutd" <>
@@ -58,19 +44,19 @@ opts = info (parseArgs <**> helpOption) idm
58
44
59connectionInfoForConfig :: InterpreterConfig -> ConnectionInfo
45connectionInfoForConfig :: InterpreterConfig -> ConnectionInfo
60connectionInfoForConfig (LocalInterpreterConfig pStrategy _ _ ghcPkgPaths _) = InProcessConnectionInfo pStrategy outputNotificationCallback ghcPkgPaths
46connectionInfoForConfig (LocalInterpreterConfig pStrategy _ _ ghcPkgPaths _) = InProcessConnectionInfo pStrategy outputNotificationCallback ghcPkgPaths
61−connectionInfoForConfig (RemoteInterpreterConfig remoteNodeId remoteDBName _ _ _) = RemoteProcessConnectionInfo remoteDBName remoteNodeId outputNotificationCallback
47+connectionInfoForConfig (RemoteInterpreterConfig remoteHost remotePort remoteDBName _ _ _) = RemoteConnectionInfo remoteDBName remoteHost (show remotePort) outputNotificationCallback
62
48
63headNameForConfig :: InterpreterConfig -> HeadName
49headNameForConfig :: InterpreterConfig -> HeadName
64headNameForConfig (LocalInterpreterConfig _ headn _ _ _) = headn
50headNameForConfig (LocalInterpreterConfig _ headn _ _ _) = headn
65−headNameForConfig (RemoteInterpreterConfig _ _ headn _ _) = headn
51+headNameForConfig (RemoteInterpreterConfig _ _ _ headn _ _) = headn
66
52
67execTutDForConfig :: InterpreterConfig -> Maybe String
53execTutDForConfig :: InterpreterConfig -> Maybe String
68execTutDForConfig (LocalInterpreterConfig _ _ t _ _) = t
54execTutDForConfig (LocalInterpreterConfig _ _ t _ _) = t
69−execTutDForConfig (RemoteInterpreterConfig _ _ _ t _) = t
55+execTutDForConfig (RemoteInterpreterConfig _ _ _ _ t _) = t
70
56
71checkFSForConfig :: InterpreterConfig -> Bool
57checkFSForConfig :: InterpreterConfig -> Bool
72checkFSForConfig (LocalInterpreterConfig _ _ _ _ c) = c
58checkFSForConfig (LocalInterpreterConfig _ _ _ _ c) = c
73−checkFSForConfig (RemoteInterpreterConfig _ _ _ _ c) = c
59+checkFSForConfig (RemoteInterpreterConfig _ _ _ _ _ c) = c
74
60
75persistenceStrategyForConfig :: InterpreterConfig -> Maybe PersistenceStrategy
61persistenceStrategyForConfig :: InterpreterConfig -> Maybe PersistenceStrategy
76persistenceStrategyForConfig (LocalInterpreterConfig strat _ _ _ _) = Just strat
62persistenceStrategyForConfig (LocalInterpreterConfig strat _ _ _ _) = Just strat
src/lib/ProjectM36/Arbitrary.hs+6−1
@@ -9,6 +9,7 @@ import ProjectM36.AtomType
9import ProjectM36.Attribute (atomType)
9import ProjectM36.Attribute (atomType)
10import ProjectM36.DataConstructorDef as DCD
10import ProjectM36.DataConstructorDef as DCD
11import ProjectM36.DataTypes.Interval
11import ProjectM36.DataTypes.Interval
12+import ProjectM36.Relation
12import qualified Data.Vector as V
13import qualified Data.Vector as V
13import Data.Text (Text)
14import Data.Text (Text)
14import Test.QuickCheck
15import Test.QuickCheck
@@ -48,6 +49,10 @@ arbitrary' ByteStringAtomType =
48
49
49arbitrary' BoolAtomType =
50arbitrary' BoolAtomType =
50 Right . BoolAtom <$> lift (arbitrary :: Gen Bool)
51 Right . BoolAtom <$> lift (arbitrary :: Gen Bool)
52+
53+arbitrary' RelationalExprAtomType =
54+ pure (Right (RelationalExprAtom (ExistingRelation relationTrue))) -- don't bother with arbitrary relational expressions
55+
51arbitrary' constructedAtomType@(ConstructedAtomType tcName tvMap)
56arbitrary' constructedAtomType@(ConstructedAtomType tcName tvMap)
52 --special-casing for Interval type
57 --special-casing for Interval type
53 | isIntervalAtomType constructedAtomType = createArbitraryInterval (intervalSubType constructedAtomType)
58 | isIntervalAtomType constructedAtomType = createArbitraryInterval (intervalSubType constructedAtomType)
@@ -79,7 +84,7 @@ maybeToRight y Nothing = Left y
79arbitraryRelationTuple :: Attributes -> WithTCMap Gen (Either RelationalError RelationTuple)
84arbitraryRelationTuple :: Attributes -> WithTCMap Gen (Either RelationalError RelationTuple)
80arbitraryRelationTuple attris = do
85arbitraryRelationTuple attris = do
81 tcMap <- ask
86 tcMap <- ask
82− listOfMaybeAType <- lift $ mapM ((\aTy -> runReaderT (arbitrary' aTy) tcMap) . atomType) (V.toList attris)
87+ listOfMaybeAType <- lift $ mapM ((\aTy -> runReaderT (arbitrary' aTy) tcMap) . atomType) (V.toList (attributesVec attris))
83 case sequence listOfMaybeAType of
88 case sequence listOfMaybeAType of
84 Left err -> pure $ Left err
89 Left err -> pure $ Left err
85 Right listOfAttr -> do
90 Right listOfAttr -> do
src/lib/ProjectM36/Atom.hs+1
@@ -20,6 +20,7 @@ atomToText (DayAtom i) = (T.pack . show) i
20atomToText (DateTimeAtom i) = (T.pack . show) i
20atomToText (DateTimeAtom i) = (T.pack . show) i
21atomToText (ByteStringAtom i) = (T.pack . show) i
21atomToText (ByteStringAtom i) = (T.pack . show) i
22atomToText (BoolAtom i) = (T.pack . show) i
22atomToText (BoolAtom i) = (T.pack . show) i
23+atomToText (RelationalExprAtom re) = (T.pack . show) re
23
24
24atomToText (RelationAtom i) = (T.pack . show) i
25atomToText (RelationAtom i) = (T.pack . show) i
25atomToText (ConstructedAtom dConsName typ atoms)
26atomToText (ConstructedAtom dConsName typ atoms)
src/lib/ProjectM36/AtomFunction.hs+7−6
@@ -1,6 +1,7 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2module ProjectM36.AtomFunction where
2module ProjectM36.AtomFunction where
3import ProjectM36.Base
3import ProjectM36.Base
4+import ProjectM36.Serialise.Base ()
4import ProjectM36.Error
5import ProjectM36.Error
5import ProjectM36.Relation
6import ProjectM36.Relation
6import ProjectM36.AtomType
7import ProjectM36.AtomType
@@ -10,7 +11,7 @@ import qualified ProjectM36.Attribute as A
10import qualified Data.HashSet as HS
11import qualified Data.HashSet as HS
11import qualified Data.Text as T
12import qualified Data.Text as T
12import qualified Data.ByteString.Lazy as BL
13import qualified Data.ByteString.Lazy as BL
13−import Data.Binary as B
14+import Codec.Winery
14
15
15foldAtomFuncType :: AtomType -> AtomType -> [AtomType]
16foldAtomFuncType :: AtomType -> AtomType -> [AtomType]
16--the underscore in the attribute name means that any attributes are acceptable
17--the underscore in the attribute name means that any attributes are acceptable
@@ -91,10 +92,10 @@ atomFunctionsAsRelation funcs = mkRelationFromList attrs tups
91
92
92--for calculating the merkle hash
93--for calculating the merkle hash
93hashBytes :: AtomFunction -> BL.ByteString
94hashBytes :: AtomFunction -> BL.ByteString
94−hashBytes func = mconcat [B.encode (atomFuncName func),
95+hashBytes func = BL.fromChunks [serialise (atomFuncName func),
95− B.encode (atomFuncType func),
96+ serialise (atomFuncType func),
96− bodyBin
97+ bodyBin
97− ]
98+ ]
98 where
99 where
99 bodyBin = case atomFuncBody func of
100 bodyBin = case atomFuncBody func of
100− AtomFunctionBody mScript _ -> B.encode mScript
101+ AtomFunctionBody mScript _ -> serialise mScript
src/lib/ProjectM36/AtomFunctionError.hs+1−2
@@ -1,6 +1,5 @@
1{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}
1{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}
2module ProjectM36.AtomFunctionError where
2module ProjectM36.AtomFunctionError where
3−import Data.Binary
4import GHC.Generics
3import GHC.Generics
5import Control.DeepSeq
4import Control.DeepSeq
6import Data.Text
5import Data.Text
@@ -14,5 +13,5 @@ data AtomFunctionError = AtomFunctionUserError String |
14 AtomTypeDoesNotSupportOrderingError Text |
13 AtomTypeDoesNotSupportOrderingError Text |
15 AtomTypeDoesNotSupportIntervalError Text |
14 AtomTypeDoesNotSupportIntervalError Text |
16 AtomFunctionBytesDecodingError String
15 AtomFunctionBytesDecodingError String
17− deriving(Generic, Eq, Show, Binary, NFData)
16+ deriving(Generic, Eq, Show, NFData)
18
17
src/lib/ProjectM36/AtomType.hs+8−7
@@ -211,7 +211,7 @@ isValidAtomTypeForTypeConstructor (ConstructedAtomType tConsName _) (ADTypeConst
211
211
212isValidAtomTypeForTypeConstructor (RelationAtomType attrs) (RelationAtomTypeConstructor attrExprs) tConsMap = do
212isValidAtomTypeForTypeConstructor (RelationAtomType attrs) (RelationAtomTypeConstructor attrExprs) tConsMap = do
213 evaldAtomTypes <- mapM (\expr -> atomTypeForAttributeExpr expr tConsMap M.empty) attrExprs
213 evaldAtomTypes <- mapM (\expr -> atomTypeForAttributeExpr expr tConsMap M.empty) attrExprs
214− mapM_ (uncurry resolveAtomType) (zip (map A.atomType (V.toList attrs)) evaldAtomTypes)
214+ mapM_ (uncurry resolveAtomType) (zip (A.atomTypesList attrs) evaldAtomTypes)
215isValidAtomTypeForTypeConstructor aType tCons _ = Left (AtomTypeTypeConstructorReconciliationError aType (TC.name tCons))
215isValidAtomTypeForTypeConstructor aType tCons _ = Left (AtomTypeTypeConstructorReconciliationError aType (TC.name tCons))
216
216
217findTypeConstructor :: TypeConstructorName -> TypeConstructorMapping -> Maybe (TypeConstructorDef, [DataConstructorDef])
217findTypeConstructor :: TypeConstructorName -> TypeConstructorMapping -> Maybe (TypeConstructorDef, [DataConstructorDef])
@@ -295,7 +295,7 @@ resolveTypeInAtom _ atom _ = Right atom
295-- Example: "Nothing" does not specify the the argument in "Maybe a", so allow delayed resolution in the tuple before it is added to the relation. Note that this resolution could cause a type error. Hardly a Hindley-Milner system.
295-- Example: "Nothing" does not specify the the argument in "Maybe a", so allow delayed resolution in the tuple before it is added to the relation. Note that this resolution could cause a type error. Hardly a Hindley-Milner system.
296resolveTypesInTuple :: Attributes -> TypeConstructorMapping -> RelationTuple -> Either RelationalError RelationTuple
296resolveTypesInTuple :: Attributes -> TypeConstructorMapping -> RelationTuple -> Either RelationalError RelationTuple
297resolveTypesInTuple resolvedAttrs tConss (RelationTuple _ tupAtoms) = do
297resolveTypesInTuple resolvedAttrs tConss (RelationTuple _ tupAtoms) = do
298− newAtoms <- mapM (\(atom, resolvedType) -> resolveTypeInAtom resolvedType atom tConss) (zip (V.toList tupAtoms) $ map A.atomType (V.toList resolvedAttrs))
298+ newAtoms <- mapM (\(atom, resolvedType) -> resolveTypeInAtom resolvedType atom tConss) (zip (V.toList tupAtoms) $ A.atomTypesList resolvedAttrs)
299 Right (RelationTuple resolvedAttrs (V.fromList newAtoms))
299 Right (RelationTuple resolvedAttrs (V.fromList newAtoms))
300
300
301-- | Validate that the type is provided with complete type variables for type constructors.
301-- | Validate that the type is provided with complete type variables for type constructors.
@@ -314,7 +314,7 @@ validateAtomType typ@(ConstructedAtomType tConsName tVarMap) tConss =
314 _ -> Right ()
314 _ -> Right ()
315validateAtomType (RelationAtomType attrs) tConss =
315validateAtomType (RelationAtomType attrs) tConss =
316 mapM_ (\attr ->
316 mapM_ (\attr ->
317− validateAtomType (A.atomType attr) tConss) (V.toList attrs)
317+ validateAtomType (A.atomType attr) tConss) (attributesVec attrs)
318validateAtomType (TypeVariableType x) _ = Left (TypeConstructorTypeVarMissing x)
318validateAtomType (TypeVariableType x) _ = Left (TypeConstructorTypeVarMissing x)
319validateAtomType _ _ = pure ()
319validateAtomType _ _ = pure ()
320
320
@@ -325,7 +325,7 @@ validateAttributes tConss attrs =
325 else
325 else
326 pure ()
326 pure ()
327 where
327 where
328− errs = lefts $ map ((`validateAtomType` tConss) . A.atomType) (V.toList attrs)
328+ errs = lefts $ map (`validateAtomType` tConss) (A.atomTypesList attrs)
329
329
330--ensure that all type vars are fully resolved
330--ensure that all type vars are fully resolved
331validateTypeVarMap :: TypeVarMap -> TypeConstructorMapping -> Either RelationalError ()
331validateTypeVarMap :: TypeVarMap -> TypeConstructorMapping -> Either RelationalError ()
@@ -358,7 +358,7 @@ atomTypeVerify x@(RelationAtomType attrs1) y@(RelationAtomType attrs2) = do
358 if notElem "_" [name1, name2] && name1 /= name2 then
358 if notElem "_" [name1, name2] && name1 /= name2 then
359 Left $ AtomTypeMismatchError x y
359 Left $ AtomTypeMismatchError x y
360 else
360 else
361− atomTypeVerify (A.atomType attr1) (A.atomType attr2)) $ V.toList (V.zip attrs1 attrs2)
361+ atomTypeVerify (A.atomType attr1) (A.atomType attr2)) $ V.toList (V.zip (attributesVec attrs1) (attributesVec attrs2))
362 return x
362 return x
363atomTypeVerify x y = if x == y then
363atomTypeVerify x y = if x == y then
364 Right x
364 Right x
@@ -375,7 +375,7 @@ typeVarMapsVerify a b = M.keysSet a == M.keysSet b && (length . rights) zipped =
375 (M.toAscList b)
375 (M.toAscList b)
376
376
377prettyAtomType :: AtomType -> T.Text
377prettyAtomType :: AtomType -> T.Text
378−prettyAtomType (RelationAtomType attrs) = "relation {" `T.append` T.intercalate "," (map prettyAttribute (V.toList attrs)) `T.append` "}"
378+prettyAtomType (RelationAtomType attrs) = "relation {" `T.append` T.intercalate "," (map prettyAttribute (V.toList (attributesVec attrs))) `T.append` "}"
379prettyAtomType (ConstructedAtomType tConsName typeVarMap) = tConsName `T.append` T.concat (map showTypeVars (M.toList typeVarMap))
379prettyAtomType (ConstructedAtomType tConsName typeVarMap) = tConsName `T.append` T.concat (map showTypeVars (M.toList typeVarMap))
380 where
380 where
381 showTypeVars (_, TypeVariableType x) = " " <> x
381 showTypeVars (_, TypeVariableType x) = " " <> x
@@ -442,12 +442,13 @@ isResolvedType typ =
442 DateTimeAtomType -> True
442 DateTimeAtomType -> True
443 ByteStringAtomType -> True
443 ByteStringAtomType -> True
444 BoolAtomType -> True
444 BoolAtomType -> True
445+ RelationalExprAtomType -> True
445 RelationAtomType attrs -> isResolvedAttributes attrs
446 RelationAtomType attrs -> isResolvedAttributes attrs
446 ConstructedAtomType _ tvMap -> all isResolvedType (M.elems tvMap)
447 ConstructedAtomType _ tvMap -> all isResolvedType (M.elems tvMap)
447 TypeVariableType _ -> False
448 TypeVariableType _ -> False
448
449
449isResolvedAttributes :: Attributes -> Bool
450isResolvedAttributes :: Attributes -> Bool
450−isResolvedAttributes attrs = all isResolvedAttribute (V.toList attrs)
451+isResolvedAttributes attrs = all isResolvedAttribute (V.toList (attributesVec attrs))
451
452
452isResolvedAttribute :: Attribute -> Bool
453isResolvedAttribute :: Attribute -> Bool
453isResolvedAttribute = isResolvedType . A.atomType
454isResolvedAttribute = isResolvedType . A.atomType
src/lib/ProjectM36/Atomable.hs+4−20
@@ -13,29 +13,16 @@ import qualified Data.Map as M
13import qualified Data.Text as T
13import qualified Data.Text as T
14import qualified Data.Vector as V
14import qualified Data.Vector as V
15import Control.DeepSeq (NFData)
15import Control.DeepSeq (NFData)
16−import Data.Binary
17import Control.Applicative
16import Control.Applicative
18import Data.Time.Calendar
17import Data.Time.Calendar
19import Data.ByteString (ByteString)
18import Data.ByteString (ByteString)
20import Data.Time.Clock
19import Data.Time.Clock
21import Data.Proxy
20import Data.Proxy
22import qualified Data.List.NonEmpty as NE
21import qualified Data.List.NonEmpty as NE
22+import Codec.Winery
23
23
24−--also add haskell scripting atomable support
25−--rename this module to Atomable along with test
26−
27−{-
28−data Test1T = Test1C Int
29− deriving (Generic, Show, Eq, Binary, NFData, Atomable)
30−
31−data Test2T = Test2C Int Int
32− deriving (Generic, Show, Eq, Binary, NFData, Atomable)
33−
34−data Test3T = Test3Ca | Test3Cb
35− deriving (Generic, Show, Eq, Binary, NFData, Atomable)
36−-}
37-- | All database values ("atoms") adhere to the 'Atomable' typeclass. This class is derivable allowing new datatypes to be easily marshaling between Haskell values and database values.
24-- | All database values ("atoms") adhere to the 'Atomable' typeclass. This class is derivable allowing new datatypes to be easily marshaling between Haskell values and database values.
38−class (Eq a, NFData a, Binary a, Show a) => Atomable a where
25+class (Eq a, NFData a, Serialise a, Show a) => Atomable a where
39 toAtom :: a -> Atom
26 toAtom :: a -> Atom
40 default toAtom :: (Generic a, AtomableG (Rep a)) => a -> Atom
27 default toAtom :: (Generic a, AtomableG (Rep a)) => a -> Atom
41 toAtom v = toAtomG (from v) (toAtomTypeG (from v))
28 toAtom v = toAtomG (from v) (toAtomTypeG (from v))
@@ -165,10 +152,6 @@ instance Atomable a => Atomable (NE.NonEmpty a) where
165 toAtomType _ = ConstructedAtomType "NonEmptyList" (M.singleton "a" (toAtomType (Proxy :: Proxy a)))
152 toAtomType _ = ConstructedAtomType "NonEmptyList" (M.singleton "a" (toAtomType (Proxy :: Proxy a)))
166 toAddTypeExpr _ = NoOperation
153 toAddTypeExpr _ = NoOperation
167
154
168−#if !MIN_VERSION_binary(0,8,4)
169−instance Binary a => Binary (NE.NonEmpty a)
170−#endif
171−
172-- Generics
155-- Generics
173class AtomableG g where
156class AtomableG g where
174 --type AtomTG g
157 --type AtomTG g
@@ -252,8 +235,9 @@ typeToTypeConstructor x@DayAtomType = PrimitiveTypeConstructor "Day" x
252typeToTypeConstructor x@DateTimeAtomType = PrimitiveTypeConstructor "DateTime" x
235typeToTypeConstructor x@DateTimeAtomType = PrimitiveTypeConstructor "DateTime" x
253typeToTypeConstructor x@ByteStringAtomType = PrimitiveTypeConstructor "ByteString" x
236typeToTypeConstructor x@ByteStringAtomType = PrimitiveTypeConstructor "ByteString" x
254typeToTypeConstructor x@BoolAtomType = PrimitiveTypeConstructor "Bool" x
237typeToTypeConstructor x@BoolAtomType = PrimitiveTypeConstructor "Bool" x
238+typeToTypeConstructor x@RelationalExprAtomType = PrimitiveTypeConstructor "RelationalExpr" x
255typeToTypeConstructor (RelationAtomType attrs)
239typeToTypeConstructor (RelationAtomType attrs)
256− = RelationAtomTypeConstructor $ map attrToAttrExpr $ V.toList attrs
240+ = RelationAtomTypeConstructor $ map attrToAttrExpr $ V.toList (attributesVec attrs)
257 where
241 where
258 attrToAttrExpr (Attribute n t) = AttributeAndTypeNameExpr n (typeToTypeConstructor t) ()
242 attrToAttrExpr (Attribute n t) = AttributeAndTypeNameExpr n (typeToTypeConstructor t) ()
259typeToTypeConstructor (ConstructedAtomType tcName tvMap)
243typeToTypeConstructor (ConstructedAtomType tcName tvMap)
src/lib/ProjectM36/Attribute.hs+148−29
@@ -1,3 +1,4 @@
1+{-# OPTIONS_GHC -fno-warn-orphans #-}
1module ProjectM36.Attribute where
2module ProjectM36.Attribute where
2import ProjectM36.Base
3import ProjectM36.Base
3import ProjectM36.Error
4import ProjectM36.Error
@@ -10,16 +11,54 @@ import qualified Data.Map as M
10import Data.Either
11import Data.Either
11
12
12arity :: Attributes -> Int
13arity :: Attributes -> Int
13−arity = V.length
14+arity a = V.length (attributesVec a)
15+
16+instance Semigroup Attributes where
17+ attrsA <> attrsB =
18+ case joinAttributes attrsA attrsB of
19+ Left err -> error (show err)
20+ Right attrs' -> attrs'
21+
22+instance Monoid Attributes where
23+ mempty = Attributes {
24+ attributesVec = mempty
25+ --,attributeSet = mempty
26+ }
14
27
15emptyAttributes :: Attributes
28emptyAttributes :: Attributes
16−emptyAttributes = V.empty
29+emptyAttributes = mempty
17
30
18null :: Attributes -> Bool
31null :: Attributes -> Bool
19−null = V.null
32+null a = V.null (attributesVec a)
33+
34+singleton :: Attribute -> Attributes
35+singleton attr = Attributes {
36+ attributesVec = V.singleton attr
37+ --,attributesSet = HS.singleton attr
38+ }
39+
40+toList :: Attributes -> [Attribute]
41+toList attrs = V.toList (attributesVec attrs)
20
42
21attributesFromList :: [Attribute] -> Attributes
43attributesFromList :: [Attribute] -> Attributes
22−attributesFromList = V.fromList -- . L.nub --too expensive
44+attributesFromList attrsL = Attributes {
45+ attributesVec = vec
46+ --,attributesSet = hset
47+ }
48+ where
49+ vec = if length attrsL == HS.size hset then
50+ --fast path- no duplicates
51+ V.fromList attrsL
52+ else
53+ --duplicate detected, uniqueify while maintaining original ordering
54+ V.fromList uniquedL
55+ hset = HS.fromList attrsL
56+ uniquedL = fst $ foldr (\attr acc@(l,s) ->
57+ if HS.member attr s then
58+ acc
59+ else
60+ (l ++ [attr], HS.insert attr s))
61+ ([],mempty) attrsL
23
62
24attributeName :: Attribute -> AttributeName
63attributeName :: Attribute -> AttributeName
25attributeName (Attribute name _) = name
64attributeName (Attribute name _) = name
@@ -28,17 +67,16 @@ atomType :: Attribute -> AtomType
28atomType (Attribute _ atype) = atype
67atomType (Attribute _ atype) = atype
29
68
30atomTypes :: Attributes -> V.Vector AtomType
69atomTypes :: Attributes -> V.Vector AtomType
31−atomTypes = V.map atomType
70+atomTypes attrs = V.map atomType (attributesVec attrs)
32
71
33atomTypesList :: Attributes -> [AtomType]
72atomTypesList :: Attributes -> [AtomType]
34atomTypesList = V.toList . atomTypes
73atomTypesList = V.toList . atomTypes
35
74
36−--hm- no error-checking here
37addAttribute :: Attribute -> Attributes -> Attributes
75addAttribute :: Attribute -> Attributes -> Attributes
38−addAttribute attr attrs = attrs `V.snoc` attr
76+addAttribute attr attrs = attrs <> singleton attr
39
77
40--if some attribute names overlap but the types do not, then spit back an error
78--if some attribute names overlap but the types do not, then spit back an error
41−joinAttributes :: Attributes -> Attributes -> Either RelationalError Attributes
79+{-joinAttributes :: Attributes -> Attributes -> Either RelationalError Attributes
42joinAttributes attrs1 attrs2 | V.length uniqueOverlappingAttributes /= V.length overlappingAttributes = Left (TupleAttributeTypeMismatchError overlappingAttributes)
80joinAttributes attrs1 attrs2 | V.length uniqueOverlappingAttributes /= V.length overlappingAttributes = Left (TupleAttributeTypeMismatchError overlappingAttributes)
43 | V.length overlappingAttrsDifferentTypes > 0 = Left (TupleAttributeTypeMismatchError overlappingAttrsDifferentTypes)
81 | V.length overlappingAttrsDifferentTypes > 0 = Left (TupleAttributeTypeMismatchError overlappingAttrsDifferentTypes)
44 | otherwise = Right $ vectorUniqueify (attrs1 V.++ attrs2)
82 | otherwise = Right $ vectorUniqueify (attrs1 V.++ attrs2)
@@ -47,20 +85,52 @@ joinAttributes attrs1 attrs2 | V.length uniqueOverlappingAttributes /= V.length
47 attrNames2 = V.map attributeName attrs2
85 attrNames2 = V.map attributeName attrs2
48 uniqueOverlappingAttributes = vectorUniqueify overlappingAttributes
86 uniqueOverlappingAttributes = vectorUniqueify overlappingAttributes
49 overlappingAttributes = V.filter (`V.elem` attrs2) attrs1
87 overlappingAttributes = V.filter (`V.elem` attrs2) attrs1
88+-}
89+joinAttributes :: Attributes -> Attributes -> Either RelationalError Attributes
90+joinAttributes attrs1 attrs2
91+ | S.size overlappingNames == 0 = -- fast path, no overlapping names
92+ pure (concated id)
93+ | attributesForNames overlappingNames attrs1 == attributesForNames overlappingNames attrs2 = -- that atomtypes match
94+ pure (concated vectorUniqueify)
95+ | otherwise =
96+ --special handling to validate that overlapping names have the same atom types
97+ Left (TupleAttributeTypeMismatchError (attributesForNames overlappingNames attrs1))
98+ where
99+ nameSet1 = attributeNameSet attrs1
100+ nameSet2 = attributeNameSet attrs2
101+ overlappingNames = S.intersection nameSet1 nameSet2
102+ concated f = Attributes {
103+ attributesVec = f (attributesVec attrs1 <> attributesVec attrs2)
104+ --,attributesSet = attributesSet attrs1 <> attributesSet attrs2
105+ }
50
106
51addAttributes :: Attributes -> Attributes -> Attributes
107addAttributes :: Attributes -> Attributes -> Attributes
52−addAttributes = (V.++)
108+addAttributes = (<>)
109+
110+member :: Attribute -> Attributes -> Bool
111+member attr attrs = HS.member attr (attributesSet attrs)
53
112
54deleteAttributeName :: AttributeName -> Attributes -> Attributes
113deleteAttributeName :: AttributeName -> Attributes -> Attributes
55−deleteAttributeName attrName = V.filter (\attr -> attributeName attr /= attrName)
114+deleteAttributeName attrName = deleteAttributeNames (S.singleton attrName)
115+
116+deleteAttributeNames :: S.Set AttributeName -> Attributes -> Attributes
117+deleteAttributeNames attrNames attrs = Attributes {
118+ attributesVec = vec
119+ }
120+ where
121+ vec = V.filter attrFilter (attributesVec attrs)
122+ attrFilter attr = S.notMember (attributeName attr) attrNames
56
123
57renameAttribute :: AttributeName -> Attribute -> Attribute
124renameAttribute :: AttributeName -> Attribute -> Attribute
58renameAttribute newAttrName (Attribute _ typeo) = Attribute newAttrName typeo
125renameAttribute newAttrName (Attribute _ typeo) = Attribute newAttrName typeo
59
126
60renameAttributes :: AttributeName -> AttributeName -> Attributes -> Attributes
127renameAttributes :: AttributeName -> AttributeName -> Attributes -> Attributes
61−renameAttributes oldAttrName newAttrName = V.map renamer
128+renameAttributes oldAttrName newAttrName attrs = Attributes {
129+ attributesVec = vec
130+ }
62 where
131 where
132+ vec = V.map renamer (attributesVec attrs)
63− renamer attr = if attributeName attr == oldAttrName then
133+ renamer attr = if attributeName attr == oldAttrName then
64 renameAttribute newAttrName attr
134 renameAttribute newAttrName attr
65 else
135 else
66 attr
136 attr
@@ -71,7 +141,7 @@ atomTypeForAttributeName attrName attrs = do
71 return atype
141 return atype
72
142
73attributeForName :: AttributeName -> Attributes -> Either RelationalError Attribute
143attributeForName :: AttributeName -> Attributes -> Either RelationalError Attribute
74−attributeForName attrName attrs = case V.find (\attr -> attributeName attr == attrName) attrs of
144+attributeForName attrName attrs = case V.find (\attr -> attributeName attr == attrName) (attributesVec attrs) of
75 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
145 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
76 Just attr -> Right attr
146 Just attr -> Right attr
77
147
@@ -89,15 +159,18 @@ projectionAttributesForNames names attrsIn =
89 missingNames = attributeNamesNotContained names (S.fromList (V.toList (attributeNames attrsIn)))
159 missingNames = attributeNamesNotContained names (S.fromList (V.toList (attributeNames attrsIn)))
90
160
91attributesForNames :: S.Set AttributeName -> Attributes -> Attributes
161attributesForNames :: S.Set AttributeName -> Attributes -> Attributes
92−attributesForNames attrNameSet = V.filter filt
162+attributesForNames attrNameSet attrs = Attributes {
163+ attributesVec = vec
164+ }
93 where
165 where
166+ vec = V.filter filt (attributesVec attrs)
94 filt attr = S.member (attributeName attr) attrNameSet
167 filt attr = S.member (attributeName attr) attrNameSet
95
168
96attributeNameSet :: Attributes -> S.Set AttributeName
169attributeNameSet :: Attributes -> S.Set AttributeName
97−attributeNameSet attrVec = S.fromList $ V.toList $ V.map (\(Attribute name _) -> name) attrVec
170+attributeNameSet attrs = S.fromList $ V.toList $ V.map (\(Attribute name _) -> name) (attributesVec attrs)
98
171
99attributeNames :: Attributes -> V.Vector AttributeName
172attributeNames :: Attributes -> V.Vector AttributeName
100−attributeNames = V.map attributeName
173+attributeNames attrs = V.map attributeName (attributesVec attrs)
101
174
102--checks if set s1 is wholly contained in the set s2
175--checks if set s1 is wholly contained in the set s2
103attributesContained :: Attributes -> Attributes -> Bool
176attributesContained :: Attributes -> Attributes -> Bool
@@ -118,42 +191,88 @@ attributeNamesNotContained subset superset = S.filter (`S.notMember` superset) s
118
191
119-- useful for display
192-- useful for display
120orderedAttributes :: Attributes -> [Attribute]
193orderedAttributes :: Attributes -> [Attribute]
121−orderedAttributes attrs = L.sortBy (\a b -> attributeName a `compare` attributeName b) (V.toList attrs)
194+orderedAttributes attrs = L.sortBy (\a b -> attributeName a `compare` attributeName b) (V.toList (attributesVec attrs))
122
195
123orderedAttributeNames :: Attributes -> [AttributeName]
196orderedAttributeNames :: Attributes -> [AttributeName]
124orderedAttributeNames attrs = map attributeName (orderedAttributes attrs)
197orderedAttributeNames attrs = map attributeName (orderedAttributes attrs)
125
198
126-- take two attribute sets and return an attribute set with the attributes which do not match
199-- take two attribute sets and return an attribute set with the attributes which do not match
200+--this is the function which benefits the most from the HashSet representation- this turned up in the insert performance test
127attributesDifference :: Attributes -> Attributes -> Attributes
201attributesDifference :: Attributes -> Attributes -> Attributes
128−attributesDifference attrsA attrsB = V.fromList $ diff (V.toList attrsA) (V.toList attrsB)
202+{-attributesDifference attrsA attrsB = V.fromList $ diff (V.toList attrsA) (V.toList attrsB)
129 where
203 where
130 diff a b = (a L.\\ b) ++ (b L.\\ a)
204 diff a b = (a L.\\ b) ++ (b L.\\ a)
205+-}
206+attributesDifference attrsA attrsB =
207+ if attributesSet attrsA == attributesSet attrsB then
208+ mempty
209+ else
210+ Attributes {
211+ attributesVec = vec
212+ --,attributesSet = hset
213+ }
214+ where
215+ hset = HS.difference setA setB <> HS.difference setB setA
216+ setA = attributesSet attrsA
217+ setB = attributesSet attrsB
218+ vec = V.filter (`HS.member` hset) (attributesVec attrsA <> attributesVec attrsB)
131
219
132vectorUniqueify :: (Hash.Hashable a, Eq a) => V.Vector a -> V.Vector a
220vectorUniqueify :: (Hash.Hashable a, Eq a) => V.Vector a -> V.Vector a
133vectorUniqueify vecIn = V.fromList $ HS.toList $ HS.fromList $ V.toList vecIn
221vectorUniqueify vecIn = V.fromList $ HS.toList $ HS.fromList $ V.toList vecIn
134
222
135--check that each attribute only appears once
223--check that each attribute only appears once
136verifyAttributes :: Attributes -> Either RelationalError Attributes
224verifyAttributes :: Attributes -> Either RelationalError Attributes
137−verifyAttributes attrs = if collapsedAttrs /= attrs then
225+verifyAttributes attrs =
226+ if vecSet == attributesSet attrs then
227+ pure attrs
228+ else
138− Left (TupleAttributeTypeMismatchError (attributesDifference collapsedAttrs attrs))
229+ Left (TupleAttributeTypeMismatchError diffAttrs)
139− else
140− Right attrs
141 where
230 where
142− collapsedAttrs = vectorUniqueify attrs
231+ vecSet = V.foldr' HS.insert HS.empty (attributesVec attrs)
232+ diffSet = HS.difference vecSet (attributesSet attrs) <> HS.difference (attributesSet attrs) vecSet
233+ diffAttrs = Attributes {
234+ attributesVec = V.fromList (HS.toList diffSet)
235+ --,attributesSet = diffSet
236+ }
237+
238+--used in Generics derivation for ADTs without named attributes- not to be used elsewhere
239+--drop first n attributes from vector representation
240+drop :: Int -> Attributes -> Attributes
241+drop c attrs = Attributes { attributesVec = vec
242+ }
243+ where
244+ vec = V.drop c (attributesVec attrs)
245+
246+
247+-- use this in preference to attributesEqual when the attribute ordering matters such as during tuple unions
248+attributesAndOrderEqual :: Attributes -> Attributes -> Bool
249+attributesAndOrderEqual a b = attributesVec a == attributesVec b
143
250
251+-- use to determine if the same attributes are contained (but ordering is irrelevant)
144attributesEqual :: Attributes -> Attributes -> Bool
252attributesEqual :: Attributes -> Attributes -> Bool
145−attributesEqual attrs1 attrs2 = V.null (attributesDifference attrs1 attrs2)
253+attributesEqual attrsA attrsB =
254+ attributesVec attrsA == attributesVec attrsB ||
255+ attributesSet attrsA == attributesSet attrsB
146
256
147attributesAsMap :: Attributes -> M.Map AttributeName Attribute
257attributesAsMap :: Attributes -> M.Map AttributeName Attribute
148−attributesAsMap attrs = (M.fromList . V.toList) (V.map (\attr -> (attributeName attr, attr)) attrs)
258+attributesAsMap attrs = V.foldr' (\attr acc -> M.insert (attributeName attr) attr acc) mempty (attributesVec attrs)
259+
149
260
150-- | Left-biased union of attributes.
261-- | Left-biased union of attributes.
151union :: Attributes -> Attributes -> Attributes
262union :: Attributes -> Attributes -> Attributes
152−union attrsA attrsB = V.fromList (M.elems unioned)
263+union attrsA attrsB = Attributes {
264+ attributesVec = vec
265+ --,attributesSet = hset
266+ }
153 where
267 where
154− unioned = M.union (attributesAsMap attrsA) (attributesAsMap attrsB)
268+ hset = HS.union (attributesSet attrsA) (attributesSet attrsB)
269+ vec = HS.foldr (flip V.snoc) mempty hset
155
270
156intersection :: Attributes -> Attributes -> Attributes
271intersection :: Attributes -> Attributes -> Attributes
157−intersection attrsA attrsB = V.fromList (M.elems intersected)
272+intersection attrsA attrsB = Attributes {
273+ attributesVec = vec
274+ --,attributesSet = hset
275+ }
158 where
276 where
159− intersected = M.intersection (attributesAsMap attrsA) (attributesAsMap attrsB)
277+ hset = HS.intersection (attributesSet attrsA) (attributesSet attrsB)
278+ vec = HS.foldr (flip V.snoc) mempty hset
src/lib/ProjectM36/Base.hs+100−108
@@ -1,4 +1,4 @@
1−{-# LANGUAGE ExistentialQuantification,DeriveGeneric,DeriveAnyClass,FlexibleInstances,OverloadedStrings, DeriveTraversable #-}
1+{-# LANGUAGE ExistentialQuantification,DeriveGeneric,DeriveAnyClass,FlexibleInstances,OverloadedStrings, DeriveTraversable, DerivingVia, TemplateHaskell, TypeFamilies #-}
2{-# OPTIONS_GHC -fno-warn-orphans #-}
2{-# OPTIONS_GHC -fno-warn-orphans #-}
3
3
4module ProjectM36.Base where
4module ProjectM36.Base where
@@ -6,6 +6,7 @@ import ProjectM36.DatabaseContextFunctionError
6import ProjectM36.AtomFunctionError
6import ProjectM36.AtomFunctionError
7import ProjectM36.MerkleHash
7import ProjectM36.MerkleHash
8
8
9+import Data.Functor.Foldable.TH
9import qualified Data.Map as M
10import qualified Data.Map as M
10import qualified Data.HashSet as HS
11import qualified Data.HashSet as HS
11import Data.Hashable (Hashable, hashWithSalt)
12import Data.Hashable (Hashable, hashWithSalt)
@@ -18,16 +19,17 @@ import GHC.Stack
18import qualified Data.Vector as V
19import qualified Data.Vector as V
19import qualified Data.List as L
20import qualified Data.List as L
20import Data.Text (Text,unpack)
21import Data.Text (Text,unpack)
21−import Data.Binary
22−import Data.Vector.Binary()
23import Data.Time.Clock
22import Data.Time.Clock
24−import Data.Time.Clock.POSIX
25−import Data.Time.Calendar (Day,toGregorian,fromGregorian)
26import Data.Hashable.Time ()
23import Data.Hashable.Time ()
24+import Data.Time.Calendar (Day)
27import Data.Typeable
25import Data.Typeable
28import Data.ByteString (ByteString)
26import Data.ByteString (ByteString)
29import qualified Data.List.NonEmpty as NE
27import qualified Data.List.NonEmpty as NE
28+import Data.Vector.Instances ()
29+
30type StringType = Text
30type StringType = Text
31+
32+type DatabaseName = String
31
33
32-- | Database atoms are the smallest, undecomposable units of a tuple. Common examples are integers, text, or unique identity keys.
34-- | Database atoms are the smallest, undecomposable units of a tuple. Common examples are integers, text, or unique identity keys.
33data Atom = IntegerAtom Integer |
35data Atom = IntegerAtom Integer |
@@ -39,8 +41,9 @@ data Atom = IntegerAtom Integer |
39 ByteStringAtom ByteString |
41 ByteStringAtom ByteString |
40 BoolAtom Bool |
42 BoolAtom Bool |
41 RelationAtom Relation |
43 RelationAtom Relation |
44+ RelationalExprAtom RelationalExpr | --used for returning inc deps
42 ConstructedAtom DataConstructorName AtomType [Atom]
45 ConstructedAtom DataConstructorName AtomType [Atom]
43− deriving (Eq, Show, Binary, Typeable, NFData, Generic)
46+ deriving (Eq, Show, Typeable, NFData, Generic, Read)
44
47
45instance Hashable Atom where
48instance Hashable Atom where
46 hashWithSalt salt (ConstructedAtom dConsName _ atoms) = salt `hashWithSalt` atoms
49 hashWithSalt salt (ConstructedAtom dConsName _ atoms) = salt `hashWithSalt` atoms
@@ -54,16 +57,7 @@ instance Hashable Atom where
54 hashWithSalt salt (ByteStringAtom bs) = salt `hashWithSalt` bs
57 hashWithSalt salt (ByteStringAtom bs) = salt `hashWithSalt` bs
55 hashWithSalt salt (BoolAtom b) = salt `hashWithSalt` b
58 hashWithSalt salt (BoolAtom b) = salt `hashWithSalt` b
56 hashWithSalt salt (RelationAtom r) = salt `hashWithSalt` r
59 hashWithSalt salt (RelationAtom r) = salt `hashWithSalt` r
57−
60+ hashWithSalt salt (RelationalExprAtom re) = salt `hashWithSalt` re
58−instance Binary UTCTime where
59− put utc = put $ toRational (utcTimeToPOSIXSeconds utc)
60− get = posixSecondsToUTCTime . fromRational <$> (get :: Get Rational)
61−
62−instance Binary Day where
63− put day = put $ toGregorian day
64− get = do
65− (y,m,d) <- get :: Get (Integer, Int, Int)
66− return (fromGregorian y m d)
67
61
68-- I suspect the definition of ConstructedAtomType with its name alone is insufficient to disambiguate the cases; for example, one could create a type named X, remove a type named X, and re-add it using different constructors. However, as long as requests are served from only one DatabaseContext at-a-time, the type name is unambiguous. This will become a problem for time-travel, however.
62-- I suspect the definition of ConstructedAtomType with its name alone is insufficient to disambiguate the cases; for example, one could create a type named X, remove a type named X, and re-add it using different constructors. However, as long as requests are served from only one DatabaseContext at-a-time, the type name is unambiguous. This will become a problem for time-travel, however.
69-- | The AtomType uniquely identifies the type of a atom.
63-- | The AtomType uniquely identifies the type of a atom.
@@ -77,13 +71,15 @@ data AtomType = IntAtomType |
77 BoolAtomType |
71 BoolAtomType |
78 RelationAtomType Attributes |
72 RelationAtomType Attributes |
79 ConstructedAtomType TypeConstructorName TypeVarMap |
73 ConstructedAtomType TypeConstructorName TypeVarMap |
74+ RelationalExprAtomType |
80 TypeVariableType TypeVarName
75 TypeVariableType TypeVarName
81 --wildcard used in Atom Functions and tuples for data constructors which don't provide all arguments to the type constructor
76 --wildcard used in Atom Functions and tuples for data constructors which don't provide all arguments to the type constructor
82− deriving (Eq, NFData, Generic, Binary, Show)
77+ deriving (Eq, NFData, Generic, Show, Read, Hashable)
83
78
84instance Ord AtomType where
79instance Ord AtomType where
85 compare = undefined
80 compare = undefined
86−
81+
82+-- this should probably be an ordered dictionary in order to be able to round-trip these arguments
87type TypeVarMap = M.Map TypeVarName AtomType
83type TypeVarMap = M.Map TypeVarName AtomType
88
84
89instance Hashable TypeVarMap where
85instance Hashable TypeVarMap where
@@ -98,25 +94,37 @@ isRelationAtomType _ = False
98type AttributeName = StringType
94type AttributeName = StringType
99
95
100-- | A relation's type is composed of attribute names and types.
96-- | A relation's type is composed of attribute names and types.
101−data Attribute = Attribute AttributeName AtomType deriving (Eq, Show, Generic, NFData, Binary)
97+data Attribute = Attribute AttributeName AtomType deriving (Eq, Show, Read, Generic, NFData)
102
98
103instance Hashable Attribute where
99instance Hashable Attribute where
104 hashWithSalt salt (Attribute attrName _) = hashWithSalt salt attrName
100 hashWithSalt salt (Attribute attrName _) = hashWithSalt salt attrName
105
101
102+type AttributesHash = Int
103+
106-- | 'Attributes' represent the head of a relation.
104-- | 'Attributes' represent the head of a relation.
105+newtype Attributes = Attributes {
107−type Attributes = V.Vector Attribute
106+ attributesVec :: V.Vector Attribute
107+ --,attributesSet :: HS.HashSet Attribute --compare with this generated in heap profile and benchmarks
108+ }
109+ deriving (NFData, Read, Hashable, Generic)
110+
111+attributesSet :: Attributes -> HS.HashSet Attribute
112+attributesSet = HS.fromList . V.toList . attributesVec
113+
114+instance Show Attributes where
115+ show attrs = "attributesFromList [" <> L.intercalate ", " (map (\attr -> "(" <> show attr <> ")") (V.toList (attributesVec attrs))) <> "]"
116+
117+--when attribute ordering is irrelevant
118+instance Eq Attributes where
119+ attrsA == attrsB =
120+ attributesVec attrsA == attributesVec attrsB ||
121+ attributesSet attrsA == attributesSet attrsB
108
122
109−-- | Equality function for a set of attributes.
110−attributesEqual :: Attributes -> Attributes -> Bool
111−attributesEqual attrs1 attrs2 = attrsAsSet attrs1 == attrsAsSet attrs2
112− where
113− attrsAsSet = HS.fromList . V.toList
114−
115sortedAttributesIndices :: Attributes -> [(Int, Attribute)]
123sortedAttributesIndices :: Attributes -> [(Int, Attribute)]
116−sortedAttributesIndices attrs = L.sortBy (\(_, Attribute name1 _) (_,Attribute name2 _) -> compare name1 name2) $ V.toList (V.indexed attrs)
124+sortedAttributesIndices attrs = L.sortBy (\(_, Attribute name1 _) (_,Attribute name2 _) -> compare name1 name2) $ V.toList (V.indexed (attributesVec attrs))
117
125
118-- | The relation's tuple set is the body of the relation.
126-- | The relation's tuple set is the body of the relation.
119−newtype RelationTupleSet = RelationTupleSet { asList :: [RelationTuple] } deriving (Hashable, Show, Generic, Binary)
127+newtype RelationTupleSet = RelationTupleSet { asList :: [RelationTuple] } deriving (Hashable, Show, Generic, Read)
120
128
121instance Read Relation where
129instance Read Relation where
122 readsPrec = error "relation read not supported"
130 readsPrec = error "relation read not supported"
@@ -132,8 +140,8 @@ instance NFData RelationTupleSet where rnf = genericRnf
132instance Hashable RelationTuple where
140instance Hashable RelationTuple where
133 --sanity check the tuple for attribute and tuple counts
141 --sanity check the tuple for attribute and tuple counts
134 --this bit me when tuples were being hashed before being verified
142 --this bit me when tuples were being hashed before being verified
135− hashWithSalt salt (RelationTuple attrs tupVec) = if V.length attrs /= V.length tupVec then
143+ hashWithSalt salt (RelationTuple attrs tupVec) = if V.length (attributesVec attrs) /= V.length tupVec then
136− error "invalid tuple: attributes and tuple count mismatch"
144+ error ("invalid tuple: attributes and tuple count mismatch " <> show (attributesVec attrs, tupVec))
137 else
145 else
138 salt `hashWithSalt`
146 salt `hashWithSalt`
139 sortedAttrs `hashWithSalt`
147 sortedAttrs `hashWithSalt`
@@ -144,25 +152,23 @@ instance Hashable RelationTuple where
144 sortedTupVec = V.map (\(index, _) -> tupVec V.! index) $ V.fromList sortedAttrsIndices
152 sortedTupVec = V.map (\(index, _) -> tupVec V.! index) $ V.fromList sortedAttrsIndices
145
153
146-- | A tuple is a set of attributes mapped to their 'Atom' values.
154-- | A tuple is a set of attributes mapped to their 'Atom' values.
147−data RelationTuple = RelationTuple Attributes (V.Vector Atom) deriving (Show, Generic)
155+data RelationTuple = RelationTuple Attributes (V.Vector Atom) deriving (Show, Read, Generic)
148−
149−instance Binary RelationTuple
150
156
151instance Eq RelationTuple where
157instance Eq RelationTuple where
152− (==) tuple1@(RelationTuple attrs1 _) tuple2@(RelationTuple attrs2 _) = attributesEqual attrs1 attrs2 && atomsEqual
158+ tuple1@(RelationTuple attrs1 _) == tuple2@(RelationTuple attrs2 _) =
159+ attrs1 == attrs2 && atomsEqual
153 where
160 where
154− atomForAttribute attr (RelationTuple attrs tupVec) = case V.findIndex (== attr) attrs of
161+ atomForAttribute attr (RelationTuple attrs tupVec) = case V.findIndex (== attr) (attributesVec attrs) of
155 Nothing -> Nothing
162 Nothing -> Nothing
156 Just index -> tupVec V.!? index
163 Just index -> tupVec V.!? index
157− atomsEqual = V.all (== True) $ V.map (\attr -> atomForAttribute attr tuple1 == atomForAttribute attr tuple2) attrs1
164+ atomsEqual = V.all (== True) $ V.map (\attr -> atomForAttribute attr tuple1 == atomForAttribute attr tuple2) (attributesVec attrs1)
158
165
159instance NFData RelationTuple where rnf = genericRnf
166instance NFData RelationTuple where rnf = genericRnf
160
167
161−
162data Relation = Relation Attributes RelationTupleSet deriving (Show, Generic,Typeable)
168data Relation = Relation Attributes RelationTupleSet deriving (Show, Generic,Typeable)
163
169
164instance Eq Relation where
170instance Eq Relation where
165− Relation attrs1 tupSet1 == Relation attrs2 tupSet2 = attributesEqual attrs1 attrs2 && tupSet1 == tupSet2
171+ Relation attrs1 tupSet1 == Relation attrs2 tupSet2 = attrs1 == attrs2 && tupSet1 == tupSet2
166
172
167instance NFData Relation where rnf = genericRnf
173instance NFData Relation where rnf = genericRnf
168
174
@@ -173,8 +179,6 @@ instance Hashable Relation where
173 where
179 where
174 sortedAttrs = map snd (sortedAttributesIndices attrs)
180 sortedAttrs = map snd (sortedAttributesIndices attrs)
175
181
176−instance Binary Relation
177−
178-- | Used to represent the number of tuples in a relation.
182-- | Used to represent the number of tuples in a relation.
179data RelationCardinality = Countable | Finite Int deriving (Eq, Show, Generic, Ord)
183data RelationCardinality = Countable | Finite Int deriving (Eq, Show, Generic, Ord)
180
184
@@ -219,17 +223,15 @@ data RelationalExprBase a =
219 --Summarize :: AtomExpr -> AttributeName -> RelationalExpr -> RelationalExpr -> RelationalExpr -- a special case of Extend
223 --Summarize :: AtomExpr -> AttributeName -> RelationalExpr -> RelationalExpr -> RelationalExpr -- a special case of Extend
220 --Evaluate relationalExpr with scoped views
224 --Evaluate relationalExpr with scoped views
221 With [(WithNameExprBase a, RelationalExprBase a)] (RelationalExprBase a)
225 With [(WithNameExprBase a, RelationalExprBase a)] (RelationalExprBase a)
222− deriving (Show, Eq, Generic, NFData, Foldable, Functor, Traversable)
226+ deriving (Show, Read, Eq, Generic, NFData, Foldable, Functor, Traversable)
223−
224−instance Binary RelationalExpr
225
227
228+instance Hashable RelationalExpr
229+
226data WithNameExprBase a = WithNameExpr RelVarName a
230data WithNameExprBase a = WithNameExpr RelVarName a
227− deriving (Show, Eq, Generic, NFData, Foldable, Functor, Traversable)
231+ deriving (Show, Read, Eq, Generic, NFData, Foldable, Functor, Traversable, Hashable)
228
232
229type WithNameExpr = WithNameExprBase ()
233type WithNameExpr = WithNameExprBase ()
230
234
231−instance Binary WithNameExpr
232−
233type GraphRefWithNameExpr = WithNameExprBase GraphRefTransactionMarker
235type GraphRefWithNameExpr = WithNameExprBase GraphRefTransactionMarker
234
236
235type NotificationName = StringType
237type NotificationName = StringType
@@ -241,22 +243,22 @@ data Notification = Notification {
241 reportOldExpr :: RelationalExpr, --run the expression in the pre-change context
243 reportOldExpr :: RelationalExpr, --run the expression in the pre-change context
242 reportNewExpr :: RelationalExpr --run the expression in the post-change context
244 reportNewExpr :: RelationalExpr --run the expression in the post-change context
243 }
245 }
244− deriving (Show, Eq, Binary, Generic, NFData)
246+ deriving (Show, Eq, Generic, NFData)
245
247
246type TypeVarName = StringType
248type TypeVarName = StringType
247
249
248-- | Metadata definition for type constructors such as @data Either a b@.
250-- | Metadata definition for type constructors such as @data Either a b@.
249data TypeConstructorDef = ADTypeConstructorDef TypeConstructorName [TypeVarName] |
251data TypeConstructorDef = ADTypeConstructorDef TypeConstructorName [TypeVarName] |
250 PrimitiveTypeConstructorDef TypeConstructorName AtomType
252 PrimitiveTypeConstructorDef TypeConstructorName AtomType
251− deriving (Show, Generic, Binary, Eq, NFData)
253+ deriving (Show, Generic, Eq, NFData, Hashable, Read)
252
254
253-- | Found in data constructors and type declarations: Left (Either Int Text) | Right Int
255-- | Found in data constructors and type declarations: Left (Either Int Text) | Right Int
254type TypeConstructor = TypeConstructorBase ()
256type TypeConstructor = TypeConstructorBase ()
255data TypeConstructorBase a = ADTypeConstructor TypeConstructorName [TypeConstructor] |
257data TypeConstructorBase a = ADTypeConstructor TypeConstructorName [TypeConstructor] |
256− PrimitiveTypeConstructor TypeConstructorName AtomType |
258+ PrimitiveTypeConstructor TypeConstructorName AtomType |
257− RelationAtomTypeConstructor [AttributeExprBase a] |
259+ RelationAtomTypeConstructor [AttributeExprBase a] |
258− TypeVariable TypeVarName
260+ TypeVariable TypeVarName
259− deriving (Show, Generic, Binary, Eq, NFData)
261+ deriving (Show, Generic, Eq, NFData, Hashable, Read)
260
262
261type TypeConstructorMapping = [(TypeConstructorDef, DataConstructorDefs)]
263type TypeConstructorMapping = [(TypeConstructorDef, DataConstructorDefs)]
262
264
@@ -266,20 +268,20 @@ type DataConstructorName = StringType
266type AtomTypeName = StringType
268type AtomTypeName = StringType
267
269
268-- | Used to define a data constructor in a type constructor context such as @Left a | Right b@
270-- | Used to define a data constructor in a type constructor context such as @Left a | Right b@
269−data DataConstructorDef = DataConstructorDef DataConstructorName [DataConstructorDefArg] deriving (Eq, Show, Binary, Generic, NFData)
271+data DataConstructorDef = DataConstructorDef DataConstructorName [DataConstructorDefArg] deriving (Eq, Show, Generic, NFData, Hashable, Read)
270
272
271type DataConstructorDefs = [DataConstructorDef]
273type DataConstructorDefs = [DataConstructorDef]
272
274
273data DataConstructorDefArg = DataConstructorDefTypeConstructorArg TypeConstructor |
275data DataConstructorDefArg = DataConstructorDefTypeConstructorArg TypeConstructor |
274 DataConstructorDefTypeVarNameArg TypeVarName
276 DataConstructorDefTypeVarNameArg TypeVarName
275− deriving (Show, Generic, Binary, Eq, NFData)
277+ deriving (Show, Generic, Eq, NFData, Hashable, Read)
276
278
277type InclusionDependencies = M.Map IncDepName InclusionDependency
279type InclusionDependencies = M.Map IncDepName InclusionDependency
278type RelationVariables = M.Map RelVarName GraphRefRelationalExpr
280type RelationVariables = M.Map RelVarName GraphRefRelationalExpr
279
281
280data GraphRefTransactionMarker = TransactionMarker TransactionId |
282data GraphRefTransactionMarker = TransactionMarker TransactionId |
281 UncommittedContextMarker
283 UncommittedContextMarker
282− deriving (Eq, Show, Binary, Generic, NFData, Ord)
284+ deriving (Eq, Show, Generic, NFData, Ord)
283
285
284-- a fundamental relational expr to which other relational expressions compile
286-- a fundamental relational expr to which other relational expressions compile
285type GraphRefRelationalExpr = RelationalExprBase GraphRefTransactionMarker
287type GraphRefRelationalExpr = RelationalExprBase GraphRefTransactionMarker
@@ -290,17 +292,18 @@ type Subschemas = M.Map SchemaName Schema
290
292
291-- | Every transaction has one concrete database context and any number of isomorphic subschemas.
293-- | Every transaction has one concrete database context and any number of isomorphic subschemas.
292data Schemas = Schemas DatabaseContext Subschemas
294data Schemas = Schemas DatabaseContext Subschemas
295+ deriving (Generic)
293
296
294-- | The DatabaseContext is a snapshot of a database's evolving state and contains everything a database client can change over time.
297-- | The DatabaseContext is a snapshot of a database's evolving state and contains everything a database client can change over time.
295-- I spent some time thinking about whether the VirtualDatabaseContext/Schema and DatabaseContext data constructors should be the same constructor, but that would allow relation variables to be created in a "virtual" context which would appear to defeat the isomorphisms of the contexts. It should be possible to switch to an alternative schema to view the same equivalent information without information loss. However, allowing all contexts to reference another context while maintaining its own relation variables, new types, etc. could be interesting from a security perspective. For example, if a user creates a new relvar in a virtual context, then does it necessarily appear in all linked contexts? After deliberation, I think the relvar should appear in *all* linked contexts to retain the isomorphic properties, even when the isomorphism is for a subset of the context. This hints that the IsoMorphs should allow for "fall-through"; that is, when a relvar is not defined in the virtual context (for morphing), then the lookup should fall through to the underlying context.
298-- I spent some time thinking about whether the VirtualDatabaseContext/Schema and DatabaseContext data constructors should be the same constructor, but that would allow relation variables to be created in a "virtual" context which would appear to defeat the isomorphisms of the contexts. It should be possible to switch to an alternative schema to view the same equivalent information without information loss. However, allowing all contexts to reference another context while maintaining its own relation variables, new types, etc. could be interesting from a security perspective. For example, if a user creates a new relvar in a virtual context, then does it necessarily appear in all linked contexts? After deliberation, I think the relvar should appear in *all* linked contexts to retain the isomorphic properties, even when the isomorphism is for a subset of the context. This hints that the IsoMorphs should allow for "fall-through"; that is, when a relvar is not defined in the virtual context (for morphing), then the lookup should fall through to the underlying context.
296newtype Schema = Schema SchemaIsomorphs
299newtype Schema = Schema SchemaIsomorphs
297− deriving (Generic, Binary)
300+ deriving (Generic)
298
301
299data SchemaIsomorph = IsoRestrict RelVarName RestrictionPredicateExpr (RelVarName, RelVarName) |
302data SchemaIsomorph = IsoRestrict RelVarName RestrictionPredicateExpr (RelVarName, RelVarName) |
300 IsoRename RelVarName RelVarName |
303 IsoRename RelVarName RelVarName |
301 IsoUnion (RelVarName, RelVarName) RestrictionPredicateExpr RelVarName --maps two relvars to one relvar
304 IsoUnion (RelVarName, RelVarName) RestrictionPredicateExpr RelVarName --maps two relvars to one relvar
302 -- IsoTypeConstructor in morphAttrExpr
305 -- IsoTypeConstructor in morphAttrExpr
303− deriving (Generic, Binary, Show)
306+ deriving (Generic, Show)
304
307
305type SchemaIsomorphs = [SchemaIsomorph]
308type SchemaIsomorphs = [SchemaIsomorph]
306
309
@@ -316,9 +319,7 @@ data DatabaseContext = DatabaseContext {
316type IncDepName = StringType
319type IncDepName = StringType
317
320
318-- | Inclusion dependencies represent every possible database constraint. Constraints enforce specific, arbitrarily-complex rules to which the database context's relation variables must adhere unconditionally.
321-- | Inclusion dependencies represent every possible database constraint. Constraints enforce specific, arbitrarily-complex rules to which the database context's relation variables must adhere unconditionally.
319−data InclusionDependency = InclusionDependency RelationalExpr RelationalExpr deriving (Show, Eq, Generic, NFData)
322+data InclusionDependency = InclusionDependency RelationalExpr RelationalExpr deriving (Show, Eq, Generic, NFData, Hashable, Read)
320−
321−instance Binary InclusionDependency
322
323
323type AttributeNameAtomExprMap = M.Map AttributeName AtomExpr
324type AttributeNameAtomExprMap = M.Map AttributeName AtomExpr
324
325
@@ -327,9 +328,9 @@ type DatabaseContextExprName = StringType
327
328
328type DatabaseContextExpr = DatabaseContextExprBase ()
329type DatabaseContextExpr = DatabaseContextExprBase ()
329
330
330−type GraphRefDatabaseContextExpr = DatabaseContextExprBase GraphRefTransactionMarker
331+instance Hashable DatabaseContextExpr
331
332
332−instance Binary GraphRefDatabaseContextExpr
333+type GraphRefDatabaseContextExpr = DatabaseContextExprBase GraphRefTransactionMarker
333
334
334-- | Database context expressions modify the database context.
335-- | Database context expressions modify the database context.
335data DatabaseContextExprBase a =
336data DatabaseContextExprBase a =
@@ -358,9 +359,10 @@ data DatabaseContextExprBase a =
358 ExecuteDatabaseContextFunction DatabaseContextFunctionName [AtomExprBase a] |
359 ExecuteDatabaseContextFunction DatabaseContextFunctionName [AtomExprBase a] |
359
360
360 MultipleExpr [DatabaseContextExprBase a]
361 MultipleExpr [DatabaseContextExprBase a]
361− deriving (Show, Eq, Generic)
362+ deriving (Show, Read, Eq, Generic, NFData)
362
363
363−instance Binary DatabaseContextExpr
364+instance Hashable (M.Map AttributeName AtomExpr) where
365+ hashWithSalt salt m = salt `hashWithSalt` M.toList m
364
366
365type ObjModuleName = StringType
367type ObjModuleName = StringType
366type ObjFunctionName = StringType
368type ObjFunctionName = StringType
@@ -372,7 +374,7 @@ data DatabaseContextIOExprBase a =
372 AddDatabaseContextFunction DatabaseContextFunctionName [TypeConstructor] DatabaseContextFunctionBodyScript |
374 AddDatabaseContextFunction DatabaseContextFunctionName [TypeConstructor] DatabaseContextFunctionBodyScript |
373 LoadDatabaseContextFunctions ObjModuleName ObjFunctionName FilePath |
375 LoadDatabaseContextFunctions ObjModuleName ObjFunctionName FilePath |
374 CreateArbitraryRelation RelVarName [AttributeExprBase a] Range
376 CreateArbitraryRelation RelVarName [AttributeExprBase a] Range
375− deriving (Show, Eq, Generic, Binary)
377+ deriving (Show, Eq, Generic)
376
378
377type GraphRefDatabaseContextIOExpr = DatabaseContextIOExprBase GraphRefTransactionMarker
379type GraphRefDatabaseContextIOExpr = DatabaseContextIOExprBase GraphRefTransactionMarker
378
380
@@ -380,6 +382,8 @@ type DatabaseContextIOExpr = DatabaseContextIOExprBase ()
380
382
381type RestrictionPredicateExpr = RestrictionPredicateExprBase ()
383type RestrictionPredicateExpr = RestrictionPredicateExprBase ()
382
384
385+instance Hashable RestrictionPredicateExpr
386+
383type GraphRefRestrictionPredicateExpr = RestrictionPredicateExprBase GraphRefTransactionMarker
387type GraphRefRestrictionPredicateExpr = RestrictionPredicateExprBase GraphRefTransactionMarker
384
388
385-- | Restriction predicates are boolean algebra components which, when composed, indicate whether or not a tuple should be retained during a restriction (filtering) operation.
389-- | Restriction predicates are boolean algebra components which, when composed, indicate whether or not a tuple should be retained during a restriction (filtering) operation.
@@ -391,9 +395,7 @@ data RestrictionPredicateExprBase a =
391 RelationalExprPredicate (RelationalExprBase a) | --type must be same as true and false relations (no attributes)
395 RelationalExprPredicate (RelationalExprBase a) | --type must be same as true and false relations (no attributes)
392 AtomExprPredicate (AtomExprBase a) | --atom must evaluate to boolean
396 AtomExprPredicate (AtomExprBase a) | --atom must evaluate to boolean
393 AttributeEqualityPredicate AttributeName (AtomExprBase a) -- relationalexpr must result in relation with single tuple
397 AttributeEqualityPredicate AttributeName (AtomExprBase a) -- relationalexpr must result in relation with single tuple
394− deriving (Show, Eq, Generic, NFData, Foldable, Functor, Traversable)
398+ deriving (Show, Read, Eq, Generic, NFData, Foldable, Functor, Traversable)
395−
396−instance Binary RestrictionPredicateExpr
397
399
398-- child + parent links
400-- child + parent links
399-- | A transaction graph's head name references the leaves of the transaction graph and can be used during session creation to indicate at which point in the graph commits should persist.
401-- | A transaction graph's head name references the leaves of the transaction graph and can be used during session creation to indicate at which point in the graph commits should persist.
@@ -403,6 +405,7 @@ type TransactionHeads = M.Map HeadName Transaction
403
405
404-- | The transaction graph is the global database's state which references every committed transaction.
406-- | The transaction graph is the global database's state which references every committed transaction.
405data TransactionGraph = TransactionGraph TransactionHeads (S.Set Transaction)
407data TransactionGraph = TransactionGraph TransactionHeads (S.Set Transaction)
408+ deriving Generic
406
409
407transactionHeadsForGraph :: TransactionGraph -> TransactionHeads
410transactionHeadsForGraph :: TransactionGraph -> TransactionHeads
408transactionHeadsForGraph (TransactionGraph hs _) = hs
411transactionHeadsForGraph (TransactionGraph hs _) = hs
@@ -425,12 +428,11 @@ data TransactionInfo = TransactionInfo TransactionId TransactionDiffs UTCTime |
425 deriving (Show, Generic)
428 deriving (Show, Generic)
426-}
429-}
427
430
428−instance Binary TransactionInfo
429−
430-- | Every set of modifications made to the database are atomically committed to the transaction graph as a transaction.
431-- | Every set of modifications made to the database are atomically committed to the transaction graph as a transaction.
431type TransactionId = UUID
432type TransactionId = UUID
432
433
433data Transaction = Transaction TransactionId TransactionInfo Schemas
434data Transaction = Transaction TransactionId TransactionInfo Schemas
435+ deriving Generic
434
436
435-- | The disconnected transaction represents an in-progress workspace used by sessions before changes are committed. This is similar to git's "index". After a transaction is committed, it is "connected" in the transaction graph and can no longer be modified.
437-- | The disconnected transaction represents an in-progress workspace used by sessions before changes are committed. This is similar to git's "index". After a transaction is committed, it is "connected" in the transaction graph and can no longer be modified.
436data DisconnectedTransaction = DisconnectedTransaction TransactionId Schemas DirtyFlag
438data DisconnectedTransaction = DisconnectedTransaction TransactionId Schemas DirtyFlag
@@ -454,6 +456,8 @@ instance Ord Transaction where
454
456
455type AtomExpr = AtomExprBase ()
457type AtomExpr = AtomExprBase ()
456
458
459+instance Hashable AtomExpr
460+
457type GraphRefAtomExpr = AtomExprBase GraphRefTransactionMarker
461type GraphRefAtomExpr = AtomExprBase GraphRefTransactionMarker
458
462
459-- | An atom expression represents an action to take when extending a relation or when statically defining a relation or a new tuple.
463-- | An atom expression represents an action to take when extending a relation or when statically defining a relation or a new tuple.
@@ -462,18 +466,17 @@ data AtomExprBase a = AttributeAtomExpr AttributeName |
462 FunctionAtomExpr AtomFunctionName [AtomExprBase a] a |
466 FunctionAtomExpr AtomFunctionName [AtomExprBase a] a |
463 RelationAtomExpr (RelationalExprBase a) |
467 RelationAtomExpr (RelationalExprBase a) |
464 ConstructedAtomExpr DataConstructorName [AtomExprBase a] a
468 ConstructedAtomExpr DataConstructorName [AtomExprBase a] a
465− deriving (Eq,Show,Generic, NFData, Foldable, Functor, Traversable)
469+ deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable)
466
470
467−instance Binary AtomExpr
468−
469-- | Used in tuple creation when creating a relation.
471-- | Used in tuple creation when creating a relation.
470data ExtendTupleExprBase a = AttributeExtendTupleExpr AttributeName (AtomExprBase a)
472data ExtendTupleExprBase a = AttributeExtendTupleExpr AttributeName (AtomExprBase a)
471− deriving (Show, Eq, Generic, NFData, Foldable, Functor, Traversable)
473+ deriving (Show, Read, Eq, Generic, NFData, Foldable, Functor, Traversable)
472
474
473type ExtendTupleExpr = ExtendTupleExprBase ()
475type ExtendTupleExpr = ExtendTupleExprBase ()
474−type GraphRefExtendTupleExpr = ExtendTupleExprBase GraphRefTransactionMarker
475
476
476−instance Binary ExtendTupleExpr
477+instance Hashable ExtendTupleExpr
478+
479+type GraphRefExtendTupleExpr = ExtendTupleExprBase GraphRefTransactionMarker
477
480
478--enumerates the list of functions available to be run as part of tuple expressions
481--enumerates the list of functions available to be run as part of tuple expressions
479type AtomFunctions = HS.HashSet AtomFunction
482type AtomFunctions = HS.HashSet AtomFunction
@@ -485,6 +488,7 @@ type AtomFunctionBodyScript = StringType
485type AtomFunctionBodyType = [Atom] -> Either AtomFunctionError Atom
488type AtomFunctionBodyType = [Atom] -> Either AtomFunctionError Atom
486
489
487data AtomFunctionBody = AtomFunctionBody (Maybe AtomFunctionBodyScript) AtomFunctionBodyType
490data AtomFunctionBody = AtomFunctionBody (Maybe AtomFunctionBodyScript) AtomFunctionBodyType
491+ deriving Generic
488
492
489instance NFData AtomFunctionBody where
493instance NFData AtomFunctionBody where
490 rnf (AtomFunctionBody mScript _) = rnf mScript
494 rnf (AtomFunctionBody mScript _) = rnf mScript
@@ -519,14 +523,17 @@ data AttributeNamesBase a = AttributeNames (S.Set AttributeName) |
519 UnionAttributeNames (AttributeNamesBase a) (AttributeNamesBase a) |
523 UnionAttributeNames (AttributeNamesBase a) (AttributeNamesBase a) |
520 IntersectAttributeNames (AttributeNamesBase a) (AttributeNamesBase a) |
524 IntersectAttributeNames (AttributeNamesBase a) (AttributeNamesBase a) |
521 RelationalExprAttributeNames (RelationalExprBase a) -- use attribute names from the relational expression's type
525 RelationalExprAttributeNames (RelationalExprBase a) -- use attribute names from the relational expression's type
522− deriving (Eq, Show, Generic, NFData, Foldable, Functor, Traversable)
526+ deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable)
527+
528+instance Hashable AttributeNames
529+
530+instance Hashable (S.Set AttributeName) where
531+ hashWithSalt salt s = salt `hashWithSalt` S.toList s
523
532
524type AttributeNames = AttributeNamesBase ()
533type AttributeNames = AttributeNamesBase ()
525
534
526type GraphRefAttributeNames = AttributeNamesBase GraphRefTransactionMarker
535type GraphRefAttributeNames = AttributeNamesBase GraphRefTransactionMarker
527
536
528−instance Binary AttributeNames
529−
530-- | The persistence strategy is a global database option which represents how to persist the database in the filesystem, if at all.
537-- | The persistence strategy is a global database option which represents how to persist the database in the filesystem, if at all.
531data PersistenceStrategy = NoPersistence | -- ^ no filesystem persistence/memory-only database
538data PersistenceStrategy = NoPersistence | -- ^ no filesystem persistence/memory-only database
532 MinimalPersistence FilePath | -- ^ fsync off, not crash-safe
539 MinimalPersistence FilePath | -- ^ fsync off, not crash-safe
@@ -539,27 +546,27 @@ type GraphRefAttributeExpr = AttributeExprBase GraphRefTransactionMarker
539-- | Create attributes dynamically.
546-- | Create attributes dynamically.
540data AttributeExprBase a = AttributeAndTypeNameExpr AttributeName TypeConstructor a |
547data AttributeExprBase a = AttributeAndTypeNameExpr AttributeName TypeConstructor a |
541 NakedAttributeExpr Attribute
548 NakedAttributeExpr Attribute
542− deriving (Eq, Show, Generic, Binary, NFData, Foldable, Functor, Traversable)
549+ deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable, Hashable)
543
550
544-- | Dynamically create a tuple from attribute names and 'AtomExpr's.
551-- | Dynamically create a tuple from attribute names and 'AtomExpr's.
545newtype TupleExprBase a = TupleExpr (M.Map AttributeName (AtomExprBase a))
552newtype TupleExprBase a = TupleExpr (M.Map AttributeName (AtomExprBase a))
546− deriving (Eq, Show, Generic, NFData, Foldable, Functor, Traversable)
553+ deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable)
547−
554+
548−instance Binary TupleExpr
555+instance Hashable TupleExpr
549
556
550type TupleExpr = TupleExprBase ()
557type TupleExpr = TupleExprBase ()
551
558
552type GraphRefTupleExpr = TupleExprBase GraphRefTransactionMarker
559type GraphRefTupleExpr = TupleExprBase GraphRefTransactionMarker
553
560
554data TupleExprsBase a = TupleExprs a [TupleExprBase a]
561data TupleExprsBase a = TupleExprs a [TupleExprBase a]
555− deriving (Eq, Show, Generic, NFData, Foldable, Functor, Traversable)
562+ deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable)
563+
564+instance Hashable TupleExprs
556
565
557type GraphRefTupleExprs = TupleExprsBase GraphRefTransactionMarker
566type GraphRefTupleExprs = TupleExprsBase GraphRefTransactionMarker
558
567
559type TupleExprs = TupleExprsBase ()
568type TupleExprs = TupleExprsBase ()
560
569
561−instance Binary TupleExprs
562−
563data MergeStrategy =
570data MergeStrategy =
564 -- | After a union merge, the merge transaction is a result of union'ing relvars of the same name, introducing all uniquely-named relvars, union of constraints, union of atom functions, notifications, and types (unless the names and definitions collide, e.g. two types of the same name with different definitions)
571 -- | After a union merge, the merge transaction is a result of union'ing relvars of the same name, introducing all uniquely-named relvars, union of constraints, union of atom functions, notifications, and types (unless the names and definitions collide, e.g. two types of the same name with different definitions)
565 UnionMergeStrategy |
572 UnionMergeStrategy |
@@ -567,7 +574,7 @@ data MergeStrategy =
567 UnionPreferMergeStrategy HeadName |
574 UnionPreferMergeStrategy HeadName |
568 -- | Similar to the our/theirs merge strategy in git, the merge transaction's context is identical to that of the last transaction in the selected branch.
575 -- | Similar to the our/theirs merge strategy in git, the merge transaction's context is identical to that of the last transaction in the selected branch.
569 SelectedBranchMergeStrategy HeadName
576 SelectedBranchMergeStrategy HeadName
570− deriving (Eq, Show, Binary, Generic, NFData)
577+ deriving (Eq, Show, Generic, NFData)
571
578
572type DatabaseContextFunctionName = StringType
579type DatabaseContextFunctionName = StringType
573
580
@@ -604,7 +611,8 @@ attrTypeVars (Attribute _ aType) = case aType of
604 DateTimeAtomType -> S.empty
611 DateTimeAtomType -> S.empty
605 ByteStringAtomType -> S.empty
612 ByteStringAtomType -> S.empty
606 BoolAtomType -> S.empty
613 BoolAtomType -> S.empty
614+ RelationalExprAtomType -> S.empty
607− (RelationAtomType attrs) -> S.unions (map attrTypeVars (V.toList attrs))
615+ (RelationAtomType attrs) -> S.unions (map attrTypeVars (V.toList (attributesVec attrs)))
608 (ConstructedAtomType _ tvMap) -> M.keysSet tvMap
616 (ConstructedAtomType _ tvMap) -> M.keysSet tvMap
609 (TypeVariableType nam) -> S.singleton nam
617 (TypeVariableType nam) -> S.singleton nam
610
618
@@ -627,28 +635,12 @@ atomTypeVars DayAtomType = S.empty
627atomTypeVars DateTimeAtomType = S.empty
635atomTypeVars DateTimeAtomType = S.empty
628atomTypeVars ByteStringAtomType = S.empty
636atomTypeVars ByteStringAtomType = S.empty
629atomTypeVars BoolAtomType = S.empty
637atomTypeVars BoolAtomType = S.empty
638+atomTypeVars RelationalExprAtomType = S.empty
630−atomTypeVars (RelationAtomType attrs) = S.unions (map attrTypeVars (V.toList attrs))
639+atomTypeVars (RelationAtomType attrs) = S.unions (map attrTypeVars (V.toList (attributesVec attrs)))
631atomTypeVars (ConstructedAtomType _ tvMap) = M.keysSet tvMap
640atomTypeVars (ConstructedAtomType _ tvMap) = M.keysSet tvMap
632atomTypeVars (TypeVariableType nam) = S.singleton nam
641atomTypeVars (TypeVariableType nam) = S.singleton nam
633
642
634unimplemented :: HasCallStack => a
643unimplemented :: HasCallStack => a
635−unimplemented = undefined
644+unimplemented = error "unimplemented"
636−
637−--for serializing GraphRefRelationalExpr as part of transaction serialization
638−instance Binary (TupleExprsBase GraphRefTransactionMarker)
639−
640−instance Binary (TupleExprBase GraphRefTransactionMarker)
641−
642−instance Binary GraphRefRelationalExpr
643−
644−instance Binary (AtomExprBase GraphRefTransactionMarker)
645−
646−instance Binary (AttributeNamesBase GraphRefTransactionMarker)
647−
648−instance Binary (RestrictionPredicateExprBase GraphRefTransactionMarker)
649−
650−instance Binary (ExtendTupleExprBase GraphRefTransactionMarker)
651−
652−instance Binary GraphRefWithNameExpr
653
645
654−
646+makeBaseFunctor ''RelationalExprBase
src/lib/ProjectM36/Client.hs+163−293
@@ -1,4 +1,4 @@
1−{-# LANGUAGE DeriveAnyClass, DeriveGeneric, ScopedTypeVariables, MonoLocalBinds #-}
1+{-# LANGUAGE DeriveGeneric, ScopedTypeVariables, MonoLocalBinds, DerivingVia #-}
2{-|
2{-|
3Module: ProjectM36.Client
3Module: ProjectM36.Client
4
4
@@ -9,6 +9,7 @@ module ProjectM36.Client
9 Connection(..),
9 Connection(..),
10 Port,
10 Port,
11 Hostname,
11 Hostname,
12+ ServiceName,
12 DatabaseName,
13 DatabaseName,
13 ConnectionError(..),
14 ConnectionError(..),
14 connectProjectM36,
15 connectProjectM36,
@@ -43,6 +44,7 @@ module ProjectM36.Client
43 defaultDatabaseName,
44 defaultDatabaseName,
44 defaultRemoteConnectionInfo,
45 defaultRemoteConnectionInfo,
45 defaultHeadName,
46 defaultHeadName,
47+ addClientNode,
46 PersistenceStrategy(..),
48 PersistenceStrategy(..),
47 RelationalExpr,
49 RelationalExpr,
48 RelationalExprBase(..),
50 RelationalExprBase(..),
@@ -53,11 +55,9 @@ module ProjectM36.Client
53 Attribute(..),
55 Attribute(..),
54 MergeStrategy(..),
56 MergeStrategy(..),
55 attributesFromList,
57 attributesFromList,
56− createNodeId,
57 createSessionAtCommit,
58 createSessionAtCommit,
58 createSessionAtHead,
59 createSessionAtHead,
59 closeSession,
60 closeSession,
60− addClientNode,
61 callTestTimeout_,
61 callTestTimeout_,
62 RelationCardinality(..),
62 RelationCardinality(..),
63 TransactionGraphOperator(..),
63 TransactionGraphOperator(..),
@@ -67,7 +67,6 @@ module ProjectM36.Client
67 TransGraphRelationalExpr,
67 TransGraphRelationalExpr,
68 TransactionIdLookup(..),
68 TransactionIdLookup(..),
69 TransactionIdHeadBacktrack(..),
69 TransactionIdHeadBacktrack(..),
70− NodeId(..),
71 Atom(..),
70 Atom(..),
72 Session,
71 Session,
73 SessionId,
72 SessionId,
@@ -107,6 +106,7 @@ module ProjectM36.Client
107 ) where
106 ) where
108import ProjectM36.Base hiding (inclusionDependencies) --defined in this module as well
107import ProjectM36.Base hiding (inclusionDependencies) --defined in this module as well
109import qualified ProjectM36.Base as B
108import qualified ProjectM36.Base as B
109+import ProjectM36.Serialise.Error ()
110import ProjectM36.Error
110import ProjectM36.Error
111import ProjectM36.Atomable
111import ProjectM36.Atomable
112import ProjectM36.AtomFunction as AF
112import ProjectM36.AtomFunction as AF
@@ -134,28 +134,16 @@ import ProjectM36.Relation (typesAsRelation)
134import ProjectM36.ScriptSession (initScriptSession, ScriptSession)
134import ProjectM36.ScriptSession (initScriptSession, ScriptSession)
135import qualified ProjectM36.Relation as R
135import qualified ProjectM36.Relation as R
136import Control.Exception.Base
136import Control.Exception.Base
137−import GHC.Conc.Sync
137+import Control.Concurrent.STM
138−
138+import Control.Concurrent.Async
139−import Network.Transport (Transport(closeTransport))
140−#if MIN_VERSION_network_transport_tcp(0,7,0)
141−import Network.Transport.TCP (createTransport, defaultTCPParameters, defaultTCPAddr)
142−import Network.Transport.TCP.Internal (encodeEndPointAddress)
143−#elif MIN_VERSION_network_transport_tcp(0,6,0)
144−import Network.Transport.TCP (createTransport, defaultTCPParameters)
145−import Network.Transport.TCP.Internal (encodeEndPointAddress)
146−#else
147−import Network.Transport.TCP (encodeEndPointAddress, createTransport, defaultTCPParameters)
148−#endif
149
139
150−import Control.Distributed.Process.Node (newLocalNode, initRemoteTable, runProcess, LocalNode, forkProcess, closeLocalNode)
151−import Control.Distributed.Process.Extras.Internal.Types (whereisRemote)
152−import Control.Distributed.Process.ManagedProcess.Client (call, safeCall)
153import Data.Either (isRight)
140import Data.Either (isRight)
154import Data.UUID.V4 (nextRandom)
141import Data.UUID.V4 (nextRandom)
155import Data.Word
142import Data.Word
156−import Control.Distributed.Process (ProcessId, Process, receiveWait, send, match, NodeId(..), reconnect)
143+import Data.Hashable
157import Control.Exception (IOException, handle, AsyncException, throwIO, fromException, Exception)
144import Control.Exception (IOException, handle, AsyncException, throwIO, fromException, Exception)
158import Control.Concurrent.MVar
145import Control.Concurrent.MVar
146+import Codec.Winery hiding (Schema, schema)
159import qualified Data.Map as M
147import qualified Data.Map as M
160#if MIN_VERSION_stm_containers(1,0,0)
148#if MIN_VERSION_stm_containers(1,0,0)
161import qualified StmContainers.Map as StmMap
149import qualified StmContainers.Map as StmMap
@@ -167,19 +155,19 @@ import qualified STMContainers.Set as StmSet
167import qualified ProjectM36.Session as Sess
155import qualified ProjectM36.Session as Sess
168import ProjectM36.Session
156import ProjectM36.Session
169import ProjectM36.Sessions
157import ProjectM36.Sessions
170−import Data.Binary (Binary)
171import GHC.Generics (Generic)
158import GHC.Generics (Generic)
172import Control.DeepSeq (force)
159import Control.DeepSeq (force)
173import System.IO
160import System.IO
174import Data.Time.Clock
161import Data.Time.Clock
175−import Data.Typeable
162+import qualified Network.RPC.Curryer.Client as RPC
163+import qualified Network.RPC.Curryer.Server as RPC
164+import Network.Socket (Socket, AddrInfo(..), getAddrInfo, defaultHints, AddrInfoFlag(..), SocketType(..), ServiceName, hostAddressToTuple, SockAddr(..))
165+import GHC.Conc (unsafeIOToSTM)
176
166
177type Hostname = String
167type Hostname = String
178
168
179type Port = Word16
169type Port = Word16
180
170
181−type DatabaseName = String
182−
183-- | The type for notifications callbacks in the client. When a registered notification fires due to a changed relational expression evaluation, the server propagates the notifications to the clients in the form of the callback.
171-- | The type for notifications callbacks in the client. When a registered notification fires due to a changed relational expression evaluation, the server propagates the notifications to the clients in the form of the callback.
184type NotificationCallback = NotificationName -> EvaluatedNotification -> IO ()
172type NotificationCallback = NotificationName -> EvaluatedNotification -> IO ()
185
173
@@ -199,15 +187,16 @@ data RequestTimeoutException = RequestTimeoutException
199
187
200instance Exception RequestTimeoutException
188instance Exception RequestTimeoutException
201
189
202−-- | Construct a 'ConnectionInfo' to describe how to make the 'Connection'. The database can be run within the current process or running remotely via distributed-process.
190+-- | Construct a 'ConnectionInfo' to describe how to make the 'Connection'. The database can be run within the current process or running remotely via RPC.
203−data ConnectionInfo = InProcessConnectionInfo PersistenceStrategy NotificationCallback [GhcPkgPath]|
191+data ConnectionInfo = InProcessConnectionInfo PersistenceStrategy NotificationCallback [GhcPkgPath] |
204− RemoteProcessConnectionInfo DatabaseName NodeId NotificationCallback
192+ RemoteConnectionInfo DatabaseName Hostname ServiceName NotificationCallback
205
193
206type EvaluatedNotifications = M.Map NotificationName EvaluatedNotification
194type EvaluatedNotifications = M.Map NotificationName EvaluatedNotification
207
195
208-- | Used for callbacks from the server when monitored changes have been made.
196-- | Used for callbacks from the server when monitored changes have been made.
209newtype NotificationMessage = NotificationMessage EvaluatedNotifications
197newtype NotificationMessage = NotificationMessage EvaluatedNotifications
210− deriving (Binary, Eq, Show, Generic)
198+ deriving (Eq, Show, Generic)
199+ deriving Serialise via WineryVariant NotificationMessage
211
200
212-- | When a notification is fired, the 'reportOldExpr' is evaluated in the commit's pre-change context while the 'reportNewExpr' is evaluated in the post-change context and they are returned along with the original notification.
201-- | When a notification is fired, the 'reportOldExpr' is evaluated in the commit's pre-change context while the 'reportNewExpr' is evaluated in the post-change context and they are returned along with the original notification.
213data EvaluatedNotification = EvaluatedNotification {
202data EvaluatedNotification = EvaluatedNotification {
@@ -215,13 +204,10 @@ data EvaluatedNotification = EvaluatedNotification {
215 reportOldRelation :: Either RelationalError Relation,
204 reportOldRelation :: Either RelationalError Relation,
216 reportNewRelation :: Either RelationalError Relation
205 reportNewRelation :: Either RelationalError Relation
217 }
206 }
218− deriving(Binary, Eq, Show, Generic)
207+ deriving (Eq, Show, Generic)
208+ deriving Serialise via WineryRecord EvaluatedNotification
219
209
220
210
221−-- | Create a 'NodeId' for use in connecting to a remote server using distributed-process.
222−createNodeId :: Hostname -> Port -> NodeId
223−createNodeId host port = NodeId $ encodeEndPointAddress host (show port) 1
224−
225-- | Use this for connecting to remote servers on the default port.
211-- | Use this for connecting to remote servers on the default port.
226defaultServerPort :: Port
212defaultServerPort :: Port
227defaultServerPort = 6543
213defaultServerPort = 6543
@@ -236,31 +222,16 @@ defaultHeadName = "master"
236
222
237-- | Create a connection configuration which connects to the localhost on the default server port and default server database name. The configured notification callback is set to ignore all events.
223-- | Create a connection configuration which connects to the localhost on the default server port and default server database name. The configured notification callback is set to ignore all events.
238defaultRemoteConnectionInfo :: ConnectionInfo
224defaultRemoteConnectionInfo :: ConnectionInfo
225+defaultRemoteConnectionInfo =
239−defaultRemoteConnectionInfo = RemoteProcessConnectionInfo defaultDatabaseName (createNodeId "127.0.0.1" defaultServerPort) emptyNotificationCallback
226+ RemoteConnectionInfo defaultDatabaseName defaultServerHostname (show defaultServerPort) emptyNotificationCallback
240
227
241−-- | The 'Connection' represents either local or remote access to a database. All operations flow through the connection.
228+defaultServerHostname :: Hostname
242−type ClientNodes = StmSet.Set ProcessId
229+defaultServerHostname = "localhost"
243−
244−-- internal structure specific to in-process connections
245−data InProcessConnectionConf = InProcessConnectionConf {
246− ipPersistenceStrategy :: PersistenceStrategy,
247− ipClientNodes :: ClientNodes,
248− ipSessions :: Sessions,
249− ipTransactionGraph :: TVar TransactionGraph,
250− ipScriptSession :: Maybe ScriptSession,
251− ipLocalNode :: LocalNode,
252− ipTransport :: Transport, -- we hold onto this so that we can close it gracefully
253− ipLocks :: Maybe (LockFile, MVar LockFileHash) -- nothing when NoPersistence
254− }
255
230
256−data RemoteProcessConnectionConf = RemoteProcessConnectionConf {
231+newtype RemoteConnectionConf = RemoteConnectionConf RPC.Connection
257− rLocalNode :: LocalNode,
258− rProcessId :: ProcessId, --remote processId
259− rTransport :: Transport --the TCP socket transport
260− }
261
232
262data Connection = InProcessConnection InProcessConnectionConf |
233data Connection = InProcessConnection InProcessConnectionConf |
263− RemoteProcessConnection RemoteProcessConnectionConf
234+ RemoteConnection RemoteConnectionConf
264
235
265-- | There are several reasons why a connection can fail.
236-- | There are several reasons why a connection can fail.
266data ConnectionError = SetupDatabaseDirectoryError PersistenceError |
237data ConnectionError = SetupDatabaseDirectoryError PersistenceError |
@@ -273,46 +244,14 @@ data ConnectionError = SetupDatabaseDirectoryError PersistenceError |
273remoteDBLookupName :: DatabaseName -> String
244remoteDBLookupName :: DatabaseName -> String
274remoteDBLookupName = (++) "db-"
245remoteDBLookupName = (++) "db-"
275
246
276−createLocalNode :: IO (LocalNode, Transport)
277−createLocalNode = do
278−#if MIN_VERSION_network_transport_tcp(0,7,0)
279− eLocalTransport <- createTransport (defaultTCPAddr "127.0.0.1" "0") defaultTCPParameters
280−#elif MIN_VERSION_network_transport_tcp(0,6,0)
281− eLocalTransport <- createTransport "127.0.0.1" "0" (\sn -> ("127.0.0.1", sn)) defaultTCPParameters
282−#else
283− eLocalTransport <- createTransport "127.0.0.1" "0" defaultTCPParameters
284−#endif
285− case eLocalTransport of
286− Left err -> error ("failed to create transport: " ++ show err)
287− Right localTransport -> do
288− localNode <- newLocalNode localTransport initRemoteTable
289− pure (localNode, localTransport)
290−
291−notificationListener :: NotificationCallback -> Process ()
292−notificationListener callback = do
293− --pid <- getSelfPid
294− --liftIO $ putStrLn $ "LISTENER THREAD START " ++ show pid
295− _ <- forever $
296− receiveWait [
297− match (\(NotificationMessage eNots) ->
298− --say $ "NOTIFICATION: " ++ show eNots
299− -- when notifications are thrown, they are not adjusted for the current schema which could be problematic, but we don't have access to the current session here
300− liftIO $ mapM_ (uncurry callback) (M.toList eNots)
301− )
302− ]
303− --say "LISTENER THREAD EXIT"
304− pure ()
305−
306−startNotificationListener :: LocalNode -> NotificationCallback -> IO ProcessId
307−startNotificationListener localNode callback = forkProcess localNode (notificationListener callback)
308−
309createScriptSession :: [String] -> IO (Maybe ScriptSession)
247createScriptSession :: [String] -> IO (Maybe ScriptSession)
310createScriptSession ghcPkgPaths = do
248createScriptSession ghcPkgPaths = do
311 eScriptSession <- initScriptSession ghcPkgPaths
249 eScriptSession <- initScriptSession ghcPkgPaths
312 case eScriptSession of
250 case eScriptSession of
313− Left err -> hPutStrLn stderr ("Failed to load scripting engine- scripting disabled: " ++ show err) >> pure Nothing --not a fatal error, but the scripting feature must be disabled
251+ Left err -> hPutStrLn stderr ("Warning: Haskell scripting disabled: " ++ show err) >> pure Nothing --not a fatal error, but the scripting feature must be disabled
314 Right s -> pure (Just s)
252 Right s -> pure (Just s)
315
253
254+
316-- | To create a 'Connection' to a remote or local database, create a 'ConnectionInfo' and call 'connectProjectM36'.
255-- | To create a 'Connection' to a remote or local database, create a 'ConnectionInfo' and call 'connectProjectM36'.
317connectProjectM36 :: ConnectionInfo -> IO (Either ConnectionError Connection)
256connectProjectM36 :: ConnectionInfo -> IO (Either ConnectionError Connection)
318--create a new in-memory database/transaction graph
257--create a new in-memory database/transaction graph
@@ -327,42 +266,63 @@ connectProjectM36 (InProcessConnectionInfo strat notificationCallback ghcPkgPath
327 graphTvar <- newTVarIO freshGraph
266 graphTvar <- newTVarIO freshGraph
328 clientNodes <- StmSet.newIO
267 clientNodes <- StmSet.newIO
329 sessions <- StmMap.newIO
268 sessions <- StmMap.newIO
330− (localNode, transport) <- createLocalNode
331− notificationPid <- startNotificationListener localNode notificationCallback
332 mScriptSession <- createScriptSession ghcPkgPaths
269 mScriptSession <- createScriptSession ghcPkgPaths
333−
270+ notifAsync <- startNotificationListener clientNodes notificationCallback
334 let conn = InProcessConnection InProcessConnectionConf {
271 let conn = InProcessConnection InProcessConnectionConf {
335 ipPersistenceStrategy = strat,
272 ipPersistenceStrategy = strat,
336 ipClientNodes = clientNodes,
273 ipClientNodes = clientNodes,
337 ipSessions = sessions,
274 ipSessions = sessions,
338 ipTransactionGraph = graphTvar,
275 ipTransactionGraph = graphTvar,
339 ipScriptSession = mScriptSession,
276 ipScriptSession = mScriptSession,
340− ipLocalNode = localNode,
341− ipTransport = transport,
342− ipLocks = Nothing}
277+ ipLocks = Nothing,
343− addClientNode conn notificationPid
278+ ipCallbackAsync = notifAsync
279+ }
344 pure (Right conn)
280 pure (Right conn)
345 MinimalPersistence dbdir -> connectPersistentProjectM36 strat NoDiskSync dbdir freshGraph notificationCallback ghcPkgPaths
281 MinimalPersistence dbdir -> connectPersistentProjectM36 strat NoDiskSync dbdir freshGraph notificationCallback ghcPkgPaths
346 CrashSafePersistence dbdir -> connectPersistentProjectM36 strat FsyncDiskSync dbdir freshGraph notificationCallback ghcPkgPaths
282 CrashSafePersistence dbdir -> connectPersistentProjectM36 strat FsyncDiskSync dbdir freshGraph notificationCallback ghcPkgPaths
347
283
348−connectProjectM36 (RemoteProcessConnectionInfo databaseName serverNodeId notificationCallback) = do
284+connectProjectM36 (RemoteConnectionInfo dbName hostName servicePort notificationCallback) = do
349− connStatus <- newEmptyMVar
285+ --TODO- add notification callback thread
350− (localNode, transport) <- createLocalNode
286+ let resolutionHints = defaultHints { addrFlags = [AI_NUMERICHOST, AI_NUMERICSERV],
351− let dbName = remoteDBLookupName databaseName
287+ addrSocketType = Stream
352− --putStrLn $ "Connecting to " ++ show serverNodeId ++ " " ++ dbName
288+ }
353− notificationListenerPid <- startNotificationListener localNode notificationCallback
289+ resolved <- getAddrInfo (Just resolutionHints) (Just hostName) (Just servicePort)
354− runProcess localNode $ do
290+ case resolved of
355− --even a failed connection retains an open socket!
291+ [] -> error ("DNS resolution failed for" <> hostName <> ":" <> servicePort)
356− mServerProcessId <- whereisRemote serverNodeId dbName
292+ addrInfo:_ -> do
357− case mServerProcessId of
293+ --supports IPv4 only for now
358− Nothing -> liftIO $ putMVar connStatus $ Left (NoSuchDatabaseByNameError databaseName)
294+ let (SockAddrInet port addr) = addrAddress addrInfo
359− Just serverProcessId -> do
295+ notificationHandlers =
360− loginConfirmation <- safeLogin (Login notificationListenerPid) serverProcessId
296+ [RPC.ClientAsyncRequestHandler $
361− if not loginConfirmation then
297+ \(NotificationMessage notifications') ->
362− liftIO $ putMVar connStatus (Left LoginError)
298+ forM_ (M.toList notifications') (uncurry notificationCallback)
363− else
299+ ]
364− liftIO $ putMVar connStatus (Right $ RemoteProcessConnection RemoteProcessConnectionConf {rLocalNode = localNode, rProcessId = serverProcessId, rTransport = transport})
300+ let connectExcHandler (e :: IOException) = pure $ Left (IOExceptionError e)
365− takeMVar connStatus
301+ eConn <- (Right <$> RPC.connect notificationHandlers (hostAddressToTuple addr) port) `catch` connectExcHandler
302+ case eConn of
303+ Left err -> pure (Left err)
304+ Right conn -> do
305+ eRet <- RPC.call conn (Login dbName)
306+ case eRet of
307+ Left err -> error (show err)
308+ Right False -> error "wtf"
309+ Right True ->
310+ --TODO handle connection errors!
311+ pure (Right (RemoteConnection (RemoteConnectionConf conn)))
312+
313+--convert RPC errors into exceptions
314+convertRPCErrors :: RPC.ConnectionError -> IO a
315+convertRPCErrors err =
316+ case err of
317+ RPC.TimeoutError -> throw RequestTimeoutException
318+ RPC.CodecError msg -> error $ "decoding message failed on server: " <> msg
319+ RPC.ExceptionError msg -> error $ "server threw exception: " <> msg
320+
321+addClientNode :: Connection -> RPC.Locking Socket -> IO ()
322+addClientNode (RemoteConnection _) _ = error "addClientNode called on remote connection"
323+addClientNode (InProcessConnection conf) lockSock = atomically (StmSet.insert clientInfo (ipClientNodes conf))
324+ where
325+ clientInfo = RemoteClientInfo lockSock
366
326
367connectPersistentProjectM36 :: PersistenceStrategy ->
327connectPersistentProjectM36 :: PersistenceStrategy ->
368 DiskSync ->
328 DiskSync ->
@@ -387,29 +347,34 @@ connectPersistentProjectM36 strat sync dbdir freshGraph notificationCallback ghc
387 tvarGraph <- newTVarIO graph'
347 tvarGraph <- newTVarIO graph'
388 sessions <- StmMap.newIO
348 sessions <- StmMap.newIO
389 clientNodes <- StmSet.newIO
349 clientNodes <- StmSet.newIO
390− (localNode, transport) <- createLocalNode
391 lockMVar <- newMVar digest
350 lockMVar <- newMVar digest
351+ notifAsync <- startNotificationListener clientNodes notificationCallback
392 let conn = InProcessConnection InProcessConnectionConf {
352 let conn = InProcessConnection InProcessConnectionConf {
393 ipPersistenceStrategy = strat,
353 ipPersistenceStrategy = strat,
394 ipClientNodes = clientNodes,
354 ipClientNodes = clientNodes,
395 ipSessions = sessions,
355 ipSessions = sessions,
396 ipTransactionGraph = tvarGraph,
356 ipTransactionGraph = tvarGraph,
397 ipScriptSession = mScriptSession,
357 ipScriptSession = mScriptSession,
398− ipLocalNode = localNode,
399− ipTransport = transport,
400− ipLocks = Just (lockFileH, lockMVar)
358+ ipLocks = Just (lockFileH, lockMVar),
359+ ipCallbackAsync = notifAsync
401 }
360 }
402−
403− notificationPid <- startNotificationListener localNode notificationCallback
404− addClientNode conn notificationPid
405 pure (Right conn)
361 pure (Right conn)
406−
362+
363+--startup local async process to handle notification callbacks
364+startNotificationListener :: ClientNodes -> NotificationCallback -> IO (Async ())
365+startNotificationListener cNodes notificationCallback = do
366+ inProcessClientInfo@(InProcessClientInfo notifMVar) <- InProcessClientInfo <$> newEmptyMVar
367+ atomically $ StmSet.insert inProcessClientInfo cNodes
368+ async $ forever $ do
369+ notifs <- takeMVar notifMVar
370+ forM_ (M.toList notifs) $ uncurry notificationCallback
371+
407-- | Create a new session at the transaction id and return the session's Id.
372-- | Create a new session at the transaction id and return the session's Id.
408createSessionAtCommit :: Connection -> TransactionId -> IO (Either RelationalError SessionId)
373createSessionAtCommit :: Connection -> TransactionId -> IO (Either RelationalError SessionId)
409createSessionAtCommit conn@(InProcessConnection _) commitId = do
374createSessionAtCommit conn@(InProcessConnection _) commitId = do
410 newSessionId <- nextRandom
375 newSessionId <- nextRandom
411 atomically $ createSessionAtCommit_ commitId newSessionId conn
376 atomically $ createSessionAtCommit_ commitId newSessionId conn
412−createSessionAtCommit conn@(RemoteProcessConnection _) uuid = remoteCall conn (CreateSessionAtCommit uuid)
377+createSessionAtCommit conn@(RemoteConnection _) uuid = remoteCall conn (CreateSessionAtCommit uuid)
413
378
414createSessionAtCommit_ :: TransactionId -> SessionId -> Connection -> STM (Either RelationalError SessionId)
379createSessionAtCommit_ :: TransactionId -> SessionId -> Connection -> STM (Either RelationalError SessionId)
415createSessionAtCommit_ commitId newSessionId (InProcessConnection conf) = do
380createSessionAtCommit_ commitId newSessionId (InProcessConnection conf) = do
@@ -426,7 +391,7 @@ createSessionAtCommit_ commitId newSessionId (InProcessConnection conf) = do
426 Nothing -> do
391 Nothing -> do
427 StmMap.insert (Session freshDiscon defaultSchemaName) newSessionId sessions
392 StmMap.insert (Session freshDiscon defaultSchemaName) newSessionId sessions
428 pure $ Right newSessionId
393 pure $ Right newSessionId
429−createSessionAtCommit_ _ _ (RemoteProcessConnection _) = error "createSessionAtCommit_ called on remote connection"
394+createSessionAtCommit_ _ _ (RemoteConnection _) = error "createSessionAtCommit_ called on remote connection"
430
395
431-- | Call 'createSessionAtHead' with a transaction graph's head's name to create a new session pinned to that head. This function returns a 'SessionId' which can be used in other function calls to reference the point in the transaction graph.
396-- | Call 'createSessionAtHead' with a transaction graph's head's name to create a new session pinned to that head. This function returns a 'SessionId' which can be used in other function calls to reference the point in the transaction graph.
432createSessionAtHead :: Connection -> HeadName -> IO (Either RelationalError SessionId)
397createSessionAtHead :: Connection -> HeadName -> IO (Either RelationalError SessionId)
@@ -438,22 +403,18 @@ createSessionAtHead conn@(InProcessConnection conf) headn = do
438 case transactionForHead headn graph of
403 case transactionForHead headn graph of
439 Nothing -> pure $ Left (NoSuchHeadNameError headn)
404 Nothing -> pure $ Left (NoSuchHeadNameError headn)
440 Just trans -> createSessionAtCommit_ (transactionId trans) newSessionId conn
405 Just trans -> createSessionAtCommit_ (transactionId trans) newSessionId conn
441−createSessionAtHead conn@(RemoteProcessConnection _) headn = remoteCall conn (CreateSessionAtHead headn)
406+createSessionAtHead conn@(RemoteConnection _) headn = remoteCall conn (CreateSessionAtHead headn)
442−
443−-- | Used internally for server connections to keep track of remote nodes for the purpose of sending notifications later.
444−addClientNode :: Connection -> ProcessId -> IO ()
445−addClientNode (RemoteProcessConnection _) _ = error "addClientNode called on remote connection"
446−addClientNode (InProcessConnection conf) newProcessId = atomically (StmSet.insert newProcessId (ipClientNodes conf))
447
407
448-- | Discards a session, eliminating any uncommitted changes present in the session.
408-- | Discards a session, eliminating any uncommitted changes present in the session.
449closeSession :: SessionId -> Connection -> IO ()
409closeSession :: SessionId -> Connection -> IO ()
450closeSession sessionId (InProcessConnection conf) =
410closeSession sessionId (InProcessConnection conf) =
451 atomically $ StmMap.delete sessionId (ipSessions conf)
411 atomically $ StmMap.delete sessionId (ipSessions conf)
452−closeSession sessionId conn@(RemoteProcessConnection _) = remoteCall conn (CloseSession sessionId)
412+closeSession sessionId conn@(RemoteConnection _) = remoteCall conn (CloseSession sessionId)
453
413
454-- | 'close' cleans up the database access connection and closes any relevant sockets.
414-- | 'close' cleans up the database access connection and closes any relevant sockets.
455close :: Connection -> IO ()
415close :: Connection -> IO ()
456close (InProcessConnection conf) = do
416close (InProcessConnection conf) = do
417+ cancel (ipCallbackAsync conf)
457 atomically $ do
418 atomically $ do
458 let sessions = ipSessions conf
419 let sessions = ipSessions conf
459#if MIN_VERSION_stm_containers(1,0,0)
420#if MIN_VERSION_stm_containers(1,0,0)
@@ -462,22 +423,18 @@ close (InProcessConnection conf) = do
462 StmMap.deleteAll sessions
423 StmMap.deleteAll sessions
463#endif
424#endif
464 pure ()
425 pure ()
465− closeLocalNode (ipLocalNode conf)
466− closeTransport (ipTransport conf)
467 let mLocks = ipLocks conf
426 let mLocks = ipLocks conf
468 case mLocks of
427 case mLocks of
469 Nothing -> pure ()
428 Nothing -> pure ()
470 Just (lockFileH, _) -> closeLockFile lockFileH
429 Just (lockFileH, _) -> closeLockFile lockFileH
471
430
472−close conn@(RemoteProcessConnection conf) = do
431+close (RemoteConnection (RemoteConnectionConf conn)) =
473− _ <- remoteCall conn Logout :: IO Bool
432+ RPC.close conn
474− closeLocalNode (rLocalNode conf)
475− closeTransport (rTransport conf)
476
433
477--used only by the server EntryPoints
434--used only by the server EntryPoints
478closeRemote_ :: Connection -> IO ()
435closeRemote_ :: Connection -> IO ()
479closeRemote_ (InProcessConnection _) = error "invalid call of closeRemote_ on InProcessConnection"
436closeRemote_ (InProcessConnection _) = error "invalid call of closeRemote_ on InProcessConnection"
480−closeRemote_ (RemoteProcessConnection conf) = runProcess (rLocalNode conf) (reconnect (rProcessId conf))
437+closeRemote_ (RemoteConnection (RemoteConnectionConf conn)) = RPC.close conn
481
438
482 --we need to actually close the localNode's connection to the remote
439 --we need to actually close the localNode's connection to the remote
483--within the database server, we must catch and handle all exception lest they take down the database process- this handling might be different for other use-cases
440--within the database server, we must catch and handle all exception lest they take down the database process- this handling might be different for other use-cases
@@ -488,35 +445,15 @@ excEither = handle handler
488 where
445 where
489 handler exc | Just (_ :: AsyncException) <- fromException exc = throwIO exc
446 handler exc | Just (_ :: AsyncException) <- fromException exc = throwIO exc
490 | otherwise = pure (Left (UnhandledExceptionError (show exc)))
447 | otherwise = pure (Left (UnhandledExceptionError (show exc)))
491−
492−runProcessResult :: LocalNode -> Process a -> IO a
493−runProcessResult localNode proc = do
494− ret <- newEmptyMVar
495− runProcess localNode $ do
496− val <- proc
497− liftIO $ putMVar ret val
498− takeMVar ret
499−
500−safeLogin :: Login -> ProcessId -> Process Bool
501−safeLogin login procId = do
502− ret <- call procId login
503− case ret of
504− Left (_ :: ServerError) -> pure False
505− Right val -> pure val
506
448
449+
507−remoteCall :: (Binary a, Binary b, Typeable a, Typeable b) => Connection -> a -> IO b
450+remoteCall :: (Serialise a, Serialise b) => Connection -> a -> IO b
508remoteCall (InProcessConnection _ ) _ = error "remoteCall called on local connection"
451remoteCall (InProcessConnection _ ) _ = error "remoteCall called on local connection"
509−remoteCall (RemoteProcessConnection conf) arg = runProcessResult localNode $ do
452+remoteCall (RemoteConnection (RemoteConnectionConf rpcConn)) arg = do
510− ret <- safeCall serverProcessId arg
453+ eRet <- RPC.call rpcConn arg
511− case ret of
454+ case eRet of
512− Left err -> error ("server died: " ++ show err)
455+ Left err -> convertRPCErrors err
513− Right ret' -> case ret' of
514− Left RequestTimeoutError -> liftIO (throwIO RequestTimeoutException)
515− Left (ProcessDiedError _) -> liftIO (throwIO RemoteProcessDiedException)
516− Right val -> pure val
456+ Right val -> pure val
517− where
518− localNode = rLocalNode conf
519− serverProcessId = rProcessId conf
520
457
521sessionForSessionId :: SessionId -> Sessions -> STM (Either RelationalError Session)
458sessionForSessionId :: SessionId -> Sessions -> STM (Either RelationalError Session)
522sessionForSessionId sessionId sessions =
459sessionForSessionId sessionId sessions =
@@ -551,7 +488,7 @@ currentSchemaName sessionId (InProcessConnection conf) = atomically $ do
551 case eSession of
488 case eSession of
552 Left err -> pure (Left err)
489 Left err -> pure (Left err)
553 Right session -> pure (Right (Sess.schemaName session))
490 Right session -> pure (Right (Sess.schemaName session))
554−currentSchemaName sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveCurrentSchemaName sessionId)
491+currentSchemaName sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveCurrentSchemaName sessionId)
555
492
556-- | Switch to the named isomorphic schema.
493-- | Switch to the named isomorphic schema.
557setCurrentSchemaName :: SessionId -> Connection -> SchemaName -> IO (Either RelationalError ())
494setCurrentSchemaName :: SessionId -> Connection -> SchemaName -> IO (Either RelationalError ())
@@ -563,7 +500,7 @@ setCurrentSchemaName sessionId (InProcessConnection conf) sname = atomically $ d
563 Right session -> case Sess.setSchemaName sname session of
500 Right session -> case Sess.setSchemaName sname session of
564 Left err -> pure (Left err)
501 Left err -> pure (Left err)
565 Right newSession -> StmMap.insert newSession sessionId sessions >> pure (Right ())
502 Right newSession -> StmMap.insert newSession sessionId sessions >> pure (Right ())
566−setCurrentSchemaName sessionId conn@(RemoteProcessConnection _) sname = remoteCall conn (ExecuteSetCurrentSchema sessionId sname)
503+setCurrentSchemaName sessionId conn@(RemoteConnection _) sname = remoteCall conn (ExecuteSetCurrentSchema sessionId sname)
567
504
568-- | Execute a relational expression in the context of the session and connection. Relational expressions are queries and therefore cannot alter the database.
505-- | Execute a relational expression in the context of the session and connection. Relational expressions are queries and therefore cannot alter the database.
569executeRelationalExpr :: SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)
506executeRelationalExpr :: SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)
@@ -587,7 +524,7 @@ executeRelationalExpr sessionId (InProcessConnection conf) expr = excEither $ at
587 Right rel -> pure (force (Right rel)) -- this is necessary so that any undefined/error exceptions are spit out here
524 Right rel -> pure (force (Right rel)) -- this is necessary so that any undefined/error exceptions are spit out here
588 Left err -> pure (Left err)
525 Left err -> pure (Left err)
589
526
590−executeRelationalExpr sessionId conn@(RemoteProcessConnection _) relExpr = remoteCall conn (ExecuteRelationalExpr sessionId relExpr)
527+executeRelationalExpr sessionId conn@(RemoteConnection _) relExpr = remoteCall conn (ExecuteRelationalExpr sessionId relExpr)
591
528
592-- | Execute a database context expression in the context of the session and connection. Database expressions modify the current session's disconnected transaction but cannot modify the transaction graph.
529-- | Execute a database context expression in the context of the session and connection. Database expressions modify the current session's disconnected transaction but cannot modify the transaction graph.
593executeDatabaseContextExpr :: SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError ())
530executeDatabaseContextExpr :: SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError ())
@@ -621,7 +558,7 @@ executeDatabaseContextExpr sessionId (InProcessConnection conf) expr = excEither
621 newSession = Session newDiscon (Sess.schemaName session)
558 newSession = Session newDiscon (Sess.schemaName session)
622 StmMap.insert newSession sessionId sessions
559 StmMap.insert newSession sessionId sessions
623 pure (Right ())
560 pure (Right ())
624−executeDatabaseContextExpr sessionId conn@(RemoteProcessConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextExpr sessionId dbExpr)
561+executeDatabaseContextExpr sessionId conn@(RemoteConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextExpr sessionId dbExpr)
625
562
626-- | Similar to a git rebase, 'autoMergeToHead' atomically creates a temporary branch and merges it to the latest commit of the branch referred to by the 'HeadName' and commits the merge. This is useful to reduce incidents of 'TransactionIsNotAHeadError's but at the risk of merge errors (thus making it similar to rebasing). Alternatively, as an optimization, if a simple commit is possible (meaning that the head has not changed), then a fast-forward commit takes place instead.
563-- | Similar to a git rebase, 'autoMergeToHead' atomically creates a temporary branch and merges it to the latest commit of the branch referred to by the 'HeadName' and commits the merge. This is useful to reduce incidents of 'TransactionIsNotAHeadError's but at the risk of merge errors (thus making it similar to rebasing). Alternatively, as an optimization, if a simple commit is possible (meaning that the head has not changed), then a fast-forward commit takes place instead.
627autoMergeToHead :: SessionId -> Connection -> MergeStrategy -> HeadName -> IO (Either RelationalError ())
564autoMergeToHead :: SessionId -> Connection -> MergeStrategy -> HeadName -> IO (Either RelationalError ())
@@ -650,7 +587,7 @@ autoMergeToHead sessionId (InProcessConnection conf) strat headName' = do
650 Left err -> pure (Left err)
587 Left err -> pure (Left err)
651 Right ((discon', graph'), transactionIdsAdded) ->
588 Right ((discon', graph'), transactionIdsAdded) ->
652 pure (Right (discon', graph', transactionIdsAdded))
589 pure (Right (discon', graph', transactionIdsAdded))
653−autoMergeToHead sessionId conn@(RemoteProcessConnection _) strat headName' = remoteCall conn (ExecuteAutoMergeToHead sessionId strat headName')
590+autoMergeToHead sessionId conn@(RemoteConnection _) strat headName' = remoteCall conn (ExecuteAutoMergeToHead sessionId strat headName')
654
591
655-- | Execute a database context IO-monad-based expression for the given session and connection. `DatabaseContextIOExpr`s modify the DatabaseContext but cannot be purely implemented.
592-- | Execute a database context IO-monad-based expression for the given session and connection. `DatabaseContextIOExpr`s modify the DatabaseContext but cannot be purely implemented.
656--this is almost completely identical to executeDatabaseContextExpr above
593--this is almost completely identical to executeDatabaseContextExpr above
@@ -676,22 +613,8 @@ executeDatabaseContextIOExpr sessionId (InProcessConnection conf) expr = excEith
676 context' = RE.dbc_context newState
613 context' = RE.dbc_context newState
677 atomically $ StmMap.insert newSession sessionId sessions
614 atomically $ StmMap.insert newSession sessionId sessions
678 pure (Right ())
615 pure (Right ())
679−executeDatabaseContextIOExpr sessionId conn@(RemoteProcessConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextIOExpr sessionId dbExpr)
616+executeDatabaseContextIOExpr sessionId conn@(RemoteConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextIOExpr sessionId dbExpr)
680
617
681−{-
682−executeGraphExprSTM_ :: TransactionId -> SessionId -> Session -> Sessions -> TransactionGraphOperator -> TransactionGraph -> TVar TransactionGraph -> STM (Either RelationalError (TransactionGraph, DisconnectedTransaction)
683−executeGraphExprSTM_ freshId sessionId session sessions graphExpr graph graphTVar= do
684− case evalGraphOp freshId (Sess.disconnectedTransaction session) graph graphExpr of
685− Left err -> do
686− when updateGraphOnError (writeTVar graphTVar graph)
687− pure $ Left err
688− Right (discon', graph') -> do
689− writeTVar graphTVar graph'
690− let newSession = Session discon' (Sess.schemaName session)
691− STMMap.insert newSession sessionId sessions
692− pure $ Right graph'
693−-}
694−
695-- process notifications for commits
618-- process notifications for commits
696executeCommitExprSTM_
619executeCommitExprSTM_
697 :: TransactionGraph
620 :: TransactionGraph
@@ -732,78 +655,8 @@ executeGraphExpr sessionId (InProcessConnection conf) graphExpr = excEither $ do
732 --if freshId appears in the graph, then we need to pass it on
655 --if freshId appears in the graph, then we need to pass it on
733 let transIds = [freshId | isRight (RE.transactionForId freshId graph')]
656 let transIds = [freshId | isRight (RE.transactionForId freshId graph')]
734 pure (Right (discon', graph', transIds))
657 pure (Right (discon', graph', transIds))
735−{-
658+
736−executeGraphExpr sessionId (InProcessConnection conf) graphExpr = excEither $ do
737− let strat = ipPersistenceStrategy conf
738− clientNodes = ipClientNodes conf
739− sessions = ipSessions conf
740− graphTvar = ipTransactionGraph conf
741− mLockFileH = ipLocks conf
742− lockHandler body = case graphExpr of
743− Commit -> case mLockFileH of
744− Nothing -> body False
745− Just (lockFileH, lockMVar) -> let acquireLocks = do
746− lastWrittenDigest <- takeMVar lockMVar
747− lockFile lockFileH WriteLock
748− latestDigest <- readGraphTransactionIdDigest strat
749− pure (latestDigest /= lastWrittenDigest)
750−
751− releaseLocks _ = do
752− --still holding the lock- get the latest digest
753− gDigest <- readGraphTransactionIdDigest strat
754− unlockFile lockFileH
755− putMVar lockMVar gDigest
756− in bracket acquireLocks releaseLocks body
757− _ -> body False
758− freshId <- nextRandom
759− lockHandler $ \dbWrittenByOtherProcess -> do
760− --if the database file has been updated since we wrote it last, load it before trying to sync our version done- this can result in TransactionNotAHeadErrors
761− --read transaction data and compare to existing graph
762− --in the future, we can detect if updated transaction graph can be safely merged (such as with a transaction on a separate head) (rebase-able commits should force the user to rebase from the client to confirm that the action makes sense)
763− manip <- atomically $ do
764− eSession <- sessionForSessionId sessionId sessions
765− --handle graph update by other process
766− oldGraph <- readTVar graphTvar
767− case eSession of
768− Left err -> pure (Left err)
769− Right session -> do
770− let mScriptSession = ipScriptSession conf
771− dbdir = case strat of
772− MinimalPersistence x -> x
773− CrashSafePersistence x -> x
774− _ -> error "accessing dbdir on non-persisted connection"
775− eRefreshedGraph <- if dbWrittenByOtherProcess then
776− unsafeIOToSTM (transactionGraphLoad dbdir oldGraph mScriptSession)
777− else
778− pure (Right oldGraph)
779− case eRefreshedGraph of
780− Left err -> pure (Left (DatabaseLoadError err))
781− Right refreshedGraph -> do
782− --snip it
783− eGraph <- executeGraphExprSTM_ dbWrittenByOtherProcess freshId sessionId session sessions graphExpr refreshedGraph graphTvar
784− --snip it
785− case eGraph of
786− Left err -> pure (Left err)
787− Right newGraph -> do
788− --handle commit
789− if isCommit graphExpr then do
790− case transactionForId (Sess.parentId session) oldGraph of
791− Left err -> pure $ Left err
792− Right previousTrans -> do
793− (evaldNots, nodes) <- executeCommitExprSTM_ (Trans.concreteDatabaseContext previousTrans) (Sess.concreteDatabaseContext session) clientNodes
794− nodesToNotify <- toList (StmSet.stream nodes)
795− pure $ Right (evaldNots, nodesToNotify, newGraph)
796− else
797− pure $ Right (M.empty, [], newGraph)
798− case manip of
799− Left err -> return $ Just err
800− Right (notsToFire, nodesToNotify, newGraph) -> do
801− --update filesystem database, if necessary
802− processTransactionGraphPersistence strat newGraph
803− sendNotifications nodesToNotify (ipLocalNode conf) notsToFire
804− pure Nothing
805−-}
806−executeGraphExpr sessionId conn@(RemoteProcessConnection _) graphExpr = remoteCall conn (ExecuteGraphExpr sessionId graphExpr)
659+executeGraphExpr sessionId conn@(RemoteConnection _) graphExpr = remoteCall conn (ExecuteGraphExpr sessionId graphExpr)
807
660
808-- | A trans-graph expression is a relational query executed against the entirety of a transaction graph.
661-- | A trans-graph expression is a relational query executed against the entirety of a transaction graph.
809executeTransGraphRelationalExpr :: SessionId -> Connection -> TransGraphRelationalExpr -> IO (Either RelationalError Relation)
662executeTransGraphRelationalExpr :: SessionId -> Connection -> TransGraphRelationalExpr -> IO (Either RelationalError Relation)
@@ -811,10 +664,7 @@ executeTransGraphRelationalExpr _ (InProcessConnection conf) tgraphExpr = excEit
811 let graphTvar = ipTransactionGraph conf
664 let graphTvar = ipTransactionGraph conf
812 graph <- readTVar graphTvar
665 graph <- readTVar graphTvar
813 pure $ force $ optimizeAndEvalTransGraphRelationalExpr graph tgraphExpr
666 pure $ force $ optimizeAndEvalTransGraphRelationalExpr graph tgraphExpr
814−{- case runReader (RE.evalRelationalExpr relExpr) (RE.mkRelationalExprState DBC.empty) of
815− Left err -> pure (Left err)
816− Right rel -> pure (force (Right rel))-}
817−executeTransGraphRelationalExpr sessionId conn@(RemoteProcessConnection _) tgraphExpr = remoteCall conn (ExecuteTransGraphRelationalExpr sessionId tgraphExpr)
667+executeTransGraphRelationalExpr sessionId conn@(RemoteConnection _) tgraphExpr = remoteCall conn (ExecuteTransGraphRelationalExpr sessionId tgraphExpr)
818
668
819-- | Schema expressions manipulate the isomorphic schemas for the current 'DatabaseContext'.
669-- | Schema expressions manipulate the isomorphic schemas for the current 'DatabaseContext'.
820executeSchemaExpr :: SessionId -> Connection -> Schema.SchemaExpr -> IO (Either RelationalError ())
670executeSchemaExpr :: SessionId -> Connection -> Schema.SchemaExpr -> IO (Either RelationalError ())
@@ -837,23 +687,24 @@ executeSchemaExpr sessionId (InProcessConnection conf) schemaExpr = atomically $
837 newSession = Session (DisconnectedTransaction (Discon.parentId discon) newSchemas False) (Sess.schemaName session)
687 newSession = Session (DisconnectedTransaction (Discon.parentId discon) newSchemas False) (Sess.schemaName session)
838 StmMap.insert newSession sessionId sessions
688 StmMap.insert newSession sessionId sessions
839 pure (Right ())
689 pure (Right ())
840−executeSchemaExpr sessionId conn@(RemoteProcessConnection _) schemaExpr = remoteCall conn (ExecuteSchemaExpr sessionId schemaExpr)
690+executeSchemaExpr sessionId conn@(RemoteConnection _) schemaExpr = remoteCall conn (ExecuteSchemaExpr sessionId schemaExpr)
841
691
842-- | After modifying a 'DatabaseContext', 'commit' the transaction to the transaction graph at the head which the session is referencing. This will also trigger checks for any notifications which need to be propagated.
692-- | After modifying a 'DatabaseContext', 'commit' the transaction to the transaction graph at the head which the session is referencing. This will also trigger checks for any notifications which need to be propagated.
843commit :: SessionId -> Connection -> IO (Either RelationalError ())
693commit :: SessionId -> Connection -> IO (Either RelationalError ())
844commit sessionId conn@(InProcessConnection _) = executeGraphExpr sessionId conn Commit
694commit sessionId conn@(InProcessConnection _) = executeGraphExpr sessionId conn Commit
845−commit sessionId conn@(RemoteProcessConnection _) = remoteCall conn (ExecuteGraphExpr sessionId Commit)
695+commit sessionId conn@(RemoteConnection _) = remoteCall conn (ExecuteGraphExpr sessionId Commit)
846−
696+
847−sendNotifications :: [ProcessId] -> LocalNode -> EvaluatedNotifications -> IO ()
697+sendNotifications :: [ClientInfo] -> EvaluatedNotifications -> IO ()
848−sendNotifications pids localNode nots = mapM_ sendNots pids
698+sendNotifications clients notifs =
849− where
699+ unless (M.null notifs) $ forM_ clients sender
850− sendNots remoteClientPid =
700+ where
851− unless (M.null nots) $ runProcess localNode $ send remoteClientPid (NotificationMessage nots)
701+ sender (RemoteClientInfo sock) = RPC.sendMessage sock (NotificationMessage notifs)
852−
702+ sender (InProcessClientInfo tvar) = putMVar tvar notifs
703+
853-- | Discard any changes made in the current 'Session' and 'DatabaseContext'. This resets the disconnected transaction to reference the original database context of the parent transaction and is a very cheap operation.
704-- | Discard any changes made in the current 'Session' and 'DatabaseContext'. This resets the disconnected transaction to reference the original database context of the parent transaction and is a very cheap operation.
854rollback :: SessionId -> Connection -> IO (Either RelationalError ())
705rollback :: SessionId -> Connection -> IO (Either RelationalError ())
855rollback sessionId conn@(InProcessConnection _) = executeGraphExpr sessionId conn Rollback
706rollback sessionId conn@(InProcessConnection _) = executeGraphExpr sessionId conn Rollback
856−rollback sessionId conn@(RemoteProcessConnection _) = remoteCall conn (ExecuteGraphExpr sessionId Rollback)
707+rollback sessionId conn@(RemoteConnection _) = remoteCall conn (ExecuteGraphExpr sessionId Rollback)
857
708
858-- | Write the transaction graph to disk. This function can be used to incrementally write new transactions to disk.
709-- | Write the transaction graph to disk. This function can be used to incrementally write new transactions to disk.
859processTransactionGraphPersistence :: PersistenceStrategy -> [TransactionId] -> TransactionGraph -> IO ()
710processTransactionGraphPersistence :: PersistenceStrategy -> [TransactionId] -> TransactionGraph -> IO ()
@@ -869,7 +720,7 @@ readGraphTransactionIdDigest (CrashSafePersistence dbdir) = readGraphTransaction
869-- | Return a relation whose type would match that of the relational expression if it were executed. This is useful for checking types and validating a relational expression's types.
720-- | Return a relation whose type would match that of the relational expression if it were executed. This is useful for checking types and validating a relational expression's types.
870typeForRelationalExpr :: SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)
721typeForRelationalExpr :: SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)
871typeForRelationalExpr sessionId conn@(InProcessConnection _) relExpr = atomically $ typeForRelationalExprSTM sessionId conn relExpr
722typeForRelationalExpr sessionId conn@(InProcessConnection _) relExpr = atomically $ typeForRelationalExprSTM sessionId conn relExpr
872−typeForRelationalExpr sessionId conn@(RemoteProcessConnection _) relExpr = remoteCall conn (ExecuteTypeForRelationalExpr sessionId relExpr)
723+typeForRelationalExpr sessionId conn@(RemoteConnection _) relExpr = remoteCall conn (ExecuteTypeForRelationalExpr sessionId relExpr)
873
724
874typeForRelationalExprSTM :: SessionId -> Connection -> RelationalExpr -> STM (Either RelationalError Relation)
725typeForRelationalExprSTM :: SessionId -> Connection -> RelationalExpr -> STM (Either RelationalError Relation)
875typeForRelationalExprSTM sessionId (InProcessConnection conf) relExpr = do
726typeForRelationalExprSTM sessionId (InProcessConnection conf) relExpr = do
@@ -906,7 +757,7 @@ inclusionDependencies sessionId (InProcessConnection conf) = do
906 else
757 else
907 pure (Schema.inclusionDependenciesInSchema schema (B.inclusionDependencies context))
758 pure (Schema.inclusionDependenciesInSchema schema (B.inclusionDependencies context))
908
759
909−inclusionDependencies sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveInclusionDependencies sessionId)
760+inclusionDependencies sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveInclusionDependencies sessionId)
910
761
911typeConstructorMapping :: SessionId -> Connection -> IO (Either RelationalError TypeConstructorMapping)
762typeConstructorMapping :: SessionId -> Connection -> IO (Either RelationalError TypeConstructorMapping)
912typeConstructorMapping sessionId (InProcessConnection conf) = do
763typeConstructorMapping sessionId (InProcessConnection conf) = do
@@ -917,7 +768,7 @@ typeConstructorMapping sessionId (InProcessConnection conf) = do
917 Left err -> pure $ Left err
768 Left err -> pure $ Left err
918 Right (session, _) -> --warning, no schema support for typeconstructors
769 Right (session, _) -> --warning, no schema support for typeconstructors
919 pure (Right (B.typeConstructorMapping (Sess.concreteDatabaseContext session)))
770 pure (Right (B.typeConstructorMapping (Sess.concreteDatabaseContext session)))
920−typeConstructorMapping sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveTypeConstructorMapping sessionId)
771+typeConstructorMapping sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveTypeConstructorMapping sessionId)
921
772
922-- | Return an optimized database expression which is logically equivalent to the input database expression. This function can be used to determine which expression will actually be evaluated.
773-- | Return an optimized database expression which is logically equivalent to the input database expression. This function can be used to determine which expression will actually be evaluated.
923planForDatabaseContextExpr :: SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError GraphRefDatabaseContextExpr)
774planForDatabaseContextExpr :: SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError GraphRefDatabaseContextExpr)
@@ -937,7 +788,7 @@ planForDatabaseContextExpr sessionId (InProcessConnection conf) dbExpr = do
937 else -- don't show any optimization because the current optimization infrastructure relies on access to the base context- this probably underscores the need for each schema to have its own DatabaseContext, even if it is generated on-the-fly-}
788 else -- don't show any optimization because the current optimization infrastructure relies on access to the base context- this probably underscores the need for each schema to have its own DatabaseContext, even if it is generated on-the-fly-}
938 pure (Left NonConcreteSchemaPlanError)
789 pure (Left NonConcreteSchemaPlanError)
939
790
940−planForDatabaseContextExpr sessionId conn@(RemoteProcessConnection _) dbExpr = remoteCall conn (RetrievePlanForDatabaseContextExpr sessionId dbExpr)
791+planForDatabaseContextExpr sessionId conn@(RemoteConnection _) dbExpr = remoteCall conn (RetrievePlanForDatabaseContextExpr sessionId dbExpr)
941
792
942-- | Return a relation which represents the current state of the global transaction graph. The attributes are
793-- | Return a relation which represents the current state of the global transaction graph. The attributes are
943-- * current- boolean attribute representing whether or not the current session references this transaction
794-- * current- boolean attribute representing whether or not the current session references this transaction
@@ -955,7 +806,7 @@ transactionGraphAsRelation sessionId (InProcessConnection conf) = do
955 Right session ->
806 Right session ->
956 graphAsRelation (Sess.disconnectedTransaction session) <$> readTVar tvar
807 graphAsRelation (Sess.disconnectedTransaction session) <$> readTVar tvar
957
808
958−transactionGraphAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveTransactionGraph sessionId)
809+transactionGraphAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveTransactionGraph sessionId)
959
810
960-- | Returns the names and types of the relation variables in the current 'Session'.
811-- | Returns the names and types of the relation variables in the current 'Session'.
961relationVariablesAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)
812relationVariablesAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)
@@ -977,7 +828,7 @@ relationVariablesAsRelation sessionId (InProcessConnection conf) = do
977 let schemaContext = context {relationVariables = relvars }
828 let schemaContext = context {relationVariables = relvars }
978 pure $ RE.relationVariablesAsRelation schemaContext graph
829 pure $ RE.relationVariablesAsRelation schemaContext graph
979
830
980−relationVariablesAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveRelationVariableSummary sessionId)
831+relationVariablesAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveRelationVariableSummary sessionId)
981
832
982-- | Returns the names and types of the atom functions in the current 'Session'.
833-- | Returns the names and types of the atom functions in the current 'Session'.
983atomFunctionsAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)
834atomFunctionsAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)
@@ -990,7 +841,7 @@ atomFunctionsAsRelation sessionId (InProcessConnection conf) = do
990 Right (session, _) ->
841 Right (session, _) ->
991 pure (AF.atomFunctionsAsRelation (atomFunctions (concreteDatabaseContext session)))
842 pure (AF.atomFunctionsAsRelation (atomFunctions (concreteDatabaseContext session)))
992
843
993−atomFunctionsAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveAtomFunctionSummary sessionId)
844+atomFunctionsAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveAtomFunctionSummary sessionId)
994
845
995databaseContextFunctionsAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)
846databaseContextFunctionsAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)
996databaseContextFunctionsAsRelation sessionId (InProcessConnection conf) = do
847databaseContextFunctionsAsRelation sessionId (InProcessConnection conf) = do
@@ -1002,7 +853,7 @@ databaseContextFunctionsAsRelation sessionId (InProcessConnection conf) = do
1002 Right (session, _) ->
853 Right (session, _) ->
1003 pure (DCF.databaseContextFunctionsAsRelation (dbcFunctions (concreteDatabaseContext session)))
854 pure (DCF.databaseContextFunctionsAsRelation (dbcFunctions (concreteDatabaseContext session)))
1004
855
1005−databaseContextFunctionsAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveDatabaseContextFunctionSummary sessionId)
856+databaseContextFunctionsAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveDatabaseContextFunctionSummary sessionId)
1006
857
1007-- | Returns the transaction id for the connection's disconnected transaction committed parent transaction.
858-- | Returns the transaction id for the connection's disconnected transaction committed parent transaction.
1008headTransactionId :: SessionId -> Connection -> IO (Either RelationalError TransactionId)
859headTransactionId :: SessionId -> Connection -> IO (Either RelationalError TransactionId)
@@ -1013,7 +864,7 @@ headTransactionId sessionId (InProcessConnection conf) = do
1013 case eSession of
864 case eSession of
1014 Left err -> pure (Left err)
865 Left err -> pure (Left err)
1015 Right session -> pure $ Right (Sess.parentId session)
866 Right session -> pure $ Right (Sess.parentId session)
1016−headTransactionId sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveHeadTransactionId sessionId)
867+headTransactionId sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveHeadTransactionId sessionId)
1017
868
1018headNameSTM_ :: SessionId -> Sessions -> TVar TransactionGraph -> STM (Either RelationalError HeadName)
869headNameSTM_ :: SessionId -> Sessions -> TVar TransactionGraph -> STM (Either RelationalError HeadName)
1019headNameSTM_ sessionId sessions graphTvar = do
870headNameSTM_ sessionId sessions graphTvar = do
@@ -1033,7 +884,7 @@ headName sessionId (InProcessConnection conf) = do
1033 let sessions = ipSessions conf
884 let sessions = ipSessions conf
1034 graphTvar = ipTransactionGraph conf
885 graphTvar = ipTransactionGraph conf
1035 atomically (headNameSTM_ sessionId sessions graphTvar)
886 atomically (headNameSTM_ sessionId sessions graphTvar)
1036−headName sessionId conn@(RemoteProcessConnection _) = remoteCall conn (ExecuteHeadName sessionId)
887+headName sessionId conn@(RemoteConnection _) = remoteCall conn (ExecuteHeadName sessionId)
1037
888
1038-- | Returns a listing of all available atom types.
889-- | Returns a listing of all available atom types.
1039atomTypesAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)
890atomTypesAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)
@@ -1047,7 +898,7 @@ atomTypesAsRelation sessionId (InProcessConnection conf) = do
1047 case typesAsRelation (B.typeConstructorMapping (Sess.concreteDatabaseContext session)) of
898 case typesAsRelation (B.typeConstructorMapping (Sess.concreteDatabaseContext session)) of
1048 Left err -> pure (Left err)
899 Left err -> pure (Left err)
1049 Right rel -> pure (Right rel)
900 Right rel -> pure (Right rel)
1050−atomTypesAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveAtomTypesAsRelation sessionId)
901+atomTypesAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveAtomTypesAsRelation sessionId)
1051
902
1052disconnectedTransactionIsDirty :: SessionId -> Connection -> IO (Either RelationalError Bool)
903disconnectedTransactionIsDirty :: SessionId -> Connection -> IO (Either RelationalError Bool)
1053disconnectedTransactionIsDirty sessionId (InProcessConnection conf) = do
904disconnectedTransactionIsDirty sessionId (InProcessConnection conf) = do
@@ -1058,12 +909,12 @@ disconnectedTransactionIsDirty sessionId (InProcessConnection conf) = do
1058 Left err -> pure (Left err)
909 Left err -> pure (Left err)
1059 Right session ->
910 Right session ->
1060 pure (Right (isDirty session))
911 pure (Right (isDirty session))
1061−disconnectedTransactionIsDirty sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveSessionIsDirty sessionId)
912+disconnectedTransactionIsDirty sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveSessionIsDirty sessionId)
1062
913
1063--used only for testing- we expect this to throw an exception
914--used only for testing- we expect this to throw an exception
1064callTestTimeout_ :: SessionId -> Connection -> IO Bool
915callTestTimeout_ :: SessionId -> Connection -> IO Bool
1065callTestTimeout_ _ (InProcessConnection _) = error "bad testing call"
916callTestTimeout_ _ (InProcessConnection _) = error "bad testing call"
1066−callTestTimeout_ sessionId conn@(RemoteProcessConnection _) = remoteCall conn (TestTimeout sessionId)
917+callTestTimeout_ sessionId conn@(RemoteConnection _) = remoteCall conn (TestTimeout sessionId)
1067
918
1068--used in tests only
919--used in tests only
1069transactionGraph_ :: Connection -> IO TransactionGraph
920transactionGraph_ :: Connection -> IO TransactionGraph
@@ -1148,15 +999,8 @@ commitLock_ sessionId conf stmBlock = do
1148 Right (notsToFire, nodesToNotify, newGraph, transactionIdsToPersist) -> do
999 Right (notsToFire, nodesToNotify, newGraph, transactionIdsToPersist) -> do
1149 --update filesystem database, if necessary
1000 --update filesystem database, if necessary
1150 processTransactionGraphPersistence strat transactionIdsToPersist newGraph
1001 processTransactionGraphPersistence strat transactionIdsToPersist newGraph
1151− sendNotifications nodesToNotify (ipLocalNode conf) notsToFire
1002+ sendNotifications nodesToNotify notsToFire
1152 pure (Right ())
1003 pure (Right ())
1153−{-
1154−writeDisconAndGraph_ :: TVar TransactionGraph -> SessionId -> Session -> Sessions -> DisconnectedTransaction -> TransactionGraph -> STM ()
1155−writeDisconAndGraph_ graphTvar sessionId session sessions discon graph = do
1156− writeTVar graphTvar graph
1157− let newSession = Session discon (Sess.schemaName session)
1158− StmMap.insert newSession sessionId sessions
1159−-}
1160
1004
1161-- | Runs an IO monad, commits the result when the monad returns no errors, otherwise, rolls back the changes and the error.
1005-- | Runs an IO monad, commits the result when the monad returns no errors, otherwise, rolls back the changes and the error.
1162withTransaction :: SessionId -> Connection -> IO (Either RelationalError a) -> IO (Either RelationalError ()) -> IO (Either RelationalError a)
1006withTransaction :: SessionId -> Connection -> IO (Either RelationalError a) -> IO (Either RelationalError ()) -> IO (Either RelationalError a)
@@ -1208,7 +1052,7 @@ executeDataFrameExpr sessionId conn@(InProcessConnection _) dfExpr = do
1208 let dFrame' = maybe dFrame (`DF.drop'` dFrame) (DF.offset dfExpr)
1052 let dFrame' = maybe dFrame (`DF.drop'` dFrame) (DF.offset dfExpr)
1209 dFrame'' = maybe dFrame' (`DF.take'` dFrame') (DF.limit dfExpr)
1053 dFrame'' = maybe dFrame' (`DF.take'` dFrame') (DF.limit dfExpr)
1210 pure (Right dFrame'')
1054 pure (Right dFrame'')
1211−executeDataFrameExpr sessionId conn@(RemoteProcessConnection _) dfExpr = remoteCall conn (ExecuteDataFrameExpr sessionId dfExpr)
1055+executeDataFrameExpr sessionId conn@(RemoteConnection _) dfExpr = remoteCall conn (ExecuteDataFrameExpr sessionId dfExpr)
1212
1056
1213validateMerkleHashes :: SessionId -> Connection -> IO (Either RelationalError ())
1057validateMerkleHashes :: SessionId -> Connection -> IO (Either RelationalError ())
1214validateMerkleHashes sessionId (InProcessConnection conf) = do
1058validateMerkleHashes sessionId (InProcessConnection conf) = do
@@ -1222,4 +1066,30 @@ validateMerkleHashes sessionId (InProcessConnection conf) = do
1222 case Graph.validateMerkleHashes graph of
1066 case Graph.validateMerkleHashes graph of
1223 Left merkleErrs -> pure $ Left $ someErrors (map (\(MerkleValidationError tid expected actual) -> MerkleHashValidationError tid expected actual) merkleErrs)
1067 Left merkleErrs -> pure $ Left $ someErrors (map (\(MerkleValidationError tid expected actual) -> MerkleHashValidationError tid expected actual) merkleErrs)
1224 Right () -> pure (Right ())
1068 Right () -> pure (Right ())
1225−validateMerkleHashes sessionId conn@RemoteProcessConnection{} = remoteCall conn (ExecuteValidateMerkleHashes sessionId)
1069+validateMerkleHashes sessionId conn@RemoteConnection{} = remoteCall conn (ExecuteValidateMerkleHashes sessionId)
1070+
1071+type ClientNodes = StmSet.Set ClientInfo
1072+
1073+-- internal structure specific to in-process connections
1074+data InProcessConnectionConf = InProcessConnectionConf {
1075+ ipPersistenceStrategy :: PersistenceStrategy,
1076+ ipClientNodes :: ClientNodes,
1077+ ipSessions :: Sessions,
1078+ ipTransactionGraph :: TVar TransactionGraph,
1079+ ipScriptSession :: Maybe ScriptSession,
1080+ ipLocks :: Maybe (LockFile, MVar LockFileHash), -- nothing when NoPersistence
1081+ ipCallbackAsync :: Async ()
1082+ }
1083+
1084+-- clients may connect associate one socket/mvar with the server to register for change callbacks
1085+data ClientInfo = RemoteClientInfo (RPC.Locking Socket) |
1086+ InProcessClientInfo (MVar EvaluatedNotifications)
1087+
1088+instance Eq ClientInfo where
1089+ (RemoteClientInfo a) == (RemoteClientInfo b) = RPC.lockless a == RPC.lockless b
1090+ (InProcessClientInfo a) == (InProcessClientInfo b) = a == b
1091+ _ == _ = False
1092+
1093+instance Hashable ClientInfo where
1094+ hashWithSalt salt (RemoteClientInfo sock) = hashWithSalt salt (show (RPC.lockless sock))
1095+ hashWithSalt salt (InProcessClientInfo _) = hashWithSalt salt (1::Int)
src/lib/ProjectM36/DataFrame.hs+21−14
@@ -1,8 +1,8 @@
1−{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}
1+{-# LANGUAGE DeriveGeneric, DerivingVia #-}
2{- A dataframe is a strongly-typed, ordered list of named tuples. A dataframe differs from a relation in that its tuples are ordered.-}
2{- A dataframe is a strongly-typed, ordered list of named tuples. A dataframe differs from a relation in that its tuples are ordered.-}
3module ProjectM36.DataFrame where
3module ProjectM36.DataFrame where
4import ProjectM36.Base
4import ProjectM36.Base
5−import ProjectM36.Attribute as A
5+import ProjectM36.Attribute as A hiding (drop)
6import ProjectM36.Error
6import ProjectM36.Error
7import qualified ProjectM36.Relation as R
7import qualified ProjectM36.Relation as R
8import ProjectM36.Relation.Show.Term
8import ProjectM36.Relation.Show.Term
@@ -16,15 +16,19 @@ import qualified Data.List as L
16import qualified Data.Set as S
16import qualified Data.Set as S
17import Data.Maybe
17import Data.Maybe
18import qualified Data.Text as T
18import qualified Data.Text as T
19−import Data.Binary
20import Control.Arrow
19import Control.Arrow
21#if __GLASGOW_HASKELL__ < 804
20#if __GLASGOW_HASKELL__ < 804
22import Data.Monoid
21import Data.Monoid
23#endif
22#endif
24
23
25−data AttributeOrderExpr = AttributeOrderExpr AttributeName Order deriving (Show, Generic, Binary)
24+data AttributeOrderExpr = AttributeOrderExpr AttributeName Order
25+ deriving (Show, Generic)
26+
26−data AttributeOrder = AttributeOrder AttributeName Order deriving (Show, Generic, Binary)
27+data AttributeOrder = AttributeOrder AttributeName Order
28+ deriving (Show, Generic)
29+
27−data Order = AscendingOrder | DescendingOrder deriving (Eq, Show, Generic, Binary)
30+data Order = AscendingOrder | DescendingOrder
31+ deriving (Eq, Show, Generic)
28
32
29ascending :: T.Text
33ascending :: T.Text
30ascending = "⬆"
34ascending = "⬆"
@@ -39,9 +43,11 @@ data DataFrame = DataFrame {
39 orders :: [AttributeOrder],
43 orders :: [AttributeOrder],
40 attributes :: Attributes,
44 attributes :: Attributes,
41 tuples :: [DataFrameTuple]
45 tuples :: [DataFrameTuple]
46+ }
42− } deriving (Show, Generic, Binary)
47+ deriving (Show, Generic)
43
48
44−data DataFrameTuple = DataFrameTuple Attributes (V.Vector Atom) deriving (Eq, Show, Generic, Binary)
49+data DataFrameTuple = DataFrameTuple Attributes (V.Vector Atom)
50+ deriving (Eq, Show, Generic)
45
51
46sortDataFrameBy :: [AttributeOrder] -> DataFrame -> Either RelationalError DataFrame
52sortDataFrameBy :: [AttributeOrder] -> DataFrame -> Either RelationalError DataFrame
47sortDataFrameBy attrOrders frame = do
53sortDataFrameBy attrOrders frame = do
@@ -75,7 +81,7 @@ compareTupleByOneAttributeName attr tuple1 tuple2 =
75 Right atom2 -> compareAtoms atom1 atom2
81 Right atom2 -> compareAtoms atom1 atom2
76
82
77atomForAttributeName :: AttributeName -> DataFrameTuple -> Either RelationalError Atom
83atomForAttributeName :: AttributeName -> DataFrameTuple -> Either RelationalError Atom
78−atomForAttributeName attrName (DataFrameTuple tupAttrs tupVec) = case V.findIndex (\attr -> attributeName attr == attrName) tupAttrs of
84+atomForAttributeName attrName (DataFrameTuple tupAttrs tupVec) = case V.findIndex (\attr -> attributeName attr == attrName) (attributesVec tupAttrs) of
79 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
85 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
80 Just index -> case tupVec V.!? index of
86 Just index -> case tupVec V.!? index of
81 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
87 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
@@ -122,17 +128,18 @@ data DataFrameExpr = DataFrameExpr {
122 orderExprs :: [AttributeOrderExpr],
128 orderExprs :: [AttributeOrderExpr],
123 offset :: Maybe Integer,
129 offset :: Maybe Integer,
124 limit :: Maybe Integer
130 limit :: Maybe Integer
131+ }
125− } deriving (Show, Binary, Generic)
132+ deriving (Show, Generic)
126
133
127dataFrameAsHTML :: DataFrame -> T.Text
134dataFrameAsHTML :: DataFrame -> T.Text
128-- web browsers don't display tables with empty cells or empty headers, so we have to insert some placeholders- it's not technically the same, but looks as expected in the browser
135-- web browsers don't display tables with empty cells or empty headers, so we have to insert some placeholders- it's not technically the same, but looks as expected in the browser
129dataFrameAsHTML df
136dataFrameAsHTML df
130− | length (tuples df) == 1 && L.null (attributes df) = style <>
137+ | length (tuples df) == 1 && A.null (attributes df) = style <>
131 tablestart <>
138 tablestart <>
132 "<tr><th></th></tr>" <>
139 "<tr><th></th></tr>" <>
133 "<tr><td></td></tr>" <>
140 "<tr><td></td></tr>" <>
134 tablefooter <> "</table>"
141 tablefooter <> "</table>"
135− | L.null (tuples df) && L.null (attributes df) = style <>
142+ | L.null (tuples df) && A.null (attributes df) = style <>
136 tablestart <>
143 tablestart <>
137 "<tr><th></th></tr>" <>
144 "<tr><th></th></tr>" <>
138 tablefooter <>
145 tablefooter <>
@@ -155,7 +162,7 @@ tuplesAsHTML = foldr folder ""
155 folder tuple acc = acc <> tupleAsHTML tuple
162 folder tuple acc = acc <> tupleAsHTML tuple
156
163
157tupleAssocs :: DataFrameTuple -> [(AttributeName, Atom)]
164tupleAssocs :: DataFrameTuple -> [(AttributeName, Atom)]
158−tupleAssocs (DataFrameTuple attrVec tupVec) = V.toList $ V.map (first attributeName) (V.zip attrVec tupVec)
165+tupleAssocs (DataFrameTuple attrs tupVec) = V.toList $ V.map (first attributeName) (V.zip (attributesVec attrs) tupVec)
159
166
160
167
161tupleAsHTML :: DataFrameTuple -> T.Text
168tupleAsHTML :: DataFrameTuple -> T.Text
@@ -167,7 +174,7 @@ tupleAsHTML tuple = "<tr>" <> T.concat (L.map tupleFrag (tupleAssocs tuple)) <>
167 atomAsHTML atom = atomToText atom
174 atomAsHTML atom = atomToText atom
168
175
169attributesAsHTML :: Attributes -> [AttributeOrder] -> T.Text
176attributesAsHTML :: Attributes -> [AttributeOrder] -> T.Text
170−attributesAsHTML attrs orders' = "<tr>" <> T.concat (map oneAttrHTML (V.toList attrs)) <> "</tr>"
177+attributesAsHTML attrs orders' = "<tr>" <> T.concat (map oneAttrHTML (A.toList attrs)) <> "</tr>"
171 where
178 where
172 oneAttrHTML attr = "<th>" <> prettyAttribute attr <> ordering (attributeName attr) <> "</th>"
179 oneAttrHTML attr = "<th>" <> prettyAttribute attr <> ordering (attributeName attr) <> "</th>"
173 ordering attrName = " " <> case L.find (\(AttributeOrder nam _) -> nam == attrName) orders' of
180 ordering attrName = " " <> case L.find (\(AttributeOrder nam _) -> nam == attrName) orders' of
src/lib/ProjectM36/DataTypes/Interval.hs+2
@@ -37,6 +37,7 @@ supportsInterval typ = case typ of
37 BoolAtomType -> False
37 BoolAtomType -> False
38 RelationAtomType _ -> False
38 RelationAtomType _ -> False
39 ConstructedAtomType _ _ -> False --once we support an interval-style typeclass, we might enable this
39 ConstructedAtomType _ _ -> False --once we support an interval-style typeclass, we might enable this
40+ RelationalExprAtomType -> False
40 TypeVariableType _ -> False
41 TypeVariableType _ -> False
41
42
42supportsOrdering :: AtomType -> Bool
43supportsOrdering :: AtomType -> Bool
@@ -50,6 +51,7 @@ supportsOrdering typ = case typ of
50 ByteStringAtomType -> False
51 ByteStringAtomType -> False
51 BoolAtomType -> False
52 BoolAtomType -> False
52 RelationAtomType _ -> False
53 RelationAtomType _ -> False
54+ RelationalExprAtomType -> False
53 ConstructedAtomType _ _ -> False --once we support an interval-style typeclass, we might enable this
55 ConstructedAtomType _ _ -> False --once we support an interval-style typeclass, we might enable this
54 TypeVariableType _ -> False
56 TypeVariableType _ -> False
55
57
src/lib/ProjectM36/DataTypes/Primitive.hs+1
@@ -42,3 +42,4 @@ atomTypeForAtom (ByteStringAtom _) = ByteStringAtomType
42atomTypeForAtom (BoolAtom _) = BoolAtomType
42atomTypeForAtom (BoolAtom _) = BoolAtomType
43atomTypeForAtom (RelationAtom (Relation attrs _)) = RelationAtomType attrs
43atomTypeForAtom (RelationAtom (Relation attrs _)) = RelationAtomType attrs
44atomTypeForAtom (ConstructedAtom _ aType _) = aType
44atomTypeForAtom (ConstructedAtom _ aType _) = aType
45+atomTypeForAtom (RelationalExprAtom _) = RelationalExprAtomType
src/lib/ProjectM36/DataTypes/Sorting.hs+1
@@ -24,6 +24,7 @@ isSortableAtomType typ = case typ of
24 DateTimeAtomType -> True
24 DateTimeAtomType -> True
25 ByteStringAtomType -> False
25 ByteStringAtomType -> False
26 BoolAtomType -> True
26 BoolAtomType -> True
27+ RelationalExprAtomType -> False
27 RelationAtomType _ -> False
28 RelationAtomType _ -> False
28 ConstructedAtomType _ _ -> False
29 ConstructedAtomType _ _ -> False
29 TypeVariableType _ -> False
30 TypeVariableType _ -> False
src/lib/ProjectM36/DatabaseContext.hs+6−6
@@ -7,9 +7,9 @@ import ProjectM36.DataTypes.Basic
7import ProjectM36.AtomFunctions.Basic
7import ProjectM36.AtomFunctions.Basic
8import ProjectM36.Relation
8import ProjectM36.Relation
9import qualified Data.ByteString.Lazy as BL
9import qualified Data.ByteString.Lazy as BL
10−import Data.Binary as B
11import ProjectM36.AtomFunction as AF
10import ProjectM36.AtomFunction as AF
12import ProjectM36.DatabaseContextFunction as DBCF
11import ProjectM36.DatabaseContextFunction as DBCF
12+import Codec.Winery
13
13
14empty :: DatabaseContext
14empty :: DatabaseContext
15empty = DatabaseContext { inclusionDependencies = M.empty,
15empty = DatabaseContext { inclusionDependencies = M.empty,
@@ -44,11 +44,11 @@ basicDatabaseContext = DatabaseContext { inclusionDependencies = M.empty,
44
44
45--for building the Merkle hash
45--for building the Merkle hash
46hashBytes :: DatabaseContext -> BL.ByteString
46hashBytes :: DatabaseContext -> BL.ByteString
47−hashBytes ctx = mconcat [incDeps, rvs, atomFs, dbcFs, nots, tConsMap]
47+hashBytes ctx = BL.fromChunks [incDeps, rvs, nots, tConsMap] <> atomFs <> dbcFs
48 where
48 where
49− incDeps = B.encode (inclusionDependencies ctx)
49+ incDeps = serialise (inclusionDependencies ctx)
50− rvs = B.encode (relationVariables ctx)
50+ rvs = serialise (relationVariables ctx)
51 atomFs = HS.foldr (mappend . AF.hashBytes) mempty (atomFunctions ctx)
51 atomFs = HS.foldr (mappend . AF.hashBytes) mempty (atomFunctions ctx)
52 dbcFs = HS.foldr (mappend . DBCF.hashBytes) mempty (dbcFunctions ctx)
52 dbcFs = HS.foldr (mappend . DBCF.hashBytes) mempty (dbcFunctions ctx)
53− nots = B.encode (notifications ctx)
53+ nots = serialise (notifications ctx)
54− tConsMap = B.encode (typeConstructorMapping ctx)
54+ tConsMap = serialise (typeConstructorMapping ctx)
src/lib/ProjectM36/DatabaseContextFunction.hs+6−5
@@ -3,6 +3,7 @@ module ProjectM36.DatabaseContextFunction where
3--implements functions which operate as: [Atom] -> DatabaseContextExpr -> Either RelationalError DatabaseContextExpr
3--implements functions which operate as: [Atom] -> DatabaseContextExpr -> Either RelationalError DatabaseContextExpr
4import ProjectM36.Base
4import ProjectM36.Base
5import ProjectM36.Error
5import ProjectM36.Error
6+import ProjectM36.Serialise.Base ()
6import ProjectM36.Attribute as A
7import ProjectM36.Attribute as A
7import ProjectM36.Relation
8import ProjectM36.Relation
8import ProjectM36.AtomType
9import ProjectM36.AtomType
@@ -11,7 +12,7 @@ import qualified Data.Map as M
11import ProjectM36.ScriptSession
12import ProjectM36.ScriptSession
12import qualified Data.Text as T
13import qualified Data.Text as T
13import qualified Data.ByteString.Lazy as BL
14import qualified Data.ByteString.Lazy as BL
14−import Data.Binary as B
15+import Codec.Winery
15
16
16emptyDatabaseContextFunction :: DatabaseContextFunctionName -> DatabaseContextFunction
17emptyDatabaseContextFunction :: DatabaseContextFunctionName -> DatabaseContextFunction
17emptyDatabaseContextFunction name = DatabaseContextFunction {
18emptyDatabaseContextFunction name = DatabaseContextFunction {
@@ -82,9 +83,9 @@ databaseContextFunctionsAsRelation dbcFuncs = mkRelationFromList attrs tups
82
83
83-- for merkle hash
84-- for merkle hash
84hashBytes :: DatabaseContextFunction -> BL.ByteString
85hashBytes :: DatabaseContextFunction -> BL.ByteString
85−hashBytes func = mconcat [fname, ftype, fbody]
86+hashBytes func = BL.fromChunks [fname, ftype, fbody]
86 where
87 where
87− fname = B.encode (dbcFuncName func)
88+ fname = serialise (dbcFuncName func)
88− ftype = B.encode (dbcFuncType func)
89+ ftype = serialise (dbcFuncType func)
89 fbody = case dbcFuncBody func of
90 fbody = case dbcFuncBody func of
90− DatabaseContextFunctionBody mBody _ -> B.encode mBody
91+ DatabaseContextFunctionBody mBody _ -> serialise mBody
src/lib/ProjectM36/DatabaseContextFunctionError.hs+1−2
@@ -1,9 +1,8 @@
1{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}
1{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}
2module ProjectM36.DatabaseContextFunctionError where
2module ProjectM36.DatabaseContextFunctionError where
3import GHC.Generics
3import GHC.Generics
4−import Data.Binary
5import Control.DeepSeq
4import Control.DeepSeq
6
5
7{-# ANN module ("HLint: ignore Use newtype instead of data" :: String) #-}
6{-# ANN module ("HLint: ignore Use newtype instead of data" :: String) #-}
8data DatabaseContextFunctionError = DatabaseContextFunctionUserError String
7data DatabaseContextFunctionError = DatabaseContextFunctionUserError String
9− deriving (Generic, Eq, Show, Binary, NFData)
8+ deriving (Generic, Eq, Show, NFData)
src/lib/ProjectM36/Error.hs+16−14
@@ -9,7 +9,6 @@ import Control.DeepSeq (NFData, rnf)
9import Control.DeepSeq.Generics (genericRnf)
9import Control.DeepSeq.Generics (genericRnf)
10import GHC.Generics (Generic)
10import GHC.Generics (Generic)
11import qualified Data.Text as T
11import qualified Data.Text as T
12−import Data.Binary
13import Data.Typeable
12import Data.Typeable
14import Control.Exception
13import Control.Exception
15
14
@@ -82,7 +81,7 @@ data RelationalError = NoSuchAttributeNamesError (S.Set AttributeName)
82 | RelationValuedAttributesNotSupportedError [AttributeName]
81 | RelationValuedAttributesNotSupportedError [AttributeName]
83 | NotificationNameInUseError NotificationName
82 | NotificationNameInUseError NotificationName
84 | NotificationNameNotInUseError NotificationName
83 | NotificationNameNotInUseError NotificationName
85− | ImportError T.Text -- really? This should be broken out into some other error type- this has nothing to do with relational algebra
84+ | ImportError ImportError'
86 | ExportError T.Text
85 | ExportError T.Text
87 | UnhandledExceptionError String
86 | UnhandledExceptionError String
88 | MergeTransactionError MergeError
87 | MergeTransactionError MergeError
@@ -104,14 +103,14 @@ data RelationalError = NoSuchAttributeNamesError (S.Set AttributeName)
104 | TupleExprsReferenceMultipleMarkersError
103 | TupleExprsReferenceMultipleMarkersError
105
104
106 | MerkleHashValidationError TransactionId MerkleHash MerkleHash
105 | MerkleHashValidationError TransactionId MerkleHash MerkleHash
107−
106+
108 | MultipleErrors [RelationalError]
107 | MultipleErrors [RelationalError]
109− deriving (Show,Eq,Generic,Binary,Typeable, NFData)
108+ deriving (Show,Eq,Generic,Typeable, NFData)
110
109
111data PersistenceError = InvalidDirectoryError FilePath |
110data PersistenceError = InvalidDirectoryError FilePath |
112 MissingTransactionError TransactionId |
111 MissingTransactionError TransactionId |
113 WrongDatabaseFormatVersionError String String
112 WrongDatabaseFormatVersionError String String
114− deriving (Show, Eq, Generic, Binary, NFData)
113+ deriving (Show, Eq, Generic, NFData)
115
114
116--collapse list of errors into normal error- if there is just one, just return one
115--collapse list of errors into normal error- if there is just one, just return one
117someErrors :: [RelationalError] -> RelationalError
116someErrors :: [RelationalError] -> RelationalError
@@ -129,7 +128,7 @@ data MergeError = SelectedHeadMismatchMergeError |
129 StrategyViolatesComponentMergeError | --failed merge in inc deps, relvars, etc.
128 StrategyViolatesComponentMergeError | --failed merge in inc deps, relvars, etc.
130 StrategyViolatesRelationVariableMergeError |
129 StrategyViolatesRelationVariableMergeError |
131 StrategyViolatesTypeConstructorMergeError
130 StrategyViolatesTypeConstructorMergeError
132− deriving (Show, Eq, Generic, Binary, Typeable)
131+ deriving (Show, Eq, Generic, Typeable)
133
132
134instance NFData MergeError where rnf = genericRnf
133instance NFData MergeError where rnf = genericRnf
135
134
@@ -137,17 +136,20 @@ data ScriptCompilationError = TypeCheckCompilationError String String | --expect
137 SyntaxErrorCompilationError String |
136 SyntaxErrorCompilationError String |
138 ScriptCompilationDisabledError |
137 ScriptCompilationDisabledError |
139 OtherScriptCompilationError String
138 OtherScriptCompilationError String
140− deriving (Show, Eq, Generic, Binary, Typeable, NFData)
139+ deriving (Show, Eq, Generic, Typeable, NFData)
141
140
142instance Exception ScriptCompilationError
141instance Exception ScriptCompilationError
143
142
144data SchemaError = RelVarReferencesMissing (S.Set RelVarName) |
143data SchemaError = RelVarReferencesMissing (S.Set RelVarName) |
145 RelVarInReferencedMoreThanOnce RelVarName |
144 RelVarInReferencedMoreThanOnce RelVarName |
146 RelVarOutReferencedMoreThanOnce RelVarName
145 RelVarOutReferencedMoreThanOnce RelVarName
147− deriving (Show, Eq, Generic, Binary, Typeable, NFData)
146+ deriving (Show, Eq, Generic, Typeable, NFData)
148−
147+
149−
148+
150−-- errors returned from the distributed-process call handlers
149+data ImportError' = InvalidSHA256Error T.Text
151−data ServerError = RequestTimeoutError |
150+ | SHA256MismatchError T.Text T.Text
152− ProcessDiedError String
151+ | InvalidFileURIError T.Text
152+ | ImportFileDecodeError T.Text
153+ | ImportFileError T.Text
154+ | ImportDownloadError T.Text
153− deriving (Generic, Binary, Eq)
155+ deriving (Show, Eq, Generic, Typeable, NFData)
src/lib/ProjectM36/InclusionDependency.hs+5−6
@@ -4,17 +4,16 @@ import ProjectM36.Attribute
4import ProjectM36.Error
4import ProjectM36.Error
5import ProjectM36.Relation
5import ProjectM36.Relation
6import qualified Data.Map as M
6import qualified Data.Map as M
7−import qualified Data.Text as T
8
7
9inclusionDependenciesAsRelation :: InclusionDependencies -> Either RelationalError Relation
8inclusionDependenciesAsRelation :: InclusionDependencies -> Either RelationalError Relation
10inclusionDependenciesAsRelation incDeps =
9inclusionDependenciesAsRelation incDeps =
11 mkRelationFromList attrs (map incDepAsAtoms (M.toList incDeps))
10 mkRelationFromList attrs (map incDepAsAtoms (M.toList incDeps))
12 where
11 where
13 attrs = attributesFromList [Attribute "name" TextAtomType,
12 attrs = attributesFromList [Attribute "name" TextAtomType,
14− Attribute "sub" TextAtomType,
13+ Attribute "sub" RelationalExprAtomType,
15− Attribute "super" TextAtomType
14+ Attribute "super" RelationalExprAtomType
16 ]
15 ]
17 incDepAsAtoms (name, InclusionDependency exprA exprB) = [TextAtom name,
16 incDepAsAtoms (name, InclusionDependency exprA exprB) = [TextAtom name,
18− TextAtom (T.pack (show exprA)),
17+ RelationalExprAtom exprA,
19− TextAtom (T.pack (show exprB))]
18+ RelationalExprAtom exprB]
20−
19+
src/lib/ProjectM36/IsomorphicSchema.hs+2−4
@@ -1,4 +1,4 @@
1−{-# LANGUAGE DeriveGeneric, DeriveAnyClass, LambdaCase #-}
1+{-# LANGUAGE DeriveGeneric, LambdaCase, DerivingVia #-}
2module ProjectM36.IsomorphicSchema where
2module ProjectM36.IsomorphicSchema where
3import ProjectM36.Base
3import ProjectM36.Base
4import ProjectM36.Error
4import ProjectM36.Error
@@ -9,7 +9,6 @@ import ProjectM36.RelationalExpression
9import qualified ProjectM36.AttributeNames as AN
9import qualified ProjectM36.AttributeNames as AN
10import Control.Monad
10import Control.Monad
11import GHC.Generics
11import GHC.Generics
12−import Data.Binary
13import qualified Data.Map as M
12import qualified Data.Map as M
14import qualified Data.Set as S
13import qualified Data.Set as S
15import qualified Data.List as L
14import qualified Data.List as L
@@ -28,8 +27,7 @@ import Data.Monoid
28
27
29data SchemaExpr = AddSubschema SchemaName SchemaIsomorphs |
28data SchemaExpr = AddSubschema SchemaName SchemaIsomorphs |
30 RemoveSubschema SchemaName
29 RemoveSubschema SchemaName
31− deriving (Generic, Binary, Show)
30+ deriving (Generic, Show)
32−
33
31
34isomorphs :: Schema -> SchemaIsomorphs
32isomorphs :: Schema -> SchemaIsomorphs
35isomorphs (Schema i) = i
33isomorphs (Schema i) = i
src/lib/ProjectM36/MerkleHash.hs+2−3
@@ -1,10 +1,9 @@
1−{-# LANGUAGE GeneralizedNewtypeDeriving, DeriveGeneric #-}
1+{-# LANGUAGE GeneralizedNewtypeDeriving, DeriveGeneric, DerivingVia #-}
2module ProjectM36.MerkleHash where
2module ProjectM36.MerkleHash where
3import Data.ByteString (ByteString)
3import Data.ByteString (ByteString)
4import GHC.Generics
4import GHC.Generics
5−import Data.Binary (Binary)
6import Control.DeepSeq (NFData)
5import Control.DeepSeq (NFData)
7
6
8newtype MerkleHash = MerkleHash { _unMerkleHash :: ByteString }
7newtype MerkleHash = MerkleHash { _unMerkleHash :: ByteString }
9− deriving (Show, Eq, Binary, Generic, Monoid, Semigroup, NFData)
8+ deriving (Show, Eq, Generic, Monoid, Semigroup, NFData)
10
9
src/lib/ProjectM36/Persist.hs+3−4
@@ -36,7 +36,6 @@ import Foreign.C
36#endif
36#endif
37
37
38import System.IO (withFile, IOMode(WriteMode), Handle)
38import System.IO (withFile, IOMode(WriteMode), Handle)
39−import qualified Data.ByteString.Lazy as BS
40import qualified Data.ByteString as BS'
39import qualified Data.ByteString as BS'
41import qualified Data.Text.Encoding as TE
40import qualified Data.Text.Encoding as TE
42
41
@@ -100,10 +99,10 @@ syncDirectory :: DiskSync -> FilePath -> IO ()
100syncDirectory FsyncDiskSync path = directoryFsync path
99syncDirectory FsyncDiskSync path = directoryFsync path
101syncDirectory NoDiskSync _ = pure ()
100syncDirectory NoDiskSync _ = pure ()
102
101
103−writeBSFileSync :: DiskSync -> FilePath -> BS.ByteString -> IO ()
102+writeBSFileSync :: DiskSync -> FilePath -> BS'.ByteString -> IO ()
104writeBSFileSync sync path bstring =
103writeBSFileSync sync path bstring =
105 withFile path WriteMode $ \handle -> do
104 withFile path WriteMode $ \handle -> do
106− BS.hPut handle bstring
105+ BS'.hPut handle bstring
107 syncHandle sync handle
106 syncHandle sync handle
108
107
109directoryFsync :: FilePath -> IO ()
108directoryFsync :: FilePath -> IO ()
@@ -131,4 +130,4 @@ fdCount = do
131 fds <- getDirectoryContents FDDIR
130 fds <- getDirectoryContents FDDIR
132 pure ((length fds) - 2)
131 pure ((length fds) - 2)
133--not supported on non-linux
132--not supported on non-linux
134−#endif
133+#endif
src/lib/ProjectM36/Relation.hs+17−22
@@ -9,7 +9,6 @@ import ProjectM36.Tuple
9import qualified ProjectM36.Attribute as A
9import qualified ProjectM36.Attribute as A
10import ProjectM36.TupleSet
10import ProjectM36.TupleSet
11import ProjectM36.Error
11import ProjectM36.Error
12−import ProjectM36.MiscUtils
13--import qualified Control.Parallel.Strategies as P
12--import qualified Control.Parallel.Strategies as P
14import qualified ProjectM36.TypeConstructorDef as TCD
13import qualified ProjectM36.TypeConstructorDef as TCD
15import qualified ProjectM36.DataConstructorDef as DCD
14import qualified ProjectM36.DataConstructorDef as DCD
@@ -17,7 +16,6 @@ import qualified Data.Text as T
17import Data.Either (isRight)
16import Data.Either (isRight)
18import System.Random.Shuffle
17import System.Random.Shuffle
19import Control.Monad.Random
18import Control.Monad.Random
20−import Data.List (sort)
21
19
22attributes :: Relation -> Attributes
20attributes :: Relation -> Attributes
23attributes (Relation attrs _ ) = attrs
21attributes (Relation attrs _ ) = attrs
@@ -35,7 +33,7 @@ atomTypeForName :: AttributeName -> Relation -> Either RelationalError AtomType
35atomTypeForName attrName (Relation attrs _) = A.atomTypeForAttributeName attrName attrs
33atomTypeForName attrName (Relation attrs _) = A.atomTypeForAttributeName attrName attrs
36
34
37mkRelationFromList :: Attributes -> [[Atom]] -> Either RelationalError Relation
35mkRelationFromList :: Attributes -> [[Atom]] -> Either RelationalError Relation
38−mkRelationFromList attrs atomMatrix =
36+mkRelationFromList attrs atomMatrix = do
39 Relation attrs <$> mkTupleSetFromList attrs atomMatrix
37 Relation attrs <$> mkTupleSetFromList attrs atomMatrix
40
38
41emptyRelationWithAttrs :: Attributes -> Relation
39emptyRelationWithAttrs :: Attributes -> Relation
@@ -43,11 +41,6 @@ emptyRelationWithAttrs attrs = Relation attrs emptyTupleSet
43
41
44mkRelation :: Attributes -> RelationTupleSet -> Either RelationalError Relation
42mkRelation :: Attributes -> RelationTupleSet -> Either RelationalError Relation
45mkRelation attrs tupleSet =
43mkRelation attrs tupleSet =
46− --check that all attributes are unique- this cannot be done when creating attributes because the check can become expensive
47− let duplicateAttrNames = dupes (sort (map A.attributeName (V.toList attrs))) in
48− if not (null duplicateAttrNames) then
49− Left (DuplicateAttributeNamesError (S.fromList duplicateAttrNames))
50− else
51 --check that all tuples have the same keys
44 --check that all tuples have the same keys
52 --check that all tuples have keys (1-N) where N is the attribute count
45 --check that all tuples have keys (1-N) where N is the attribute count
53 case verifyTupleSet attrs tupleSet of
46 case verifyTupleSet attrs tupleSet of
@@ -93,13 +86,12 @@ union (Relation attrs1 tupSet1) (Relation attrs2 tupSet2) =
93 else
86 else
94 Right $ Relation attrs1 newtuples
87 Right $ Relation attrs1 newtuples
95 where
88 where
96− newtuples = RelationTupleSet $ HS.toList . HS.fromList $ asList tupSet1 ++ map (reorderTuple attrs1) (asList tupSet2)
89+ newtuples = tupleSetUnion attrs1 tupSet1 tupSet2
97−
90+
98project :: S.Set AttributeName -> Relation -> Either RelationalError Relation
91project :: S.Set AttributeName -> Relation -> Either RelationalError Relation
99project attrNames rel@(Relation _ tupSet) = do
92project attrNames rel@(Relation _ tupSet) = do
100 newAttrs <- A.projectionAttributesForNames attrNames (attributes rel)
93 newAttrs <- A.projectionAttributesForNames attrNames (attributes rel)
101− let newAttrNameSet = A.attributeNameSet newAttrs
102− newTupleList = map (tupleProject newAttrNameSet) (asList tupSet)
94+ newTupleList <- mapM (tupleProject newAttrs) (asList tupSet)
103 pure (Relation newAttrs (RelationTupleSet (HS.toList (HS.fromList newTupleList))))
95 pure (Relation newAttrs (RelationTupleSet (HS.toList (HS.fromList newTupleList))))
104
96
105rename :: AttributeName -> AttributeName -> Relation -> Either RelationalError Relation
97rename :: AttributeName -> AttributeName -> Relation -> Either RelationalError Relation
@@ -154,7 +146,7 @@ group groupAttrNames newAttrName rel = do
154 groupProjectionAttributes <- A.projectionAttributesForNames groupAttrNames (attributes rel)
146 groupProjectionAttributes <- A.projectionAttributesForNames groupAttrNames (attributes rel)
155 let groupAttr = Attribute newAttrName (RelationAtomType groupProjectionAttributes)
147 let groupAttr = Attribute newAttrName (RelationAtomType groupProjectionAttributes)
156 matchingRelTuple tupIn = case imageRelationFor tupIn rel of
148 matchingRelTuple tupIn = case imageRelationFor tupIn rel of
157− Right rel2 -> RelationTuple (V.singleton groupAttr) (V.singleton (RelationAtom rel2))
149+ Right rel2 -> RelationTuple (A.singleton groupAttr) (V.singleton (RelationAtom rel2))
158 Left _ -> undefined
150 Left _ -> undefined
159 mogrifier tupIn = pure (tupleExtend tupIn (matchingRelTuple tupIn))
151 mogrifier tupIn = pure (tupleExtend tupIn (matchingRelTuple tupIn))
160 newAttrs = A.addAttribute groupAttr nonGroupProjectionAttributes
152 newAttrs = A.addAttribute groupAttr nonGroupProjectionAttributes
@@ -168,7 +160,8 @@ restrictEq :: RelationTuple -> Relation -> Either RelationalError Relation
168restrictEq tuple = restrict rfilter
160restrictEq tuple = restrict rfilter
169 where
161 where
170 rfilter :: RelationTuple -> Either RelationalError Bool
162 rfilter :: RelationTuple -> Either RelationalError Bool
163+ rfilter tupleIn = do
171− rfilter tupleIn = pure (tupleIntersection tuple tupleIn == tuple)
164+ pure (tupleIntersection tuple tupleIn == tuple)
172
165
173-- unwrap relation-valued attribute
166-- unwrap relation-valued attribute
174-- return error if relval attrs and nongroup attrs overlap
167-- return error if relval attrs and nongroup attrs overlap
@@ -190,13 +183,13 @@ ungroup relvalAttrName rel = case attributesForRelval relvalAttrName rel of
190tupleUngroup :: AttributeName -> Attributes -> RelationTuple -> Either RelationalError Relation
183tupleUngroup :: AttributeName -> Attributes -> RelationTuple -> Either RelationalError Relation
191tupleUngroup relvalAttrName newAttrs tuple = do
184tupleUngroup relvalAttrName newAttrs tuple = do
192 relvalRelation <- relationForAttributeName relvalAttrName tuple
185 relvalRelation <- relationForAttributeName relvalAttrName tuple
186+ let nonGroupAttrs = A.intersection newAttrs (tupleAttributes tuple)
187+ nonGroupTupleProjection <- tupleProject nonGroupAttrs tuple
188+ let folder tupleIn acc = case acc of
189+ Left err -> Left err
190+ Right accRel ->
191+ union accRel $ Relation newAttrs (RelationTupleSet [tupleExtend nonGroupTupleProjection tupleIn])
193 relFold folder (Right $ Relation newAttrs emptyTupleSet) relvalRelation
192 relFold folder (Right $ Relation newAttrs emptyTupleSet) relvalRelation
194− where
195− nonGroupTupleProjection = tupleProject nonGroupAttrNames tuple
196− nonGroupAttrNames = A.attributeNameSet newAttrs
197− folder tupleIn acc = case acc of
198− Left err -> Left err
199− Right accRel -> union accRel $ Relation newAttrs (RelationTupleSet [tupleExtend nonGroupTupleProjection tupleIn])
200
193
201attributesForRelval :: AttributeName -> Relation -> Either RelationalError Attributes
194attributesForRelval :: AttributeName -> Relation -> Either RelationalError Attributes
202attributesForRelval relvalAttrName (Relation attrs _) = do
195attributesForRelval relvalAttrName (Relation attrs _) = do
@@ -251,7 +244,8 @@ relMap mapper (Relation attrs tupleSet) =
251
244
252relMogrify :: (RelationTuple -> Either RelationalError RelationTuple) -> Attributes -> Relation -> Either RelationalError Relation
245relMogrify :: (RelationTuple -> Either RelationalError RelationTuple) -> Attributes -> Relation -> Either RelationalError Relation
253relMogrify mapper newAttributes (Relation _ tupSet) = do
246relMogrify mapper newAttributes (Relation _ tupSet) = do
254− newTuples <- mapM mapper (asList tupSet)
247+ newTuples <- mapM (fmap (reorderTuple newAttributes) . mapper) (asList tupSet)
248+
255 mkRelationFromTuples newAttributes newTuples
249 mkRelationFromTuples newAttributes newTuples
256
250
257relFold :: (RelationTuple -> a -> a) -> a -> Relation -> a
251relFold :: (RelationTuple -> a -> a) -> a -> Relation -> a
@@ -297,7 +291,8 @@ typesAsRelation types = mkRelationFromTuples attrs tuples
297 dConsType = RelationAtomType subAttrs
291 dConsType = RelationAtomType subAttrs
298 tuples = map mkTypeConsDescription types
292 tuples = map mkTypeConsDescription types
299
293
294+ mkTypeConsDescription (tCons, dConsList) =
300− mkTypeConsDescription (tCons, dConsList) = RelationTuple attrs (V.fromList [TextAtom (TCD.name tCons), mkDataConsRelation dConsList])
295+ RelationTuple attrs (V.fromList [TextAtom (TCD.name tCons), mkDataConsRelation dConsList])
301
296
302 mkDataConsRelation dConsList = case mkRelationFromTuples subAttrs $ map (\dCons -> RelationTuple subAttrs (V.singleton $ TextAtom $ T.intercalate " " (DCD.name dCons:map (T.pack . show) (DCD.fields dCons)))) dConsList of
297 mkDataConsRelation dConsList = case mkRelationFromTuples subAttrs $ map (\dCons -> RelationTuple subAttrs (V.singleton $ TextAtom $ T.intercalate " " (DCD.name dCons:map (T.pack . show) (DCD.fields dCons)))) dConsList of
303 Left err -> error ("mkRelationFromTuples pooped " ++ show err)
298 Left err -> error ("mkRelationFromTuples pooped " ++ show err)
src/lib/ProjectM36/Relation/Parse/CSV.hs+7−3
@@ -38,8 +38,7 @@ csvAsRelation attrs tConsMap inString = case APBL.parse (csvWithHeader csvDecode
38 let strHeader = V.map decodeUtf8 headerRaw
38 let strHeader = V.map decodeUtf8 headerRaw
39 strMapRecords = V.map convertMap vecMapsRaw
39 strMapRecords = V.map convertMap vecMapsRaw
40 convertMap hmap = HM.fromList $ L.map (decodeUtf8 *** (T.unpack . decodeUtf8)) (HM.toList hmap)
40 convertMap hmap = HM.fromList $ L.map (decodeUtf8 *** (T.unpack . decodeUtf8)) (HM.toList hmap)
41− attrNames = V.map A.attributeName attrs
41+ attrNameSet = A.attributeNameSet attrs
42− attrNameSet = S.fromList (V.toList attrNames)
43 headerSet = S.fromList (V.toList strHeader)
42 headerSet = S.fromList (V.toList strHeader)
44 parseAtom attrName aType textIn = case APT.parseOnly (parseCSVAtomP attrName tConsMap aType <* APT.endOfInput) textIn of
43 parseAtom attrName aType textIn = case APT.parseOnly (parseCSVAtomP attrName tConsMap aType <* APT.endOfInput) textIn of
45 Left err -> Left (ParseError (T.pack err))
44 Left err -> Left (ParseError (T.pack err))
@@ -47,7 +46,7 @@ csvAsRelation attrs tConsMap inString = case APBL.parse (csvWithHeader csvDecode
47 makeTupleList :: HM.HashMap AttributeName String -> [Either CsvImportError Atom]
46 makeTupleList :: HM.HashMap AttributeName String -> [Either CsvImportError Atom]
48 makeTupleList tupMap = V.toList $ V.map (\attr ->
47 makeTupleList tupMap = V.toList $ V.map (\attr ->
49 either (Left . AttributeMappingError) Right $
48 either (Left . AttributeMappingError) Right $
50− parseAtom (A.attributeName attr) (A.atomType attr) (T.pack $ tupMap HM.! A.attributeName attr)) attrs
49+ parseAtom (A.attributeName attr) (A.atomType attr) (T.pack $ tupMap HM.! A.attributeName attr)) (attributesVec attrs)
51 if attrNameSet == headerSet then do
50 if attrNameSet == headerSet then do
52 tupleList <- mapM sequence $ V.toList (V.map makeTupleList strMapRecords)
51 tupleList <- mapM sequence $ V.toList (V.map makeTupleList strMapRecords)
53 case mkRelationFromList attrs tupleList of
52 case mkRelationFromList attrs tupleList of
@@ -83,6 +82,11 @@ parseCSVAtomP _ _ BoolAtomType = do
83 case readMaybe bString of
82 case readMaybe bString of
84 Nothing -> fail ("invalid BoolAtom string: " ++ bString)
83 Nothing -> fail ("invalid BoolAtom string: " ++ bString)
85 Just b -> pure (Right (BoolAtom b))
84 Just b -> pure (Right (BoolAtom b))
85+parseCSVAtomP _ _ RelationalExprAtomType = do
86+ reString <- T.unpack <$> takeToEndOfData
87+ case readMaybe reString of
88+ Nothing -> fail ("invalid RelationalExprAtom string: " ++ reString)
89+ Just b -> pure (Right (RelationalExprAtom b))
86parseCSVAtomP attrName tConsMap typ@(ConstructedAtomType _ tvmap)
90parseCSVAtomP attrName tConsMap typ@(ConstructedAtomType _ tvmap)
87 | isIntervalAtomType typ = do
91 | isIntervalAtomType typ = do
88 begin <- (APT.char '[' >> pure False) <|> (APT.char '(' >> pure True)
92 begin <- (APT.char '[' >> pure False) <|> (APT.char '(' >> pure True)
src/lib/ProjectM36/Relation/Show/CSV.hs+5−5
@@ -1,7 +1,7 @@
1{-# OPTIONS_GHC -fno-warn-orphans #-}
1{-# OPTIONS_GHC -fno-warn-orphans #-}
2module ProjectM36.Relation.Show.CSV where
2module ProjectM36.Relation.Show.CSV where
3import ProjectM36.Base
3import ProjectM36.Base
4−import ProjectM36.Attribute
4+import ProjectM36.Attribute as A
5import Data.Csv
5import Data.Csv
6import ProjectM36.Tuple
6import ProjectM36.Tuple
7import qualified Data.ByteString.Lazy as BS
7import qualified Data.ByteString.Lazy as BS
@@ -17,13 +17,13 @@ relationAsCSV (Relation attrs tupleSet)
17 | relValAttrs /= [] =
17 | relValAttrs /= [] =
18 Left $ RelationValuedAttributesNotSupportedError (map attributeName relValAttrs)
18 Left $ RelationValuedAttributesNotSupportedError (map attributeName relValAttrs)
19 --check that there is at least one attribute
19 --check that there is at least one attribute
20− | V.null attrs =
20+ | A.null attrs =
21 Left $ TupleAttributeCountMismatchError 0
21 Left $ TupleAttributeCountMismatchError 0
22 | otherwise =
22 | otherwise =
23 Right $ encodeByName bsAttrNames $ map RecordRelationTuple (asList tupleSet)
23 Right $ encodeByName bsAttrNames $ map RecordRelationTuple (asList tupleSet)
24 where
24 where
25− relValAttrs = V.toList $ V.filter (isRelationAtomType . atomType) attrs
25+ relValAttrs = V.toList $ V.filter (isRelationAtomType . atomType) (attributesVec attrs)
26− bsAttrNames = V.map (TE.encodeUtf8 . attributeName) attrs
26+ bsAttrNames = V.map (TE.encodeUtf8 . attributeName) (attributesVec attrs)
27
27
28{-
28{-
29instance ToRecord RelationTuple where
29instance ToRecord RelationTuple where
@@ -36,7 +36,7 @@ instance ToNamedRecord RecordRelationTuple where
36 toNamedRecord rTuple = namedRecord $ map (\(k,v) -> TE.encodeUtf8 k .= RecordAtom v) (tupleAssocs $ unTuple rTuple)
36 toNamedRecord rTuple = namedRecord $ map (\(k,v) -> TE.encodeUtf8 k .= RecordAtom v) (tupleAssocs $ unTuple rTuple)
37
37
38instance DefaultOrdered RecordRelationTuple where
38instance DefaultOrdered RecordRelationTuple where
39− headerOrder (RecordRelationTuple tuple) = V.map (TE.encodeUtf8 . attributeName) (tupleAttributes tuple)
39+ headerOrder (RecordRelationTuple tuple) = V.map (TE.encodeUtf8 . attributeName) (attributesVec (tupleAttributes tuple))
40
40
41newtype RecordAtom = RecordAtom {unAtom :: Atom}
41newtype RecordAtom = RecordAtom {unAtom :: Atom}
42
42
src/lib/ProjectM36/Relation/Show/HTML.hs+2−2
@@ -3,6 +3,7 @@ import ProjectM36.Base
3import ProjectM36.Relation
3import ProjectM36.Relation
4import ProjectM36.Tuple
4import ProjectM36.Tuple
5import ProjectM36.Atom
5import ProjectM36.Atom
6+import ProjectM36.Attribute as A
6import ProjectM36.AtomType
7import ProjectM36.AtomType
7import qualified Data.List as L
8import qualified Data.List as L
8import Data.Text (Text, pack)
9import Data.Text (Text, pack)
@@ -11,10 +12,9 @@ import qualified Data.Text.IO as TIO
11#if __GLASGOW_HASKELL__ < 804
12#if __GLASGOW_HASKELL__ < 804
12import Data.Monoid
13import Data.Monoid
13#endif
14#endif
14−import qualified Data.Vector as V
15
15
16attributesAsHTML :: Attributes -> Text
16attributesAsHTML :: Attributes -> Text
17−attributesAsHTML attrs = "<tr>" <> T.concat (map oneAttrHTML (V.toList attrs)) <> "</tr>"
17+attributesAsHTML attrs = "<tr>" <> T.concat (map oneAttrHTML (A.toList attrs)) <> "</tr>"
18 where
18 where
19 oneAttrHTML attr = "<th>" <> prettyAttribute attr <> "</th>"
19 oneAttrHTML attr = "<th>" <> prettyAttribute attr <> "</th>"
20
20
src/lib/ProjectM36/RelationalExpression.hs+169−310
@@ -1,6 +1,7 @@
1{-# LANGUAGE ScopedTypeVariables #-}
1{-# LANGUAGE ScopedTypeVariables #-}
2{-# LANGUAGE FlexibleInstances #-}
2{-# LANGUAGE FlexibleInstances #-}
3{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE OverloadedStrings #-}
4module ProjectM36.RelationalExpression where
5module ProjectM36.RelationalExpression where
5import ProjectM36.Relation
6import ProjectM36.Relation
6import ProjectM36.Tuple
7import ProjectM36.Tuple
@@ -40,6 +41,8 @@ import Control.Monad.Reader as R hiding (join)
40import ProjectM36.NormalizeExpr
41import ProjectM36.NormalizeExpr
41import ProjectM36.WithNameExpr
42import ProjectM36.WithNameExpr
42import Test.QuickCheck
43import Test.QuickCheck
44+import qualified Data.Functor.Foldable as Fold
45+import Control.Applicative
43#ifdef PM36_HASKELL_SCRIPTING
46#ifdef PM36_HASKELL_SCRIPTING
44import GHC hiding (getContext)
47import GHC hiding (getContext)
45import Control.Exception
48import Control.Exception
@@ -107,11 +110,11 @@ askEnv :: GraphRefRelationalExprM GraphRefRelationalExprEnv
107askEnv = R.ask
110askEnv = R.ask
108
111
109mergeTuplesIntoGraphRefRelationalExprEnv :: RelationTuple -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
112mergeTuplesIntoGraphRefRelationalExprEnv :: RelationTuple -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
110−mergeTuplesIntoGraphRefRelationalExprEnv tupIn e =
113+mergeTuplesIntoGraphRefRelationalExprEnv tupIn env =
111− e{ gre_extra = new_elems }
114+ env { gre_extra = new_elems }
112 where
115 where
113 new_elems = Just (Left newTuple)
116 new_elems = Just (Left newTuple)
114− mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (envTuple e))
117+ mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (envTuple env))
115 newTuple = mkRelationTupleFromMap mergedTupMap
118 newTuple = mkRelationTupleFromMap mergedTupMap
116
119
117mergeAttributesIntoGraphRefRelationalExprEnv :: Attributes -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
120mergeAttributesIntoGraphRefRelationalExprEnv :: Attributes -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
@@ -209,166 +212,13 @@ envContext = re_context
209setEnvContext :: RelationalExprEnv -> DatabaseContext -> RelationalExprEnv
212setEnvContext :: RelationalExprEnv -> DatabaseContext -> RelationalExprEnv
210setEnvContext e ctx = e { re_context = ctx }
213setEnvContext e ctx = e { re_context = ctx }
211
214
212−{-
213−--full evaluation down the graph
214−eval :: RelationalExpr -> RelationalExprState (Either RelationalError Relation)
215−eval expr = do
216− env <- askEnv
217− eGfExpr <- processRelationalExpr expr
218− case eGfExpr of
219− Left err -> pure (Left err)
220− Right gfExpr -> pure $ evalGraphRefRelationalExpr gfExpr (re_graph env)
221−-}
222−{-
223−--relvar state is needed in evaluation of relational expression but only as read-only in order to extract current relvar values
224−evalRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError GraphRefRelationalExpr)
225−evalRelationalExpr (RelationVariable name _) = do
226− relvarTable <- fmap (relationVariables . envContext) askEnv
227− return $ case M.lookup name relvarTable of
228− Just res -> Right res
229− Nothing -> Left $ RelVarNotDefinedError name
230−
231−evalRelationalExpr (Project attrNames expr) = do
232− eAttrNameSet <- evalAttributeNames attrNames expr
233− case eAttrNameSet of
234− Left err -> pure (Left err)
235− Right attrNameSet -> do
236− rel <- evalRelationalExpr expr
237− case rel of
238− Right rel2 -> pure $ Right (Project (AttributeNames attrNameSet) rel2)
239− Left err -> pure $ Left err
240−
241−evalRelationalExpr (Union exprA exprB) = do
242− relA <- evalRelationalExpr exprA
243− relB <- evalRelationalExpr exprB
244− case relA of
245− Left err -> return $ Left err
246− Right relA2 -> case relB of
247− Left err -> return $ Left err
248− Right relB2 -> return $ Right (Union relA2 relB2)
249−
250−evalRelationalExpr (Join exprA exprB) = do
251− relA <- evalRelationalExpr exprA
252− relB <- evalRelationalExpr exprB
253− case relA of
254− Left err -> return $ Left err
255− Right relA2 -> case relB of
256− Left err -> return $ Left err
257− Right relB2 -> return $ Right (Join relA2 relB2)
258−
259−evalRelationalExpr (Difference exprA exprB) = do
260− relA <- evalRelationalExpr exprA
261− relB <- evalRelationalExpr exprB
262− case relA of
263− Left err -> return $ Left err
264− Right relA2 -> case relB of
265− Left err -> return $ Left err
266− Right relB2 -> return $ Right (Difference relA2 relB2)
267−
268−evalRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
269− case mkRelation attributeSet tupleSet of
270− Right rel -> return $ Right (ExistingRelation rel)
271− Left err -> return $ Left err
272−
273−evalRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
274− currentContext <- fmap envContext askEnv
275− let tConss = typeConstructorMapping currentContext
276− -- if the mAttrExprs is Nothing, then we should attempt to infer the tuple attributes from the first tuple itself- note that this is not always possible
277− runExceptT $ do
278− mAttrs <- case mAttrExprs of
279− Just _ ->
280− Just . A.attributesFromList <$> mapM evalGraphRefAttrExpr (fromMaybe [] mAttrExprs)
281− Nothing -> pure Nothing
282− tuples <- mapM (liftE . evalTupleExpr mAttrs) tupleExprs
283− let attrs = fromMaybe firstTupleAttrs mAttrs
284− firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
285− expr <- either throwE pure (mkRelation attrs (RelationTupleSet tuples))
286− pure (ExistingRelation expr)
287−
288−evalRelationalExpr (ExistingRelation rel) = pure (Right (ExistingRelation rel))
289−
290−evalRelationalExpr (Rename oldAttrName newAttrName relExpr) = do
291− evald <- evalRelationalExpr relExpr
292− case evald of
293− Right expr -> return $ Right (Rename oldAttrName newAttrName expr)
294− Left err -> return $ Left err
295−
296−evalRelationalExpr (Group oldAttrNames newAttrName relExpr) = do
297− eOldAttrNameSet <- evalAttributeNames oldAttrNames relExpr
298− case eOldAttrNameSet of
299− Left err -> pure (Left err)
300− Right oldAttrNameSet -> do
301− evald <- evalRelationalExpr relExpr
302− case evald of
303− Right expr -> return $ Right (Group (AttributeNames oldAttrNameSet) newAttrName expr)
304− Left err -> return $ Left err
305−
306−evalRelationalExpr (Ungroup attrName relExpr) = do
307− evald <- evalRelationalExpr relExpr
308− case evald of
309− Right expr -> return $ Right (Ungroup attrName expr)
310− Left err -> return $ Left err
311−
312−evalRelationalExpr (Restrict predicateExpr relExpr) = do
313− evald <- evalRelationalExpr relExpr
314− pred <- processRestrictionPredicateExpr predicateExpr
315− case evald of
316− Left err -> return $ Left err
317− Right expr ->
318− pure $ Right (Restrict pred expr)
319−
320−evalRelationalExpr (Equals relExprA relExprB) = do
321− evaldA <- evalRelationalExpr relExprA
322− evaldB <- evalRelationalExpr relExprB
323− case evaldA of
324− Left err -> return $ Left err
325− Right exprA -> case evaldB of
326− Left err -> return $ Left err
327− Right exprB -> return $ Right (Equals exprA exprB)
328−{-
329−evalRelationalExpr (With views mainExpr) = do
330− rstate <- ask
331−
332− let addScopedView ctx (vname,vexpr) = if vname `M.member` relationVariables ctx then
333− Left (RelVarAlreadyDefinedError vname)
334− else
335− case runState (evalDatabaseContextExpr (Assign vname vexpr)) (freshDatabaseState ctx) of
336− (Left err,_) -> Left err
337− (Right (), (ctx',_,_)) -> Right ctx'
338−
339− case foldM addScopedView (stateElemsContext rstate) views of
340− Left err -> return $ Left err
341− Right ctx'' -> do
342− let evalMainExpr expr = runReader (evalRelationalExpr expr) (RelationalExprEnv ctx'')
343− case evalMainExpr mainExpr of
344− Left err -> return $ Left err
345− Right rel -> return $ Right rel
346−-}
347−--warning: copy-pasta from above- refactor
348−evalRelationalExpr (NotEquals relExprA relExprB) = do
349− evaldA <- evalRelationalExpr relExprA
350− evaldB <- evalRelationalExpr relExprB
351− case evaldA of
352− Left err -> return $ Left err
353− Right exprA -> case evaldB of
354− Left err -> return $ Left err
355− Right exprB -> return $ Right (NotEquals exprA exprB)
356−
357−-- extending a relation adds a single attribute with the results of the per-tuple expression evaluated
358−evalRelationalExpr (Extend tupleExpression relExpr) = do
359− eExpr <- evalRelationalExpr relExpr
360− case eExpr of
361− Left err -> pure (Left err)
362− Right expr -> do
363− tupProc <- processExtendTupleExpr tupleExpression
364− pure (Right (Extend tupProc expr))
365−-}
366--helper function to process relation variable creation/assignment
215--helper function to process relation variable creation/assignment
367setRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
216setRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
368setRelVar relVarName relExpr = do
217setRelVar relVarName relExpr = do
369 currentContext <- getStateContext
218 currentContext <- getStateContext
370− --prevent recursive relvar definition
219+ --prevent recursive relvar definition by resolving references to relvars in previous states
220+ relExpr' <- resolve relExpr
371− let newRelVars = M.insert relVarName relExpr $ relationVariables currentContext
221+ let newRelVars = M.insert relVarName relExpr' $ relationVariables currentContext
372 potentialContext = currentContext { relationVariables = newRelVars }
222 potentialContext = currentContext { relationVariables = newRelVars }
373 --optimization: if the relexpr is unchanged, skip the update
223 --optimization: if the relexpr is unchanged, skip the update
374 if M.lookup relVarName (relationVariables currentContext) == Just relExpr then
224 if M.lookup relVarName (relationVariables currentContext) == Just relExpr then
@@ -381,6 +231,9 @@ setRelVar relVarName relExpr = do
381 Left err -> dbErr err
231 Left err -> dbErr err
382 Right _ -> putStateContext potentialContext
232 Right _ -> putStateContext potentialContext
383
233
234+--fast-path insertion- we already know that the previous relvar validated correctly, so we can validate just the relation that is being inserted for attribute matches- without this, even a single tuple relation inserted causes the entire relation to be re-validated unnecessarily
235+--insertIntoRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
236+
384-- it is not an error to delete a relvar which does not exist, just like it is not an error to insert a pre-existing tuple into a relation
237-- it is not an error to delete a relvar which does not exist, just like it is not an error to insert a pre-existing tuple into a relation
385deleteRelVar :: RelVarName -> DatabaseContextEvalMonad ()
238deleteRelVar :: RelVarName -> DatabaseContextEvalMonad ()
386deleteRelVar relVarName = do
239deleteRelVar relVarName = do
@@ -446,20 +299,36 @@ evalGraphRefDatabaseContextExpr (Assign relVarName expr) = do
446
299
447evalGraphRefDatabaseContextExpr (Insert relVarName relExpr) = do
300evalGraphRefDatabaseContextExpr (Insert relVarName relExpr) = do
448 gfExpr <- relVarByName relVarName
301 gfExpr <- relVarByName relVarName
302+ let optExpr = applyUnionCollapse (Union
303+ relExpr
304+ gfExpr)
449− evalGraphRefDatabaseContextExpr (Assign relVarName
305+ evalGraphRefDatabaseContextExpr (Assign relVarName optExpr)
450− (Union
451− gfExpr
452− relExpr))
453
306
454evalGraphRefDatabaseContextExpr (Delete relVarName predicate) = do
307evalGraphRefDatabaseContextExpr (Delete relVarName predicate) = do
455 gfExpr <- relVarByName relVarName
308 gfExpr <- relVarByName relVarName
456− setRelVar relVarName (Restrict (NotPredicate predicate) gfExpr)
309+ let optExpr = applyRestrictionCollapse (Restrict (NotPredicate predicate) gfExpr)
310+ setRelVar relVarName optExpr
457
311
458--union of restricted+updated portion and the unrestricted+unupdated portion
312--union of restricted+updated portion and the unrestricted+unupdated portion
459evalGraphRefDatabaseContextExpr (Update relVarName atomExprMap pred') = do
313evalGraphRefDatabaseContextExpr (Update relVarName atomExprMap pred') = do
460 rvExpr <- relVarByName relVarName
314 rvExpr <- relVarByName relVarName
315+ graph <- re_graph <$> dbcRelationalExprEnv
316+ context <- getStateContext
317+ let reEnv = freshGraphRefRelationalExprEnv (Just context) graph
318+ --get the current attributes name in the relvar to ensure that we don't conflict when renaming
319+ eExprType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr rvExpr)
320+ exprType' <- case eExprType of
321+ Left err -> throwError err
322+ Right t -> pure t
461 let unrestrictedPortion = Restrict (NotPredicate pred') rvExpr
323 let unrestrictedPortion = Restrict (NotPredicate pred') rvExpr
462− tmpAttr attr = "_tmp_" <> attr --this could certainly be improved to verify that there is no attribute name conflict
324+ tmpAttr = tmpAttrC 1
325+ tmpAttrC :: Int -> AttributeName -> AttributeName
326+ tmpAttrC c attr =
327+ let tmpAttrName = "_tmp_" <> T.pack (show c) <> attr in
328+ if tmpAttrName `S.member` A.attributeNameSet (attributes exprType') then
329+ tmpAttrC (c+1) attr
330+ else
331+ tmpAttrName
463 updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)
332 updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)
464 projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)
333 projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)
465 restrictedPortion = Restrict pred' rvExpr
334 restrictedPortion = Restrict pred' rvExpr
@@ -741,6 +610,7 @@ evalGraphRefDatabaseContextIOExpr (LoadDatabaseContextFunctions modName funcName
741 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }
610 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }
742 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)
611 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)
743 in putDBCIOContext newContext
612 in putDBCIOContext newContext
613+#endif
744evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs range) = do
614evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs range) = do
745 --Define
615 --Define
746 currentContext <- getDBCIOContext
616 currentContext <- getDBCIOContext
@@ -771,22 +641,10 @@ evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs
771 case runDatabaseContextEvalMonad currentContext evalEnv (setRelVar relVarName (ExistingRelation rel)) of
641 case runDatabaseContextEvalMonad currentContext evalEnv (setRelVar relVarName (ExistingRelation rel)) of
772 Left err -> pure (Left err)
642 Left err -> pure (Left err)
773 Right dbstate' -> putDBCIOContext (dbc_context dbstate')
643 Right dbstate' -> putDBCIOContext (dbc_context dbstate')
774−#endif
644+
775−{-
776−updateTupleWithAtomExprs :: M.Map AttributeName AtomExpr -> DatabaseContext -> TransactionGraph -> RelationTuple -> Either RelationalError RelationTuple
777−updateTupleWithAtomExprs exprMap context graph tupIn = do
778− --resolve all atom exprs
779− let
780− atomsAssoc <- mapM (\(attrName, atomExpr) -> do
781− let atom = unimplemented
782− --atom <- runReader (evalAtomExpr tupIn atomExpr) (mkRelationalExprState context graph)
783− pure (attrName, atom)
784− ) (M.toList exprMap)
785− pure (updateTupleWithAtoms (M.fromList atomsAssoc) tupIn)
786−-}
787--run verification on all constraints
645--run verification on all constraints
788checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()
646checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()
789−checkConstraints context transId graph@(TransactionGraph graphHeads transSet) =
647+checkConstraints context transId graph@(TransactionGraph graphHeads transSet) = do
790 mapM_ (uncurry checkIncDep) (M.toList deps)
648 mapM_ (uncurry checkIncDep) (M.toList deps)
791 where
649 where
792 potentialGraph = TransactionGraph graphHeads (S.insert tempTrans transSet)
650 potentialGraph = TransactionGraph graphHeads (S.insert tempTrans transSet)
@@ -835,15 +693,6 @@ typeForRelationalExpr expr = do
835 runGf = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
693 runGf = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
836 lift $ except runGf
694 lift $ except runGf
837
695
838−--returns a database context with all tuples removed
839−--this is useful for type checking and optimization
840−{-
841−contextWithEmptyTupleSets :: DatabaseContext -> DatabaseContext
842−contextWithEmptyTupleSets contextIn = contextIn { relationVariables = relVars }
843− where
844− relVars = M.map (\rel -> ExistingRelation (Relation (attributes rel) emptyTupleSet)) (relationVariables contextIn)
845−-}
846−
847liftE :: (Monad m) => m (Either a b) -> ExceptT a m b
696liftE :: (Monad m) => m (Either a b) -> ExceptT a m b
848liftE v = do
697liftE v = do
849 y <- lift v
698 y <- lift v
@@ -999,58 +848,6 @@ evalGraphRefAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs _) = do
999 mapM (evalGraphRefAtomExpr tupIn) dConsArgs
848 mapM (evalGraphRefAtomExpr tupIn) dConsArgs
1000 pure (ConstructedAtom dConsName aType argAtoms)
849 pure (ConstructedAtom dConsName aType argAtoms)
1001
850
1002−{-
1003−evalAtomExpr :: RelationTuple -> AtomExpr -> RelationalExprM Atom
1004−evalAtomExpr tupIn expr =
1005− -}
1006−{-
1007−
1008−evalAtomExpr tupIn (AttributeAtomExpr attrName) = case atomForAttributeName attrName tupIn of
1009− Right atom -> pure (Right atom)
1010− err@(Left (NoSuchAttributeNamesError _)) -> do
1011− rstate <- ask
1012− let stateTup = stateTuple rstate
1013− pure (atomForAttributeName attrName stateTup)
1014− Left err -> pure (Left err)
1015−evalAtomExpr _ (NakedAtomExpr atom) = pure (Right atom)
1016−evalAtomExpr tupIn (FunctionAtomExpr funcName arguments ()) = do
1017− argTypes <- mapM (typeFromAtomExpr (tupleAttributes tupIn)) arguments
1018− context <- fmap stateElemsContext ask
1019− runExceptT $ do
1020− let functions = atomFunctions context
1021− func <- either throwE pure (atomFunctionForName funcName functions)
1022− let expectedArgCount = length (atomFuncType func) - 1
1023− actualArgCount = length argTypes
1024− safeInit [] = [] -- different behavior from normal init
1025− safeInit xs = init xs
1026− if expectedArgCount /= actualArgCount then
1027− throwE (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
1028− else do
1029− let zippedArgs = zip (safeInit (atomFuncType func)) argTypes
1030− mapM_ (\(expType, eActType) -> do
1031− actType <- either throwE pure eActType
1032− either throwE pure (atomTypeVerify expType actType)) zippedArgs
1033− evaldArgs <- mapM (liftE . evalAtomExpr tupIn) arguments
1034− case evalAtomFunction func evaldArgs of
1035− Left err -> throwE (AtomFunctionUserError err)
1036− Right result -> do
1037− --validate that the result matches the expected type
1038− _ <- either throwE pure (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
1039− pure result
1040−evalAtomExpr tupIn (RelationAtomExpr relExpr) = do
1041− --merge existing state tuple context into new state tuple context to support an arbitrary number of levels, but new attributes trounce old attributes
1042− rstate <- ask
1043− runExceptT $ do
1044− let newState = mergeTuplesIntoRelationalExprState tupIn rstate
1045− relAtom <- either throwE pure (runReader (evalRelationalExpr relExpr) newState)
1046− pure (RelationAtom relAtom)
1047−evalAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs ()) = runExceptT $ do
1048− rstate <- lift ask
1049− let newState = mergeTuplesIntoRelationalExprState tupIn rstate
1050− aType <- either throwE pure (runReader (typeFromAtomExpr (tupleAttributes tupIn) cons) newState)
1051− argAtoms <- mapM (\arg -> either throwE pure (runReader (evalAtomExpr tupIn arg) newState)) dConsArgs
1052− pure (ConstructedAtom dConsName aType argAtoms)
1053−-}
1054typeForGraphRefAtomExpr :: Attributes -> GraphRefAtomExpr -> GraphRefRelationalExprM AtomType
851typeForGraphRefAtomExpr :: Attributes -> GraphRefAtomExpr -> GraphRefRelationalExprM AtomType
1055typeForGraphRefAtomExpr attrs (AttributeAtomExpr attrName) = do
852typeForGraphRefAtomExpr attrs (AttributeAtomExpr attrName) = do
1056 renv <- askEnv
853 renv <- askEnv
@@ -1117,7 +914,7 @@ verifyGraphRefAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs tid) e
1117 let handler :: RelationalError -> GraphRefRelationalExprM AtomType
914 let handler :: RelationalError -> GraphRefRelationalExprM AtomType
1118 handler (AtomTypeMismatchError expSubType actSubType) = throwError (AtomFunctionTypeError funcName argCount expSubType actSubType)
915 handler (AtomTypeMismatchError expSubType actSubType) = throwError (AtomFunctionTypeError funcName argCount expSubType actSubType)
1119 handler err = throwError err
916 handler err = throwError err
1120− verifyGraphRefAtomExprTypes relIn atomExpr expectedType2 `catchError` handler
917+ verifyGraphRefAtomExprTypes relIn atomExpr expectedType2 `catchError` handler
1121 funcArgTypes <- mapM funcArgVerifier $ zip3 funcArgExprs expectedArgTypes [1..]
918 funcArgTypes <- mapM funcArgVerifier $ zip3 funcArgExprs expectedArgTypes [1..]
1122 if length funcArgTypes /= length expectedArgTypes - 1 then
919 if length funcArgTypes /= length expectedArgTypes - 1 then
1123 throwError (AtomTypeCountError funcArgTypes expectedArgTypes)
920 throwError (AtomTypeCountError funcArgTypes expectedArgTypes)
@@ -1154,15 +951,27 @@ evalGraphRefTupleExprs mAttrs (TupleExprs fixedMarker tupleExprL) = do
1154 [] -> pure emptyAttributes
951 [] -> pure emptyAttributes
1155 (headTuple:tailTuples) -> do
952 (headTuple:tailTuples) -> do
1156 --gather up resolved atom types or throw an error if an attribute cannot be made concrete from the inferred types- this could still fail if the type cannot be inferred (e.g. from [Nothing, Nothing])
953 --gather up resolved atom types or throw an error if an attribute cannot be made concrete from the inferred types- this could still fail if the type cannot be inferred (e.g. from [Nothing, Nothing])
1157− let mostResolvedTypes =
954+ let
1158− foldr (\tup acc ->
955+ processTupleAttrs (tupAttr, accAttr) =
1159− fmap (\(tupAttr,accAttr) -> --if the attribute is a constructedatomtype, we can recurse into it to potentially resolve type variables
956+ --if the attribute is a constructedatomtype, we can recurse into it to potentially resolve type variables
1160− if isResolvedAttribute accAttr then
957+ if isResolvedAttribute accAttr && tupAttr == accAttr then
1161− accAttr
958+ pure accAttr
1162− else
959+ else
1163− case resolveAttributes accAttr tupAttr of
960+ lift $ except $ resolveAttributes accAttr tupAttr
1164− Left _ -> accAttr
961+ mostResolvedTypes <-
962+ foldM (\acc tup -> do
963+ let zipped = zip (V.toList . attributesVec $ tupleAttributes tup) acc
964+ accNames = S.fromList $ map A.attributeName acc
965+ tupNames = A.attributeNameSet (tupleAttributes tup)
966+ attrNamesDiff = S.union (S.difference accNames tupNames) (S.difference tupNames accNames)
967+ unless (null attrNamesDiff) (throwError (AttributeNamesMismatchError attrNamesDiff))
968+ nextTupleAttrs <- mapM processTupleAttrs zipped
969+ let diff = A.attributesDifference (A.attributesFromList nextTupleAttrs) (A.attributesFromList acc)
970+ if diff == A.emptyAttributes then
971+ pure nextTupleAttrs
972+ else
973+ throwError (TupleAttributeTypeMismatchError diff)
1165− Right val -> val) (zip (V.toList $ tupleAttributes tup) acc)) (V.toList $ tupleAttributes headTuple) tailTuples
974+ ) (V.toList . attributesVec $ tupleAttributes headTuple) tailTuples
1166 pure (A.attributesFromList mostResolvedTypes)
975 pure (A.attributesFromList mostResolvedTypes)
1167 --strategy: if all the tuple expr transaction markers refer to one location, then we can pass the type constructor mapping from that location, otherwise, we cannot assume that the types are the same
976 --strategy: if all the tuple expr transaction markers refer to one location, then we can pass the type constructor mapping from that location, otherwise, we cannot assume that the types are the same
1168 tConsMap <- case singularTransactions tupleExprL of
977 tConsMap <- case singularTransactions tupleExprL of
@@ -1208,56 +1017,6 @@ evalGraphRefTupleExpr mAttrs (TupleExpr tupMap) = do
1208-- _ <- lift $ except (validateTuple tup' tConss)
1017-- _ <- lift $ except (validateTuple tup' tConss)
1209 pure tup'
1018 pure tup'
1210
1019
1211−{-
1212−evalAttributeNames :: AttributeNames -> RelationalExpr -> RelationalExprM (Either RelationalError (S.Set AttributeName))
1213−evalAttributeNames attrNames expr = do
1214− eExprType <- typeForRelationalExpr expr
1215− case eExprType of
1216− Left err -> throwError err
1217− Right exprTyp -> do
1218− let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))
1219− case attrNames of
1220− AttributeNames names ->
1221− case A.projectionAttributesForNames names (attributes exprTyp) of
1222− Left err -> pure (Left err)
1223− Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))
1224−
1225− InvertedAttributeNames names -> do
1226− let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
1227− if not (S.null nonExistentAttributeNames) then
1228− pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))
1229− else
1230− pure (Right (A.nonMatchingAttributeNameSet names typeNameSet))
1231−
1232− UnionAttributeNames namesA namesB -> do
1233− eNameSetA <- evalAttributeNames namesA expr
1234− case eNameSetA of
1235− Left err -> pure (Left err)
1236− Right nameSetA -> do
1237− eNameSetB <- evalAttributeNames namesB expr
1238− case eNameSetB of
1239− Left err -> pure (Left err)
1240− Right nameSetB ->
1241− pure (Right (S.union nameSetA nameSetB))
1242−
1243− IntersectAttributeNames namesA namesB -> do
1244− eNameSetA <- evalAttributeNames namesA expr
1245− case eNameSetA of
1246− Left err -> pure (Left err)
1247− Right nameSetA -> do
1248− eNameSetB <- evalAttributeNames namesB expr
1249− case eNameSetB of
1250− Left err -> pure (Left err)
1251− Right nameSetB ->
1252− pure (Right (S.intersection nameSetA nameSetB))
1253−
1254− RelationalExprAttributeNames attrExpr -> do
1255− eAttrExprType <- typeForRelationalExpr attrExpr
1256− case eAttrExprType of
1257− Left err -> pure (Left err)
1258− Right attrExprType -> pure (Right (A.attributeNameSet (attributes attrExprType)))
1259−-}
1260−
1261--temporary implementation until we have a proper planner+executor
1020--temporary implementation until we have a proper planner+executor
1262evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
1021evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
1263evalGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
1022evalGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
@@ -1486,7 +1245,7 @@ relationVariablesAsRelation ctx graph = do
1486 let gfEnv = freshGraphRefRelationalExprEnv (Just ctx) graph
1245 let gfEnv = freshGraphRefRelationalExprEnv (Just ctx) graph
1487 gfType <- runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
1246 gfType <- runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
1488 pure (rvName, gfType)
1247 pure (rvName, gfType)
1489− relVarToAtomList (rvName, rel) = [TextAtom rvName, attributesToRel (attributes rel)]
1248+ relVarToAtomList (rvName, rel) = [TextAtom rvName, attributesToRel (attributesVec (attributes rel))]
1490 attrAtoms a = [TextAtom (A.attributeName a), TextAtom (prettyAtomType (A.atomType a))]
1249 attrAtoms a = [TextAtom (A.attributeName a), TextAtom (prettyAtomType (A.atomType a))]
1491 attributesToRel attrl = case mkRelationFromList subrelAttrs (map attrAtoms (V.toList attrl)) of
1250 attributesToRel attrl = case mkRelationFromList subrelAttrs (map attrAtoms (V.toList attrl)) of
1492 Left err -> error ("relationVariablesAsRelation pooped " ++ show err)
1251 Left err -> error ("relationVariablesAsRelation pooped " ++ show err)
@@ -1506,15 +1265,6 @@ evalRelationalExpr expr = do
1506 Left err -> throwError err
1265 Left err -> throwError err
1507 Right rel -> pure rel
1266 Right rel -> pure rel
1508
1267
1509−{-
1510−relVarByName :: RelVarName -> GraphRefRelationalExprM GraphRefRelationalExpr
1511−relVarByName = do
1512− relvars <- relationVariables <$> getStateContext
1513− case M.lookup relVarName relvars of
1514− Nothing -> dbErr (RelVarNotDefinedError relVarName)
1515− Just gfexpr -> pure gfExpr
1516−-}
1517−
1518class (MonadError RelationalError m, Monad m) => DatabaseContextM m where
1268class (MonadError RelationalError m, Monad m) => DatabaseContextM m where
1519 getContext :: m DatabaseContext
1269 getContext :: m DatabaseContext
1520
1270
@@ -1531,3 +1281,112 @@ relVarByName rvName = do
1531 Nothing -> throwError (RelVarNotDefinedError rvName)
1281 Nothing -> throwError (RelVarNotDefinedError rvName)
1532 Just gfexpr -> pure gfexpr
1282 Just gfexpr -> pure gfexpr
1533
1283
1284+-- | resolve UncommittedTransactionMarker whenever possible- this is important in the DatabaseContext in order to mitigate self-referencing loops for updates
1285+class ResolveGraphRefTransactionMarker a where
1286+ resolve :: a -> DatabaseContextEvalMonad a
1287+
1288+-- s := s union t
1289+instance ResolveGraphRefTransactionMarker GraphRefRelationalExpr where
1290+ resolve (MakeRelationFromExprs mAttrs tupleExprs) =
1291+ MakeRelationFromExprs mAttrs <$> resolve tupleExprs
1292+ resolve orig@MakeStaticRelation{} = pure orig
1293+ resolve orig@ExistingRelation{} = pure orig
1294+ resolve orig@(RelationVariable rvName UncommittedContextMarker) = do
1295+ rvMap <- relationVariables <$> getStateContext
1296+ case M.lookup rvName rvMap of
1297+ Nothing -> pure orig
1298+ Just resolvedRv -> resolve resolvedRv
1299+ resolve orig@RelationVariable{} = pure orig
1300+ resolve (Project attrNames relExpr) = Project <$> resolve attrNames <*> resolve relExpr
1301+ resolve (Union exprA exprB) = Union <$> resolve exprA <*> resolve exprB
1302+ resolve (Join exprA exprB) = Join <$> resolve exprA <*> resolve exprB
1303+ resolve (Rename attrA attrB expr) = Rename attrA attrB <$> resolve expr
1304+ resolve (Difference exprA exprB) = Difference <$> resolve exprA <*> resolve exprB
1305+ resolve (Group namesA nameB expr) = Group <$> resolve namesA <*> pure nameB <*> resolve expr
1306+ resolve (Ungroup nameA expr) = Ungroup nameA <$> resolve expr
1307+ resolve (Restrict restrictExpr relExpr) = Restrict <$> resolve restrictExpr <*> resolve relExpr
1308+ resolve (Equals exprA exprB) = Equals <$> resolve exprA <*> resolve exprB
1309+ resolve (NotEquals exprA exprB) = NotEquals <$> resolve exprA <*> resolve exprB
1310+ resolve (Extend extendExpr relExpr) = Extend <$> resolve extendExpr <*> resolve relExpr
1311+ resolve (With withExprs relExpr) = With <$> mapM (\(nam, expr) -> (,) <$> resolve nam <*> resolve expr) withExprs <*> resolve relExpr
1312+
1313+instance ResolveGraphRefTransactionMarker GraphRefTupleExprs where
1314+ resolve (TupleExprs marker tupleExprs) =
1315+ TupleExprs marker <$> mapM resolve tupleExprs
1316+
1317+instance ResolveGraphRefTransactionMarker GraphRefTupleExpr where
1318+ resolve (TupleExpr tupMap) = do
1319+ tupMap' <- mapM (\(attrName, expr) -> (,) attrName <$> resolve expr ) (M.toList tupMap)
1320+ pure (TupleExpr (M.fromList tupMap'))
1321+
1322+instance ResolveGraphRefTransactionMarker GraphRefAttributeNames where
1323+ resolve orig@AttributeNames{} = pure orig
1324+ resolve orig@InvertedAttributeNames{} = pure orig
1325+ resolve (UnionAttributeNames namesA namesB) = UnionAttributeNames <$> resolve namesA <*> resolve namesB
1326+ resolve (IntersectAttributeNames namesA namesB) = IntersectAttributeNames <$> resolve namesA <*> resolve namesB
1327+ resolve (RelationalExprAttributeNames expr) = RelationalExprAttributeNames <$> resolve expr
1328+
1329+instance ResolveGraphRefTransactionMarker GraphRefRestrictionPredicateExpr where
1330+ resolve TruePredicate = pure TruePredicate
1331+ resolve (AndPredicate exprA exprB) = AndPredicate <$> resolve exprA <*> resolve exprB
1332+ resolve (OrPredicate exprA exprB) = OrPredicate <$> resolve exprA <*> resolve exprB
1333+ resolve (NotPredicate expr) = NotPredicate <$> resolve expr
1334+ resolve (RelationalExprPredicate expr) = RelationalExprPredicate <$> resolve expr
1335+ resolve (AtomExprPredicate expr) = AtomExprPredicate <$> resolve expr
1336+ resolve (AttributeEqualityPredicate nam expr)= AttributeEqualityPredicate nam <$> resolve expr
1337+
1338+instance ResolveGraphRefTransactionMarker GraphRefExtendTupleExpr where
1339+ resolve (AttributeExtendTupleExpr nam atomExpr) = AttributeExtendTupleExpr nam <$> resolve atomExpr
1340+
1341+instance ResolveGraphRefTransactionMarker GraphRefWithNameExpr where
1342+ resolve orig@WithNameExpr{} = pure orig -- match uncommitted marker?
1343+
1344+instance ResolveGraphRefTransactionMarker GraphRefAtomExpr where
1345+ resolve orig@AttributeAtomExpr{} = pure orig
1346+ resolve orig@NakedAtomExpr{} = pure orig
1347+ resolve (FunctionAtomExpr nam atomExprs marker) =
1348+ FunctionAtomExpr nam <$> mapM resolve atomExprs <*> pure marker
1349+ resolve (RelationAtomExpr expr) = RelationAtomExpr <$> resolve expr
1350+ resolve (ConstructedAtomExpr dConsName atomExprs marker) =
1351+ ConstructedAtomExpr dConsName <$> mapM resolve atomExprs <*> pure marker
1352+
1353+--convert series of simple Union queries into MakeStaticRelation
1354+-- this is especially useful for long, nested applications of Union with simple tuples
1355+-- Union (MakeRelation x y) (MakeRelation x y') -> MakeRelation x (y + y')
1356+
1357+--MakeRelationFromExprs Nothing (TupleExprs UncommittedContextMarker [TupleExpr (fromList [("name", NakedAtomExpr (TextAtom "steve"))])])
1358+
1359+applyUnionCollapse :: GraphRefRelationalExpr -> GraphRefRelationalExpr
1360+applyUnionCollapse = Fold.cata opt
1361+ where
1362+ opt :: RelationalExprBaseF GraphRefTransactionMarker GraphRefRelationalExpr -> GraphRefRelationalExpr
1363+ opt (UnionF exprA exprB) | exprA == exprB = exprA
1364+ opt (UnionF
1365+ exprA@(MakeRelationFromExprs mAttrs1 tupExprs1)
1366+ exprB@(MakeRelationFromExprs mAttrs2 tupExprs2)) | tupExprs1 == tupExprs2 = MakeRelationFromExprs (mAttrs1 <|> mAttrs2) tupExprs1
1367+ | tupExprsNull tupExprs1 = exprB
1368+ | tupExprsNull tupExprs2 = exprA
1369+ opt x = Fold.embed x
1370+ tupExprsNull (TupleExprs _ []) = True
1371+ tupExprsNull _ = False
1372+
1373+
1374+--UPDATE optimization- find matching where clause in "lower" levels of renaming
1375+--update x where y=1 set (x:=5,z:=10); update x where y=1 set(x:=6,z:=11)
1376+-- =>
1377+-- update x where y=1 set (x:=6,z:=11)
1378+-- future opt: match individual attributes update x where y=1 set (x:=5); update x where y=1 set (z:=11) => update x where y=1 set (x:=5,z:=11)
1379+
1380+--strategy: try to collapse the top-level update (union (restrict pred MakeRelationFromExpr) expr) if it contains the same predicate and resultant relation
1381+
1382+--DELETE optimization
1383+-- if a restriction matches a previous restriction, combine them
1384+-- O(1) since it only scans at the top level, critical in benchmarks generating redundant deletions
1385+applyRestrictionCollapse :: GraphRefRelationalExpr -> GraphRefRelationalExpr
1386+applyRestrictionCollapse orig@(Restrict npred@(NotPredicate _) expr) =
1387+ case expr of
1388+ orig'@(Restrict npred'@(NotPredicate _) _) | npred == npred' -> orig'
1389+ _ -> orig
1390+applyRestrictionCollapse expr = expr
1391+
1392+
src/lib/ProjectM36/ScriptSession.hs+11−4
@@ -18,6 +18,7 @@ import System.Info (os, arch)
18import Data.Text (Text, unpack)
18import Data.Text (Text, unpack)
19import Data.Maybe
19import Data.Maybe
20import GHC.Paths (libdir)
20import GHC.Paths (libdir)
21+import System.Environment
21#if __GLASGOW_HASKELL__ >= 800
22#if __GLASGOW_HASKELL__ >= 800
22import GHC.LanguageExtensions
23import GHC.LanguageExtensions
23import GHCi.ObjLink
24import GHCi.ObjLink
@@ -78,6 +79,8 @@ initScriptSession ghcPkgPaths = do
78 handleGhcException excHandler $ runGhc (Just libdir) $ do
79 handleGhcException excHandler $ runGhc (Just libdir) $ do
79 dflags <- getSessionDynFlags
80 dflags <- getSessionDynFlags
80 let ghcVersion = projectVersion dflags
81 let ghcVersion = projectVersion dflags
82+ -- get nix packages dir, if available
83+ mNixLibDir <- liftIO $ lookupEnv "NIX_GHC_LIBDIR"
81
84
82 sandboxPkgPaths <- liftIO $ concat <$> mapM glob [
85 sandboxPkgPaths <- liftIO $ concat <$> mapM glob [
83 --"./dist-newstyle/packagedb/ghc-" ++ ghcVersion, --rely on cabal 3's ghc.environment install: "cabal install --lib project-m36"
86 --"./dist-newstyle/packagedb/ghc-" ++ ghcVersion, --rely on cabal 3's ghc.environment install: "cabal install --lib project-m36"
@@ -89,7 +92,7 @@ initScriptSession ghcPkgPaths = do
89 --homeDir </> ".cabal/store/ghc-" ++ ghcVersion ++ "/package.db"
92 --homeDir </> ".cabal/store/ghc-" ++ ghcVersion ++ "/package.db"
90 ]
93 ]
91
94
92− let localPkgPaths = map PkgConfFile (ghcPkgPaths ++ sandboxPkgPaths)
95+ let localPkgPaths = map PkgConfFile (ghcPkgPaths ++ sandboxPkgPaths ++ maybeToList mNixLibDir)
93
96
94 let dflags' = applyGopts . applyXopts $ dflags { hscTarget = HscInterpreted ,
97 let dflags' = applyGopts . applyXopts $ dflags { hscTarget = HscInterpreted ,
95 ghcLink = LinkInMemory,
98 ghcLink = LinkInMemory,
@@ -125,8 +128,6 @@ initScriptSession ghcPkgPaths = do
125 "uuid",
128 "uuid",
126 "vector",
129 "vector",
127 "text",
130 "text",
128− "binary",
129− "vector-binary-instances",
130 "time",
131 "time",
131 "project-m36",
132 "project-m36",
132 "bytestring"]
133 "bytestring"]
@@ -144,7 +145,9 @@ initScriptSession ghcPkgPaths = do
144 ideclSourceSrc = Nothing,
145 ideclSourceSrc = Nothing,
145#endif
146#endif
146
147
147−#if __GLASGOW_HASKELL__ >= 806
148+#if __GLASGOW_HASKELL__ >= 810
149+ ideclExt = noExtField,
150+#elif __GLASGOW_HASKELL__ >= 806
148 ideclExt = NoExt,
151 ideclExt = NoExt,
149#endif
152#endif
150 ideclName = noLoc mn,
153 ideclName = noLoc mn,
@@ -152,7 +155,11 @@ initScriptSession ghcPkgPaths = do
152 ideclSource = False,
155 ideclSource = False,
153 ideclSafe = True,
156 ideclSafe = True,
154 ideclImplicit = False,
157 ideclImplicit = False,
158+#if __GLASGOW_HASKELL__ >= 810
159+ ideclQualified = if isJust mQual then QualifiedPre else NotQualified,
160+#else
155 ideclQualified = isJust mQual,
161 ideclQualified = isJust mQual,
162+#endif
156 ideclAs = mQual,
163 ideclAs = mQual,
157 ideclHiding = Nothing
164 ideclHiding = Nothing
158 }
165 }
src/lib/ProjectM36/Serialise/AtomFunctionError.hsnew file+7
@@ -0,0 +1,7 @@
1+{-# LANGUAGE DerivingVia, StandaloneDeriving #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+module ProjectM36.Serialise.AtomFunctionError where
4+import Codec.Winery
5+import ProjectM36.AtomFunctionError
6+
7+deriving via WineryVariant AtomFunctionError instance Serialise AtomFunctionError
src/lib/ProjectM36/Serialise/Base.hsnew file+85
@@ -0,0 +1,85 @@
1+{-# LANGUAGE StandaloneDeriving, DerivingVia, TypeApplications, TypeSynonymInstances, ScopedTypeVariables #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+--Serialise instances for ProjectM36.Base data types- orphan instance city
4+module ProjectM36.Serialise.Base where
5+import Codec.Winery hiding (Schema)
6+import Codec.Winery.Internal
7+import Control.Monad
8+import ProjectM36.Base
9+import ProjectM36.MerkleHash
10+import Data.UUID
11+import Data.Proxy
12+import Data.Word
13+import ProjectM36.Attribute as A
14+import qualified Data.List.NonEmpty as NE
15+import qualified Data.Vector as V
16+import Data.Time.Calendar (Day,toGregorian,fromGregorian)
17+
18+deriving via WineryVariant Atom instance Serialise Atom
19+deriving via WineryVariant AtomType instance Serialise AtomType
20+deriving via WineryVariant Attribute instance Serialise Attribute
21+deriving via WineryVariant RelationTupleSet instance Serialise RelationTupleSet
22+deriving via WineryVariant RelationTuple instance Serialise RelationTuple
23+deriving via WineryVariant Relation instance Serialise Relation
24+deriving via WineryVariant RelationCardinality instance Serialise RelationCardinality
25+deriving via WineryVariant (RelationalExprBase a) instance Serialise a => Serialise (RelationalExprBase a)
26+deriving via WineryVariant (WithNameExprBase a) instance Serialise a => Serialise (WithNameExprBase a)
27+deriving via WineryVariant Notification instance Serialise Notification
28+deriving via WineryVariant TypeConstructorDef instance Serialise TypeConstructorDef
29+deriving via WineryVariant (TypeConstructorBase a) instance Serialise a => Serialise (TypeConstructorBase a)
30+deriving via WineryVariant DataConstructorDef instance Serialise DataConstructorDef
31+deriving via WineryVariant DataConstructorDefArg instance Serialise DataConstructorDefArg
32+deriving via WineryVariant GraphRefTransactionMarker instance Serialise GraphRefTransactionMarker
33+deriving via WineryVariant SchemaIsomorph instance Serialise SchemaIsomorph
34+deriving via WineryVariant InclusionDependency instance Serialise InclusionDependency
35+deriving via WineryVariant (DatabaseContextExprBase a) instance Serialise a => Serialise (DatabaseContextExprBase a)
36+deriving via WineryVariant (DatabaseContextIOExprBase a) instance Serialise a => Serialise (DatabaseContextIOExprBase a)
37+deriving via WineryVariant (RestrictionPredicateExprBase a) instance Serialise a => Serialise (RestrictionPredicateExprBase a)
38+deriving via WineryVariant TransactionInfo instance Serialise TransactionInfo
39+deriving via WineryVariant (AtomExprBase a) instance Serialise a => Serialise (AtomExprBase a)
40+deriving via WineryVariant MerkleHash instance Serialise MerkleHash
41+deriving via WineryVariant (AttributeExprBase a) instance Serialise a => Serialise (AttributeExprBase a)
42+deriving via WineryVariant (TupleExprsBase a) instance Serialise a => Serialise (TupleExprsBase a)
43+deriving via WineryVariant (TupleExprBase a) instance Serialise a => Serialise (TupleExprBase a)
44+deriving via WineryVariant (AttributeNamesBase a) instance Serialise a => Serialise (AttributeNamesBase a)
45+deriving via WineryVariant (ExtendTupleExprBase a) instance Serialise a => Serialise (ExtendTupleExprBase a)
46+deriving via WineryVariant Schema instance Serialise Schema
47+deriving via WineryVariant MergeStrategy instance Serialise MergeStrategy
48+
49+fromWordsTup :: (Word32, Word32, Word32, Word32) -> TransactionId
50+fromWordsTup (a,b,c,d) = fromWords a b c d
51+
52+instance Serialise TransactionId where
53+ schemaGen _ = getSchema (Proxy @(Word32, Word32, Word32, Word32))
54+ toBuilder uuid = toBuilder (toWords uuid)
55+ extractor = fromWordsTup <$> extractor
56+ decodeCurrent = fromWordsTup <$> decodeCurrent
57+
58+instance Serialise a => Serialise (NE.NonEmpty a) where
59+ schemaGen _ = SVector <$> getSchema (Proxy @a)
60+ toBuilder xs = varInt (length xs) <> foldMap toBuilder xs
61+ extractor = NE.fromList . V.toList <$> extractListBy extractor --use nonempty instead to replace error with winery error
62+ decodeCurrent = do
63+ n <- decodeVarInt
64+ l <- replicateM n decodeCurrent
65+ pure (NE.fromList l)
66+
67+fromGregorianTup :: (Integer, Int, Int) -> Day
68+fromGregorianTup (a, b, c) = fromGregorian a b c
69+
70+instance Serialise Day where
71+ schemaGen _ = getSchema (Proxy @(Integer, Int, Int))
72+ toBuilder day = toBuilder (toGregorian day)
73+ extractor = fromGregorianTup <$> extractor
74+ decodeCurrent = fromGregorianTup <$> decodeCurrent
75+
76+instance Serialise Attributes where
77+ schemaGen _ = SVector <$> getSchema (Proxy @Attribute)
78+ toBuilder attrs = varInt (V.length (attributesVec attrs)) <> foldMap toBuilder (V.toList (attributesVec attrs))
79+ extractor =
80+ attributesFromList . V.toList <$> extractListBy extractor
81+
82+ decodeCurrent = do
83+ n <- decodeVarInt
84+ l <- replicateM n decodeCurrent
85+ pure (A.attributesFromList l)
src/lib/ProjectM36/Serialise/DataFrame.hsnew file+13
@@ -0,0 +1,13 @@
1+{-# LANGUAGE DerivingVia, StandaloneDeriving #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+module ProjectM36.Serialise.DataFrame where
4+import Codec.Winery
5+import ProjectM36.DataFrame
6+import ProjectM36.Serialise.Base ()
7+
8+deriving via WineryVariant AttributeOrderExpr instance Serialise AttributeOrderExpr
9+deriving via WineryVariant AttributeOrder instance Serialise AttributeOrder
10+deriving via WineryVariant Order instance Serialise Order
11+deriving via WineryRecord DataFrame instance Serialise DataFrame
12+deriving via WineryVariant DataFrameTuple instance Serialise DataFrameTuple
13+deriving via WineryRecord DataFrameExpr instance Serialise DataFrameExpr
src/lib/ProjectM36/Serialise/DatabaseContextFunctionError.hsnew file+7
@@ -0,0 +1,7 @@
1+{-# LANGUAGE DerivingVia, StandaloneDeriving #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+module ProjectM36.Serialise.DatabaseContextFunctionError where
4+import Codec.Winery
5+import ProjectM36.DatabaseContextFunctionError
6+
7+deriving via WineryVariant DatabaseContextFunctionError instance Serialise DatabaseContextFunctionError
src/lib/ProjectM36/Serialise/Error.hsnew file+15
@@ -0,0 +1,15 @@
1+{-# LANGUAGE DerivingVia, StandaloneDeriving #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+module ProjectM36.Serialise.Error where
4+import ProjectM36.Error
5+import Codec.Winery
6+import ProjectM36.Serialise.Base ()
7+import ProjectM36.Serialise.AtomFunctionError ()
8+import ProjectM36.Serialise.DatabaseContextFunctionError ()
9+
10+deriving via WineryVariant RelationalError instance Serialise RelationalError
11+deriving via WineryVariant MergeError instance Serialise MergeError
12+deriving via WineryVariant ScriptCompilationError instance Serialise ScriptCompilationError
13+deriving via WineryVariant PersistenceError instance Serialise PersistenceError
14+deriving via WineryVariant SchemaError instance Serialise SchemaError
15+deriving via WineryVariant ImportError' instance Serialise ImportError'
src/lib/ProjectM36/Serialise/IsomorphicSchema.hsnew file+7
@@ -0,0 +1,7 @@
1+{-# LANGUAGE StandaloneDeriving, DerivingVia, TypeSynonymInstances, ScopedTypeVariables #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+module ProjectM36.Serialise.IsomorphicSchema where
4+import Codec.Winery
5+import ProjectM36.IsomorphicSchema
6+
7+deriving via WineryVariant SchemaExpr instance Serialise SchemaExpr
src/lib/ProjectM36/Serialise/MergeError.hsnew file+1
@@ -0,0 +1 @@
1+
src/lib/ProjectM36/Server.hs+166−91
@@ -7,77 +7,119 @@ import ProjectM36.Server.RemoteCallTypes
7import ProjectM36.Server.Config (ServerConfig(..))
7import ProjectM36.Server.Config (ServerConfig(..))
8import ProjectM36.FSType
8import ProjectM36.FSType
9
9
10−import Control.Monad.IO.Class (liftIO)
11−#if MIN_VERSION_network_transport_tcp(0,7,0)
12−import Network.Transport.TCP (createTransport, defaultTCPParameters, defaultTCPAddr)
13−#else
14−import Network.Transport.TCP (createTransport, defaultTCPParameters)
15−#endif
16−import Network.Transport (EndPointAddress(..), newEndPoint, address)
17−import Control.Distributed.Process.Node (initRemoteTable, runProcess, newLocalNode, initRemoteTable)
18−import Control.Distributed.Process.Extras.Time (Delay(..))
19−import Control.Distributed.Process (Process, register, getSelfPid)
20−import Control.Distributed.Process.ManagedProcess (defaultProcess, UnhandledMessagePolicy(..), ProcessDefinition(..), handleCall, serve, InitHandler, InitResult(..))
21−import Control.Concurrent.MVar (putMVar, MVar)
10+import Control.Concurrent.MVar (MVar)
22import System.IO (stderr, hPutStrLn)
11import System.IO (stderr, hPutStrLn)
23import System.FilePath (takeDirectory)
12import System.FilePath (takeDirectory)
24import System.Directory (doesDirectoryExist)
13import System.Directory (doesDirectoryExist)
14+import Network.RPC.Curryer.Server
15+import Network.Socket
16+import qualified StmContainers.Map as StmMap
17+import Control.Concurrent.STM
25
18
26−-- the state should be a mapping of remote connection to the disconnected transaction- the graph should be the same, so discon must be removed from the stm tuple
19+type TestMode = Bool
27−--trying to refactor this for less repetition is very challenging because the return type cannot be polymorphic or the distributed-process call gets confused and drops messages
28−serverDefinition :: Bool -> Timeout -> ProcessDefinition Connection
29−serverDefinition testBool ti = defaultProcess {
30− apiHandlers = [
31− handleCall (\conn (ExecuteHeadName sessionId) -> handleExecuteHeadName ti sessionId conn),
32− handleCall (\conn (ExecuteRelationalExpr sessionId expr) -> handleExecuteRelationalExpr ti sessionId conn expr),
33− handleCall (\conn (ExecuteDataFrameExpr sessionId expr) -> handleExecuteDataFrameExpr ti sessionId conn expr),
34− handleCall (\conn (ExecuteDatabaseContextExpr sessionId expr) -> handleExecuteDatabaseContextExpr ti sessionId conn expr),
35− handleCall (\conn (ExecuteDatabaseContextIOExpr sessionId expr) -> handleExecuteDatabaseContextIOExpr ti sessionId conn expr),
36− handleCall (\conn (ExecuteGraphExpr sessionId expr) -> handleExecuteGraphExpr ti sessionId conn expr),
37− handleCall (\conn (ExecuteTransGraphRelationalExpr sessionId expr) -> handleExecuteTransGraphRelationalExpr ti sessionId conn expr),
38− handleCall (\conn (ExecuteTypeForRelationalExpr sessionId expr) -> handleExecuteTypeForRelationalExpr ti sessionId conn expr),
39− handleCall (\conn (RetrieveInclusionDependencies sessionId) -> handleRetrieveInclusionDependencies ti sessionId conn),
40− handleCall (\conn (RetrievePlanForDatabaseContextExpr sessionId dbExpr) -> handleRetrievePlanForDatabaseContextExpr ti sessionId conn dbExpr),
41− handleCall (\conn (RetrieveHeadTransactionId sessionId) -> handleRetrieveHeadTransactionId ti sessionId conn),
42− handleCall (\conn (RetrieveTransactionGraph sessionId) -> handleRetrieveTransactionGraph ti sessionId conn),
43− handleCall (\conn (Login procId) -> handleLogin ti conn procId),
44− handleCall (\conn (CreateSessionAtHead headn) -> handleCreateSessionAtHead ti conn headn),
45− handleCall (\conn (CreateSessionAtCommit commitId) -> handleCreateSessionAtCommit ti conn commitId),
46− handleCall (\conn (CloseSession sessionId) -> handleCloseSession ti sessionId conn),
47− handleCall (\conn (RetrieveAtomTypesAsRelation sessionId) -> handleRetrieveAtomTypesAsRelation ti sessionId conn),
48− handleCall (\conn (RetrieveRelationVariableSummary sessionId) -> handleRetrieveRelationVariableSummary ti sessionId conn),
49− handleCall (\conn (RetrieveAtomFunctionSummary sessionId) -> handleRetrieveAtomFunctionSummary ti sessionId conn),
50− handleCall (\conn (RetrieveDatabaseContextFunctionSummary sessionId) -> handleRetrieveDatabaseContextFunctionSummary ti sessionId conn),
51− handleCall (\conn (RetrieveCurrentSchemaName sessionId) -> handleRetrieveCurrentSchemaName ti sessionId conn),
52− handleCall (\conn (ExecuteSchemaExpr sessionId schemaExpr) -> handleExecuteSchemaExpr ti sessionId conn schemaExpr),
53− handleCall (\conn (RetrieveSessionIsDirty sessionId) -> handleRetrieveSessionIsDirty ti sessionId conn),
54− handleCall (\conn (ExecuteAutoMergeToHead sessionId strat headName') -> handleExecuteAutoMergeToHead ti sessionId conn strat headName'),
55− handleCall (\conn (RetrieveTypeConstructorMapping sessionId) -> handleRetrieveTypeConstructorMapping ti sessionId conn),
56− handleCall (\conn (ExecuteValidateMerkleHashes sessionId) -> handleValidateMerkleHashes ti sessionId conn),
57− handleCall (\conn Logout -> handleLogout ti conn)
58− ] ++ testModeHandlers,
59− unhandledMessagePolicy = Terminate
60− --unhandledMessagePolicy = Log
61− }
62− where
63− testModeHandlers = [handleCall (\conn (TestTimeout sessionId) -> handleTestTimeout ti sessionId conn) | testBool]
64−
65−initServer :: InitHandler (Connection, DatabaseName, Maybe (MVar EndPointAddress), EndPointAddress) Connection
66−initServer (conn, dbname, mAddressMVar, saddress) = do
67− registerDB dbname
68− case mAddressMVar of
69− Nothing -> pure ()
70− Just addressMVar -> liftIO $ putMVar addressMVar saddress
71− --traceShowM ("server started on " ++ show saddress)
72− pure $ InitOk conn Infinity
73
20
74−registerDB :: DatabaseName -> Process ()
21+requestHandlers :: TestMode -> Maybe Timeout -> RequestHandlers ServerState
75−registerDB dbname = do
22+requestHandlers testFlag ti =
76− self <- getSelfPid
23+ [
77− let dbname' = remoteDBLookupName dbname
24+ RequestHandler (\sState (Login dbName) -> do
78− register dbname' self
25+ addClientLogin dbName sState
79− --liftIO $ putStrLn $ "registered " ++ (show self) ++ " " ++ dbname'
26+ conn <- getConn sState
80−
27+ handleLogin conn (connectionSocket sState)),
28+ RequestHandler (\sState Logout -> do
29+ conn <- getConn sState
30+ handleLogout ti conn),
31+ RequestHandler $ \sState (ExecuteHeadName sessionId) -> do
32+ --socket -> dbname --maybe create a socket->client state mapping in the server state, too
33+ conn <- getConn sState
34+ handleExecuteHeadName ti sessionId conn,
35+ RequestHandler (\sState (ExecuteRelationalExpr sessionId expr) -> do
36+ conn <- getConn sState
37+ handleExecuteRelationalExpr ti sessionId conn expr),
38+ RequestHandler (\sState (ExecuteDataFrameExpr sessionId expr) -> do
39+ conn <- getConn sState
40+ handleExecuteDataFrameExpr ti sessionId conn expr),
41+ RequestHandler (\sState (ExecuteDatabaseContextExpr sessionId expr) -> do
42+ conn <- getConn sState
43+ handleExecuteDatabaseContextExpr ti sessionId conn expr),
44+ RequestHandler (\sState (ExecuteDatabaseContextIOExpr sessionId expr) -> do
45+ conn <- getConn sState
46+ handleExecuteDatabaseContextIOExpr ti sessionId conn expr),
47+ RequestHandler (\sState (ExecuteGraphExpr sessionId expr) -> do
48+ conn <- getConn sState
49+ handleExecuteGraphExpr ti sessionId conn expr),
50+ RequestHandler (\sState (ExecuteTransGraphRelationalExpr sessionId expr) -> do
51+ conn <- getConn sState
52+ handleExecuteTransGraphRelationalExpr ti sessionId conn expr),
53+ RequestHandler (\sState (ExecuteTypeForRelationalExpr sessionId expr) -> do
54+ conn <- getConn sState
55+ handleExecuteTypeForRelationalExpr ti sessionId conn expr),
56+ RequestHandler (\sState (RetrieveInclusionDependencies sessionId) -> do
57+ conn <- getConn sState
58+ handleRetrieveInclusionDependencies ti sessionId conn),
59+ RequestHandler (\sState (RetrievePlanForDatabaseContextExpr sessionId dbExpr) -> do
60+ conn <- getConn sState
61+ handleRetrievePlanForDatabaseContextExpr ti sessionId conn dbExpr),
62+ RequestHandler (\sState (RetrieveHeadTransactionId sessionId) -> do
63+ conn <- getConn sState
64+ handleRetrieveHeadTransactionId ti sessionId conn),
65+ RequestHandler (\sState (RetrieveTransactionGraph sessionId) -> do
66+ conn <- getConn sState
67+ handleRetrieveTransactionGraph ti sessionId conn),
68+ RequestHandler (\sState (CreateSessionAtHead headn) -> do
69+ conn <- getConn sState
70+ handleCreateSessionAtHead ti conn headn),
71+ RequestHandler (\sState (CreateSessionAtCommit commitId) -> do
72+ conn <- getConn sState
73+ handleCreateSessionAtCommit ti conn commitId),
74+ RequestHandler (\sState (CloseSession sessionId) -> do
75+ conn <- getConn sState
76+ handleCloseSession sessionId conn),
77+ RequestHandler (\sState (RetrieveAtomTypesAsRelation sessionId) -> do
78+ conn <- getConn sState
79+ handleRetrieveAtomTypesAsRelation ti sessionId conn),
80+ RequestHandler (\sState (RetrieveRelationVariableSummary sessionId) -> do
81+ conn <- getConn sState
82+ handleRetrieveRelationVariableSummary ti sessionId conn),
83+ RequestHandler (\sState (RetrieveAtomFunctionSummary sessionId) -> do
84+ conn <- getConn sState
85+ handleRetrieveAtomFunctionSummary ti sessionId conn),
86+ RequestHandler (\sState (RetrieveDatabaseContextFunctionSummary sessionId) -> do
87+ conn <- getConn sState
88+ handleRetrieveDatabaseContextFunctionSummary ti sessionId conn), RequestHandler (\sState (RetrieveCurrentSchemaName sessionId) -> do
89+ conn <- getConn sState
90+ handleRetrieveCurrentSchemaName ti sessionId conn),
91+ RequestHandler (\sState (ExecuteSchemaExpr sessionId schemaExpr) -> do
92+ conn <- getConn sState
93+ handleExecuteSchemaExpr ti sessionId conn schemaExpr),
94+ RequestHandler (\sState (RetrieveSessionIsDirty sessionId) -> do
95+ conn <- getConn sState
96+ handleRetrieveSessionIsDirty ti sessionId conn),
97+ RequestHandler (\sState (ExecuteAutoMergeToHead sessionId strat headName') -> do
98+ conn <- getConn sState
99+ handleExecuteAutoMergeToHead ti sessionId conn strat headName'),
100+ RequestHandler (\sState (RetrieveTypeConstructorMapping sessionId) -> do
101+ conn <- getConn sState
102+ handleRetrieveTypeConstructorMapping ti sessionId conn),
103+ RequestHandler (\sState (ExecuteValidateMerkleHashes sessionId) -> do
104+ conn <- getConn sState
105+ handleValidateMerkleHashes ti sessionId conn)
106+ ] ++ if testFlag then testModeHandlers ti else []
107+
108+getConn :: ConnectionState ServerState -> IO Connection
109+getConn connState = do
110+ let sock = lockless (connectionSocket connState)
111+ sState = connectionServerState connState
112+ mConn <- connectionForClient sock sState
113+ case mConn of
114+ Nothing -> error "failed to find socket in client map"
115+ Just conn -> pure conn
116+
117+testModeHandlers :: Maybe Timeout -> RequestHandlers ServerState
118+testModeHandlers ti = [RequestHandler (\sState (TestTimeout sessionId) -> do
119+ conn <- getConn sState
120+ handleTestTimeout ti sessionId conn)]
121+
122+
81-- | A notification callback which logs the notification to stderr and does nothing else.
123-- | A notification callback which logs the notification to stderr and does nothing else.
82loggingNotificationCallback :: NotificationCallback
124loggingNotificationCallback :: NotificationCallback
83loggingNotificationCallback notName evaldNot = hPutStrLn stderr $ "Notification received \"" ++ show notName ++ "\": " ++ show evaldNot
125loggingNotificationCallback notName evaldNot = hPutStrLn stderr $ "Notification received \"" ++ show notName ++ "\": " ++ show evaldNot
@@ -102,9 +144,47 @@ checkFSType performCheck strat =
102checkFSErrorMsg :: String
144checkFSErrorMsg :: String
103checkFSErrorMsg = "The filesystem does not support journaling so writes may not be crash-safe. Use --disable-fscheck to disable this fatal error."
145checkFSErrorMsg = "The filesystem does not support journaling so writes may not be crash-safe. Use --disable-fscheck to disable this fatal error."
104
146
147+-- Sockets do not implement hashable, so we just use their string values as keys
148+type SocketString = String
149+
150+data ServerState =
151+ ServerState {
152+ --map available databases to local database configurations
153+ stateDBMap :: StmMap.Map DatabaseName Connection,
154+ --map clients to database names- after logging in, clients are afixed to specific database names
155+ stateClientMap :: StmMap.Map SocketString DatabaseName
156+ }
157+
158+-- add a client socket to the database mapping
159+addClientLogin :: DatabaseName -> ConnectionState ServerState -> IO ()
160+addClientLogin dbName cState = do
161+ let clientMap = stateClientMap (connectionServerState cState)
162+ sock = lockless (connectionSocket cState)
163+ atomically $ do
164+ mVal <- StmMap.lookup (show sock) clientMap
165+ case mVal of
166+ Nothing -> StmMap.insert dbName (show sock) clientMap
167+ Just _ -> pure () --TODO: throw exception- user already logged in
168+
169+connectionForClient :: Socket -> ServerState -> IO (Maybe Connection)
170+connectionForClient sock sState =
171+ atomically $ do
172+ mdbname <- StmMap.lookup (show sock) (stateClientMap sState)
173+ case mdbname of
174+ Nothing -> pure Nothing
175+ Just dbname ->
176+ StmMap.lookup dbname (stateDBMap sState)
177+
178+initialServerState :: DatabaseName -> Connection -> IO ServerState
179+initialServerState dbName conn =
180+ atomically $ do
181+ dbmap <- StmMap.new
182+ clientMap <- StmMap.new
183+ StmMap.insert conn dbName dbmap
184+ pure (ServerState { stateDBMap = dbmap, stateClientMap = clientMap })
105-- | A synchronous function to start the project-m36 daemon given an appropriate 'ServerConfig'. Note that this function only returns if the server exits. Returns False if the daemon exited due to an error. If the second argument is not Nothing, the port is put after the server is ready to service the port.
185-- | A synchronous function to start the project-m36 daemon given an appropriate 'ServerConfig'. Note that this function only returns if the server exits. Returns False if the daemon exited due to an error. If the second argument is not Nothing, the port is put after the server is ready to service the port.
106−launchServer :: ServerConfig -> Maybe (MVar EndPointAddress) -> IO Bool
186+launchServer :: ServerConfig -> Maybe (MVar SockAddr) -> IO Bool
107−launchServer daemonConfig mAddressMVar = do
187+launchServer daemonConfig mAddr = do
108 checkFSResult <- checkFSType (checkFS daemonConfig) (persistenceStrategy daemonConfig)
188 checkFSResult <- checkFSType (checkFS daemonConfig) (persistenceStrategy daemonConfig)
109 if not checkFSResult then do
189 if not checkFSResult then do
110 hPutStrLn stderr checkFSErrorMsg
190 hPutStrLn stderr checkFSErrorMsg
@@ -117,26 +197,21 @@ launchServer daemonConfig mAddressMVar = do
117 pure False
197 pure False
118 Right conn -> do
198 Right conn -> do
119 let hostname = bindHost daemonConfig
199 let hostname = bindHost daemonConfig
120− port = bindPort daemonConfig
200+ port = fromIntegral (bindPort daemonConfig)
121−#if MIN_VERSION_network_transport_tcp(0,7,0)
201+
122− etransport <- createTransport (defaultTCPAddr hostname (show port)) defaultTCPParameters
202+
123−#elif MIN_VERSION_network_transport_tcp(0,6,0)
203+ --curryer only supports IPv4 for now
124− etransport <- createTransport hostname (show port) (\nam -> (hostname, nam)) defaultTCPParameters
204+ let addrHints = defaultHints { addrSocketType = Stream, addrFamily = AF_INET }
125−#else
205+ hostAddrs <- getAddrInfo (Just addrHints) (Just hostname) Nothing
126− etransport <- createTransport hostname (show port) defaultTCPParameters
127−#endif
128− case etransport of
129− Left err -> error ("failed to create transport: " ++ show err)
130− Right transport -> do
131− eEndpoint <- newEndPoint transport
132− case eEndpoint of
206+ case hostAddrs of
133− Left err -> hPutStrLn stderr ("Failed to create transport: " ++ show err) >> pure False
207+ [] -> hPutStrLn stderr ("Failed to resolve: " <> hostname) >> pure False
134− Right endpoint -> do
208+ (AddrInfo _ _ _ _ (SockAddrInet _ addr32) _):_ -> do
135− localTCPNode <- newLocalNode transport initRemoteTable
209+ let hostAddr = hostAddressToTuple addr32
136− --traceShowM ("newLocalNode in Server " ++ show (localNodeId localTCPNode))
137− runProcess localTCPNode $ do
138− let testBool = testMode daemonConfig
139− reqTimeout = perRequestTimeout daemonConfig
210+ mTimeout = fromIntegral <$> case perRequestTimeout daemonConfig of
140− serve (conn, databaseName daemonConfig, mAddressMVar, address endpoint) initServer (serverDefinition testBool reqTimeout)
211+ 0 -> Nothing
141− liftIO $ putStrLn "serve returned"
212+ v -> Just v
142− pure True
213+
214+ sState <- initialServerState (databaseName daemonConfig) conn
215+ serve (requestHandlers (testMode daemonConfig) mTimeout) sState hostAddr port mAddr
216+ _ -> error "unsupported socket addressing mode (IPv4 only currently)"
217+
src/lib/ProjectM36/Server/Config.hs+6
@@ -12,6 +12,12 @@ data ServerConfig = ServerConfig { persistenceStrategy :: PersistenceStrategy,
12 }
12 }
13 deriving (Show)
13 deriving (Show)
14
14
15+data WebsocketServerConfig = WebsocketServerConfig { wsServerConfig :: ServerConfig,
16+ tlsCertificatePath :: Maybe String,
17+ tlsKeyPath :: Maybe String
18+ }
19+ deriving (Show)
20+
15defaultServerConfig :: ServerConfig
21defaultServerConfig :: ServerConfig
16defaultServerConfig = ServerConfig { persistenceStrategy = NoPersistence,
22defaultServerConfig = ServerConfig { persistenceStrategy = NoPersistence,
17 checkFS = True,
23 checkFS = True,
src/lib/ProjectM36/Server/EntryPoints.hs+125−157
@@ -3,176 +3,144 @@ module ProjectM36.Server.EntryPoints where
3import ProjectM36.Base hiding (inclusionDependencies)
3import ProjectM36.Base hiding (inclusionDependencies)
4import ProjectM36.IsomorphicSchema
4import ProjectM36.IsomorphicSchema
5import ProjectM36.Client as C
5import ProjectM36.Client as C
6−import ProjectM36.Error
7−import Control.Distributed.Process (Process, ProcessId)
8−import Control.Distributed.Process.ManagedProcess (ProcessReply)
9−import Control.Distributed.Process.ManagedProcess.Server (reply)
10−import Control.Distributed.Process.Async (async, task, waitCancelTimeout, AsyncResult(..))
11−import Control.Monad.IO.Class (liftIO)
12import Data.Map
6import Data.Map
13import Control.Concurrent (threadDelay)
7import Control.Concurrent (threadDelay)
14−import Data.Typeable
8+import Network.RPC.Curryer.Server
15−import Data.Binary
9+import System.Timeout hiding (Timeout)
10+import Network.Socket
11+import Control.Exception
16
12
17−timeoutOrDie :: (Binary a, Typeable a) => Timeout -> IO a -> Process (Either ServerError a)
13+timeoutOrDie :: Maybe Timeout -> IO a -> IO (Maybe a)
18−timeoutOrDie micros act =
14+timeoutOrDie mMicros act =
19− if micros == 0 then
20− liftIO act >>= \x -> pure (Right x)
21− else do
22− asyncUnit <- async (task (liftIO act))
23− asyncRes <- waitCancelTimeout micros asyncUnit
24− case asyncRes of
15+ case mMicros of
25− AsyncDone x -> pure (Right x)
16+ Nothing -> Just <$> act
26− AsyncCancelled -> pure (Left RequestTimeoutError)
17+ Just micros ->
27− AsyncFailed reason -> pure (Left (ProcessDiedError (show reason)))
18+ timeout (fromIntegral micros) act
28− AsyncLinkFailed reason -> pure (Left (ProcessDiedError (show reason)))
29− AsyncPending -> pure (Left (ProcessDiedError "process pending"))
30−
31−type Timeout = Int
32−
33−type Reply a = Process (ProcessReply (Either ServerError a) Connection)
34−
35−handleExecuteRelationalExpr :: Timeout -> SessionId -> Connection -> RelationalExpr -> Reply (Either RelationalError Relation)
36−handleExecuteRelationalExpr ti sessionId conn expr = do
37− ret <- timeoutOrDie ti (executeRelationalExpr sessionId conn expr)
38− reply ret conn
39
19
40−handleExecuteDataFrameExpr :: Timeout -> SessionId -> Connection -> DataFrameExpr -> Reply (Either RelationalError DataFrame)
20+timeoutRelErr :: Maybe Timeout -> IO (Either RelationalError a) -> IO (Either RelationalError a)
41−handleExecuteDataFrameExpr ti sessionId conn expr = do
21+timeoutRelErr mMicros act = do
42− ret <- timeoutOrDie ti (executeDataFrameExpr sessionId conn expr)
22+ ret <- timeoutOrDie mMicros act
43− reply ret conn
44−
45−handleExecuteDatabaseContextExpr :: Timeout -> SessionId -> Connection -> DatabaseContextExpr -> Reply (Either RelationalError ())
46−handleExecuteDatabaseContextExpr ti sessionId conn dbexpr = do
47− ret <- timeoutOrDie ti (executeDatabaseContextExpr sessionId conn dbexpr)
48− reply ret conn
49−
50−handleExecuteDatabaseContextIOExpr :: Timeout -> SessionId -> Connection -> DatabaseContextIOExpr -> Reply (Either RelationalError ())
51−handleExecuteDatabaseContextIOExpr ti sessionId conn dbexpr = do
52− ret <- timeoutOrDie ti (executeDatabaseContextIOExpr sessionId conn dbexpr)
53− reply ret conn
54−
55−handleExecuteHeadName :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError HeadName)
56−handleExecuteHeadName ti sessionId conn = do
57− ret <- timeoutOrDie ti (headName sessionId conn)
58− reply ret conn
59−
60−handleLogin :: Timeout -> Connection -> ProcessId -> Reply Bool
61−handleLogin ti conn newClientProcessId = do
62− ret <- timeoutOrDie ti (addClientNode conn newClientProcessId)
63 case ret of
23 case ret of
64− Right () -> reply (Right True) conn
24+ Nothing -> throw TimeoutException
65− Left err -> reply (Left err) conn
25+ Just v -> pure v
66−
26+
67−handleExecuteGraphExpr :: Timeout -> SessionId -> Connection -> TransactionGraphOperator -> Reply (Either RelationalError ())
68−handleExecuteGraphExpr ti sessionId conn graphExpr = do
69− ret <- timeoutOrDie ti (executeGraphExpr sessionId conn graphExpr)
70− reply ret conn
71−
72−handleExecuteTransGraphRelationalExpr :: Timeout -> SessionId -> Connection -> TransGraphRelationalExpr -> Reply (Either RelationalError Relation)
73−handleExecuteTransGraphRelationalExpr ti sessionId conn graphExpr = do
74− ret <- timeoutOrDie ti (executeTransGraphRelationalExpr sessionId conn graphExpr)
75− reply ret conn
76
27
77−handleExecuteTypeForRelationalExpr :: Timeout -> SessionId -> Connection -> RelationalExpr -> Reply (Either RelationalError Relation)
28+handleExecuteRelationalExpr :: Maybe Timeout -> SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)
78−handleExecuteTypeForRelationalExpr ti sessionId conn relExpr = do
29+handleExecuteRelationalExpr ti sessionId conn expr =
30+ timeoutRelErr ti (executeRelationalExpr sessionId conn expr)
31+
32+handleExecuteDataFrameExpr :: Maybe Timeout -> SessionId -> Connection -> DataFrameExpr -> IO (Either RelationalError DataFrame)
33+handleExecuteDataFrameExpr ti sessionId conn expr =
34+ timeoutRelErr ti (executeDataFrameExpr sessionId conn expr)
35+
36+handleExecuteDatabaseContextExpr :: Maybe Timeout -> SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError ())
37+handleExecuteDatabaseContextExpr ti sessionId conn dbexpr =
38+ timeoutRelErr ti (executeDatabaseContextExpr sessionId conn dbexpr)
39+
40+handleExecuteDatabaseContextIOExpr :: Maybe Timeout -> SessionId -> Connection -> DatabaseContextIOExpr -> IO (Either RelationalError ())
41+handleExecuteDatabaseContextIOExpr ti sessionId conn dbexpr =
42+ timeoutRelErr ti (executeDatabaseContextIOExpr sessionId conn dbexpr)
43+
44+handleExecuteHeadName :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError HeadName)
45+handleExecuteHeadName ti sessionId conn =
46+ timeoutRelErr ti (headName sessionId conn)
47+
48+handleLogin :: Connection -> Locking Socket -> IO Bool
49+handleLogin conn lockSock = do
50+ addClientNode conn lockSock
51+ pure True
52+
53+handleExecuteGraphExpr :: Maybe Timeout -> SessionId -> Connection -> TransactionGraphOperator -> IO (Either RelationalError ())
54+handleExecuteGraphExpr ti sessionId conn graphExpr =
55+ timeoutRelErr ti (executeGraphExpr sessionId conn graphExpr)
56+
57+handleExecuteTransGraphRelationalExpr :: Maybe Timeout -> SessionId -> Connection -> TransGraphRelationalExpr -> IO (Either RelationalError Relation)
58+handleExecuteTransGraphRelationalExpr ti sessionId conn graphExpr =
59+ timeoutRelErr ti (executeTransGraphRelationalExpr sessionId conn graphExpr)
60+
61+handleExecuteTypeForRelationalExpr :: Maybe Timeout -> SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)
62+handleExecuteTypeForRelationalExpr ti sessionId conn relExpr =
79− ret <- timeoutOrDie ti (typeForRelationalExpr sessionId conn relExpr)
63+ timeoutRelErr ti (typeForRelationalExpr sessionId conn relExpr)
80− reply ret conn
64+
81−
82−handleRetrieveInclusionDependencies :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError (Map IncDepName InclusionDependency))
65+handleRetrieveInclusionDependencies :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError (Map IncDepName InclusionDependency))
83−handleRetrieveInclusionDependencies ti sessionId conn = do
66+handleRetrieveInclusionDependencies ti sessionId conn =
84− ret <- timeoutOrDie ti (inclusionDependencies sessionId conn)
67+ timeoutRelErr ti (inclusionDependencies sessionId conn)
85− reply ret conn
68+
86−
87−handleRetrievePlanForDatabaseContextExpr :: Timeout -> SessionId -> Connection -> DatabaseContextExpr -> Reply (Either RelationalError GraphRefDatabaseContextExpr)
69+handleRetrievePlanForDatabaseContextExpr :: Maybe Timeout -> SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError GraphRefDatabaseContextExpr)
88−handleRetrievePlanForDatabaseContextExpr ti sessionId conn dbExpr = do
70+handleRetrievePlanForDatabaseContextExpr ti sessionId conn dbExpr =
89− ret <- timeoutOrDie ti (planForDatabaseContextExpr sessionId conn dbExpr)
71+ timeoutRelErr ti (planForDatabaseContextExpr sessionId conn dbExpr)
90− reply ret conn
72+
91−
92−handleRetrieveTransactionGraph :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)
73+handleRetrieveTransactionGraph :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)
93−handleRetrieveTransactionGraph ti sessionId conn = do
74+handleRetrieveTransactionGraph ti sessionId conn =
94− ret <- timeoutOrDie ti (transactionGraphAsRelation sessionId conn)
75+ timeoutRelErr ti (transactionGraphAsRelation sessionId conn)
95− reply ret conn
76+
96−
97−handleRetrieveHeadTransactionId :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError TransactionId)
77+handleRetrieveHeadTransactionId :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError TransactionId)
98−handleRetrieveHeadTransactionId ti sessionId conn = do
78+handleRetrieveHeadTransactionId ti sessionId conn =
99− ret <- timeoutOrDie ti (headTransactionId sessionId conn)
79+ timeoutRelErr ti (headTransactionId sessionId conn)
100− reply ret conn
101−
102−handleCreateSessionAtCommit :: Timeout -> Connection -> TransactionId -> Reply (Either RelationalError SessionId)
103−handleCreateSessionAtCommit ti conn commitId = do
104− ret <- timeoutOrDie ti (createSessionAtCommit conn commitId)
105− reply ret conn
106−
107−handleCreateSessionAtHead :: Timeout -> Connection -> HeadName -> Reply (Either RelationalError SessionId)
108−handleCreateSessionAtHead ti conn headn = do
109− ret <- timeoutOrDie ti (createSessionAtHead conn headn)
110− reply ret conn
111−
112−handleCloseSession :: Timeout -> SessionId -> Connection -> Reply ()
113−handleCloseSession ti sessionId conn = do
114− ret <- timeoutOrDie ti (closeSession sessionId conn)
115− case ret of
116− Right () -> reply (Right ()) conn
117− Left err -> reply (Left err) conn
118
80
81+handleCreateSessionAtCommit :: Maybe Timeout -> Connection -> TransactionId -> IO (Either RelationalError SessionId)
82+handleCreateSessionAtCommit ti conn commitId =
83+ timeoutRelErr ti (createSessionAtCommit conn commitId)
84+
85+handleCreateSessionAtHead :: Maybe Timeout -> Connection -> HeadName -> IO (Either RelationalError SessionId)
86+handleCreateSessionAtHead ti conn headn =
87+ timeoutRelErr ti (createSessionAtHead conn headn)
88+
89+handleCloseSession :: SessionId -> Connection -> IO ()
90+handleCloseSession =
91+ closeSession
92+
119−handleRetrieveAtomTypesAsRelation :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)
93+handleRetrieveAtomTypesAsRelation :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)
120−handleRetrieveAtomTypesAsRelation ti sessionId conn = do
94+handleRetrieveAtomTypesAsRelation ti sessionId conn =
121− ret <- timeoutOrDie ti (atomTypesAsRelation sessionId conn)
95+ timeoutRelErr ti (atomTypesAsRelation sessionId conn)
122− reply ret conn
123
96
124-- | Returns a relation which lists the names of relvars in the current session as well as its types.
97-- | Returns a relation which lists the names of relvars in the current session as well as its types.
125−handleRetrieveRelationVariableSummary :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)
98+handleRetrieveRelationVariableSummary :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)
126−handleRetrieveRelationVariableSummary ti sessionId conn = do
99+handleRetrieveRelationVariableSummary ti sessionId conn =
127− ret <- timeoutOrDie ti (relationVariablesAsRelation sessionId conn)
100+ timeoutRelErr ti (relationVariablesAsRelation sessionId conn)
128− reply ret conn
101+
129−
130−handleRetrieveAtomFunctionSummary :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)
102+handleRetrieveAtomFunctionSummary :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)
131−handleRetrieveAtomFunctionSummary ti sessionId conn = do
103+handleRetrieveAtomFunctionSummary ti sessionId conn =
132− ret <- timeoutOrDie ti (atomFunctionsAsRelation sessionId conn)
104+ timeoutRelErr ti (atomFunctionsAsRelation sessionId conn)
133− reply ret conn
105+
134−
135−handleRetrieveDatabaseContextFunctionSummary :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)
106+handleRetrieveDatabaseContextFunctionSummary :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)
136−handleRetrieveDatabaseContextFunctionSummary ti sessionId conn = do
107+handleRetrieveDatabaseContextFunctionSummary ti sessionId conn =
137− ret <- timeoutOrDie ti (databaseContextFunctionsAsRelation sessionId conn)
108+ timeoutRelErr ti (databaseContextFunctionsAsRelation sessionId conn)
138− reply ret conn
109+
139−
140−handleRetrieveCurrentSchemaName :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError SchemaName)
110+handleRetrieveCurrentSchemaName :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError SchemaName)
141−handleRetrieveCurrentSchemaName ti sessionId conn = do
111+handleRetrieveCurrentSchemaName ti sessionId conn =
142− ret <- timeoutOrDie ti (currentSchemaName sessionId conn)
112+ timeoutRelErr ti (currentSchemaName sessionId conn)
143− reply ret conn
144
113
145−handleExecuteSchemaExpr :: Timeout -> SessionId -> Connection -> SchemaExpr -> Reply (Either RelationalError ())
114+handleExecuteSchemaExpr :: Maybe Timeout -> SessionId -> Connection -> SchemaExpr -> IO (Either RelationalError ())
146−handleExecuteSchemaExpr ti sessionId conn schemaExpr = do
115+handleExecuteSchemaExpr ti sessionId conn schemaExpr =
147− ret <- timeoutOrDie ti (executeSchemaExpr sessionId conn schemaExpr)
116+ timeoutRelErr ti (executeSchemaExpr sessionId conn schemaExpr)
148− reply ret conn
149
117
150−handleLogout :: Timeout -> Connection -> Reply Bool
118+handleLogout :: Maybe Timeout -> Connection -> IO Bool
151−handleLogout _ =
119+handleLogout _ _ =
152 --liftIO $ closeRemote_ conn
120 --liftIO $ closeRemote_ conn
153− reply (pure True)
121+ pure True
154
122
155−handleTestTimeout :: Timeout -> SessionId -> Connection -> Reply Bool
123+handleTestTimeout :: Maybe Timeout -> SessionId -> Connection -> IO Bool
156−handleTestTimeout ti _ conn = do
124+handleTestTimeout ti _ _ = do
157− ret <- timeoutOrDie ti (threadDelay 100000 >> pure True)
125+ ret <- timeoutRelErr ti (threadDelay 100000 >> pure (Right ()))
158− reply ret conn
126+ case ret of
127+ Right () -> pure True
128+ Left _ -> pure False
159
129
130+
131+
160−handleRetrieveSessionIsDirty :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Bool)
132+handleRetrieveSessionIsDirty :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Bool)
161−handleRetrieveSessionIsDirty ti sessionId conn = do
133+handleRetrieveSessionIsDirty ti sessionId conn =
162− ret <- timeoutOrDie ti (disconnectedTransactionIsDirty sessionId conn)
134+ timeoutRelErr ti (disconnectedTransactionIsDirty sessionId conn)
163− reply ret conn
135+
164−
165−handleExecuteAutoMergeToHead :: Timeout -> SessionId -> Connection -> MergeStrategy -> HeadName -> Reply (Either RelationalError ())
136+handleExecuteAutoMergeToHead :: Maybe Timeout -> SessionId -> Connection -> MergeStrategy -> HeadName -> IO (Either RelationalError ())
166−handleExecuteAutoMergeToHead ti sessionId conn strat headName' = do
137+handleExecuteAutoMergeToHead ti sessionId conn strat headName' =
167− ret <- timeoutOrDie ti (autoMergeToHead sessionId conn strat headName')
138+ timeoutRelErr ti (autoMergeToHead sessionId conn strat headName')
168− reply ret conn
169
139
170−handleRetrieveTypeConstructorMapping :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError TypeConstructorMapping)
140+handleRetrieveTypeConstructorMapping :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError TypeConstructorMapping)
171−handleRetrieveTypeConstructorMapping ti sessionId conn = do
141+handleRetrieveTypeConstructorMapping ti sessionId conn =
172− ret <- timeoutOrDie ti (C.typeConstructorMapping sessionId conn)
142+ timeoutRelErr ti (C.typeConstructorMapping sessionId conn)
173− reply ret conn
174
143
175−handleValidateMerkleHashes :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError ())
144+handleValidateMerkleHashes :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError ())
176−handleValidateMerkleHashes ti sessionId conn = do
145+handleValidateMerkleHashes ti sessionId conn =
177− ret <- timeoutOrDie ti (C.validateMerkleHashes sessionId conn)
146+ timeoutRelErr ti (C.validateMerkleHashes sessionId conn)
178− reply ret conn
src/lib/ProjectM36/Server/ParseArgs.hs+38−15
@@ -17,14 +17,14 @@ parseArgsWithDefaults defaults = ServerConfig <$>
17 many parseGhcPkgPath <*>
17 many parseGhcPkgPath <*>
18 parseTimeout (perRequestTimeout defaults) <*>
18 parseTimeout (perRequestTimeout defaults) <*>
19 parseTestMode
19 parseTestMode
20−
20+
21parsePersistenceStrategy :: Parser PersistenceStrategy
21parsePersistenceStrategy :: Parser PersistenceStrategy
22parsePersistenceStrategy = CrashSafePersistence <$> (dbdirOpt <* fsyncOpt) <|>
22parsePersistenceStrategy = CrashSafePersistence <$> (dbdirOpt <* fsyncOpt) <|>
23 MinimalPersistence <$> dbdirOpt <|>
23 MinimalPersistence <$> dbdirOpt <|>
24 pure NoPersistence
24 pure NoPersistence
25− where
25+ where
26− dbdirOpt = strOption (short 'd' <>
26+ dbdirOpt = strOption (short 'd' <>
27− long "database-directory" <>
27+ long "database-directory" <>
28 metavar "DIRECTORY" <>
28 metavar "DIRECTORY" <>
29 showDefaultWith show
29 showDefaultWith show
30 )
30 )
@@ -34,46 +34,69 @@ parsePersistenceStrategy = CrashSafePersistence <$> (dbdirOpt <* fsyncOpt) <|>
34
34
35parseTestMode :: Parser Bool
35parseTestMode :: Parser Bool
36parseTestMode = flag True False (long "test-mode" <> hidden)
36parseTestMode = flag True False (long "test-mode" <> hidden)
37−
37+
38−parseCheckFS :: Parser Bool
38+parseCheckFS :: Parser Bool
39parseCheckFS = flag True False (long "disable-fscheck" <>
39parseCheckFS = flag True False (long "disable-fscheck" <>
40 help "Disable filesystem check for journaling.")
40 help "Disable filesystem check for journaling.")
41−
41+
42parseDatabaseName :: Parser DatabaseName
42parseDatabaseName :: Parser DatabaseName
43parseDatabaseName = strOption (short 'n' <>
43parseDatabaseName = strOption (short 'n' <>
44 long "database" <>
44 long "database" <>
45 metavar "DATABASE_NAME")
45 metavar "DATABASE_NAME")
46
46
47−parseHostname :: Hostname -> Parser Hostname
47+parseHostname :: Hostname -> Parser Hostname
48parseHostname defHostname = strOption (short 'h' <>
48parseHostname defHostname = strOption (short 'h' <>
49 long "hostname" <>
49 long "hostname" <>
50 metavar "HOST_NAME" <>
50 metavar "HOST_NAME" <>
51 value defHostname)
51 value defHostname)
52−
52+
53−parsePort :: Port -> Parser Port
53+parsePort :: Port -> Parser Port
54parsePort defPort = option auto (short 'p' <>
54parsePort defPort = option auto (short 'p' <>
55 long "port" <>
55 long "port" <>
56 metavar "PORT_NUMBER" <>
56 metavar "PORT_NUMBER" <>
57 value defPort)
57 value defPort)
58−
58+
59parseGhcPkgPath :: Parser String
59parseGhcPkgPath :: Parser String
60parseGhcPkgPath = strOption (long "ghc-pkg-dir" <>
60parseGhcPkgPath = strOption (long "ghc-pkg-dir" <>
61 metavar "GHC_PACKAGE_DIRECTORY")
61 metavar "GHC_PACKAGE_DIRECTORY")
62−
62+
63−parseTimeout :: Int -> Parser Int
63+parseTimeout :: Int -> Parser Int
64parseTimeout defTimeout = option auto (long "timeout" <>
64parseTimeout defTimeout = option auto (long "timeout" <>
65 metavar "MICROSECONDS" <>
65 metavar "MICROSECONDS" <>
66 value defTimeout)
66 value defTimeout)
67
67
68parseConfig :: IO ServerConfig
68parseConfig :: IO ServerConfig
69parseConfig = parseConfigWithDefaults defaultServerConfig
69parseConfig = parseConfigWithDefaults defaultServerConfig
70−
70+
71parseConfigWithDefaults :: ServerConfig -> IO ServerConfig
71parseConfigWithDefaults :: ServerConfig -> IO ServerConfig
72parseConfigWithDefaults defaults = execParser (info (parseArgsWithDefaults defaults <**> helpOption) idm)
72parseConfigWithDefaults defaults = execParser (info (parseArgsWithDefaults defaults <**> helpOption) idm)
73
73
74+parseWSConfigWithDefaults :: ServerConfig -> IO WebsocketServerConfig
75+parseWSConfigWithDefaults defaults = execParser (info (parseWSArgsWithDefaults defaults <**> helpOption) idm)
76+
77+parseWSArgsWithDefaults :: ServerConfig -> Parser WebsocketServerConfig
78+parseWSArgsWithDefaults defaults = WebsocketServerConfig <$>
79+ parseArgsWithDefaults defaults <*>
80+ parseTlsCertificatePath <*>
81+ parseTlsKeyPath
82+
83+
84+parseTlsCertificatePath :: Parser (Maybe String)
85+parseTlsCertificatePath = optional $ strOption (long "tls-certificate-path" <>
86+ metavar "TLS_CERTIFICATE_PATH")
87+
88+parseTlsKeyPath :: Parser (Maybe String)
89+parseTlsKeyPath = optional $ strOption (long "tls-key-path" <>
90+ metavar "TLS_KEY_PATH")
74
91
75helpOption :: Parser (a -> a)
92helpOption :: Parser (a -> a)
76−helpOption = abortOption ShowHelpText $ mconcat
93+helpOption = abortOption helpText $ mconcat
77 [ long "help"
94 [ long "help"
78 , help "Show this help text"
95 , help "Show this help text"
79 , hidden ]
96 , hidden ]
97+ where
98+#if MIN_VERSION_optparse_applicative(0,16,0)
99+ helpText = ShowHelpText Nothing
100+#else
101+ helpText = ShowHelpText
102+#endif
src/lib/ProjectM36/Server/RemoteCallTypes.hs+65−36
@@ -1,4 +1,4 @@
1−{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}
1+{-# LANGUAGE DeriveGeneric, DerivingVia, CPP #-}
2module ProjectM36.Server.RemoteCallTypes where
2module ProjectM36.Server.RemoteCallTypes where
3import ProjectM36.Base
3import ProjectM36.Base
4import ProjectM36.IsomorphicSchema
4import ProjectM36.IsomorphicSchema
@@ -6,69 +6,98 @@ import ProjectM36.TransactionGraph
6import ProjectM36.DataFrame
6import ProjectM36.DataFrame
7import ProjectM36.TransGraphRelationalExpression
7import ProjectM36.TransGraphRelationalExpression
8import ProjectM36.Session
8import ProjectM36.Session
9+import ProjectM36.Serialise.DataFrame ()
10+import ProjectM36.Serialise.IsomorphicSchema ()
9import GHC.Generics
11import GHC.Generics
10−import Data.Binary
12+import Codec.Winery
11−import Control.Distributed.Process (ProcessId)
13+
14+#define RPCData(typeName) deriving Generic \
15+ deriving Serialise via WineryVariant typeName
12
16
13{-# ANN module ("HLint: ignore Use newtype instead of data" :: String) #-}
17{-# ANN module ("HLint: ignore Use newtype instead of data" :: String) #-}
14-- | The initial login message. The argument should be the process id of the initiating client. This ProcessId will receive notification callbacks.
18-- | The initial login message. The argument should be the process id of the initiating client. This ProcessId will receive notification callbacks.
15−data Login = Login ProcessId
19+data Login = Login DatabaseName
16− deriving (Binary, Generic)
20+ RPCData(Login)
17
21
18data Logout = Logout
22data Logout = Logout
19− deriving (Binary, Generic)
23+ RPCData(Logout)
24+
20−data ExecuteRelationalExpr = ExecuteRelationalExpr SessionId RelationalExpr
25+data ExecuteRelationalExpr = ExecuteRelationalExpr SessionId RelationalExpr
21− deriving (Binary, Generic)
26+ RPCData(ExecuteRelationalExpr)
27+
22data ExecuteDataFrameExpr = ExecuteDataFrameExpr SessionId DataFrameExpr
28data ExecuteDataFrameExpr = ExecuteDataFrameExpr SessionId DataFrameExpr
23− deriving (Binary, Generic)
29+ RPCData(ExecuteDataFrameExpr)
30+
24data ExecuteDatabaseContextExpr = ExecuteDatabaseContextExpr SessionId DatabaseContextExpr
31data ExecuteDatabaseContextExpr = ExecuteDatabaseContextExpr SessionId DatabaseContextExpr
25− deriving (Binary, Generic)
32+ RPCData(ExecuteDatabaseContextExpr)
33+
26data ExecuteDatabaseContextIOExpr = ExecuteDatabaseContextIOExpr SessionId DatabaseContextIOExpr
34data ExecuteDatabaseContextIOExpr = ExecuteDatabaseContextIOExpr SessionId DatabaseContextIOExpr
27− deriving (Binary, Generic)
35+ RPCData(ExecuteDatabaseContextIOExpr)
36+
28data ExecuteGraphExpr = ExecuteGraphExpr SessionId TransactionGraphOperator
37data ExecuteGraphExpr = ExecuteGraphExpr SessionId TransactionGraphOperator
29− deriving (Binary, Generic)
38+ RPCData(ExecuteGraphExpr)
39+
30data ExecuteTransGraphRelationalExpr = ExecuteTransGraphRelationalExpr SessionId TransGraphRelationalExpr
40data ExecuteTransGraphRelationalExpr = ExecuteTransGraphRelationalExpr SessionId TransGraphRelationalExpr
31− deriving (Binary, Generic)
41+ RPCData(ExecuteTransGraphRelationalExpr)
42+
32data ExecuteHeadName = ExecuteHeadName SessionId
43data ExecuteHeadName = ExecuteHeadName SessionId
33− deriving (Binary, Generic)
44+ RPCData(ExecuteHeadName)
45+
34data ExecuteTypeForRelationalExpr = ExecuteTypeForRelationalExpr SessionId RelationalExpr
46data ExecuteTypeForRelationalExpr = ExecuteTypeForRelationalExpr SessionId RelationalExpr
35− deriving (Binary, Generic)
47+ RPCData(ExecuteTypeForRelationalExpr)
48+
36−data ExecuteSchemaExpr = ExecuteSchemaExpr SessionId SchemaExpr
49+data ExecuteSchemaExpr = ExecuteSchemaExpr SessionId SchemaExpr RPCData(ExecuteSchemaExpr)
37− deriving (Binary, Generic)
50+
38data ExecuteSetCurrentSchema = ExecuteSetCurrentSchema SessionId SchemaName
51data ExecuteSetCurrentSchema = ExecuteSetCurrentSchema SessionId SchemaName
39− deriving (Binary, Generic)
52+ RPCData(ExecuteSetCurrentSchema)
53+
40data RetrieveInclusionDependencies = RetrieveInclusionDependencies SessionId
54data RetrieveInclusionDependencies = RetrieveInclusionDependencies SessionId
41− deriving (Binary, Generic)
55+ RPCData(RetrieveInclusionDependencies)
56+
42data RetrievePlanForDatabaseContextExpr = RetrievePlanForDatabaseContextExpr SessionId DatabaseContextExpr
57data RetrievePlanForDatabaseContextExpr = RetrievePlanForDatabaseContextExpr SessionId DatabaseContextExpr
43− deriving (Binary, Generic)
58+ RPCData(RetrievePlanForDatabaseContextExpr)
59+
44data RetrieveTransactionGraph = RetrieveTransactionGraph SessionId
60data RetrieveTransactionGraph = RetrieveTransactionGraph SessionId
45− deriving (Binary, Generic)
61+ RPCData(RetrieveTransactionGraph)
62+
46data RetrieveHeadTransactionId = RetrieveHeadTransactionId SessionId
63data RetrieveHeadTransactionId = RetrieveHeadTransactionId SessionId
47− deriving (Binary, Generic)
64+ RPCData(RetrieveHeadTransactionId)
65+
48data CreateSessionAtCommit = CreateSessionAtCommit TransactionId
66data CreateSessionAtCommit = CreateSessionAtCommit TransactionId
49− deriving (Binary, Generic)
67+ RPCData(CreateSessionAtCommit)
68+
50data CreateSessionAtHead = CreateSessionAtHead HeadName
69data CreateSessionAtHead = CreateSessionAtHead HeadName
51− deriving (Binary, Generic)
70+ RPCData(CreateSessionAtHead)
71+
52data CloseSession = CloseSession SessionId
72data CloseSession = CloseSession SessionId
53− deriving (Binary, Generic)
73+ RPCData(CloseSession)
74+
54data RetrieveAtomTypesAsRelation = RetrieveAtomTypesAsRelation SessionId
75data RetrieveAtomTypesAsRelation = RetrieveAtomTypesAsRelation SessionId
55− deriving (Binary, Generic)
76+ RPCData(RetrieveAtomTypesAsRelation)
77+
56data RetrieveRelationVariableSummary = RetrieveRelationVariableSummary SessionId
78data RetrieveRelationVariableSummary = RetrieveRelationVariableSummary SessionId
57− deriving (Binary, Generic)
79+ RPCData(RetrieveRelationVariableSummary)
80+
58data RetrieveAtomFunctionSummary = RetrieveAtomFunctionSummary SessionId
81data RetrieveAtomFunctionSummary = RetrieveAtomFunctionSummary SessionId
59− deriving (Binary, Generic)
82+ RPCData(RetrieveAtomFunctionSummary)
83+
60data RetrieveDatabaseContextFunctionSummary = RetrieveDatabaseContextFunctionSummary SessionId
84data RetrieveDatabaseContextFunctionSummary = RetrieveDatabaseContextFunctionSummary SessionId
61− deriving (Binary, Generic)
85+ RPCData(RetrieveDatabaseContextFunctionSummary)
86+
62data RetrieveCurrentSchemaName = RetrieveCurrentSchemaName SessionId
87data RetrieveCurrentSchemaName = RetrieveCurrentSchemaName SessionId
63− deriving (Binary, Generic)
88+ RPCData(RetrieveCurrentSchemaName)
89+
64data TestTimeout = TestTimeout SessionId
90data TestTimeout = TestTimeout SessionId
65− deriving (Binary, Generic)
91+ RPCData(TestTimeout)
92+
66−data RetrieveSessionIsDirty = RetrieveSessionIsDirty SessionId
93+data RetrieveSessionIsDirty = RetrieveSessionIsDirty SessionId
67− deriving (Binary, Generic)
94+ RPCData(RetrieveSessionIsDirty)
95+
68data ExecuteAutoMergeToHead = ExecuteAutoMergeToHead SessionId MergeStrategy HeadName
96data ExecuteAutoMergeToHead = ExecuteAutoMergeToHead SessionId MergeStrategy HeadName
69− deriving (Binary, Generic)
97+ RPCData(ExecuteAutoMergeToHead)
98+
70data RetrieveTypeConstructorMapping = RetrieveTypeConstructorMapping SessionId
99data RetrieveTypeConstructorMapping = RetrieveTypeConstructorMapping SessionId
71− deriving (Binary, Generic)
100+ RPCData(RetrieveTypeConstructorMapping)
72
101
73data ExecuteValidateMerkleHashes = ExecuteValidateMerkleHashes SessionId
102data ExecuteValidateMerkleHashes = ExecuteValidateMerkleHashes SessionId
74− deriving (Binary, Generic)
103+ RPCData(ExecuteValidateMerkleHashes)
src/lib/ProjectM36/Shortcuts.hsnew file+247
@@ -0,0 +1,247 @@
1+{-# OPTIONS_GHC -fno-warn-orphans #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+{-# LANGUAGE TypeApplications #-}
4+{-# LANGUAGE FlexibleInstances #-}
5+{-# LANGUAGE MultiParamTypeClasses #-}
6+{-# LANGUAGE TypeFamilies #-}
7+{-# LANGUAGE ExtendedDefaultRules #-}
8+{-# LANGUAGE ExistentialQuantification #-}
9+{-# LANGUAGE FlexibleContexts #-}
10+{-# LANGUAGE GADTs #-}
11+{-# LANGUAGE UndecidableInstances #-}
12+module ProjectM36.Shortcuts where
13+-- users need OverloadedLabels, OverloadedLists, and default(Int,Text) to use these shortcuts.
14+import Data.Text hiding (foldl, map)
15+import ProjectM36.Base
16+import ProjectM36.Relation
17+import ProjectM36.Atomable
18+import Prelude hiding ((!!))
19+import Data.Proxy
20+import GHC.OverloadedLabels
21+import GHC.TypeLits hiding (Text)
22+import qualified Data.Text as T
23+import qualified Data.Map as M
24+import qualified Data.Set as S
25+import GHC.Exts (IsList(..))
26+import Data.Convertible
27+
28+default (Text)
29+
30+instance IsList (AttributeNamesBase ()) where
31+ type Item (AttributeNamesBase ()) = AttributeName
32+ fromList = AttributeNames . S.fromList
33+ toList (AttributeNames ns) = S.toList ns
34+ toList _ = error "needs AttributeNames"
35+
36+instance IsList (TupleExprsBase ()) where
37+ type Item TupleExprs = TupleExpr
38+ fromList ts = TupleExprs () ts
39+ toList (TupleExprs _ ts) = ts
40+
41+instance IsList TupleExpr where
42+ type Item TupleExpr = (AttributeName, AtomExpr)
43+ fromList attributeValues = TupleExpr (M.fromList attributeValues)
44+ toList (TupleExpr attributeValues) = M.toList attributeValues
45+
46+
47+-- #xxx :: Text
48+instance KnownSymbol x => IsLabel x Text where
49+ fromLabel = T.pack $ symbolVal @x Proxy
50+
51+-- #relvarName :: RelationalExpr
52+instance KnownSymbol x => IsLabel x RelationalExpr where
53+ fromLabel = RelationVariable (T.pack $ symbolVal @x Proxy) ()
54+
55+-- *Main> #a Int :: AttributeExpr
56+-- NakedAttributeExpr (Attribute "a" IntAtomType)
57+-- *Main> #a (Attr @[Int]) :: AttributeExpr
58+-- NakedAttributeExpr (Attribute "a" (ConstructedAtomType "List" (fromList [("a",IntAtomType)])))
59+-- can't offer a Relation atomtype -- don't know how to express a Relation type in haskell type. Maybe something a HList of (Text, a) ?
60+--
61+-- ps. I don't understand the usage of "AttributeAndTypeNameExpr AttributeName TypeConstructor a"
62+instance (KnownSymbol x, Atomable a)=> IsLabel x (HaskAtomType a -> AttributeExpr) where
63+ fromLabel = (NakedAttributeExpr . Attribute name) . toAtomType''
64+ where name = T.pack $ symbolVal @x Proxy
65+
66+-- (#a 1) :: ExtendTupleExpr
67+-- no need for :=
68+instance (Convertible a AtomExpr, KnownSymbol x) => IsLabel x (a -> ExtendTupleExpr) where
69+ fromLabel x = AttributeExtendTupleExpr name (convert x)
70+ where name = T.pack $ symbolVal @x Proxy
71+
72+-- #name AtomExpr
73+-- ex. tuple [ #name 3 ]
74+-- default(Text) is needed in client code to avoid `no Atomable Char`
75+instance (Convertible a AtomExpr, KnownSymbol x) => IsLabel x (a -> (AttributeName, AtomExpr)) where
76+ fromLabel = \x -> (name, convert x)
77+ where name = T.pack $ symbolVal @x Proxy
78+
79+-- *Main> #a [1] :: AtomExpr
80+-- FunctionAtomExpr "a" [NakedAtomExpr (IntegerAtom 1)] ()
81+--
82+-- This usage is not working in RestrictionPredicateExpr and AttributeExtendTupleExpr. Use f "a" [1] instead.
83+instance (KnownSymbol x, Convertible a AtomExpr) => IsLabel x ([a] -> AtomExpr) where
84+ fromLabel = \as' -> FunctionAtomExpr name (map convert as') ()
85+ where name = T.pack $ symbolVal @x Proxy
86+
87+instance (KnownSymbol x) => IsLabel x AtomExpr where
88+ fromLabel = AttributeAtomExpr name
89+ where name = T.pack $ symbolVal @x Proxy
90+
91+
92+data HaskAtomType a where
93+ Int :: HaskAtomType Int
94+ Integer :: HaskAtomType Integer
95+ Double :: HaskAtomType Double
96+ Text :: HaskAtomType Text
97+-- Day :: HaskAtomType Day
98+-- DateTime :: HaskAtomType DateTime
99+-- ByteString :: HaskAtomType ByteString
100+ Bool :: HaskAtomType Bool
101+ Attr :: Atomable a => HaskAtomType a -- a Proxy-like value for type application.
102+
103+toAtomType'' :: Atomable a => HaskAtomType a -> AtomType
104+toAtomType'' (_ :: HaskAtomType a) = toAtomType (Proxy @a)
105+
106+-- usage: relation [tuple [#a 1, #b "b"], tuple [#a 2, #b "b"]]
107+relation :: [TupleExpr] -> RelationalExpr
108+relation ts = MakeRelationFromExprs Nothing (TupleExprs () ts)
109+
110+relation' :: [AttributeExprBase ()] -> [TupleExpr] -> RelationalExpr
111+relation' as' ts = MakeRelationFromExprs (Just as') (TupleExprs () ts)
112+
113+-- usage: tuple [#name "Mike",#age 6]
114+tuple :: [(AttributeName, AtomExpr)] -> TupleExprBase ()
115+tuple as' = TupleExpr (M.fromList as')
116+
117+-- #a rename [#b `as` #c]
118+rename :: RelationalExpr -> [(AttributeName,AttributeName)] -> RelationalExpr
119+rename relExpr renameList = case renameList of
120+ [] -> Restrict TruePredicate relExpr
121+ renames ->
122+ foldl (\acc (old,new) -> Rename old new acc) relExpr renames
123+
124+--project !!
125+-- #a !! [#b,#c]
126+infix 9 !!
127+(!!) :: RelationalExpr -> AttributeNames -> RelationalExpr
128+relExpr !! xs = Project xs relExpr
129+
130+--join ><
131+-- #a >< #b
132+(><) :: RelationalExpr -> RelationalExpr -> RelationalExpr
133+a >< b = Join a b
134+
135+allBut :: AttributeNames -> AttributeNames
136+allBut (AttributeNames ns) = InvertedAttributeNames ns
137+allBut _ = error "give allBut something other than attribute names."
138+
139+allFrom :: RelationalExpr -> AttributeNames
140+allFrom = RelationalExprAttributeNames
141+
142+as :: AttributeNames -> AttributeName -> (AttributeNames, AttributeName)
143+as = (,)
144+
145+-- #a `group` ([#b,#c] `as` #d)
146+group :: RelationalExpr -> (AttributeNames, AttributeName) -> RelationalExpr
147+group relExpr (aNames, aName) = Group aNames aName relExpr
148+
149+-- #a `ungroup` #b
150+ungroup :: RelationalExpr -> AttributeName -> RelationalExpr
151+ungroup relExpr aName = Ungroup aName relExpr
152+
153+-- *Main> #a #:= true #: ( #b (f "count" [1,2]))
154+-- Assign "a" (Extend (AttributeExtendTupleExpr "b" (FunctionAtomExpr "count" [NakedAtomExpr (IntegerAtom 1),NakedAtomExpr (IntegerAtom 2)] ())) (ExistingRelation (Relation attributesFromList [] (RelationTupleSet {asList = [RelationTuple attributesFromList [] []]}))))
155+(#:) :: RelationalExpr -> ExtendTupleExpr -> RelationalExpr
156+a #: b = Extend b a
157+infix 8 #:
158+
159+instance Convertible AtomExpr AtomExpr where
160+ safeConvert n = Right n
161+
162+instance Convertible RelVarName AtomExpr where
163+ safeConvert n = Right $ RelationAtomExpr (RelationVariable n ())
164+
165+instance Convertible RelationalExpr AtomExpr where
166+ safeConvert relExpr = Right $ RelationAtomExpr relExpr
167+
168+instance Convertible RelVarName RelationalExpr where
169+ safeConvert n = Right $ RelationVariable n ()
170+
171+-- @ in tutd
172+-- (@@) "aaa"
173+(@@) :: AttributeName -> AtomExpr
174+(@@) = AttributeAtomExpr
175+
176+-- works in RestrictedPredicateExpr and AttributeExtendTupleExpr
177+-- usage: f "gte" [1]
178+f :: Convertible a AtomExpr => AtomFunctionName -> [a] -> AtomExpr
179+f n as' = FunctionAtomExpr n (map convert as') ()
180+
181+-- DatabaseContextExpr
182+-- define
183+(#::) :: RelVarName -> [AttributeExpr] -> DatabaseContextExpr
184+s #:: xs = Define s xs
185+infix 5 #::
186+
187+-- assign
188+(#:=) :: RelVarName -> RelationalExpr -> DatabaseContextExpr
189+s #:= r = Assign s r
190+infix 5 #:=
191+
192+class Boolean a b where
193+ (&&&) :: a -> b -> RestrictionPredicateExpr
194+ infixl 6 &&&
195+ (|||) :: a -> b -> RestrictionPredicateExpr
196+ infixl 5 |||
197+
198+-- where: @~ mimics the restriction symbol in algebra
199+-- usage: true #: (#a 1) @~ #a ?= 1 &&& not' false ||| (f "gte" [1])
200+(@~) :: Convertible a RestrictionPredicateExpr => RelationalExpr -> a -> RelationalExpr
201+(@~) relExpr resPreExpr = Restrict (convert resPreExpr) relExpr
202+infix 4 @~
203+
204+true :: RelationalExpr
205+true = ExistingRelation relationTrue
206+
207+false :: RelationalExpr
208+false = ExistingRelation relationFalse
209+
210+trueP :: RestrictionPredicateExprBase a
211+trueP = TruePredicate
212+
213+falseP :: RestrictionPredicateExprBase a
214+falseP = NotPredicate TruePredicate
215+
216+(?=) :: Convertible a AtomExpr => AttributeName -> a -> RestrictionPredicateExpr
217+(?=) name a = AttributeEqualityPredicate name (convert a)
218+infix 9 ?=
219+
220+not' :: Convertible a RestrictionPredicateExpr => a -> RestrictionPredicateExpr
221+not' = NotPredicate . convert
222+
223+instance (Convertible a RestrictionPredicateExpr, Convertible b RestrictionPredicateExpr) => Boolean a b where
224+ a &&& b = AndPredicate (convert a) (convert b)
225+ a ||| b = OrPredicate (convert a) (convert b)
226+
227+instance {-# Incoherent #-} Atomable a => Convertible a RestrictionPredicateExpr where
228+ safeConvert n = Right $ AtomExprPredicate $ toAtomExpr . toAtom $ n
229+
230+instance {-# Incoherent #-} Convertible RelationalExpr RestrictionPredicateExpr where
231+ safeConvert a = Right $ RelationalExprPredicate a
232+
233+instance {-# Incoherent #-} Convertible AtomExpr RestrictionPredicateExpr where
234+ safeConvert a = Right $ AtomExprPredicate a
235+
236+instance {-# Incoherent #-} Convertible RestrictionPredicateExpr RestrictionPredicateExpr where
237+ safeConvert a = Right a
238+
239+instance {-# Incoherent #-} Atomable a => Convertible a AtomExpr where
240+ safeConvert n = Right $ toAtomExpr . toAtom $ n
241+
242+toAtomExpr :: Atom -> AtomExpr
243+toAtomExpr (ConstructedAtom n _ xs) = ConstructedAtomExpr n (toAtomExpr <$> xs) ()
244+toAtomExpr a = NakedAtomExpr a
245+
246+
247+
src/lib/ProjectM36/StaticOptimizer.hs+4−3
@@ -22,8 +22,6 @@ import qualified Data.Set as S
22
22
23-- the static optimizer performs optimizations which need not take any specific-relation statistics into account
23-- the static optimizer performs optimizations which need not take any specific-relation statistics into account
24
24
25−--import Debug.Trace
26−
27data GraphRefSOptRelationalExprEnv =
25data GraphRefSOptRelationalExprEnv =
28 GraphRefSOptRelationalExprEnv
26 GraphRefSOptRelationalExprEnv
29 {
27 {
@@ -179,7 +177,7 @@ fullOptimizeGraphRefRelationalExpr expr = do
179optimizeGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefSOptRelationalExprM GraphRefRelationalExpr
177optimizeGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefSOptRelationalExprM GraphRefRelationalExpr
180optimizeGraphRefRelationalExpr e@(MakeStaticRelation _ _) = pure e
178optimizeGraphRefRelationalExpr e@(MakeStaticRelation _ _) = pure e
181
179
182−optimizeGraphRefRelationalExpr e@(MakeRelationFromExprs _ _) = pure e
180+optimizeGraphRefRelationalExpr e@MakeRelationFromExprs{} = pure e
183
181
184optimizeGraphRefRelationalExpr e@(ExistingRelation _) = pure e
182optimizeGraphRefRelationalExpr e@(ExistingRelation _) = pure e
185
183
@@ -209,6 +207,8 @@ optimizeGraphRefRelationalExpr (Union exprA exprB) = do
209 case (optExprA, optExprB) of
207 case (optExprA, optExprB) of
210 (Restrict predA (RelationVariable nameA sA),
208 (Restrict predA (RelationVariable nameA sA),
211 Restrict predB (RelationVariable nameB sB)) | nameA == nameB && sA == sB -> pure (Restrict (AndPredicate predA predB) (RelationVariable nameA sA))
209 Restrict predB (RelationVariable nameB sB)) | nameA == nameB && sA == sB -> pure (Restrict (AndPredicate predA predB) (RelationVariable nameA sA))
210+ (exprA', exprB') | isEmptyRelationExpr exprA' -> pure exprB'
211+ | isEmptyRelationExpr exprB' -> pure exprA'
212 _ -> if optExprA == optExprB then
212 _ -> if optExprA == optExprB then
213 pure optExprA
213 pure optExprA
214 else
214 else
@@ -575,3 +575,4 @@ applyStaticRestrictionPushdown expr = case expr of
575-- no optimizations available
575-- no optimizations available
576optimizeDatabaseContextIOExpr :: GraphRefDatabaseContextIOExpr -> GraphRefSOptDatabaseContextExprM GraphRefDatabaseContextIOExpr
576optimizeDatabaseContextIOExpr :: GraphRefDatabaseContextIOExpr -> GraphRefSOptDatabaseContextExprM GraphRefDatabaseContextIOExpr
577optimizeDatabaseContextIOExpr = pure
577optimizeDatabaseContextIOExpr = pure
578+
src/lib/ProjectM36/TransGraphRelationalExpression.hs−17
@@ -10,43 +10,26 @@ import Control.Monad.Trans.Reader
10import Control.Monad.Trans.Class
10import Control.Monad.Trans.Class
11import Control.Monad.Trans.Except
11import Control.Monad.Trans.Except
12import Data.Functor.Identity
12import Data.Functor.Identity
13−import Data.Binary
14
13
15-- | The TransGraphRelationalExpression is equivalent to a relational expression except that relation variables can reference points in the transaction graph (at previous points in time).
14-- | The TransGraphRelationalExpression is equivalent to a relational expression except that relation variables can reference points in the transaction graph (at previous points in time).
16type TransGraphRelationalExpr = RelationalExprBase TransactionIdLookup
15type TransGraphRelationalExpr = RelationalExprBase TransactionIdLookup
17
16
18−instance Binary TransGraphRelationalExpr
19−
20type TransGraphAttributeNames = AttributeNamesBase TransactionIdLookup
17type TransGraphAttributeNames = AttributeNamesBase TransactionIdLookup
21
18
22−instance Binary TransGraphAttributeNames
23−
24type TransGraphExtendTupleExpr = ExtendTupleExprBase TransactionIdLookup
19type TransGraphExtendTupleExpr = ExtendTupleExprBase TransactionIdLookup
25
20
26−instance Binary TransGraphExtendTupleExpr
27−
28type TransGraphTupleExpr = TupleExprBase TransactionIdLookup
21type TransGraphTupleExpr = TupleExprBase TransactionIdLookup
29
22
30−instance Binary TransGraphTupleExpr
31−
32type TransGraphTupleExprs = TupleExprsBase TransactionIdLookup
23type TransGraphTupleExprs = TupleExprsBase TransactionIdLookup
33
24
34−instance Binary TransGraphTupleExprs
35−
36type TransGraphRestrictionPredicateExpr = RestrictionPredicateExprBase TransactionIdLookup
25type TransGraphRestrictionPredicateExpr = RestrictionPredicateExprBase TransactionIdLookup
37
26
38−instance Binary TransGraphRestrictionPredicateExpr
39−
40type TransGraphAtomExpr = AtomExprBase TransactionIdLookup
27type TransGraphAtomExpr = AtomExprBase TransactionIdLookup
41
28
42−instance Binary TransGraphAtomExpr
43−
44type TransGraphAttributeExpr = AttributeExprBase TransactionIdLookup
29type TransGraphAttributeExpr = AttributeExprBase TransactionIdLookup
45
30
46type TransGraphWithNameExpr = WithNameExprBase TransactionIdLookup
31type TransGraphWithNameExpr = WithNameExprBase TransactionIdLookup
47
32
48−instance Binary TransGraphWithNameExpr
49−
50newtype TransGraphEvalEnv = TransGraphEvalEnv {
33newtype TransGraphEvalEnv = TransGraphEvalEnv {
51 tge_graph :: TransactionGraph
34 tge_graph :: TransactionGraph
52 }
35 }
src/lib/ProjectM36/Transaction/Persist.hs+16−16
@@ -8,13 +8,13 @@ import ProjectM36.AtomFunction
8import ProjectM36.Persist (writeBSFileSync, DiskSync, renameSync)
8import ProjectM36.Persist (writeBSFileSync, DiskSync, renameSync)
9import qualified Data.Map as M
9import qualified Data.Map as M
10import qualified Data.HashSet as HS
10import qualified Data.HashSet as HS
11−import qualified Data.Binary as B
12import System.FilePath
11import System.FilePath
13import System.Directory
12import System.Directory
14import qualified Data.Text as T
13import qualified Data.Text as T
15import Control.Monad
14import Control.Monad
16import ProjectM36.ScriptSession
15import ProjectM36.ScriptSession
17import ProjectM36.AtomFunctions.Basic (precompiledAtomFunctions)
16import ProjectM36.AtomFunctions.Basic (precompiledAtomFunctions)
17+import Codec.Winery
18
18
19#ifdef PM36_HASKELL_SCRIPTING
19#ifdef PM36_HASKELL_SCRIPTING
20import GHC
20import GHC
@@ -62,7 +62,7 @@ readTransaction dbdir transId mScriptSession = do
62 return $ Left $ MissingTransactionError transId
62 return $ Left $ MissingTransactionError transId
63 else do
63 else do
64 relvars <- readRelVars transDir
64 relvars <- readRelVars transDir
65− transInfo <- B.decodeFile (transactionInfoPath transDir)
65+ transInfo <- readFileDeserialise (transactionInfoPath transDir)
66 incDeps <- readIncDeps transDir
66 incDeps <- readIncDeps transDir
67 typeCons <- readTypeConstructorMapping transDir
67 typeCons <- readTypeConstructorMapping transDir
68 sschemas <- readSubschemas transDir
68 sschemas <- readSubschemas transDir
@@ -92,28 +92,28 @@ writeTransaction sync dbdir trans = do
92 writeDBCFuncs sync tempTransDir (dbcFunctions context)
92 writeDBCFuncs sync tempTransDir (dbcFunctions context)
93 writeTypeConstructorMapping sync tempTransDir (typeConstructorMapping context)
93 writeTypeConstructorMapping sync tempTransDir (typeConstructorMapping context)
94 writeSubschemas sync tempTransDir (subschemas trans)
94 writeSubschemas sync tempTransDir (subschemas trans)
95− B.encodeFile (transactionInfoPath tempTransDir) (transactionInfo trans)
95+ writeFileSerialise (transactionInfoPath tempTransDir) (transactionInfo trans)
96 --move the temp directory to final location
96 --move the temp directory to final location
97 renameSync sync tempTransDir finalTransDir
97 renameSync sync tempTransDir finalTransDir
98
98
99writeRelVars :: DiskSync -> FilePath -> RelationVariables -> IO ()
99writeRelVars :: DiskSync -> FilePath -> RelationVariables -> IO ()
100writeRelVars sync transDir relvars = do
100writeRelVars sync transDir relvars = do
101 let path = relvarsPath transDir
101 let path = relvarsPath transDir
102− writeBSFileSync sync path (B.encode relvars)
102+ writeBSFileSync sync path (serialise relvars)
103
103
104readRelVars :: FilePath -> IO RelationVariables
104readRelVars :: FilePath -> IO RelationVariables
105readRelVars transDir =
105readRelVars transDir =
106− B.decodeFile (relvarsPath transDir)
106+ readFileDeserialise (relvarsPath transDir)
107
107
108writeAtomFuncs :: DiskSync -> FilePath -> AtomFunctions -> IO ()
108writeAtomFuncs :: DiskSync -> FilePath -> AtomFunctions -> IO ()
109writeAtomFuncs sync transDir funcs = do
109writeAtomFuncs sync transDir funcs = do
110 let atomFuncPath = atomFuncsPath transDir
110 let atomFuncPath = atomFuncsPath transDir
111− writeBSFileSync sync atomFuncPath (B.encode $ map (\f -> (atomFuncType f, atomFuncName f, atomFunctionScript f)) (HS.toList funcs))
111+ writeBSFileSync sync atomFuncPath (serialise $ map (\f -> (atomFuncType f, atomFuncName f, atomFunctionScript f)) (HS.toList funcs))
112
112
113--all the atom functions are in one file
113--all the atom functions are in one file
114readAtomFuncs :: FilePath -> Maybe ScriptSession -> IO AtomFunctions
114readAtomFuncs :: FilePath -> Maybe ScriptSession -> IO AtomFunctions
115readAtomFuncs transDir mScriptSession = do
115readAtomFuncs transDir mScriptSession = do
116− atomFuncsList <- B.decodeFile (atomFuncsPath transDir)
116+ atomFuncsList <- readFileDeserialise (atomFuncsPath transDir)
117 --only Haskell script functions can be serialized
117 --only Haskell script functions can be serialized
118 --we always return the pre-compiled functions
118 --we always return the pre-compiled functions
119 funcs <- mapM (\(funcType, funcName, mFuncScript) -> loadAtomFunc precompiledAtomFunctions mScriptSession funcName funcType mFuncScript) atomFuncsList
119 funcs <- mapM (\(funcType, funcName, mFuncScript) -> loadAtomFunc precompiledAtomFunctions mScriptSession funcName funcType mFuncScript) atomFuncsList
@@ -153,7 +153,7 @@ readAtomFunc _ _ _ _ = error "Haskell scripting is disabled"
153#else
153#else
154readAtomFunc transDir funcName mScriptSession precompiledFuncs = do
154readAtomFunc transDir funcName mScriptSession precompiledFuncs = do
155 let atomFuncPath = atomFuncsPath transDir
155 let atomFuncPath = atomFuncsPath transDir
156− (funcType, mFuncScript) <- B.decodeFile @([AtomType],Maybe T.Text) atomFuncPath
156+ (funcType, mFuncScript) <- readFileDeserialise @([AtomType],Maybe T.Text) atomFuncPath
157 case mFuncScript of
157 case mFuncScript of
158 --handle pre-compiled case- pull it from the precompiled list
158 --handle pre-compiled case- pull it from the precompiled list
159 Nothing -> case atomFunctionForName funcName precompiledFuncs of
159 Nothing -> case atomFunctionForName funcName precompiledFuncs of
@@ -184,7 +184,7 @@ writeDBCFuncs sync transDir funcs = mapM_ (writeDBCFunc sync transDir) (HS.toLis
184writeDBCFunc :: DiskSync -> FilePath -> DatabaseContextFunction -> IO ()
184writeDBCFunc :: DiskSync -> FilePath -> DatabaseContextFunction -> IO ()
185writeDBCFunc sync transDir func = do
185writeDBCFunc sync transDir func = do
186 let dbcFuncPath = dbcFuncsDir transDir </> T.unpack (dbcFuncName func)
186 let dbcFuncPath = dbcFuncsDir transDir </> T.unpack (dbcFuncName func)
187− writeBSFileSync sync dbcFuncPath (B.encode (dbcFuncType func, databaseContextFunctionScript func))
187+ writeBSFileSync sync dbcFuncPath (serialise (dbcFuncType func, databaseContextFunctionScript func))
188
188
189readDBCFuncs :: FilePath -> Maybe ScriptSession -> IO DatabaseContextFunctions
189readDBCFuncs :: FilePath -> Maybe ScriptSession -> IO DatabaseContextFunctions
190readDBCFuncs transDir mScriptSession = do
190readDBCFuncs transDir mScriptSession = do
@@ -201,7 +201,7 @@ readDBCFunc transDir funcName _ precompiledFuncs = do
201readDBCFunc transDir funcName mScriptSession precompiledFuncs = do
201readDBCFunc transDir funcName mScriptSession precompiledFuncs = do
202#endif
202#endif
203 let dbcFuncPath = dbcFuncsDir transDir </> T.unpack funcName
203 let dbcFuncPath = dbcFuncsDir transDir </> T.unpack funcName
204− (_funcType, mFuncScript) <- B.decodeFile @([AtomType], Maybe T.Text) dbcFuncPath
204+ (_funcType, mFuncScript) <- readFileDeserialise @([AtomType], Maybe T.Text) dbcFuncPath
205 case mFuncScript of
205 case mFuncScript of
206 Nothing -> case databaseContextFunctionForName funcName precompiledFuncs of
206 Nothing -> case databaseContextFunctionForName funcName precompiledFuncs of
207 Left _ -> error ("expected precompiled dbc function: " ++ T.unpack funcName)
207 Left _ -> error ("expected precompiled dbc function: " ++ T.unpack funcName)
@@ -225,7 +225,7 @@ readDBCFunc transDir funcName mScriptSession precompiledFuncs = do
225
225
226writeIncDep :: DiskSync -> FilePath -> (IncDepName, InclusionDependency) -> IO ()
226writeIncDep :: DiskSync -> FilePath -> (IncDepName, InclusionDependency) -> IO ()
227writeIncDep sync transDir (incDepName, incDep) =
227writeIncDep sync transDir (incDepName, incDep) =
228− writeBSFileSync sync (incDepsDir transDir </> T.unpack incDepName) $ B.encode incDep
228+ writeBSFileSync sync (incDepsDir transDir </> T.unpack incDepName) $ serialise incDep
229
229
230writeIncDeps :: DiskSync -> FilePath -> M.Map IncDepName InclusionDependency -> IO ()
230writeIncDeps :: DiskSync -> FilePath -> M.Map IncDepName InclusionDependency -> IO ()
231writeIncDeps sync transDir incdeps = mapM_ (writeIncDep sync transDir) $ M.toList incdeps
231writeIncDeps sync transDir incdeps = mapM_ (writeIncDep sync transDir) $ M.toList incdeps
@@ -233,7 +233,7 @@ writeIncDeps sync transDir incdeps = mapM_ (writeIncDep sync transDir) $ M.toLis
233readIncDep :: FilePath -> IncDepName -> IO (IncDepName, InclusionDependency)
233readIncDep :: FilePath -> IncDepName -> IO (IncDepName, InclusionDependency)
234readIncDep transDir incdepName = do
234readIncDep transDir incdepName = do
235 let incDepPath = incDepsDir transDir </> T.unpack incdepName
235 let incDepPath = incDepsDir transDir </> T.unpack incdepName
236− incDepData <- B.decodeFile incDepPath
236+ incDepData <- readFileDeserialise incDepPath
237 pure (incdepName, incDepData)
237 pure (incdepName, incDepData)
238
238
239readIncDeps :: FilePath -> IO (M.Map IncDepName InclusionDependency)
239readIncDeps :: FilePath -> IO (M.Map IncDepName InclusionDependency)
@@ -245,20 +245,20 @@ readIncDeps transDir = do
245readSubschemas :: FilePath -> IO Subschemas
245readSubschemas :: FilePath -> IO Subschemas
246readSubschemas transDir = do
246readSubschemas transDir = do
247 let sschemasPath = subschemasPath transDir
247 let sschemasPath = subschemasPath transDir
248− B.decodeFile sschemasPath
248+ readFileDeserialise sschemasPath
249
249
250writeSubschemas :: DiskSync -> FilePath -> Subschemas -> IO ()
250writeSubschemas :: DiskSync -> FilePath -> Subschemas -> IO ()
251writeSubschemas sync transDir sschemas = do
251writeSubschemas sync transDir sschemas = do
252 let sschemasPath = subschemasPath transDir
252 let sschemasPath = subschemasPath transDir
253− writeBSFileSync sync sschemasPath (B.encode sschemas)
253+ writeBSFileSync sync sschemasPath (serialise sschemas)
254
254
255writeTypeConstructorMapping :: DiskSync -> FilePath -> TypeConstructorMapping -> IO ()
255writeTypeConstructorMapping :: DiskSync -> FilePath -> TypeConstructorMapping -> IO ()
256writeTypeConstructorMapping sync path types = let atPath = typeConsPath path in
256writeTypeConstructorMapping sync path types = let atPath = typeConsPath path in
257− writeBSFileSync sync atPath $ B.encode types
257+ writeBSFileSync sync atPath $ serialise types
258
258
259readTypeConstructorMapping :: FilePath -> IO TypeConstructorMapping
259readTypeConstructorMapping :: FilePath -> IO TypeConstructorMapping
260readTypeConstructorMapping path = do
260readTypeConstructorMapping path = do
261 let atPath = typeConsPath path
261 let atPath = typeConsPath path
262− B.decodeFile atPath
262+ readFileDeserialise atPath
263
263
264
264
src/lib/ProjectM36/TransactionGraph.hs+15−13
@@ -1,4 +1,4 @@
1−{-# LANGUAGE DeriveAnyClass, DeriveGeneric, CPP, FlexibleContexts #-}
1+{-# LANGUAGE DeriveGeneric, CPP, FlexibleContexts, DerivingVia #-}
2module ProjectM36.TransactionGraph where
2module ProjectM36.TransactionGraph where
3import ProjectM36.Base
3import ProjectM36.Base
4import ProjectM36.Error
4import ProjectM36.Error
@@ -13,6 +13,7 @@ import ProjectM36.MerkleHash
13import qualified ProjectM36.DisconnectedTransaction as Discon
13import qualified ProjectM36.DisconnectedTransaction as Discon
14import qualified ProjectM36.Attribute as A
14import qualified ProjectM36.Attribute as A
15
15
16+import Codec.Winery
16import Control.Monad.Except hiding (join)
17import Control.Monad.Except hiding (join)
17import Control.Monad.Reader hiding (join)
18import Control.Monad.Reader hiding (join)
18import qualified Data.Vector as V
19import qualified Data.Vector as V
@@ -23,7 +24,6 @@ import qualified Data.List.NonEmpty as NE
23import Data.Time.Clock
24import Data.Time.Clock
24import qualified Data.Text as T
25import qualified Data.Text as T
25import GHC.Generics
26import GHC.Generics
26−import Data.Binary as B
27import Data.Either (lefts, rights, isRight)
27import Data.Either (lefts, rights, isRight)
28#if __GLASGOW_HASKELL__ < 804
28#if __GLASGOW_HASKELL__ < 804
29import Data.Monoid
29import Data.Monoid
@@ -38,13 +38,15 @@ import Crypto.Hash.SHA256
38-- | Record a lookup for a specific transaction in the graph.
38-- | Record a lookup for a specific transaction in the graph.
39data TransactionIdLookup = TransactionIdLookup TransactionId |
39data TransactionIdLookup = TransactionIdLookup TransactionId |
40 TransactionIdHeadNameLookup HeadName [TransactionIdHeadBacktrack]
40 TransactionIdHeadNameLookup HeadName [TransactionIdHeadBacktrack]
41− deriving (Show, Eq, Binary, Generic)
41+ deriving (Show, Eq, Generic)
42+ deriving Serialise via WineryVariant TransactionIdLookup
42
43
43-- | Used for git-style head backtracking such as topic~3^2.
44-- | Used for git-style head backtracking such as topic~3^2.
44−data TransactionIdHeadBacktrack = TransactionIdHeadParentBacktrack Int | -- ^ git equivalent of ~: walk back n parents, arbitrarily choosing a parent when a choice must be made
45+data TransactionIdHeadBacktrack = TransactionIdHeadParentBacktrack Int | -- ^ git equivalent of ~v: walk back n parents, arbitrarily choosing a parent when a choice must be made
45 TransactionIdHeadBranchBacktrack Int | -- ^ git equivalent of ^: walk back one parent level to the nth arbitrarily-chosen parent
46 TransactionIdHeadBranchBacktrack Int | -- ^ git equivalent of ^: walk back one parent level to the nth arbitrarily-chosen parent
46 TransactionStampHeadBacktrack UTCTime -- ^ git equivalent of 'git-rev-list -n 1 --before X' find the first transaction which was created before the timestamp
47 TransactionStampHeadBacktrack UTCTime -- ^ git equivalent of 'git-rev-list -n 1 --before X' find the first transaction which was created before the timestamp
47− deriving (Show, Eq, Binary, Generic)
48+ deriving (Show, Eq, Generic)
49+ deriving Serialise via WineryVariant TransactionIdHeadBacktrack
48
50
49
51
50-- | Operators which manipulate a transaction graph and which transaction the current 'Session' is based upon.
52-- | Operators which manipulate a transaction graph and which transaction the current 'Session' is based upon.
@@ -56,7 +58,8 @@ data TransactionGraphOperator = JumpToHead HeadName |
56 MergeTransactions MergeStrategy HeadName HeadName |
58 MergeTransactions MergeStrategy HeadName HeadName |
57 Commit |
59 Commit |
58 Rollback
60 Rollback
59− deriving (Eq, Show, Binary, Generic)
61+ deriving (Eq, Show, Generic)
62+ deriving Serialise via WineryVariant TransactionGraphOperator
60
63
61isCommit :: TransactionGraphOperator -> Bool
64isCommit :: TransactionGraphOperator -> Bool
62isCommit Commit = True
65isCommit Commit = True
@@ -381,7 +384,7 @@ subGraphOfFirstCommonAncestor origGraph resultHeads currentTrans' goalTrans trav
381 else do
384 else do
382 currentTransChildren <- childTransactions currentTrans' origGraph
385 currentTransChildren <- childTransactions currentTrans' origGraph
383 let searchChildren = S.difference (S.insert currentTrans' traverseSet) currentTransChildren
386 let searchChildren = S.difference (S.insert currentTrans' traverseSet) currentTransChildren
384− searchChild start = pathToTransaction origGraph start goalTrans (S.insert currentTrans' traverseSet)
387+ searchChild start' = pathToTransaction origGraph start' goalTrans (S.insert currentTrans' traverseSet)
385 childSearches = map searchChild (S.toList searchChildren)
388 childSearches = map searchChild (S.toList searchChildren)
386 errors = lefts childSearches
389 errors = lefts childSearches
387 pathsFound = rights childSearches
390 pathsFound = rights childSearches
@@ -593,10 +596,9 @@ addMerkleHash graph trans = Transaction (transactionId trans) newInfo (schemas t
593
596
594-- the new hash includes the parents' ids, the current id, and the hash of the context, and the merkle hashes of the parent transactions
597-- the new hash includes the parents' ids, the current id, and the hash of the context, and the merkle hashes of the parent transactions
595calculateMerkleHash :: Transaction -> TransactionGraph -> MerkleHash
598calculateMerkleHash :: Transaction -> TransactionGraph -> MerkleHash
596−calculateMerkleHash trans graph = MerkleHash $ hashlazy (mconcat [transIds,
599+calculateMerkleHash trans graph = MerkleHash $ hashlazy (BL.fromChunks [transIds,
597− dbcBytes,
600+ schemasBytes
598− schemasBytes,
599− parentMerkleHashes])
601+ ] <> dbcBytes <> parentMerkleHashes)
600 where
602 where
601 parentMerkleHashes = BL.fromChunks $ map (_unMerkleHash . getMerkleHash) parentTranses
603 parentMerkleHashes = BL.fromChunks $ map (_unMerkleHash . getMerkleHash) parentTranses
602 parentTranses =
604 parentTranses =
@@ -605,9 +607,9 @@ calculateMerkleHash trans graph = MerkleHash $ hashlazy (mconcat [transIds,
605 Left e -> error ("failed to find transaction in Merkle hash construction: " ++ show e)
607 Left e -> error ("failed to find transaction in Merkle hash construction: " ++ show e)
606 Right t -> S.toList t
608 Right t -> S.toList t
607 getMerkleHash t = merkleHash (transactionInfo t)
609 getMerkleHash t = merkleHash (transactionInfo t)
608− transIds = B.encode (transactionId trans : S.toList (parentIds trans))
610+ transIds = serialise (transactionId trans : S.toList (parentIds trans))
609 dbcBytes = DBC.hashBytes (concreteDatabaseContext trans)
611 dbcBytes = DBC.hashBytes (concreteDatabaseContext trans)
610− schemasBytes = B.encode (subschemas trans)
612+ schemasBytes = serialise (subschemas trans)
611
613
612validateMerkleHash :: Transaction -> TransactionGraph -> Either MerkleValidationError ()
614validateMerkleHash :: Transaction -> TransactionGraph -> Either MerkleValidationError ()
613validateMerkleHash trans graph =
615validateMerkleHash trans graph =
src/lib/ProjectM36/Tuple.hs+47−33
@@ -1,7 +1,7 @@
1module ProjectM36.Tuple where
1module ProjectM36.Tuple where
2import ProjectM36.Base
2import ProjectM36.Base
3import ProjectM36.Error
3import ProjectM36.Error
4−import ProjectM36.Attribute
4+import ProjectM36.Attribute as A
5import ProjectM36.Atom
5import ProjectM36.Atom
6import ProjectM36.AtomType
6import ProjectM36.AtomType
7import ProjectM36.DataTypes.Primitive
7import ProjectM36.DataTypes.Primitive
@@ -15,19 +15,19 @@ import Control.Arrow
15import Data.Maybe
15import Data.Maybe
16
16
17emptyTuple :: RelationTuple
17emptyTuple :: RelationTuple
18−emptyTuple = RelationTuple V.empty V.empty
18+emptyTuple = RelationTuple mempty mempty
19
19
20tupleSize :: RelationTuple -> Int
20tupleSize :: RelationTuple -> Int
21−tupleSize (RelationTuple tupAttrs _) = V.length tupAttrs
21+tupleSize (RelationTuple tupAttrs _) = arity tupAttrs
22
22
23tupleAttributeNameSet :: RelationTuple -> S.Set AttributeName
23tupleAttributeNameSet :: RelationTuple -> S.Set AttributeName
24−tupleAttributeNameSet (RelationTuple tupAttrs _) = S.fromList $ V.toList $ V.map attributeName tupAttrs
24+tupleAttributeNameSet (RelationTuple tupAttrs _) = attributeNameSet tupAttrs
25
25
26tupleAttributes :: RelationTuple -> Attributes
26tupleAttributes :: RelationTuple -> Attributes
27tupleAttributes (RelationTuple tupAttrs _) = tupAttrs
27tupleAttributes (RelationTuple tupAttrs _) = tupAttrs
28
28
29tupleAssocs :: RelationTuple -> [(AttributeName, Atom)]
29tupleAssocs :: RelationTuple -> [(AttributeName, Atom)]
30−tupleAssocs (RelationTuple attrVec tupVec) = V.toList $ V.map (first attributeName) (V.zip attrVec tupVec)
30+tupleAssocs (RelationTuple attrs tupVec) = V.toList $ V.map (first attributeName) (V.zip (attributesVec attrs) tupVec)
31
31
32orderedTupleAssocs :: RelationTuple -> [(AttributeName, Atom)]
32orderedTupleAssocs :: RelationTuple -> [(AttributeName, Atom)]
33orderedTupleAssocs tup@(RelationTuple attrVec _) = map (\attr -> (attributeName attr, atomForAttr (attributeName attr))) oAttrs
33orderedTupleAssocs tup@(RelationTuple attrVec _) = map (\attr -> (attributeName attr, atomForAttr (attributeName attr))) oAttrs
@@ -42,7 +42,7 @@ tupleAtoms :: RelationTuple -> V.Vector Atom
42tupleAtoms (RelationTuple _ tupVec) = tupVec
42tupleAtoms (RelationTuple _ tupVec) = tupVec
43
43
44atomForAttributeName :: AttributeName -> RelationTuple -> Either RelationalError Atom
44atomForAttributeName :: AttributeName -> RelationTuple -> Either RelationalError Atom
45−atomForAttributeName attrName (RelationTuple tupAttrs tupVec) = case V.findIndex (\attr -> attributeName attr == attrName) tupAttrs of
45+atomForAttributeName attrName (RelationTuple tupAttrs tupVec) = case V.findIndex (\attr -> attributeName attr == attrName) (attributesVec tupAttrs) of
46 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
46 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
47 Just index -> case tupVec V.!? index of
47 Just index -> case tupVec V.!? index of
48 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
48 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
@@ -59,7 +59,7 @@ vectorIndicesForAttributeNames attrNameVec attrs = if not $ V.null unknownAttrNa
59 Right $ V.map mapper attrNameVec
59 Right $ V.map mapper attrNameVec
60 where
60 where
61 unknownAttrNames = V.filter (`V.notElem` attributeNames attrs) attrNameVec
61 unknownAttrNames = V.filter (`V.notElem` attributeNames attrs) attrNameVec
62− mapper attrName = fromMaybe (error "logic failure in vectorIndicesForAttributeNames") (V.elemIndex attrName (V.map attributeName attrs))
62+ mapper attrName = fromMaybe (error "logic failure in vectorIndicesForAttributeNames") (V.elemIndex attrName (attributeNames attrs))
63
63
64
64
65relationForAttributeName :: AttributeName -> RelationTuple -> Either RelationalError Relation
65relationForAttributeName :: AttributeName -> RelationTuple -> Either RelationalError Relation
@@ -86,10 +86,10 @@ mkRelationTuples attrs = map mapper
86 mapper = mkRelationTuple attrs
86 mapper = mkRelationTuple attrs
87
87
88mkRelationTupleFromMap :: M.Map AttributeName Atom -> RelationTuple
88mkRelationTupleFromMap :: M.Map AttributeName Atom -> RelationTuple
89−mkRelationTupleFromMap attrMap = RelationTuple attrs (V.map (attrMap M.!) attrNames)
89+mkRelationTupleFromMap attrMap = RelationTuple (attributesFromList attrs) (V.map (attrMap M.!) (V.fromList attrNames))
90 where
90 where
91− attrNames = V.fromList (M.keys attrMap)
91+ attrNames = M.keys attrMap
92− attrs = V.map (\attrName -> Attribute attrName (atomTypeForAtom (attrMap M.! attrName))) attrNames
92+ attrs = map (\attrName -> Attribute attrName (atomTypeForAtom (attrMap M.! attrName))) attrNames
93
93
94--return error if attribute names match but their types do not
94--return error if attribute names match but their types do not
95singleTupleSetJoin :: Attributes -> RelationTuple -> RelationTupleSet -> Either RelationalError [RelationTuple]
95singleTupleSetJoin :: Attributes -> RelationTuple -> RelationTupleSet -> Either RelationalError [RelationTuple]
@@ -120,8 +120,8 @@ singleTupleJoin joinedAttrs tup1@(RelationTuple tupAttrs1 _) tup2@(RelationTuple
120 return $ Just $ RelationTuple joinedAttrs newVec
120 return $ Just $ RelationTuple joinedAttrs newVec
121 where
121 where
122 keysIntersection = V.map attributeName attrsIntersection
122 keysIntersection = V.map attributeName attrsIntersection
123− attrsIntersection = V.filter (`V.elem` tupAttrs1) tupAttrs2
123+ attrsIntersection = V.filter (`V.elem` attributesVec tupAttrs1) (attributesVec tupAttrs2)
124− newVec = V.map (findAtomForAttributeName . attributeName) joinedAttrs
124+ newVec = V.map (findAtomForAttributeName . attributeName) (attributesVec joinedAttrs)
125 --search both tuples for the attribute
125 --search both tuples for the attribute
126 findAtomForAttributeName attrName = head $ rights $ fmap (atomForAttributeName attrName) [tup1, tup2]
126 findAtomForAttributeName attrName = head $ rights $ fmap (atomForAttributeName attrName) [tup1, tup2]
127
127
@@ -138,23 +138,31 @@ vectorUnion v1 v2 = V.foldr folder v1 v2
138tupleExtend :: RelationTuple -> RelationTuple -> RelationTuple
138tupleExtend :: RelationTuple -> RelationTuple -> RelationTuple
139tupleExtend (RelationTuple tupAttrs1 tupVec1) (RelationTuple tupAttrs2 tupVec2) = RelationTuple newAttrs newVec
139tupleExtend (RelationTuple tupAttrs1 tupVec1) (RelationTuple tupAttrs2 tupVec2) = RelationTuple newAttrs newVec
140 where
140 where
141− newAttrs = tupAttrs1 V.++ tupAttrs2
141+ newAttrs = tupAttrs1 <> tupAttrs2
142− newVec = tupVec1 V.++ tupVec2
142+ newVec = tupVec1 <> tupVec2
143
143
144tupleAtomExtend :: AttributeName -> Atom -> RelationTuple -> RelationTuple
144tupleAtomExtend :: AttributeName -> Atom -> RelationTuple -> RelationTuple
145tupleAtomExtend newAttrName atom tupIn = tupleExtend tupIn newTup
145tupleAtomExtend newAttrName atom tupIn = tupleExtend tupIn newTup
146 where
146 where
147− newTup = RelationTuple (V.singleton $ Attribute newAttrName (atomTypeForAtom atom)) (V.singleton atom)
147+ newTup = RelationTuple (A.singleton $ Attribute newAttrName (atomTypeForAtom atom)) (V.singleton atom)
148
148
149−--this could be cheaper- it may not be wortwhile to update all the tuples for projection, but then the attribute management must be slightly different- perhaps the attributes should be a vector of association tuples [(name, index)]
150−tupleProject :: S.Set AttributeName -> RelationTuple -> RelationTuple
149+{-tupleProject :: S.Set AttributeName -> RelationTuple -> RelationTuple
151tupleProject projectAttrs (RelationTuple attrs tupVec) = RelationTuple newAttrs newTupVec
150tupleProject projectAttrs (RelationTuple attrs tupVec) = RelationTuple newAttrs newTupVec
152 where
151 where
153− deleteIndices = V.findIndices (\attr -> S.notMember (attributeName attr) projectAttrs) attrs
152+ deleteIndices = V.findIndices (\attr -> S.notMember (attributeName attr) projectAttrs) (attributesVec attrs)
154 indexDeleter = V.ifilter (\index _ -> V.notElem index deleteIndices)
153 indexDeleter = V.ifilter (\index _ -> V.notElem index deleteIndices)
155− newAttrs = indexDeleter attrs
154+ newAttrs = case A.projectionAttributesForNames projectAttrs attrs of
155+ Left err -> error (show (err, projectAttrs, attrs))
156+ Right attrs' -> attrs'
156 newTupVec = indexDeleter tupVec
157 newTupVec = indexDeleter tupVec
157−
158+-}
159+-- remember that the attributes order matters
160+tupleProject :: Attributes -> RelationTuple -> Either RelationalError RelationTuple
161+tupleProject projectAttrs tup = do
162+ newTupVec <- foldM (\acc attr ->
163+ V.snoc acc <$> atomForAttributeName (attributeName attr) tup
164+ ) V.empty (attributesVec projectAttrs)
165+ pure $ reorderTuple projectAttrs (RelationTuple projectAttrs newTupVec)
158--return the attributes and atoms which are equal in both vectors
166--return the attributes and atoms which are equal in both vectors
159--semi-join
167--semi-join
160tupleIntersection :: RelationTuple -> RelationTuple -> RelationTuple
168tupleIntersection :: RelationTuple -> RelationTuple -> RelationTuple
@@ -162,12 +170,14 @@ tupleIntersection tuple1 tuple2 = RelationTuple newAttrs newTupVec
162 where
170 where
163 attrs1 = tupleAttributes tuple1
171 attrs1 = tupleAttributes tuple1
164 attrs2 = tupleAttributes tuple2
172 attrs2 = tupleAttributes tuple2
173+ intersectAttrs = A.intersection attrs1 attrs2
165− matchingIndices = V.findIndices (\attr -> V.elem attr attrs2 &&
174+ matchingIndices = V.findIndices (\attr -> A.member attr intersectAttrs &&
166− atomForAttributeName (attributeName attr) tuple1 ==
175+ atomForAttributeName (attributeName attr) tuple1 ==
167− atomForAttributeName (attributeName attr) tuple2
176+ atomForAttributeName (attributeName attr) tuple2) (attributesVec attrs1)
168− ) attrs1
169 indexFilter = V.ifilter (\index _ -> V.elem index matchingIndices)
177 indexFilter = V.ifilter (\index _ -> V.elem index matchingIndices)
170− newAttrs = indexFilter attrs1
178+ newAttrs = case A.projectionAttributesForNames (A.attributeNameSet intersectAttrs) attrs1 of
179+ Left _ -> mempty
180+ Right attrs' -> attrs'
171 newTupVec = indexFilter (tupleAtoms tuple1)
181 newTupVec = indexFilter (tupleAtoms tuple1)
172
182
173-- | An optimized form of tuple update which updates vectors efficiently.
183-- | An optimized form of tuple update which updates vectors efficiently.
@@ -175,19 +185,20 @@ updateTupleWithAtoms :: M.Map AttributeName Atom -> RelationTuple -> RelationTup
175updateTupleWithAtoms updateMap (RelationTuple attrs tupVec) = RelationTuple attrs newVec
185updateTupleWithAtoms updateMap (RelationTuple attrs tupVec) = RelationTuple attrs newVec
176 where
186 where
177 updateKeysSet = M.keysSet updateMap
187 updateKeysSet = M.keysSet updateMap
178− updateKeysIVec = V.filter (\(_,attr) -> S.member (attributeName attr) updateKeysSet) (V.indexed attrs)
188+ updateKeysIVec = V.filter (\(_,attr) -> S.member (attributeName attr) updateKeysSet) (V.indexed (attributesVec attrs))
179 newVec = V.update tupVec updateVec
189 newVec = V.update tupVec updateVec
180 updateVec = V.map (\(index, attr) -> (index, updateMap M.! attributeName attr)) updateKeysIVec
190 updateVec = V.map (\(index, attr) -> (index, updateMap M.! attributeName attr)) updateKeysIVec
181
191
182tupleToMap :: RelationTuple -> M.Map AttributeName Atom
192tupleToMap :: RelationTuple -> M.Map AttributeName Atom
183tupleToMap (RelationTuple attrs tupVec) = M.fromList assocList
193tupleToMap (RelationTuple attrs tupVec) = M.fromList assocList
184 where
194 where
185− assocList = V.toList $ V.map (\(index, attr) -> (attributeName attr, tupVec V.! index)) (V.indexed attrs)
195+ assocList = V.toList $ V.map (\(index, attr) -> (attributeName attr, tupVec V.! index)) (V.indexed (attributesVec attrs))
186
196
197+-- | Validate that the tuple has the correct attributes in the correct order
187verifyTuple :: Attributes -> RelationTuple -> Either RelationalError RelationTuple
198verifyTuple :: Attributes -> RelationTuple -> Either RelationalError RelationTuple
188−verifyTuple attrs tuple = let attrsTypes = V.map atomType attrs
199+verifyTuple attrs tuple = let attrsTypes = A.atomTypes attrs
189 tupleTypes = V.map atomTypeForAtom (tupleAtoms tuple) in
200 tupleTypes = V.map atomTypeForAtom (tupleAtoms tuple) in
190− if V.length attrs /= V.length tupleTypes then
201+ if A.arity attrs /= V.length tupleTypes then
191 Left $ TupleAttributeCountMismatchError 0
202 Left $ TupleAttributeCountMismatchError 0
192 else do
203 else do
193 mapM_ (uncurry atomTypeVerify) (V.zip attrsTypes tupleTypes)
204 mapM_ (uncurry atomTypeVerify) (V.zip attrsTypes tupleTypes)
@@ -196,15 +207,18 @@ verifyTuple attrs tuple = let attrsTypes = V.map atomType attrs
196--two tuples can be equal but the vectors of attributes could be out-of-order
207--two tuples can be equal but the vectors of attributes could be out-of-order
197--reorder if necessary- this is useful during relMogrify so that all the relation's tuples have identical atom/attribute ordering
208--reorder if necessary- this is useful during relMogrify so that all the relation's tuples have identical atom/attribute ordering
198reorderTuple :: Attributes -> RelationTuple -> RelationTuple
209reorderTuple :: Attributes -> RelationTuple -> RelationTuple
199−reorderTuple attrs tupIn = if tupleAttributes tupIn == attrs then
210+reorderTuple attrs tupIn = if attributesAndOrderEqual (tupleAttributes tupIn) attrs then
200 tupIn
211 tupIn
201 else
212 else
202− RelationTuple attrs (V.map mapper attrs)
213+ RelationTuple attrs (V.map mapper (attributesVec attrs))
203 where
214 where
204 mapper attr = case atomForAttributeName (attributeName attr) tupIn of
215 mapper attr = case atomForAttributeName (attributeName attr) tupIn of
205− Left err -> error ("logic bug in reorderTuple: " ++ show err)
216+ Left err -> error ("logic bug in reorderTuple: " ++ show err <> show tupIn)
206 Right atom -> atom
217 Right atom -> atom
207
218
208--used in Generics derivation for ADTs without named attributes
219--used in Generics derivation for ADTs without named attributes
209trimTuple :: Int -> RelationTuple -> RelationTuple
220trimTuple :: Int -> RelationTuple -> RelationTuple
210−trimTuple index (RelationTuple attrs vals) = RelationTuple (V.drop index attrs) (V.drop index vals)
221+trimTuple index (RelationTuple attrs vals) =
222+ RelationTuple newAttrs (V.drop index vals)
223+ where
224+ newAttrs = A.drop index attrs
src/lib/ProjectM36/TupleSet.hs+7
@@ -31,3 +31,10 @@ mkTupleSet attrs tuples = verifyTupleSet attrs (RelationTupleSet tuples)
31
31
32mkTupleSetFromList :: Attributes -> [[Atom]] -> Either RelationalError RelationTupleSet
32mkTupleSetFromList :: Attributes -> [[Atom]] -> Either RelationalError RelationTupleSet
33mkTupleSetFromList attrs atomMatrix = mkTupleSet attrs $ map (mkRelationTuple attrs . V.fromList) atomMatrix
33mkTupleSetFromList attrs atomMatrix = mkTupleSet attrs $ map (mkRelationTuple attrs . V.fromList) atomMatrix
34+
35+
36+-- | Union two tuplesets while reordering their attribute/atom mapping properly.
37+tupleSetUnion :: Attributes -> RelationTupleSet -> RelationTupleSet -> RelationTupleSet
38+tupleSetUnion targetAttrs tupSet1 tupSet2 = RelationTupleSet $ HS.toList . HS.fromList $ reorder (asList tupSet1) ++ reorder (asList tupSet2)
39+ where
40+ reorder = map (reorderTuple targetAttrs)
src/lib/ProjectM36/Tupleable.hs+108−31
@@ -6,7 +6,26 @@
6{-# LANGUAGE UndecidableInstances #-}
6{-# LANGUAGE UndecidableInstances #-}
7{-# LANGUAGE CPP #-}
7{-# LANGUAGE CPP #-}
8
8
9−module ProjectM36.Tupleable where
9+module ProjectM36.Tupleable
10+ ( toInsertExpr
11+ , toDefineExpr
12+ , tupleAssocsEqualityPredicate
13+ , partitionByAttributes
14+ , toUpdateExpr
15+ , toDeleteExpr
16+ , validateAttributes
17+ , Tupleable(..)
18+
19+ -- * Generics
20+ , genericToTuple
21+ , genericFromTuple
22+ , genericToAttributes
23+ , TupleableG(..)
24+ -- ** Options
25+ , defaultTupleableOptions
26+ , TupleableOptions()
27+ , fieldModifier
28+ ) where
10
29
11import Data.Foldable
30import Data.Foldable
12import Data.List (partition)
31import Data.List (partition)
@@ -19,7 +38,7 @@ import qualified Data.Text as T
19import qualified Data.Vector as V
38import qualified Data.Vector as V
20import GHC.Generics
39import GHC.Generics
21import ProjectM36.Atomable
40import ProjectM36.Atomable
22−import ProjectM36.Attribute hiding (null)
41+import ProjectM36.Attribute as A hiding (null, toList)
23import ProjectM36.Base
42import ProjectM36.Base
24import ProjectM36.DataTypes.Primitive
43import ProjectM36.DataTypes.Primitive
25import ProjectM36.Error
44import ProjectM36.Error
@@ -70,7 +89,7 @@ toInsertExpr vals rvName = do
70
89
71-- | Convert a 'Tupleable' to a create a 'Define' expression which can be used to create an empty relation variable. Use 'toInsertExpr' to insert the actual tuple data. This function is typically used with 'Data.Proxy'.
90-- | Convert a 'Tupleable' to a create a 'Define' expression which can be used to create an empty relation variable. Use 'toInsertExpr' to insert the actual tuple data. This function is typically used with 'Data.Proxy'.
72toDefineExpr :: forall a proxy. Tupleable a => proxy a -> RelVarName -> DatabaseContextExpr
91toDefineExpr :: forall a proxy. Tupleable a => proxy a -> RelVarName -> DatabaseContextExpr
73−toDefineExpr _ rvName = Define rvName (map NakedAttributeExpr (V.toList attrs))
92+toDefineExpr _ rvName = Define rvName (map NakedAttributeExpr (V.toList (attributesVec attrs)))
74 where
93 where
75 attrs = toAttributes (Proxy :: Proxy a)
94 attrs = toAttributes (Proxy :: Proxy a)
76
95
@@ -121,56 +140,110 @@ validateAttributes actualAttrs expectedAttrs val
121 where
140 where
122 nonMatchingAttrs = attributeNamesNotContained actualAttrs expectedAttrs
141 nonMatchingAttrs = attributeNamesNotContained actualAttrs expectedAttrs
123
142
124−
143+-- | Types that can be converted to and from 'RelationTuple'.
144+--
145+-- deriving without customization:
146+--
147+-- > data Example = Example
148+-- > { foo :: Integer
149+-- > , bar :: Text
150+-- > }
151+-- > deriving (Generic)
152+-- >
153+-- > instance Tupleable Example
154+--
155+-- deriving with customization using "ProjectM36.Tupleable.Deriving":
156+--
157+-- > data Example = Example
158+-- > { exampleFoo :: Integer
159+-- > , exampleBar :: Text
160+-- > }
161+-- > deriving stock (Generic)
162+-- > deriving (Tupleable)
163+-- > via Codec (Field (DropPrefix "example" >>> CamelCase)) Example
125class Tupleable a where
164class Tupleable a where
126 toTuple :: a -> RelationTuple
165 toTuple :: a -> RelationTuple
127
166
128 fromTuple :: RelationTuple -> Either RelationalError a
167 fromTuple :: RelationTuple -> Either RelationalError a
129
168
130− toAttributes :: proxy a -> Attributes
169+ toAttributes :: Proxy a -> Attributes
131
170
132 default toTuple :: (Generic a, TupleableG (Rep a)) => a -> RelationTuple
171 default toTuple :: (Generic a, TupleableG (Rep a)) => a -> RelationTuple
133− toTuple v = toTupleG (from v)
172+ toTuple = genericToTuple defaultTupleableOptions
134
173
135 default fromTuple :: (Generic a, TupleableG (Rep a)) => RelationTuple -> Either RelationalError a
174 default fromTuple :: (Generic a, TupleableG (Rep a)) => RelationTuple -> Either RelationalError a
175+ fromTuple = genericFromTuple defaultTupleableOptions
176+
177+ default toAttributes :: (Generic a, TupleableG (Rep a)) => Proxy a -> Attributes
178+ toAttributes = genericToAttributes defaultTupleableOptions
179+
180+-- | Options that influence deriving behavior.
181+newtype TupleableOptions = TupleableOptions {
182+ -- | A function that translates record field names into attribute names.
183+ fieldModifier :: T.Text -> T.Text
184+ }
185+
186+-- | The default options for deriving Tupleable instances.
187+--
188+-- These options can be customized by using record update syntax. For example,
189+--
190+-- > defaultTupleableOptions
191+-- > { fieldModifier = \fieldName ->
192+-- > case Data.Text.stripPrefix "example" fieldName of
193+-- > Nothing -> fieldName
194+-- > Just attributeName -> attributeName
195+-- > }
196+--
197+-- will result in record field names being translated into attribute names by
198+-- removing the prefix "example" from the field names.
199+defaultTupleableOptions :: TupleableOptions
200+defaultTupleableOptions = TupleableOptions {
201+ fieldModifier = id
202+ }
203+
204+genericToTuple :: (Generic a, TupleableG (Rep a)) => TupleableOptions -> a -> RelationTuple
205+genericToTuple opts v = toTupleG opts (from v)
206+
207+genericFromTuple :: (Generic a, TupleableG (Rep a)) => TupleableOptions -> RelationTuple -> Either RelationalError a
136− fromTuple tup = to <$> fromTupleG tup
208+genericFromTuple opts tup = to <$> fromTupleG opts tup
137
209
138− default toAttributes :: (Generic a, TupleableG (Rep a)) => proxy a -> Attributes
210+genericToAttributes :: forall a. (Generic a, TupleableG (Rep a)) => TupleableOptions -> Proxy a -> Attributes
139− toAttributes _ = toAttributesG (from (undefined :: a))
211+genericToAttributes opts _ = toAttributesG opts (from (undefined :: a))
140
212
141class TupleableG g where
213class TupleableG g where
142− toTupleG :: g a -> RelationTuple
214+ toTupleG :: TupleableOptions -> g a -> RelationTuple
143− toAttributesG :: g a -> Attributes
215+ toAttributesG :: TupleableOptions -> g a -> Attributes
144− fromTupleG :: RelationTuple -> Either RelationalError (g a)
216+ fromTupleG :: TupleableOptions -> RelationTuple -> Either RelationalError (g a)
145 isRecordTypeG :: g a -> Bool
217 isRecordTypeG :: g a -> Bool
146
218
147--data type metadata
219--data type metadata
148instance (Datatype c, TupleableG a) => TupleableG (M1 D c a) where
220instance (Datatype c, TupleableG a) => TupleableG (M1 D c a) where
149− toTupleG (M1 v) = toTupleG v
221+ toTupleG opts (M1 v) = toTupleG opts v
150− toAttributesG (M1 v) = toAttributesG v
222+ toAttributesG opts (M1 v) = toAttributesG opts v
151− fromTupleG v = M1 <$> fromTupleG v
223+ fromTupleG opts v = M1 <$> fromTupleG opts v
152 isRecordTypeG (M1 v) = isRecordTypeG v
224 isRecordTypeG (M1 v) = isRecordTypeG v
153
225
154--constructor metadata
226--constructor metadata
155instance (Constructor c, TupleableG a, AtomableG a) => TupleableG (M1 C c a) where
227instance (Constructor c, TupleableG a, AtomableG a) => TupleableG (M1 C c a) where
156− toTupleG (M1 v) = RelationTuple attrs atoms
228+ toTupleG opts (M1 v) = RelationTuple attrs atoms
157 where
229 where
158− attrsToCheck = toAttributesG v
230+ attrsToCheck = toAttributesG opts v
159− counter = V.generate (V.length attrsToCheck) id
231+ counter = V.generate (arity attrsToCheck) id
232+ attrs = attributesFromList (V.toList attrsV)
160− attrs = V.zipWith (\num attr@(Attribute name typ) -> if T.null name then
233+ attrsV = V.zipWith (\num attr@(Attribute name typ) -> if T.null name then
161 Attribute ("attr" <> T.pack (show (num + 1))) typ
234 Attribute ("attr" <> T.pack (show (num + 1))) typ
162 else
235 else
163− attr) counter attrsToCheck
236+ attr) counter (attributesVec attrsToCheck)
164 atoms = V.fromList (toAtomsG v)
237 atoms = V.fromList (toAtomsG v)
165− toAttributesG (M1 v) = toAttributesG v
238+ toAttributesG opts (M1 v) = toAttributesG opts v
166− fromTupleG tup = M1 <$> fromTupleG tup
239+ fromTupleG opts tup = M1 <$> fromTupleG opts tup
167 isRecordTypeG (M1 v) = isRecordTypeG v
240 isRecordTypeG (M1 v) = isRecordTypeG v
168
241
169-- product types
242-- product types
170instance (TupleableG a, TupleableG b) => TupleableG (a :*: b) where
243instance (TupleableG a, TupleableG b) => TupleableG (a :*: b) where
171 toTupleG = error "toTupleG"
244 toTupleG = error "toTupleG"
172− toAttributesG ~(x :*: y) = toAttributesG x V.++ toAttributesG y --a bit of extra laziness prevents whnf so that we can use toAttributes (undefined :: Test2T Int Int) without throwing an exception
245+ toAttributesG opts ~(x :*: y) = toAttributesG opts x <> toAttributesG opts y --a bit of extra laziness prevents whnf so that we can use toAttributes (undefined :: Test2T Int Int) without throwing an exception
173− fromTupleG tup = (:*:) <$> fromTupleG tup <*> fromTupleG processedTuple
246+ fromTupleG opts tup = (:*:) <$> fromTupleG opts tup <*> fromTupleG opts processedTuple
174 where
247 where
175 processedTuple = if isRecordTypeG (undefined :: a x) then
248 processedTuple = if isRecordTypeG (undefined :: a x) then
176 tup
249 tup
@@ -181,18 +254,22 @@ instance (TupleableG a, TupleableG b) => TupleableG (a :*: b) where
181--selector/record
254--selector/record
182instance (Selector c, AtomableG a) => TupleableG (M1 S c a) where
255instance (Selector c, AtomableG a) => TupleableG (M1 S c a) where
183 toTupleG = error "toTupleG"
256 toTupleG = error "toTupleG"
184− toAttributesG m@(M1 v) = V.singleton (Attribute name aType)
257+ toAttributesG opts m@(M1 v) = A.singleton (Attribute modifiedName aType)
185 where
258 where
186 name = T.pack (selName m)
259 name = T.pack (selName m)
260+ modifiedName = if T.null name then
261+ name
262+ else
263+ fieldModifier opts name
187 aType = toAtomTypeG v
264 aType = toAtomTypeG v
188− fromTupleG tup = if null name then -- non-record type, just pull off the first tuple item
265+ fromTupleG opts tup = if null name then -- non-record type, just pull off the first tuple item
189 M1 <$> atomv (V.head (tupleAtoms tup))
266 M1 <$> atomv (V.head (tupleAtoms tup))
190 else do
267 else do
191− atom <- atomForAttributeName (T.pack name) tup
268+ atom <- atomForAttributeName (fieldModifier opts (T.pack name)) tup
192 val <- atomv atom
269 val <- atomv atom
193 pure (M1 val)
270 pure (M1 val)
194 where
271 where
195− expectedAtomType = atomType (V.head (toAttributesG (undefined :: M1 S c a x)))
272+ expectedAtomType = atomType (V.head (attributesVec (toAttributesG opts (undefined :: M1 S c a x))))
196 atomv atom = maybe (Left (AtomTypeMismatchError
273 atomv atom = maybe (Left (AtomTypeMismatchError
197 expectedAtomType
274 expectedAtomType
198 (atomTypeForAtom atom)
275 (atomTypeForAtom atom)
@@ -203,8 +280,8 @@ instance (Selector c, AtomableG a) => TupleableG (M1 S c a) where
203--constructors with no arguments
280--constructors with no arguments
204--basically useless but orthoganal to relationTrue
281--basically useless but orthoganal to relationTrue
205instance TupleableG U1 where
282instance TupleableG U1 where
206− toTupleG _= emptyTuple
283+ toTupleG _ _ = emptyTuple
207− toAttributesG _ = emptyAttributes
284+ toAttributesG _ _ = emptyAttributes
208− fromTupleG _ = pure U1
285+ fromTupleG _ _ = pure U1
209 isRecordTypeG _ = False
286 isRecordTypeG _ = False
210
287
src/lib/ProjectM36/Tupleable/Deriving.hsnew file+229
@@ -0,0 +1,229 @@
1+{-# LANGUAGE ScopedTypeVariables #-}
2+{-# LANGUAGE TypeOperators #-}
3+{-# LANGUAGE KindSignatures #-}
4+{-# LANGUAGE DataKinds #-}
5+{-# LANGUAGE FlexibleContexts #-}
6+{-# LANGUAGE UndecidableInstances #-}
7+
8+-- | Newtypes for deriving Tupleable instances with customization using
9+-- @DerivingVia@.
10+--
11+-- Inspired by
12+-- [Dhall.Deriving](https://hackage.haskell.org/package/dhall-1.33.1/docs/Dhall-Deriving.html)
13+-- which in turn was inspired by Matt Parson's blog post
14+-- [Mirror Mirror: Reflection and Encoding Via](https://www.parsonsmatt.org/2020/02/04/mirror_mirror.html).
15+--
16+-- required extensions:
17+--
18+-- * DerivingVia
19+-- * DeriveGenerics
20+-- * TypeOperators (for @('<<<')@ and @('>>>')@)
21+-- * DataKinds (for types that take a string argument)
22+
23+module ProjectM36.Tupleable.Deriving
24+ ( -- * DerivingVia Newtype
25+ Codec(..)
26+
27+ -- * Type-level Options
28+ , ModifyOptions(..)
29+ , Field
30+
31+ -- * Type-level 'T.Text' -> 'T.Text' Functions
32+ , ModifyText(..)
33+ , AddPrefix
34+ , DropPrefix
35+ , AddSuffix
36+ , DropSuffix
37+ , UpperCase
38+ , LowerCase
39+ , TitleCase
40+ , CamelCase
41+ , PascalCase
42+ , SnakeCase
43+ , SpinalCase
44+ , TrainCase
45+
46+ -- * Composition
47+ , AsIs
48+ , type (<<<)
49+ , type (>>>)
50+
51+ -- * Re-Exports
52+ , Generic
53+ , module ProjectM36.Tupleable
54+ ) where
55+import Data.Maybe (fromMaybe)
56+import Data.Proxy
57+import qualified Data.Text as T
58+import Data.Text.Manipulate
59+import GHC.TypeLits
60+import GHC.Generics (Generic, Rep)
61+import ProjectM36.Tupleable
62+
63+
64+-- | A newtype wrapper to allow for easier deriving of 'Tupleable' instances
65+-- with customization.
66+--
67+-- The @tag@ type variable can be used to specify options for converting the
68+-- datatype to and from a 'RelationTuple'. For example,
69+--
70+-- > data Example = Example
71+-- > { exampleFoo :: Int
72+-- > , exampleBar :: Int
73+-- > }
74+-- > deriving stock (Generic)
75+-- > deriving (Tupleable)
76+-- > via Codec (Field (DropPrefix "example" >>> CamelCase)) Example
77+--
78+-- will derive an instance of 'Tupleable' where field names are translated into
79+-- attribute names by dropping the prefix @"example"@ and then converting the
80+-- result to camelCase. So @"exampleFoo"@ becomes @"foo"@ and @"exampleBar"@
81+-- becomes @"bar"@.
82+--
83+-- Requires the @DerivingGeneric@ and @DerivingVia@ extensions to be enabled.
84+newtype Codec tag a = Codec { unCodec :: a }
85+
86+instance (ModifyOptions tag, Generic a, TupleableG (Rep a)) => Tupleable (Codec tag a) where
87+ toTuple v = genericToTuple opts (unCodec v)
88+ where
89+ opts = modifyOptions (Proxy :: Proxy tag) defaultTupleableOptions
90+
91+ fromTuple tup = Codec <$> genericFromTuple opts tup
92+ where
93+ opts = modifyOptions (Proxy :: Proxy tag) defaultTupleableOptions
94+
95+ toAttributes _ = genericToAttributes opts (Proxy :: Proxy a)
96+ where
97+ opts = modifyOptions (Proxy :: Proxy tag) defaultTupleableOptions
98+
99+-- | Types that can be used as tags for 'Codec'.
100+class ModifyOptions a where
101+ modifyOptions :: proxy a -> TupleableOptions -> TupleableOptions
102+
103+-- | Change how record field names are translated into attribute names. For
104+-- example,
105+--
106+-- > Field SnakeCase
107+--
108+-- will translate the field name @fooBar@ into the attribute name @foo_bar@.
109+data Field a
110+
111+instance ModifyText a => ModifyOptions (Field a) where
112+ modifyOptions _ opts = opts { fieldModifier = newFieldModifier }
113+ where
114+ newFieldModifier = modifyText (Proxy :: Proxy a) . fieldModifier opts
115+
116+-- | Types that can be used in options that modify 'T.Text' such as in 'Field'.
117+class ModifyText a where
118+ modifyText :: proxy a -> T.Text -> T.Text
119+
120+-- | Add a prefix. @AddPrefix "foo"@ will transform @"bar"@ into @"foobar"@.
121+data AddPrefix (prefix :: Symbol)
122+
123+instance KnownSymbol prefix => ModifyText (AddPrefix prefix) where
124+ modifyText _ oldText = prefixText <> oldText
125+ where
126+ prefixText = T.pack (symbolVal (Proxy :: Proxy prefix))
127+
128+-- | Drop a prefix. @DropPrefix "bar"@ will transform @"foobar"@ into @"foo"@.
129+data DropPrefix (prefix :: Symbol)
130+
131+instance KnownSymbol prefix => ModifyText (DropPrefix prefix) where
132+ modifyText _ oldText = fromMaybe oldText (T.stripPrefix prefixText oldText)
133+ where
134+ prefixText = T.pack (symbolVal (Proxy :: Proxy prefix))
135+
136+-- | Add a suffix. @AddSuffix "bar"@ will transform @"foo"@ into @"foobar"@.
137+data AddSuffix (suffix :: Symbol)
138+
139+instance KnownSymbol suffix => ModifyText (AddSuffix suffix) where
140+ modifyText _ oldText = oldText <> suffixText
141+ where
142+ suffixText = T.pack (symbolVal (Proxy :: Proxy suffix))
143+
144+-- | Drop a suffix. @DropSuffix "bar"@ will transform @"foobar"@ into @"foo"@.
145+data DropSuffix (suffix :: Symbol)
146+
147+instance KnownSymbol suffix => ModifyText (DropSuffix suffix) where
148+ modifyText _ oldText = fromMaybe oldText (T.stripSuffix suffixText oldText)
149+ where
150+ suffixText = T.pack (symbolVal (Proxy :: Proxy suffix))
151+
152+-- | Convert to UPPERCASE. Will transform @"foobar"@ into @\"FOOBAR\"@.
153+data UpperCase
154+
155+instance ModifyText UpperCase where
156+ modifyText _ = T.toUpper
157+
158+-- | Convert to lowercase. Will transform @\"FOOBAR\"@ into @"foobar"@.
159+data LowerCase
160+
161+instance ModifyText LowerCase where
162+ modifyText _ = T.toLower
163+
164+-- | Convert to Title Case. Will transform @"fooBar"@ into @\"Foo Bar\"@.
165+data TitleCase
166+
167+instance ModifyText TitleCase where
168+ modifyText _ = toTitle
169+
170+-- | Convert to camelCase. Will transform @"foo_bar"@ into @"fooBar"@.
171+data CamelCase
172+
173+instance ModifyText CamelCase where
174+ modifyText _ = toCamel
175+
176+-- | Convert to PascalCase. Will transform @"foo_bar"@ into @\"FooBar\"@.
177+data PascalCase
178+
179+instance ModifyText PascalCase where
180+ modifyText _ = toPascal
181+
182+-- | Convert to snake_case. Will transform @"fooBar"@ into @"foo_bar"@.
183+data SnakeCase
184+
185+instance ModifyText SnakeCase where
186+ modifyText _ = toSnake
187+
188+-- | Convert to spinal-case. will transform @"fooBar"@ into @"foo-bar"@.
189+data SpinalCase
190+
191+instance ModifyText SpinalCase where
192+ modifyText _ = toSpinal
193+
194+-- | Convert to Train-Case. Will transform @"fooBar"@ into @\"Foo-Bar\"@.
195+data TrainCase
196+
197+instance ModifyText TrainCase where
198+ modifyText _ = toTrain
199+
200+-- | Identity option.
201+type AsIs = ()
202+
203+instance ModifyOptions () where
204+ modifyOptions _ = id
205+
206+instance ModifyText () where
207+ modifyText _ = id
208+
209+-- | Right to left composition.
210+--
211+-- Requires the @TypeOperators@ extension to be enabled.
212+data a <<< b
213+
214+instance (ModifyOptions a, ModifyOptions b) => ModifyOptions (a <<< b) where
215+ modifyOptions _ = modifyOptions (Proxy :: Proxy a) . modifyOptions (Proxy :: Proxy b)
216+
217+instance (ModifyText a, ModifyText b) => ModifyText (a <<< b) where
218+ modifyText _ = modifyText (Proxy :: Proxy a) . modifyText (Proxy :: Proxy b)
219+
220+-- | Left to right composition.
221+--
222+-- Requires the @TypeOperators@ extension to be enabled.
223+data a >>> b
224+
225+instance (ModifyOptions a, ModifyOptions b) => ModifyOptions (a >>> b) where
226+ modifyOptions _ = modifyOptions (Proxy :: Proxy b) . modifyOptions (Proxy :: Proxy a)
227+
228+instance (ModifyText a, ModifyText b) => ModifyText (a >>> b) where
229+ modifyText _ = modifyText (Proxy :: Proxy b) . modifyText (Proxy :: Proxy a)
src/lib/ProjectM36/WithNameExpr.hs+4−2
@@ -42,9 +42,11 @@ substituteWithNameMacros macros (NotEquals exprA exprB) =
42substituteWithNameMacros macros (Extend extendTup expr) =
42substituteWithNameMacros macros (Extend extendTup expr) =
43 Extend (substituteWitNameMacrosExtendTupleExpr macros extendTup) (substituteWithNameMacros macros expr)
43 Extend (substituteWitNameMacrosExtendTupleExpr macros extendTup) (substituteWithNameMacros macros expr)
44substituteWithNameMacros macros (With moreMacros expr) =
44substituteWithNameMacros macros (With moreMacros expr) =
45− --collect and override existing macros and recurse
45+ --collect and update nested with exprs
46 let newMacros = foldr macroFolder macros moreMacros
46 let newMacros = foldr macroFolder macros moreMacros
47− macroFolder (wnexpr, mexpr) acc = filter (\(w,_) -> w /= wnexpr) acc ++ [(wnexpr, mexpr)] in
47+ macroFolder (wnexpr, mexpr) acc =
48+ let subExpr = substituteWithNameMacros macros mexpr in
49+ filter (\(w,_) -> w /= wnexpr) acc ++ [(wnexpr, subExpr)] in
48 --scan for a match- if it exists, replace it (representing a with clause at a lower level
50 --scan for a match- if it exists, replace it (representing a with clause at a lower level
49 substituteWithNameMacros newMacros expr
51 substituteWithNameMacros newMacros expr
50
52
stack.ghc8.0.yamldeleted−50
@@ -1,50 +0,0 @@
1−# This file was automatically generated by stack init
2−# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
3−
4−# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
5−resolver: lts-8.5
6−
7−# Local packages, usually specified by relative directory name
8−packages:
9−- '.'
10−# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
11−extra-deps:
12−- data-accessor-transformers-0.2.1.7
13−- data-interval-1.2.0
14−- extended-reals-0.2.1.0
15−- gnuplot-0.5.4.1
16−- text-1.2.2.1
17−- aeson-1.2.1.00
18−- distributed-process-0.6.6
19−- distributed-process-async-0.2.4
20−- distributed-process-client-server-0.2.3
21−- distributed-process-extras-0.3.2
22−- deferred-folds-0.6.12
23−- rset-1.0.0
24−
25−# Override default flag values for local packages and extra-deps
26−flags: {}
27−
28−# Extra package databases containing global packages
29−extra-package-dbs: []
30−
31−# Control whether we use the GHC we find on the path
32−# system-ghc: true
33−
34−# Require a specific version of stack, using version ranges
35−# require-stack-version: -any # Default
36−# require-stack-version: >= 1.0.0
37−
38−# Override the architecture used by stack, especially useful on Windows
39−# arch: i386
40−# arch: x86_64
41−
42−# Extra directories used by stack for building
43−# extra-include-dirs: [/path/to/dir]
44−# extra-lib-dirs: [/path/to/dir]
45−
46−# Allow a newer minor version of GHC than the snapshot specifies
47−# compiler-check: newer-minor
48−
49−allow-newer: true
50−
stack.ghc8.10.yamlnew file+19
@@ -0,0 +1,19 @@
1+resolver: lts-17.13
2+packages:
3+ - "."
4+
5+extra-deps:
6+ - git: https://github.com/agentm/curryer.git
7+ commit: 74ecaac619ad1165a4517d5c0f4e530493bda130
8+ - git: https://github.com/composewell/streamly.git
9+ commit: ac3af8749194f1788704dda8667d0b3807075cc2
10+ - fast-builder-0.1.2.1
11+ - rset-1.0.0
12+ - winery-1.3.2
13+ - barbies-th-0.1.8
14+ - base16-bytestring-1.0.1.0
15+
16+flags:
17+ project-m36:
18+ stack: true
19+# allow-newer: true
stack.ghc8.2.yamldeleted−51
@@ -1,51 +0,0 @@
1−# This file was automatically generated by stack init
2−# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
3−
4−# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
5−resolver: lts-11.20
6−
7−# Local packages, usually specified by relative directory name
8−packages:
9−- '.'
10−# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
11−extra-deps:
12−- data-accessor-transformers-0.2.1.7
13−- data-interval-1.2.0
14−- extended-reals-0.2.1.0
15−- gnuplot-0.5.4.1
16−- text-1.2.2.1
17−- aeson-1.2.1.00
18−- distributed-process-0.7.3
19−- distributed-process-async-0.2.4.1
20−- distributed-process-client-server-0.2.3
21−- distributed-process-extras-0.3.2
22−- rset-1.0.0
23−
24−# Override default flag values for local packages and extra-deps
25−flags:
26− project-m36:
27− stack: true
28−
29−# Extra package databases containing global packages
30−extra-package-dbs: []
31−
32−# Control whether we use the GHC we find on the path
33−# system-ghc: true
34−
35−# Require a specific version of stack, using version ranges
36−# require-stack-version: -any # Default
37−# require-stack-version: >= 1.0.0
38−
39−# Override the architecture used by stack, especially useful on Windows
40−# arch: i386
41−# arch: x86_64
42−
43−# Extra directories used by stack for building
44−# extra-include-dirs: [/path/to/dir]
45−# extra-lib-dirs: [/path/to/dir]
46−
47−# Allow a newer minor version of GHC than the snapshot specifies
48−# compiler-check: newer-minor
49−
50−allow-newer: true
51−
stack.ghc8.4.yamldeleted−48
@@ -1,48 +0,0 @@
1−# This file was automatically generated by stack init
2−# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
3−
4−# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
5−resolver: lts-12.26
6−
7−# Local packages, usually specified by relative directory name
8−packages:
9−- '.'
10−# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
11−extra-deps:
12−- data-interval-1.3.0
13−- extended-reals-0.2.3.0
14−- distributed-process-0.7.4
15−- distributed-process-async-0.2.6
16−- distributed-process-client-server-0.2.5.1
17−- distributed-process-extras-0.3.5
18−- rset-1.0.0
19−- hashable-time-0.2.0.2
20−- network-transport-tcp-0.6.0
21−
22−# Override default flag values for local packages and extra-deps
23−flags:
24− project-m36:
25− stack: true
26−
27−# Extra package databases containing global packages
28−extra-package-dbs: []
29−
30−# Control whether we use the GHC we find on the path
31−# system-ghc: true
32−
33−# Require a specific version of stack, using version ranges
34−# require-stack-version: -any # Default
35−# require-stack-version: >= 1.0.0
36−
37−# Override the architecture used by stack, especially useful on Windows
38−# arch: i386
39−# arch: x86_64
40−
41−# Extra directories used by stack for building
42−# extra-include-dirs: [/path/to/dir]
43−# extra-lib-dirs: [/path/to/dir]
44−
45−# Allow a newer minor version of GHC than the snapshot specifies
46−# compiler-check: newer-minor
47−
48−allow-newer: true
stack.ghc8.6.yaml+25−16
@@ -2,27 +2,36 @@
2# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
2# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
3
3
4# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
5−resolver: lts-14.3
5+resolver: lts-14.27
6
6
7# Local packages, usually specified by relative directory name
7# Local packages, usually specified by relative directory name
8packages:
8packages:
9−- '.'
9+ - "."
10# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
10# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
11extra-deps:
11extra-deps:
12−- git: https://github.com/haskell-distributed/distributed-process.git
12+ - git: https://github.com/agentm/curryer.git
13− commit: 660d554f6acd2dba8b605c84e8fa69e45708bc14
13+ commit: 74ecaac619ad1165a4517d5c0f4e530493bda130
14+ - git: https://github.com/composewell/streamly.git
15+ commit: ac3af8749194f1788704dda8667d0b3807075cc2
16+ - fast-builder-0.1.2.1
17+ - winery-1.3.2
18+ - barbies-2.0.2.0
19+ - barbies-th-0.1.7
14−- extended-reals-0.2.3.0
20+ - extended-reals-0.2.3.0
15−- data-interval-2.0.1
21+ - data-interval-2.0.1
16−- stm-containers-1.1.0.4
22+ - stm-containers-1.1.0.4
17−- distributed-static-0.3.9
18−- stm-hamt-1.2.0.4
23+ - stm-hamt-1.2.0.4
19−- distributed-process-async-0.2.6
20−- distributed-process-client-server-0.2.5.1
21−- distributed-process-extras-0.3.5
22−- rset-1.0.0
24+ - rset-1.0.0
23−- hashable-time-0.2.0.2
25+ - hashable-time-0.2.0.2
24−- network-transport-tcp-0.6.0
26+ - network-transport-tcp-0.6.0
25−- megaparsec-7.0.5
27+ - megaparsec-7.0.5
28+ - prettyprinter-1.7.0
29+ - prettyprinter-ansi-terminal-1.1.2
30+ - fusion-plugin-types-0.1.0
31+ - base16-bytestring-1.0.1.0
32+ - modern-uri-0.3.4.0
33+ - cryptohash-sha256-0.11.102.0
34+ - http-types-0.12.3
26
35
27# Override default flag values for local packages and extra-deps
36# Override default flag values for local packages and extra-deps
28flags:
37flags:
stack.ghc8.8.yaml+25−17
@@ -2,28 +2,36 @@
2# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
2# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
3
3
4# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
5−resolver: lts-15.11
5+resolver: lts-16.4
6
6
7# Local packages, usually specified by relative directory name
7# Local packages, usually specified by relative directory name
8packages:
8packages:
9−- '.'
9+ - "."
10# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
10# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
11extra-deps:
11extra-deps:
12−- git: https://github.com/agentm/distributed-process.git
12+ - git: https://github.com/agentm/curryer.git
13− commit: 688a5b96d4b7b36d90c3db676230b2c943604288
13+ commit: 74ecaac619ad1165a4517d5c0f4e530493bda130
14+ - git: https://github.com/composewell/streamly.git
15+ commit: ac3af8749194f1788704dda8667d0b3807075cc2
16+ - fast-builder-0.1.2.1
17+ - winery-1.3.2
18+ - barbies-2.0.2.0
19+ - barbies-th-0.1.7
14−- extended-reals-0.2.3.0
20+ - extended-reals-0.2.3.0
15−- data-interval-2.0.1
21+ - data-interval-2.0.1
16−- stm-containers-1.1.0.4
22+ - stm-containers-1.1.0.4
17−- distributed-static-0.3.9
18−- stm-hamt-1.2.0.4
23+ - stm-hamt-1.2.0.4
19−- distributed-process-async-0.2.6
20−- distributed-process-client-server-0.2.5.1
21−- distributed-process-extras-0.3.5
22−- rset-1.0.0
24+ - rset-1.0.0
23−- hashable-time-0.2.0.2
25+ - hashable-time-0.2.0.2
24−- network-transport-tcp-0.7.0
26+ - network-transport-tcp-0.7.0
25−- megaparsec-7.0.5
27+ - megaparsec-7.0.5
26−- network-2.8.0.1
28+ - network-2.8.0.1
29+ - primitive-extras-0.8
30+ - primitive-unlifted-0.1.3.0
31+ - prettyprinter-1.7.0
32+ - prettyprinter-ansi-terminal-1.1.2
33+ - base16-bytestring-1.0.1.0
34+ - modern-uri-0.3.4.0
27
35
28# Override default flag values for local packages and extra-deps
36# Override default flag values for local packages and extra-deps
29flags:
37flags:
test/Client/Simple.hs+1−2
@@ -9,7 +9,6 @@ import System.IO.Temp
9import System.FilePath
9import System.FilePath
10import ProjectM36.TupleSet
10import ProjectM36.TupleSet
11import ProjectM36.Attribute
11import ProjectM36.Attribute
12−import qualified Data.Vector as V
13import qualified Data.Map as M
12import qualified Data.Map as M
14
13
15main :: IO ()
14main :: IO ()
@@ -59,7 +58,7 @@ testSimpleCommitFailure = TestCase $ do
59 execute $ Assign "x" (ExistingRelation relationTrue)
58 execute $ Assign "x" (ExistingRelation relationTrue)
60 --cause error
59 --cause error
61 execute $ Assign "x" (MakeStaticRelation failAttrs emptyTupleSet)
60 execute $ Assign "x" (MakeStaticRelation failAttrs emptyTupleSet)
62− let expectedErr = Left (RelError (RelationTypeMismatchError V.empty failAttrs))
61+ let expectedErr = Left (RelError (RelationTypeMismatchError mempty failAttrs))
63 assertEqual "dbc error" expectedErr err
62 assertEqual "dbc error" expectedErr err
64
63
65-- #176 default merge couldn't handle Update
64-- #176 default merge couldn't handle Update
test/Relation/Atomable.hs+28−15
@@ -1,8 +1,7 @@
1--Test Atomable typeclass which allows users to use existing Haskell datatypes to marshal them to and from the database as ConstructedAtoms.
1--Test Atomable typeclass which allows users to use existing Haskell datatypes to marshal them to and from the database as ConstructedAtoms.
2−{-# LANGUAGE DeriveGeneric, DeriveAnyClass, OverloadedStrings, TypeApplications #-}
2+{-# LANGUAGE DeriveGeneric, DeriveAnyClass, OverloadedStrings, TypeApplications, DerivingVia #-}
3import Test.HUnit
3import Test.HUnit
4import ProjectM36.Client
4import ProjectM36.Client
5−import Data.Binary
6import Control.DeepSeq
5import Control.DeepSeq
7import System.Exit
6import System.Exit
8import TutorialD.Interpreter.TestBase
7import TutorialD.Interpreter.TestBase
@@ -13,52 +12,65 @@ import Data.Time.Calendar (fromGregorian)
13import Data.Text
12import Data.Text
14import qualified Data.Map as M
13import qualified Data.Map as M
15import Data.Proxy
14import Data.Proxy
15+import Codec.Winery
16
16
17{-# ANN module ("Hlint: ignore Use newtype instead of data" :: String) #-}
17{-# ANN module ("Hlint: ignore Use newtype instead of data" :: String) #-}
18data Test1T = Test1C Integer
18data Test1T = Test1C Integer
19− deriving (Generic, Show, Eq, Binary, NFData, Atomable)
19+ deriving (Generic, Show, Eq, NFData, Atomable)
20+ deriving Serialise via WineryVariant Test1T
20
21
21data Test2T x = Test2C x
22data Test2T x = Test2C x
22− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
23+ deriving (Show, Generic, Eq, NFData, Atomable)
24+ deriving Serialise via WineryVariant (Test2T x)
23
25
24data Test3T = Test3C Integer Integer
26data Test3T = Test3C Integer Integer
25− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
27+ deriving (Show, Generic, Eq, NFData, Atomable)
28+ deriving Serialise via WineryVariant Test3T
26
29
27data Test4T = Test4Ca Integer |
30data Test4T = Test4Ca Integer |
28 Test4Cb Integer
31 Test4Cb Integer
29− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
32+ deriving (Show, Generic, Eq, NFData, Atomable)
33+ deriving Serialise via WineryVariant Test4T
30
34
31data TestListT = TestListC [Integer]
35data TestListT = TestListC [Integer]
32− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
36+ deriving (Show, Generic, Eq, NFData, Atomable)
37+ deriving Serialise via WineryVariant TestListT
33
38
34data TestNonEmptyT = TestNonEmptyC [Integer]
39data TestNonEmptyT = TestNonEmptyC [Integer]
35− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
40+ deriving (Show, Generic, Eq, NFData, Atomable)
41+ deriving Serialise via WineryVariant TestNonEmptyT
36
42
37data Test5T = Test5C {
43data Test5T = Test5C {
38 con1 :: Integer,
44 con1 :: Integer,
39 con2 :: Integer
45 con2 :: Integer
40− } deriving (Show, Generic, Eq, Binary, NFData, Atomable)
46+ } deriving (Show, Generic, Eq, NFData, Atomable)
47+ deriving Serialise via WineryRecord Test5T
41
48
42data Test6T = Test6C (Maybe Integer)
49data Test6T = Test6C (Maybe Integer)
43− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
50+ deriving (Show, Generic, Eq, NFData, Atomable)
51+ deriving Serialise via WineryVariant Test6T
44
52
45data Test7T = Test7C (Either Integer Integer)
53data Test7T = Test7C (Either Integer Integer)
46− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
54+ deriving (Show, Generic, Eq, NFData, Atomable)
55+ deriving Serialise via WineryVariant Test7T
47
56
48data Test8T = Test8C Test1T
57data Test8T = Test8C Test1T
49− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
58+ deriving (Show, Generic, Eq, NFData, Atomable)
59+ deriving Serialise via WineryVariant Test8T
50
60
51data User = User
61data User = User
52 { userFirstName :: Text
62 { userFirstName :: Text
53 , userLastName :: Text
63 , userLastName :: Text
54− } deriving (Eq, Ord, Show, Generic, NFData, Binary, Atomable)
64+ } deriving (Eq, Ord, Show, Generic, NFData, Atomable)
65+ deriving Serialise via WineryRecord User
55
66
56data Test9_4T = Test9_4C {
67data Test9_4T = Test9_4C {
57 f9_41 :: Int,
68 f9_41 :: Int,
58 f9_42 :: Int,
69 f9_42 :: Int,
59 f9_43 :: Int,
70 f9_43 :: Int,
60 f9_44 :: Int }
71 f9_44 :: Int }
61− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
72+ deriving (Show, Generic, Eq, NFData, Atomable)
73+ deriving Serialise via WineryRecord Test9_4T
62
74
63data Test9_5T = Test9_5C {
75data Test9_5T = Test9_5C {
64 f9_51 :: Int,
76 f9_51 :: Int,
@@ -67,7 +79,8 @@ data Test9_5T = Test9_5C {
67 f9_54 :: Int,
79 f9_54 :: Int,
68 f9_55 :: Int
80 f9_55 :: Int
69 }
81 }
70− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
82+ deriving (Show, Generic, Eq, NFData, Atomable)
83+ deriving Serialise via WineryRecord Test9_5T
71
84
72main :: IO ()
85main :: IO ()
73main = do
86main = do
test/Relation/Basic.hs+13−12
@@ -3,8 +3,6 @@ import ProjectM36.Base
3import ProjectM36.Relation
3import ProjectM36.Relation
4import ProjectM36.Error
4import ProjectM36.Error
5import ProjectM36.DateExamples
5import ProjectM36.DateExamples
6−import ProjectM36.TupleSet
7−import ProjectM36.Attribute hiding (null, attributeNames)
8import ProjectM36.DataTypes.Primitive
6import ProjectM36.DataTypes.Primitive
9import ProjectM36.RelationalExpression
7import ProjectM36.RelationalExpression
10import ProjectM36.TransactionGraph
8import ProjectM36.TransactionGraph
@@ -25,8 +23,8 @@ testList = TestList [testRelation "relationTrue" relationTrue, testRelation "rel
25 testRelation "products" productsRel,
23 testRelation "products" productsRel,
26 testRelation "supplierProducts" supplierProductsRel,
24 testRelation "supplierProducts" supplierProductsRel,
27 testMkRelationFromExprsBadAttrs,
25 testMkRelationFromExprsBadAttrs,
28− testDuplicateAttributes,
26+ testExistingRelationType,
29− testExistingRelationType
27+ testReorderTuple
30 ]
28 ]
31
29
32main :: IO ()
30main :: IO ()
@@ -65,7 +63,7 @@ validateAttrTypesMatchTupleAttrTypes rel@(Relation attrs tupSet) = foldr (\tuple
65 attrChecks tuple = V.map (\attr -> case atomForAttributeName (A.attributeName attr) tuple of
63 attrChecks tuple = V.map (\attr -> case atomForAttributeName (A.attributeName attr) tuple of
66 Left _ -> False
64 Left _ -> False
67 Right atom -> Right (atomTypeForAtom atom) ==
65 Right atom -> Right (atomTypeForAtom atom) ==
68− A.atomTypeForAttributeName (A.attributeName attr) attrs) (attributes rel)
66+ A.atomTypeForAttributeName (A.attributeName attr) attrs) (attributesVec (attributes rel))
69
67
70simpleRel :: Relation
68simpleRel :: Relation
71simpleRel = case mkRelation attrs tupleSet of
69simpleRel = case mkRelation attrs tupleSet of
@@ -103,16 +101,19 @@ testMkRelationFromExprsBadAttrs = TestCase $ do
103 Left err -> assertEqual "tuple type mismatch" (TupleAttributeTypeMismatchError (A.attributesFromList [Attribute "badAttr2" IntAtomType])) err
101 Left err -> assertEqual "tuple type mismatch" (TupleAttributeTypeMismatchError (A.attributesFromList [Attribute "badAttr2" IntAtomType])) err
104 Right _ -> assertFailure "expected tuple type mismatch"
102 Right _ -> assertFailure "expected tuple type mismatch"
105
103
106−--creating an empty relation with duplicate attribute names should fail
107−testDuplicateAttributes :: Test
108−testDuplicateAttributes = TestCase $ do
109− let eRel = mkRelation attrs emptyTupleSet
110− attrs = attributesFromList [Attribute "a" IntAtomType, Attribute "a" TextAtomType]
111− assertEqual "duplicate attribute names" (Left (DuplicateAttributeNamesError (S.singleton "a"))) eRel
112−
113testExistingRelationType :: Test
104testExistingRelationType :: Test
114testExistingRelationType = TestCase $ do
105testExistingRelationType = TestCase $ do
115 (graph, _) <- freshTransactionGraph dateExamples
106 (graph, _) <- freshTransactionGraph dateExamples
116 let typeResult = runRelationalExprM reenv (typeForRelationalExpr (ExistingRelation relationTrue))
107 let typeResult = runRelationalExprM reenv (typeForRelationalExpr (ExistingRelation relationTrue))
117 reenv = mkRelationalExprEnv dateExamples graph
108 reenv = mkRelationalExprEnv dateExamples graph
118 assertEqual "ExistingRelation with tuples type" (Right relationFalse) typeResult
109 assertEqual "ExistingRelation with tuples type" (Right relationFalse) typeResult
110+
111+-- | Ensure that tuple reordering honors the
112+testReorderTuple :: Test
113+testReorderTuple = TestCase $ do
114+ let tup1 = mkRelationTuple attrs1 (V.fromList [IntAtom 4, TextAtom "test"])
115+ attrs1 = A.attributesFromList [Attribute "a" IntAtomType, Attribute "b" TextAtomType]
116+ attrs2 = A.attributesFromList [Attribute "b" TextAtomType, Attribute "a" IntAtomType]
117+ actual = reorderTuple attrs2 tup1
118+ expected = mkRelationTuple attrs2 (V.fromList [TextAtom "test", IntAtom 4])
119+ assertEqual "reorderTuple" expected actual
test/Relation/Tupleable.hs+187−9
@@ -1,19 +1,29 @@
1+{-# LANGUAGE
2+ DeriveGeneric
1−{-# LANGUAGE DeriveGeneric, FlexibleInstances, FlexibleContexts, DeriveAnyClass #-}
3+ , FlexibleInstances
4+ , FlexibleContexts
5+ , DeriveAnyClass
6+ , ScopedTypeVariables
7+ , TypeApplications
8+ , DataKinds
9+ , TypeOperators
10+ , AllowAmbiguousTypes
11+ , DerivingVia
12+ #-}
2import Test.HUnit
13import Test.HUnit
3−import ProjectM36.Tupleable
14+import ProjectM36.Tupleable.Deriving
4import ProjectM36.Atomable
15import ProjectM36.Atomable
5−import ProjectM36.Attribute
16+import ProjectM36.Attribute as A
6import ProjectM36.Error
17import ProjectM36.Error
7−import Data.Binary
8import ProjectM36.Base
18import ProjectM36.Base
9import Control.DeepSeq (NFData)
19import Control.DeepSeq (NFData)
10−import GHC.Generics
11import qualified Data.Vector as V
20import qualified Data.Vector as V
12import qualified Data.Map as M
21import qualified Data.Map as M
13import qualified Data.Text as T
22import qualified Data.Text as T
14import qualified Data.Set as S
23import qualified Data.Set as S
15import System.Exit
24import System.Exit
16import Data.Proxy
25import Data.Proxy
26+import Codec.Winery
17
27
18{-# ANN module ("Hlint: ignore Use newtype instead of data" :: String) #-}
28{-# ANN module ("Hlint: ignore Use newtype instead of data" :: String) #-}
19
29
@@ -21,35 +31,43 @@ data Test1T = Test1C {
21 attrA :: Integer
31 attrA :: Integer
22 }
32 }
23 deriving (Generic, Eq, Show)
33 deriving (Generic, Eq, Show)
34+ deriving Serialise via WineryRecord Test1T
24
35
25data Test2T = Test2C {
36data Test2T = Test2C {
26 attrB :: Integer,
37 attrB :: Integer,
27 attrC :: Integer
38 attrC :: Integer
28 }
39 }
29 deriving (Generic, Eq, Show)
40 deriving (Generic, Eq, Show)
41+ deriving Serialise via WineryRecord Test2T
30
42
31data Test3T = Test3C Integer
43data Test3T = Test3C Integer
32 deriving (Generic, Eq, Show)
44 deriving (Generic, Eq, Show)
45+ deriving Serialise via WineryVariant Test3T
33
46
34data Test4T = Test4C
47data Test4T = Test4C
35 deriving (Generic, Eq, Show)
48 deriving (Generic, Eq, Show)
49+ deriving Serialise via WineryVariant Test4T
36
50
37data Test5T = Test5C1 Integer |
51data Test5T = Test5C1 Integer |
38 Test5C2 Integer
52 Test5C2 Integer
39 deriving (Generic, Eq, Show)
53 deriving (Generic, Eq, Show)
54+ deriving Serialise via WineryVariant Test5T
40
55
41data Test6T = Test6C T.Text Integer Double
56data Test6T = Test6C T.Text Integer Double
42 deriving (Generic, Eq, Show)
57 deriving (Generic, Eq, Show)
43
58
44data Test7A = Test7AC Integer
59data Test7A = Test7AC Integer
45− deriving (Generic, Show, Eq, Binary, NFData, Atomable)
60+ deriving (Generic, Show, Eq, NFData, Atomable)
61+ deriving Serialise via WineryVariant Test7A
46
62
47
63
48data Test7T = Test7C Test7A
64data Test7T = Test7C Test7A
49 deriving (Generic, Show, Eq)
65 deriving (Generic, Show, Eq)
66+ deriving Serialise via WineryVariant Test7T
50
67
51data Test8T = Test8C
68data Test8T = Test8C
52 deriving (Generic, Show, Eq)
69 deriving (Generic, Show, Eq)
70+ deriving Serialise via WineryVariant Test8T
53
71
54data Test9T = Test9C
72data Test9T = Test9C
55 {
73 {
@@ -58,6 +76,15 @@ data Test9T = Test9C
58 attr9C :: Double
76 attr9C :: Double
59 }
77 }
60 deriving (Generic, Show, Eq)
78 deriving (Generic, Show, Eq)
79+ deriving Serialise via WineryRecord Test9T
80+
81+data Test10T = Test10C {
82+ longAttrNameA10 :: Integer,
83+ long_attr_name_b10 :: Integer,
84+ longMixed_attr_NameC10 :: Integer
85+ }
86+ deriving (Generic, Show, Eq)
87+ deriving Serialise via WineryRecord Test10T
61
88
62instance Tupleable Test1T
89instance Tupleable Test1T
63
90
@@ -83,7 +110,7 @@ main = do
83 if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess
110 if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess
84
111
85testList :: Test
112testList :: Test
86−testList = TestList [testADT1, testADT2, testADT3, testADT4, testADT6, testADT7, testADT8, testInsertExpr, testDefineExpr, testUpdateExpr, testUpdateExprEmptyAttrs, testDeleteExpr, testUpdateExprWrongAttr, testReorderedTuple]
113+testList = TestList [testADT1, testADT2, testADT3, testADT4, testADT6, testADT7, testADT8 ,testInsertExpr, testDefineExpr, testUpdateExpr, testUpdateExprEmptyAttrs, testDeleteExpr, testUpdateExprWrongAttr, testReorderedTuple, testAddPrefixField, testDropPrefixField, testAddSuffixField, testDropSuffixField, testUpperCaseField, testLowerCaseField, testTitleCaseField, testCamelCaseField, testPascalCaseField, testSnakeCaseField, testSpinalCaseField, testTrainCaseField, testAsIsCodec, testAsIsField, testComposeRLCodec, testComposeRLField, testComposeLRCodec, testComposeLRField]
87
114
88testADT1 :: Test
115testADT1 :: Test
89testADT1 = TestCase $ assertEqual "one record constructor" (Right example) (fromTuple (toTuple example))
116testADT1 = TestCase $ assertEqual "one record constructor" (Right example) (fromTuple (toTuple example))
@@ -121,7 +148,7 @@ testADT7 :: Test
121testADT7 = TestCase $ do
148testADT7 = TestCase $ do
122 let example = Test7C (Test7AC 3)
149 let example = Test7C (Test7AC 3)
123 assertEqual "atom type" (Right example) (fromTuple (toTuple example))
150 assertEqual "atom type" (Right example) (fromTuple (toTuple example))
124− let expectedAttrs = V.singleton (Attribute "" (ConstructedAtomType "Test7A" M.empty))
151+ let expectedAttrs = A.singleton (Attribute "" (ConstructedAtomType "Test7A" M.empty))
125 assertEqual "adt atomtype" expectedAttrs (toAttributes (Proxy :: Proxy Test7T))
152 assertEqual "adt atomtype" expectedAttrs (toAttributes (Proxy :: Proxy Test7T))
126
153
127testADT8 :: Test
154testADT8 :: Test
@@ -195,8 +222,159 @@ testDeleteExpr = TestCase $ do
195testReorderedTuple :: Test
222testReorderedTuple :: Test
196testReorderedTuple = TestCase $ do
223testReorderedTuple = TestCase $ do
197 let tupleRev :: RelationTuple -> RelationTuple
224 let tupleRev :: RelationTuple -> RelationTuple
198− tupleRev (RelationTuple v1 v2) = RelationTuple (V.reverse v1) (V.reverse v2)
225+ tupleRev (RelationTuple v1 v2) = RelationTuple (revAttrs v1) (V.reverse v2)
226+ revAttrs attrs = A.attributesFromList (reverse (A.toList attrs))
199 expected = Test2C {attrB = 3,
227 expected = Test2C {attrB = 3,
200 attrC = 4}
228 attrC = 4}
201 actual = fromTuple . tupleRev . toTuple $ expected
229 actual = fromTuple . tupleRev . toTuple $ expected
202 assertEqual "reordered tuple" (Right expected) actual
230 assertEqual "reordered tuple" (Right expected) actual
231+
232+testCodec :: forall tag. ModifyOptions tag => String -> [AttributeName] -> Test
233+testCodec msg expected = TestCase $
234+ assertEqual msg (S.fromList expected) actual
235+ where
236+ actual = attributeNameSet $ toAttributes (Proxy :: Proxy (Codec tag Test10T))
237+
238+testAddPrefixField :: Test
239+testAddPrefixField = testCodec
240+ @(Field (AddPrefix "prefix_"))
241+ "codec field add prefix attributes"
242+ ["prefix_longAttrNameA10",
243+ "prefix_long_attr_name_b10",
244+ "prefix_longMixed_attr_NameC10"]
245+
246+testDropPrefixField :: Test
247+testDropPrefixField = testCodec
248+ @(Field (DropPrefix "long"))
249+ "codec field drop prefix"
250+ ["AttrNameA10",
251+ "_attr_name_b10",
252+ "Mixed_attr_NameC10"]
253+
254+testAddSuffixField :: Test
255+testAddSuffixField = testCodec
256+ @(Field (AddSuffix "_suffix"))
257+ "codec field add suffix"
258+ ["longAttrNameA10_suffix",
259+ "long_attr_name_b10_suffix",
260+ "longMixed_attr_NameC10_suffix"]
261+
262+testDropSuffixField :: Test
263+testDropSuffixField = testCodec
264+ @(Field (DropSuffix "10"))
265+ "codec field drop suffix"
266+ ["longAttrNameA",
267+ "long_attr_name_b",
268+ "longMixed_attr_NameC"]
269+
270+testUpperCaseField :: Test
271+testUpperCaseField = testCodec
272+ @(Field UpperCase)
273+ "codec field uppercase"
274+ ["LONGATTRNAMEA10",
275+ "LONG_ATTR_NAME_B10",
276+ "LONGMIXED_ATTR_NAMEC10"]
277+
278+testLowerCaseField :: Test
279+testLowerCaseField = testCodec
280+ @(Field LowerCase)
281+ "codec field lowercase"
282+ ["longattrnamea10",
283+ "long_attr_name_b10",
284+ "longmixed_attr_namec10"]
285+
286+testTitleCaseField :: Test
287+testTitleCaseField = testCodec
288+ @(Field TitleCase)
289+ "codec field title case"
290+ ["Long Attr Name A10",
291+ "Long Attr Name B10",
292+ "Long Mixed Attr Name C10"]
293+
294+testCamelCaseField :: Test
295+testCamelCaseField = testCodec
296+ @(Field CamelCase)
297+ "codec field camel case"
298+ ["longAttrNameA10",
299+ "longAttrNameB10",
300+ "longMixedAttrNameC10"]
301+
302+testPascalCaseField :: Test
303+testPascalCaseField = testCodec
304+ @(Field PascalCase)
305+ "codec field pascal case"
306+ ["LongAttrNameA10",
307+ "LongAttrNameB10",
308+ "LongMixedAttrNameC10"]
309+
310+testSnakeCaseField :: Test
311+testSnakeCaseField = testCodec
312+ @(Field SnakeCase)
313+ "codec field snake case"
314+ ["long_attr_name_a10",
315+ "long_attr_name_b10",
316+ "long_mixed_attr_name_c10"]
317+
318+testSpinalCaseField :: Test
319+testSpinalCaseField = testCodec
320+ @(Field SpinalCase)
321+ "codec field spinal case"
322+ ["long-attr-name-a10",
323+ "long-attr-name-b10",
324+ "long-mixed-attr-name-c10"]
325+
326+testTrainCaseField :: Test
327+testTrainCaseField = testCodec
328+ @(Field TrainCase)
329+ "codec field train case"
330+ ["Long-Attr-Name-A10",
331+ "Long-Attr-Name-B10",
332+ "Long-Mixed-Attr-Name-C10"]
333+
334+testAsIsCodec :: Test
335+testAsIsCodec = testCodec
336+ @AsIs
337+ "codec as is"
338+ ["longAttrNameA10",
339+ "long_attr_name_b10",
340+ "longMixed_attr_NameC10"]
341+
342+testAsIsField :: Test
343+testAsIsField = testCodec
344+ @(Field AsIs)
345+ "codec field as is"
346+ ["longAttrNameA10",
347+ "long_attr_name_b10",
348+ "longMixed_attr_NameC10"]
349+
350+testComposeRLCodec :: Test
351+testComposeRLCodec = testCodec
352+ @(Field UpperCase <<< Field (DropPrefix "long"))
353+ "codec (<<<)"
354+ ["ATTRNAMEA10",
355+ "_ATTR_NAME_B10",
356+ "MIXED_ATTR_NAMEC10"]
357+
358+testComposeRLField :: Test
359+testComposeRLField = testCodec
360+ @(Field (UpperCase <<< DropPrefix "long"))
361+ "codec field (<<<)"
362+ ["ATTRNAMEA10",
363+ "_ATTR_NAME_B10",
364+ "MIXED_ATTR_NAMEC10"]
365+
366+testComposeLRCodec :: Test
367+testComposeLRCodec = testCodec
368+ @(Field (DropPrefix "long") >>> Field UpperCase)
369+ "codec (>>>)"
370+ ["ATTRNAMEA10",
371+ "_ATTR_NAME_B10",
372+ "MIXED_ATTR_NAMEC10"]
373+
374+testComposeLRField :: Test
375+testComposeLRField = testCodec
376+ @(Field (DropPrefix "long" >>> UpperCase))
377+ "codec field (>>>)"
378+ ["ATTRNAMEA10",
379+ "_ATTR_NAME_B10",
380+ "MIXED_ATTR_NAMEC10"]
test/Server/Main.hs+19−20
@@ -5,7 +5,6 @@ test client/server interaction
5import Test.HUnit
5import Test.HUnit
6import ProjectM36.Client
6import ProjectM36.Client
7import qualified ProjectM36.Client as C
7import qualified ProjectM36.Client as C
8−import ProjectM36.Server.EntryPoints
9import ProjectM36.Server
8import ProjectM36.Server
10import ProjectM36.Server.Config
9import ProjectM36.Server.Config
11import ProjectM36.Relation
10import ProjectM36.Relation
@@ -14,16 +13,8 @@ import ProjectM36.IsomorphicSchema
14import ProjectM36.Base
13import ProjectM36.Base
15
14
16import System.Exit
15import System.Exit
17−
16+import Network.Socket (SockAddr(..))
18import Control.Concurrent
17import Control.Concurrent
19−import Network.Transport (EndPointAddress)
20−
21−#if MIN_VERSION_network_transport_tcp(0,6,0)
22−import Network.Transport.TCP.Internal (encodeEndPointAddress, decodeEndPointAddress)
23−#else
24−import Network.Transport.TCP (encodeEndPointAddress, decodeEndPointAddress)
25−#endif
26−
27import Data.Either (isRight)
18import Data.Either (isRight)
28import Control.Exception
19import Control.Exception
29import System.IO.Temp
20import System.IO.Temp
@@ -32,6 +23,8 @@ import System.FilePath
32import System.Directory
23import System.Directory
33#endif
24#endif
34
25
26+type Timeout = Int
27+
35testList :: SessionId -> Connection -> MVar () -> Test
28testList :: SessionId -> Connection -> MVar () -> Test
36testList sessionId conn notificationTestMVar = TestList $ serverTests ++ sessionTests
29testList sessionId conn notificationTestMVar = TestList $ serverTests ++ sessionTests
37 where
30 where
@@ -49,7 +42,7 @@ testList sessionId conn notificationTestMVar = TestList $ serverTests ++ session
49 testRelationVariableSummary,
42 testRelationVariableSummary,
50 testNotification notificationTestMVar
43 testNotification notificationTestMVar
51 ]
44 ]
52− serverTests = [testRequestTimeout, testFileDescriptorCount]
45+ serverTests = [testRequestTimeout, testFileDescriptorCount, testClientConnectFail]
53
46
54main :: IO ()
47main :: IO ()
55main = do
48main = do
@@ -69,11 +62,9 @@ main = do
69testDatabaseName :: DatabaseName
62testDatabaseName :: DatabaseName
70testDatabaseName = "test"
63testDatabaseName = "test"
71
64
72−testConnection :: EndPointAddress -> MVar () -> IO (Either ConnectionError (SessionId, Connection))
65+testConnection :: Port -> MVar () -> IO (Either ConnectionError (SessionId, Connection))
73−testConnection serverAddress mvar = do
66+testConnection serverPort mvar = do
74− let Just (host, service, _) = decodeEndPointAddress serverAddress
75− serverAddress' = encodeEndPointAddress host service 1
76− let connInfo = RemoteProcessConnectionInfo testDatabaseName (NodeId serverAddress') (testNotificationCallback mvar)
67+ let connInfo = RemoteConnectionInfo testDatabaseName "127.0.0.1" (show serverPort) (testNotificationCallback mvar)
77 --putStrLn ("testConnection: " ++ show serverAddress)
68 --putStrLn ("testConnection: " ++ show serverAddress)
78 eConn <- connectProjectM36 connInfo
69 eConn <- connectProjectM36 connInfo
79 case eConn of
70 case eConn of
@@ -85,7 +76,7 @@ testConnection serverAddress mvar = do
85 Right sessionId -> pure $ Right (sessionId, conn)
76 Right sessionId -> pure $ Right (sessionId, conn)
86
77
87-- | A version of 'launchServer' which returns the port on which the server is listening on a secondary thread
78-- | A version of 'launchServer' which returns the port on which the server is listening on a secondary thread
88−launchTestServer :: Timeout -> IO (EndPointAddress, ThreadId)
79+launchTestServer :: Timeout -> IO (Port, ThreadId)
89launchTestServer ti = do
80launchTestServer ti = do
90 addressMVar <- newEmptyMVar
81 addressMVar <- newEmptyMVar
91 tid <- forkIO $
82 tid <- forkIO $
@@ -99,9 +90,9 @@ launchTestServer ti = do
99 }
90 }
100
91
101 launchServer config (Just addressMVar) >> pure ()
92 launchServer config (Just addressMVar) >> pure ()
102− endPointAddress <- takeMVar addressMVar
93+ (SockAddrInet port _) <- takeMVar addressMVar
103 --liftIO $ putStrLn ("launched server on " ++ show endPointAddress)
94 --liftIO $ putStrLn ("launched server on " ++ show endPointAddress)
104− pure (endPointAddress, tid)
95+ pure (fromIntegral port, tid)
105
96
106testRelationalExpr :: SessionId -> Connection -> Test
97testRelationalExpr :: SessionId -> Connection -> Test
107testRelationalExpr sessionId conn = TestCase $ do
98testRelationalExpr sessionId conn = TestCase $ do
@@ -217,7 +208,7 @@ testRequestTimeout = TestCase $ do
217 Left err -> putStrLn ("failed to connect: " ++ show err) >> exitFailure
208 Left err -> putStrLn ("failed to connect: " ++ show err) >> exitFailure
218 Right (session, testConn) -> do
209 Right (session, testConn) -> do
219 res <- catchJust (\exc -> if exc == RequestTimeoutException then Just exc else Nothing) (callTestTimeout_ session testConn) (const (pure False))
210 res <- catchJust (\exc -> if exc == RequestTimeoutException then Just exc else Nothing) (callTestTimeout_ session testConn) (const (pure False))
220− assertBool "exception was not thrown" (not res)
211+ assertBool "timeout exception was not thrown" (not res)
221 killThread serverTid
212 killThread serverTid
222
213
223testFileDescriptorCount :: Test
214testFileDescriptorCount :: Test
@@ -247,3 +238,11 @@ fdCount = do
247--pass on non-linux platforms
238--pass on non-linux platforms
248testFileDescriptorCount = TestCase (pure ())
239testFileDescriptorCount = TestCase (pure ())
249#endif
240#endif
241+
242+testClientConnectFail :: Test
243+testClientConnectFail = TestCase $ do
244+ let connInfo = RemoteConnectionInfo "nonexistentdb" "127.0.0.1" "7777" emptyNotificationCallback
245+ eConn <- connectProjectM36 connInfo
246+ case eConn of
247+ Left (IOExceptionError _) -> pure ()
248+ _ -> assertFailure "connection failure failed"
test/Server/WebSocket.hs+3−9
@@ -18,12 +18,6 @@ import Data.Aeson
18import qualified Data.Map as M
18import qualified Data.Map as M
19import qualified Data.ByteString.Lazy as BS
19import qualified Data.ByteString.Lazy as BS
20import ProjectM36.Relation
20import ProjectM36.Relation
21−#if MIN_VERSION_network_transport_tcp(0,6,0)
22−import Network.Transport.TCP.Internal (decodeEndPointAddress)
23−#else
24−import Network.Transport.TCP (decodeEndPointAddress)
25−#endif
26−
27
21
28--start the websocket server
22--start the websocket server
29-- run some tutoriald against it
23-- run some tutoriald against it
@@ -37,12 +31,12 @@ launchTestServer = do
37 testDatabaseName = "test"
31 testDatabaseName = "test"
38 -- start normal server
32 -- start normal server
39 _ <- forkIO (launchServer config (Just addressMVar) >> pure ())
33 _ <- forkIO (launchServer config (Just addressMVar) >> pure ())
40− serverAddress <- takeMVar addressMVar
34+ (SockAddrInet dbPort _) <- takeMVar addressMVar
41 let wsServerHost = "127.0.0.1"
35 let wsServerHost = "127.0.0.1"
42 wsServerPort = 8889
36 wsServerPort = 8889
43− Just (dbHost, dbPort, _) = decodeEndPointAddress serverAddress
37+ dbHost = "127.0.0.1"
44 -- start websocket server proxy -- runServer doesn't support returning an arbitrary socket
38 -- start websocket server proxy -- runServer doesn't support returning an arbitrary socket
45− _ <- forkIO (WS.runServer wsServerHost wsServerPort (websocketProxyServer (read dbPort) dbHost))
39+ _ <- forkIO (WS.runServer wsServerHost wsServerPort (websocketProxyServer (fromIntegral dbPort) dbHost))
46 --wait for socket to be listening
40 --wait for socket to be listening
47 waitForListenSocket 5 (fromIntegral wsServerPort)
41 waitForListenSocket 5 (fromIntegral wsServerPort)
48 pure (fromIntegral wsServerPort, testDatabaseName)
42 pure (fromIntegral wsServerPort, testDatabaseName)
test/TransactionGraph/Persist.hs+3−3
@@ -99,11 +99,11 @@ testMerkleHashValidation = TestCase $
99 --alter the on-disk representation and check that the hash validation fails
99 --alter the on-disk representation and check that the hash validation fails
100 eGraph <- transactionGraphLoad dbdir emptyTransactionGraph Nothing
100 eGraph <- transactionGraphLoad dbdir emptyTransactionGraph Nothing
101 case eGraph of
101 case eGraph of
102− Left err -> assertFailure "failed to load graph"
102+ Left err -> assertFailure $ "failed to load graph" ++ show err
103 Right graph -> do
103 Right graph -> do
104 let trans = transactionHeadsForGraph graph M.! "master"
104 let trans = transactionHeadsForGraph graph M.! "master"
105 updatedTrans = Transaction (transactionId trans) (transactionInfo trans) updatedSchemas
105 updatedTrans = Transaction (transactionId trans) (transactionInfo trans) updatedSchemas
106− transactionDir = dbdir </> show (transactionId trans)
106+ transactionDir' = dbdir </> show (transactionId trans)
107 updatedSchemas =
107 updatedSchemas =
108 case schemas trans of
108 case schemas trans of
109 Schemas ctx sschemas ->
109 Schemas ctx sschemas ->
@@ -120,7 +120,7 @@ testMerkleHashValidation = TestCase $
120 let val'' = TG.validateMerkleHashes maliciousGraph
120 let val'' = TG.validateMerkleHashes maliciousGraph
121 assertEqual "loaded graph merkle hashes" (Left [MerkleValidationError (transactionId trans) regMerkleHash malMerkleHash]) val''
121 assertEqual "loaded graph merkle hashes" (Left [MerkleValidationError (transactionId trans) regMerkleHash malMerkleHash]) val''
122 --delete existing transaction directory
122 --delete existing transaction directory
123− removeDirectoryRecursive transactionDir
123+ removeDirectoryRecursive transactionDir'
124 writeTransaction NoDiskSync dbdir updatedTrans
124 writeTransaction NoDiskSync dbdir updatedTrans
125
125
126 --read graph from disk
126 --read graph from disk
test/TutorialD/Interpreter/Import/ImportTest.hsnew file+47
@@ -0,0 +1,47 @@
1+import Test.HUnit
2+import ProjectM36.Base
3+import TutorialD.Interpreter.Import.TutorialD
4+import System.Exit
5+import qualified Data.Text as T
6+import System.IO.Temp
7+import System.FilePath
8+import qualified Data.Map as M
9+import System.IO
10+import System.Directory
11+import qualified Data.ByteString as BS
12+import qualified Data.Text.Encoding as TE
13+import Text.URI hiding (makeAbsolute)
14+
15+main :: IO ()
16+main = do
17+ tcounts <- runTestTT $ TestList [testTutdFileImport
18+ ,testTutdHTTPSImport
19+ ]
20+ if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess
21+
22+testTutdFileImport :: Test
23+testTutdFileImport = TestCase $
24+ withSystemTempFile "m.tutd" $ \tempPath handle -> do
25+ BS.hPut handle (TE.encodeUtf8 "x:=relation{tuple{a 5,b \"spam\"}}; y:=relation{tuple{b \"漢字\"}}")
26+ hClose handle
27+ let expectedExpr = MultipleExpr [
28+ Assign "x" (MakeRelationFromExprs Nothing
29+ $ TupleExprs () [TupleExpr (M.fromList [("a", NakedAtomExpr $ IntegerAtom 5),
30+ ("b", NakedAtomExpr $ TextAtom "spam")])]),
31+ Assign "y" (MakeRelationFromExprs Nothing
32+ $ TupleExprs () [TupleExpr (M.fromList [("b", NakedAtomExpr (TextAtom "漢字"))])])]
33+ --on Windows, the file URI should not include the drive letter "/c/Users..." -> "/Users"
34+ let uri = "file://" <> map (\c -> if c == '\\' then '/' else c) ( joinDrive "/" (dropDrive tempPath))
35+ fileURI <- mkURI (T.pack uri)
36+ imported <- importTutorialDFromFile fileURI Nothing
37+ assertEqual "import tutd" (Right expectedExpr) imported
38+
39+testTutdHTTPSImport :: Test
40+testTutdHTTPSImport = TestCase $ do
41+ uri <- mkURI "https://raw.githubusercontent.com/agentm/project-m36/master/test/TutorialD/Interpreter/Import/httpimporttest.tutd"
42+ let hash = "effe32b247586dc3ac0079fc241b9618d41d189afcaeb7907edbe5a8b45992a4"
43+ expected = Right (MultipleExpr [Assign "x" (RelationVariable "true" ()),Assign "y" (RelationVariable "false" ())])
44+ actual <- importTutorialDViaHTTP uri (Just hash)
45+ assertEqual "github https" expected actual
46+
47+
test/TutorialD/Interpreter/Import/TutorialD.hsdeleted−29
@@ -1,29 +0,0 @@
1−import Test.HUnit
2−import ProjectM36.Base
3−import TutorialD.Interpreter.Import.TutorialD
4−import System.Exit
5−import System.IO.Temp
6−import qualified Data.Map as M
7−import System.IO
8−import qualified Data.ByteString as BS
9−import qualified Data.Text.Encoding as TE
10−
11−main :: IO ()
12−main = do
13− tcounts <- runTestTT $ TestList [testTutdImport]
14− if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess
15−
16−testTutdImport :: Test
17−testTutdImport = TestCase $
18− withSystemTempFile "m.tutd" $ \tempPath handle -> do
19− BS.hPut handle (TE.encodeUtf8 "x:=relation{tuple{a 5,b \"spam\"}}; y:=relation{tuple{b \"漢字\"}}")
20− hClose handle
21− let expectedExpr = MultipleExpr [
22− Assign "x" (MakeRelationFromExprs Nothing
23− $ TupleExprs () [TupleExpr (M.fromList [("a", NakedAtomExpr $ IntegerAtom 5),
24− ("b", NakedAtomExpr $ TextAtom "spam")])]),
25− Assign "y" (MakeRelationFromExprs Nothing
26− $ TupleExprs () [TupleExpr (M.fromList [("b", NakedAtomExpr (TextAtom "漢字"))])])]
27− imported <- importTutorialD tempPath
28− assertEqual "import tutd" (Right expectedExpr) imported
29−
test/TutorialD/Interpreter/Import/httpimporttest.tutdnew file+2
@@ -0,0 +1,2 @@
1+x:=true;
2+y:=false;
test/TutorialD/Interpreter.hs → test/TutorialD/InterpreterTest.hsrenamed+46−7
@@ -78,13 +78,17 @@ main = do
78 testAtomFunctionArgumentMismatch,
78 testAtomFunctionArgumentMismatch,
79 testInvalidDataConstructor,
79 testInvalidDataConstructor,
80 testBasicList,
80 testBasicList,
81− testRelationDeclarationMismatch
81+ testRelationDeclarationMismatch,
82+ testInvalidTuples,
83+ testSelfReferencingUncommittedContext,
84+ testUnionAndIntersectionAttributeExprs
82 ]
85 ]
83
86
84simpleRelTests :: Test
87simpleRelTests :: Test
85simpleRelTests = TestCase $ do
88simpleRelTests = TestCase $ do
86 (graph, transId) <- freshTransactionGraph dateExamples
89 (graph, transId) <- freshTransactionGraph dateExamples
90+ mapM_ (\(tutd, expected) ->
87− mapM_ (\(tutd, expected) -> assertTutdEqual basicDatabaseContext transId graph expected tutd) testTups
91+ assertTutdEqual basicDatabaseContext transId graph expected tutd) testTups
88 where
92 where
89 testTups = [("x:=true", Right relationTrue),
93 testTups = [("x:=true", Right relationTrue),
90 ("x:=false", Right relationFalse),
94 ("x:=false", Right relationFalse),
@@ -119,7 +123,8 @@ simpleRelTests = TestCase $ do
119 ("x:=relation{tuple{a 5}} : {b:=6}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 6])]),
123 ("x:=relation{tuple{a 5}} : {b:=6}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 6])]),
120 ("x:=relation{tuple{a 5}} : {b:=add(@a,5)}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 10])]),
124 ("x:=relation{tuple{a 5}} : {b:=add(@a,5)}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 10])]),
121 ("x:=relation{tuple{a 5}} : {b:=add(@a,\"spam\")}", Left (AtomFunctionTypeError "add" 2 IntegerAtomType TextAtomType)),
125 ("x:=relation{tuple{a 5}} : {b:=add(@a,\"spam\")}", Left (AtomFunctionTypeError "add" 2 IntegerAtomType TextAtomType)),
122− ("x:=relation{tuple{a 5}} : {b:=add(add(@a,2),5)}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 12])])
126+ ("x:=relation{tuple{a 5}} : {b:=add(add(@a,2),5)}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 12])]),
127+ ("x:=false:{a:=1,b:=2}", mkRelationFromTuples simpleDAttributes [])
123 ]
128 ]
124 simpleAAttributes = A.attributesFromList [Attribute "a" IntegerAtomType]
129 simpleAAttributes = A.attributesFromList [Attribute "a" IntegerAtomType]
125 simpleBAttributes = A.attributesFromList [Attribute "d" IntegerAtomType]
130 simpleBAttributes = A.attributesFromList [Attribute "d" IntegerAtomType]
@@ -131,7 +136,8 @@ simpleRelTests = TestCase $ do
131dateExampleRelTests :: Test
136dateExampleRelTests :: Test
132dateExampleRelTests = TestCase $ do
137dateExampleRelTests = TestCase $ do
133 (graph, transId) <- freshTransactionGraph dateExamples
138 (graph, transId) <- freshTransactionGraph dateExamples
139+ mapM_ (\(tutd, expected) ->
134− mapM_ (\(tutd, expected) -> assertTutdEqual dateExamples transId graph expected tutd) testTups
140+ assertTutdEqual dateExamples transId graph expected tutd) testTups
135 where
141 where
136 simpleEitherIntTextAttributes = A.attributesFromList [Attribute "a" (eitherAtomType IntegerAtomType TextAtomType)]
142 simpleEitherIntTextAttributes = A.attributesFromList [Attribute "a" (eitherAtomType IntegerAtomType TextAtomType)]
137 maybeIntegerAtomType = ConstructedAtomType "Maybe" (M.singleton "a" IntegerAtomType)
143 maybeIntegerAtomType = ConstructedAtomType "Maybe" (M.singleton "a" IntegerAtomType)
@@ -229,7 +235,7 @@ transactionGraphAddCommitTest = TestCase $ do
229 commit sessionId dbconn >>= eitherFail
235 commit sessionId dbconn >>= eitherFail
230 discon <- disconnectedTransaction_ sessionId dbconn
236 discon <- disconnectedTransaction_ sessionId dbconn
231 let context = Discon.concreteDatabaseContext discon
237 let context = Discon.concreteDatabaseContext discon
232− assertEqual "ensure x was added" (M.lookup "x" (relationVariables context)) (Just (RelationVariable "s" UncommittedContextMarker))
238+ assertEqual "ensure x was added" (M.lookup "x" (relationVariables context)) (Just (ExistingRelation suppliersRel))
233
239
234transactionRollbackTest :: Test
240transactionRollbackTest :: Test
235transactionRollbackTest = TestCase $ do
241transactionRollbackTest = TestCase $ do
@@ -356,7 +362,7 @@ testComments :: Test
356testComments = TestCase $ do
362testComments = TestCase $ do
357 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback
363 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback
358 mapM_ (executeTutorialD sessionId dbconn) [
364 mapM_ (executeTutorialD sessionId dbconn) [
359− ":branch testbranch --test comment\n",
365+ ":branch testbranch --test comment",
360 ":jumphead {- test comment -} master"]
366 ":jumphead {- test comment -} master"]
361
367
362-- create a graph and query from two disparate contexts
368-- create a graph and query from two disparate contexts
@@ -539,7 +545,7 @@ testListConstructedAtom = TestCase $ do
539testTypeChecker :: Test
545testTypeChecker :: Test
540testTypeChecker = TestCase $ do
546testTypeChecker = TestCase $ do
541 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback
547 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback
542− let err1 = "AtomFunctionTypeError \"max\" 1 (RelationAtomType [Attribute \"_\" IntegerAtomType]) IntegerAtomType"
548+ let err1 = "AtomFunctionTypeError \"max\" 1"
543 expectTutorialDErr sessionId dbconn (T.isPrefixOf err1) "x:=relation{tuple{a 0}}:{b:=max(@a)}"
549 expectTutorialDErr sessionId dbconn (T.isPrefixOf err1) "x:=relation{tuple{a 0}}:{b:=max(@a)}"
544
550
545--exercise expression parser
551--exercise expression parser
@@ -659,6 +665,10 @@ testWithClause = TestCase $ do
659 executeTutorialD sessionId dbconn "x:=with (x as s) x"
665 executeTutorialD sessionId dbconn "x:=with (x as s) x"
660 eX <- executeRelationalExpr sessionId dbconn (RelationVariable "x" ())
666 eX <- executeRelationalExpr sessionId dbconn (RelationVariable "x" ())
661 assertEqual "with x as s" (Right suppliersRel) eX
667 assertEqual "with x as s" (Right suppliersRel) eX
668+
669+ executeTutorialD sessionId dbconn "y:=with(a as true) (with (b as a) b)"
670+ eY <- executeRelationalExpr sessionId dbconn (RelationVariable "y" ())
671+ assertEqual "nested with" (Right relationTrue) eY
662
672
663 let err1 = "RelVarAlreadyDefinedError"
673 let err1 = "RelVarAlreadyDefinedError"
664 expectTutorialDErr sessionId dbconn (T.isPrefixOf err1) "x:=with (s as s) s"
674 expectTutorialDErr sessionId dbconn (T.isPrefixOf err1) "x:=with (s as s) s"
@@ -691,3 +701,32 @@ testRelationDeclarationMismatch :: Test
691testRelationDeclarationMismatch = TestCase $ do
701testRelationDeclarationMismatch = TestCase $ do
692 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback
702 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback
693 expectTutorialDErr sessionId dbconn (T.isPrefixOf "AtomTypeMismatchError") "data A a = A a | B | C; a := relation{a A Integer}{tuple{a A \"1\"}}"
703 expectTutorialDErr sessionId dbconn (T.isPrefixOf "AtomTypeMismatchError") "data A a = A a | B | C; a := relation{a A Integer}{tuple{a A \"1\"}}"
704+
705+--generate errors when the tuples in a new relation don't match
706+testInvalidTuples :: Test
707+testInvalidTuples = TestCase $ do
708+ (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback
709+ expectTutorialDErr sessionId dbconn (T.isPrefixOf "AttributeNamesMismatchError") ":showexpr relation{tuple{a 1},tuple{b 2}}"
710+ expectTutorialDErr sessionId dbconn (T.isPrefixOf "AttributeNamesMismatchError") ":showexpr relation{tuple{a 1},tuple{a 2, b 3}}"
711+-- expectTutorialDErr sessionId dbconn (T.isPrefixOf "ParseErrorBundle") ":showexpr relation{tuple{a 2, a 3}}" --parse failure can't be validated with this function
712+
713+testSelfReferencingUncommittedContext :: Test
714+testSelfReferencingUncommittedContext = TestCase $ do
715+ (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback
716+ executeTutorialD sessionId dbconn "s:=s union s"
717+ eS <- executeRelationalExpr sessionId dbconn (RelationVariable "s" ())
718+ _ <- rollback sessionId dbconn
719+ eSorig <- executeRelationalExpr sessionId dbconn (RelationVariable "s" ())
720+ assertEqual "s=s'" eSorig eS
721+
722+testUnionAndIntersectionAttributeExprs :: Test
723+testUnionAndIntersectionAttributeExprs = TestCase $ do
724+ (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback
725+ executeTutorialD sessionId dbconn "x:=s{intersection of {all but sname} {sname}}"
726+ xRel <- executeRelationalExpr sessionId dbconn (RelationVariable "x" ())
727+ assertEqual "intersection attrs" (Right relationTrue) xRel
728+
729+ executeTutorialD sessionId dbconn "y:=s{union of {all but sname} {sname}}"
730+ yRel <- executeRelationalExpr sessionId dbconn (RelationVariable "y" ())
731+ assertEqual "union attrs" (Right suppliersRel) yRel
732+
test/TutorialD/PrinterTest.hsnew file+47
@@ -0,0 +1,47 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+import Test.HUnit
3+import ProjectM36.Base
4+import System.Exit
5+import Data.Text.Prettyprint.Doc
6+import Data.Map (fromList)
7+import TutorialD.Printer ()
8+import TutorialD.Interpreter.RelationalExpr
9+import Text.Megaparsec
10+import Data.Text (pack)
11+
12+testList :: Test
13+testList = TestList [
14+ testPretty "true" (RelationVariable "true" ()),
15+ testPretty "relation{tuple{a 3, b \"x\"}, tuple{a 4, b \"y\"}}" (MakeRelationFromExprs Nothing (TupleExprs () [TupleExpr (fromList [("a",NakedAtomExpr (IntegerAtom 3)),("b",NakedAtomExpr (TextAtom "x"))]),TupleExpr (fromList [("a",NakedAtomExpr (IntegerAtom 4)),("b",NakedAtomExpr (TextAtom "y"))])])),
16+ testPretty "true:{a:=1, b:=1}" (Extend (AttributeExtendTupleExpr "b" (NakedAtomExpr (IntegerAtom 1))) (Extend (AttributeExtendTupleExpr "a" (NakedAtomExpr (IntegerAtom 1))) (RelationVariable "true" ()))),
17+ testPretty "relation{tuple{a fromGregorian(2014, 2, 4)}}" (MakeRelationFromExprs Nothing (TupleExprs () [TupleExpr (fromList [("a",FunctionAtomExpr "fromGregorian" [NakedAtomExpr (IntegerAtom 2014),NakedAtomExpr (IntegerAtom 2),NakedAtomExpr (IntegerAtom 4)] ())])])),
18+ testPretty "relation{tuple{a bytestring(\"dGVzdGRhdGE=\")}}" (MakeRelationFromExprs Nothing (TupleExprs () [TupleExpr (fromList [("a",FunctionAtomExpr "bytestring" [NakedAtomExpr (TextAtom "dGVzdGRhdGE=")] ())])])),
19+ testPretty "relation{tuple{a t}}" (MakeRelationFromExprs Nothing (TupleExprs () [TupleExpr (fromList [("a",NakedAtomExpr (BoolAtom True))])])),
20+ testPretty "relation{tuple{a Cons 4 (Cons 5 Empty)}}" (MakeRelationFromExprs Nothing (TupleExprs () [TupleExpr (fromList [("a",ConstructedAtomExpr "Cons" [NakedAtomExpr (IntegerAtom 4),ConstructedAtomExpr "Cons" [NakedAtomExpr (IntegerAtom 5),ConstructedAtomExpr "Empty" [] ()] ()] ())])])),
21+ testPretty "relation{a Int, b Text, c Bool}{}" (MakeRelationFromExprs (Just [AttributeAndTypeNameExpr "a" (ADTypeConstructor "Int" []) (),AttributeAndTypeNameExpr "b" (ADTypeConstructor "Text" []) (),AttributeAndTypeNameExpr "c" (ADTypeConstructor "Bool" []) ()]) (TupleExprs () [])),
22+ testPretty "relation{a relation{b Int}}{}" (MakeRelationFromExprs (Just [AttributeAndTypeNameExpr "a" (RelationAtomTypeConstructor [AttributeAndTypeNameExpr "b" (ADTypeConstructor "Int" []) ()]) ()]) (TupleExprs () []))
23+ ]
24+
25+main :: IO ()
26+main = do
27+ tcounts <- runTestTT testList
28+ if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess
29+
30+testPretty :: String -> RelationalExpr -> Test
31+testPretty tutdStr relExprADT =
32+ TestCase $ do
33+ let relExprStr = show (pretty relExprADT)
34+ print relExprStr
35+ roundTrip <- parseRelExpr relExprStr
36+ {-tutdIn <- parseRelExpr tutdStr
37+ print ("tutd parsed", tutdIn)-}
38+ assertEqual ("pretty ADT " <> tutdStr) tutdStr relExprStr
39+ assertEqual ("round-trip " <> tutdStr) relExprADT roundTrip
40+
41+--round trip tutoriald
42+parseRelExpr :: String -> IO RelationalExpr
43+parseRelExpr tutdStr =
44+ case parse relExprP "test" (pack tutdStr) of
45+ Left err ->
46+ assertFailure (show err)
47+ Right parsed -> pure parsed
test/scripts.hs+5−2
@@ -4,6 +4,8 @@ import TutorialD.Interpreter.Import.TutorialD
4import System.Directory
4import System.Directory
5import Data.List (isSuffixOf)
5import Data.List (isSuffixOf)
6import System.Exit
6import System.Exit
7+import qualified Data.Text as T
8+import Text.URI
7
9
8testList :: IO Test
10testList :: IO Test
9testList = do
11testList = do
@@ -20,7 +22,8 @@ main = do
20
22
21testScript :: FilePath -> Test
23testScript :: FilePath -> Test
22testScript tutdFile = TestCase $ do
24testScript tutdFile = TestCase $ do
23− eImport <- importTutorialD tutdFile
25+ fileURI <- mkURI (T.pack ("file://" <> tutdFile))
26+ eImport <- importTutorialDFromFile fileURI Nothing
24 case eImport of
27 case eImport of
25 Left err -> assertFailure ("tutd import failure in " ++ tutdFile ++ ": " ++ show err)
28 Left err -> assertFailure ("tutd import failure in " ++ tutdFile ++ ": " ++ show err)
26− Right _ -> pure ()
29+ Right _ -> pure ()