master..bb13048 · project-m36

.appveyor.yml+1

since splitsnapshots

unifiedsplit

@@ -17,6 +17,7 @@ environment:

17 global:

18 STACK_ROOT: "c:\\sr"

19 matrix:

20+ - YAML: "stack.ghc8.2.yaml"

20 - YAML: "stack.ghc8.6.yaml"

21 - YAML: "stack.ghc8.6.yaml"

21

22

22platform:

23platform:

.github/workflows/ci.yamldeleted−69

@@ -1,69 +0,0 @@

1−name: "CI"

2−on:

3− pull_request:

4− push:

5−jobs:

6− dockerimage:

7− runs-on: ubuntu-latest

8− steps:

9− - uses: actions/checkout@v2.3.1

10− - uses: cachix/install-nix-action@v12

11− with:

12− nix_path: nixpkgs=channel:nixos-unstable

13− - uses: cachix/cachix-action@v8

14− with:

15− name: project-m36

16− signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"

17− - run: cachix use iohk

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+1−3

@@ -18,6 +18,4 @@ persistence-notes

18jupyter/itutd.egg-info

19jupyter/build

20juyter/dist

21−.ipynb_checkpoints

21+.ipynb_checkpoints

22−project-m36.nix

23−stack.yaml

.travis.ymlnew file+60

@@ -0,0 +1,60 @@

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.4.4 STACK_YAML=stack.ghc8.4.yaml

20+ compiler: ": #stack 8.4.4"

21+

22+ - env: CACHE_NAME=8.6.5 STACK_YAML=stack.ghc8.6.yaml

23+ compiler: ": #stack 8.6.5"

24+

25+ - env: CACHE_NAME=osx-8.6.5 STACK_YAML=stack.ghc8.6.yaml

26+ os: osx

27+ osx_image: xcode11

28+ compiler: ": #stack 8.6.5"

29+

30+before_script:

31+ - unset CC

32+ - export PATH=$HOME/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH

33+ - ./.travis/install-ghr.sh

34+ - ./.travis/install-stack.sh

35+

36+# Here starts the actual work to be performed for the package under test;

37+# any command which exits with a non-zero exit code causes the build to fail.

38+script:

39+ - |

40+ # Run tests

41+ set -e

42+ ./.travis/install-dependencies.sh

43+ stack --no-terminal --jobs=2 --system-ghc test

44+ - |

45+ #Run HLint

46+ if [[ "$(uname)" = "Linux" ]]; then

47+ curl -sL https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh | sh -s lint src test examples --cpp-define VERSION_project_m36=HLINT

48+ fi

49+ - |

50+ #Run Haddock

51+ if [[ "$(uname)" = "Linux" ]]; then

52+ stack --no-install-ghc --system-ghc --no-haddock-deps haddock

53+ fi

54+

55+after_success:

56+ - |

57+ # Build and ship binary

58+ #./.travis/attach-binary.sh

59+

60+# EOF

.travis/attach-binary.shnew file+25

@@ -0,0 +1,25 @@

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.shnew file+22

@@ -0,0 +1,22 @@

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.shnew file+16

@@ -0,0 +1,16 @@

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.shnew file+21

@@ -0,0 +1,21 @@

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.shnew file+27

@@ -0,0 +1,27 @@

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−25

@@ -1,28 +1,3 @@

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−

22−# 2020-05-25 (v0.8)

23−

24−* refactor backend to maximize laziness: [An Architecture for Data Independence](docs/data_independence.markdown)

25−

26# 2019-09-07 (v0.7)

1# 2019-09-07 (v0.7)

27

2

28* fix case sensitivity issue with relation variables in tutd

3* fix case sensitivity issue with relation variables in tutd

README.markdown+3−11

@@ -4,8 +4,8 @@

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)

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)

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[![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

10

11*Software can always be made faster, but rarely can it be made more correct.*

@@ -14,12 +14,6 @@

14

15Project:M36 implements a relational algebra engine as inspired by the writings of Chris Date.

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−

23## Description

17## Description

24

18

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.

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.

@@ -44,7 +38,7 @@ Project:M36 supports multiple frontends which target different audiences.

44

38

45* [Developer's Blog](https://agentm.github.io/project-m36/)

39* [Developer's Blog](https://agentm.github.io/project-m36/)

46* [Mailing List/Discussion Group](https://groups.google.com/d/forum/project-m36)

40* [Mailing List/Discussion Group](https://groups.google.com/d/forum/project-m36)

47−* IRC Channel: irc.libera.chat #project-m36 -- [Chat via Web Client](http://kiwiirc.com/nextclient/irc.libera.chat:+6697/#project-m36)

41+* IRC Channel: chat.freenode.net #project-m36

48* [Hackage](https://hackage.haskell.org/package/project-m36)

42* [Hackage](https://hackage.haskell.org/package/project-m36)

49* [Diogo Biazus' Project:M36 Video Tutorial](https://www.youtube.com/watch?v=_GC_lxlVEnE)

43* [Diogo Biazus' Project:M36 Video Tutorial](https://www.youtube.com/watch?v=_GC_lxlVEnE)

50

44

@@ -67,7 +61,6 @@ Project:M36 supports multiple frontends which target different audiences.

671. [ACID Database Properties](docs/acid_assessment.markdown)

611. [ACID Database Properties](docs/acid_assessment.markdown)

681. [On NULL (in SQL)](docs/on_null.markdown)

621. [On NULL (in SQL)](docs/on_null.markdown)

691. [Reaching "Out of the Tarpit" with Project:M36](docs/reaching_out_of_the_tarpit.markdown)

631. [Reaching "Out of the Tarpit" with Project:M36](docs/reaching_out_of_the_tarpit.markdown)

70−1. [An Architecture for Data Independence](docs/data_independence.markdown)

71

64

72### Advanced Features

65### Advanced Features

73

66

@@ -84,7 +77,6 @@ Project:M36 supports multiple frontends which target different audiences.

841. [Isomorphic Schemas](docs/isomorphic_schemas.markdown)

771. [Isomorphic Schemas](docs/isomorphic_schemas.markdown)

851. [Replication](docs/replication.markdown)

781. [Replication](docs/replication.markdown)

861. [Basic Operator Benchmarks](https://rawgit.com/agentm/project-m36/master/docs/basic_benchmarks.html)

791. [Basic Operator Benchmarks](https://rawgit.com/agentm/project-m36/master/docs/basic_benchmarks.html)

87−1. [Merkle Transaction Hashes](docs/merkle_transaction_graph.markdown)

88

80

89### Integrations

81### Integrations

90

82

@@ -94,7 +86,7 @@ Project:M36 supports multiple frontends which target different audiences.

94

86

95## Development

87## Development

96

88

97−Project:M36 is developed in Haskell and compiled with GHC 8.6 or later.

89+Project:M36 is developed in Haskell and compiled with GHC 8.2.2 or later.

98

90

99## Related Projects

91## Related Projects

100

92

cabal.project+6−7

@@ -1,10 +1,9 @@

1+-- this is needed for GHC8 until distributed-process-extras is updated on Hackage with increased upper bounds

1packages: project-m36.cabal

2packages: 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

2

4

3−package *

5+--necessary for GHC 8.6 support :/

4− split-sections: True

5−

6−--high-performance streaming library

7source-repository-package

6source-repository-package

8− type: git

7+ type: git

9− location: https://github.com/composewell/streamly.git

8+ location: https://github.com/agentm/distributed-process.git

10− tag: ac3af8749194f1788704dda8667d0b3807075cc2

9+ tag: f352e097fbe494ad648b4e09249f865893ae90a3

default.nixdeleted−1

@@ -1 +0,0 @@

1−(import ./release.nix { }).project

docker.nixdeleted−18

@@ -1,18 +0,0 @@

1−{ compiler ? "ghc8104"

2−, sources ? import ./nix/sources.nix

3−, pkgs ? import sources.nixpkgs { }

4−}:

5−let

6− release = import ./release.nix { inherit pkgs compiler sources; };

7− static-project-m36 = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.justStaticExecutables release.project);

8−in

9−pkgs.dockerTools.buildImage {

10− name = "project-m36";

11− tag = "latest";

12− contents = [ static-project-m36 ];

13− # expose default project-m36 and websocket server ports

14− config = {

15− Env = [ "LC_ALL=en_US.UTF-8" ];

16− ExposedPorts = { "6543/tcp" = { }; "8000/tcp" = { }; };

17− };

18−}

docs/15_minute_tutorial.markdown+67−64

@@ -4,19 +4,17 @@ Thank you for evaluating Project:M36, a new relational algebra engine written in

4

5## Prerequisites

6

7−* any Linux, MacOS, or Windows computer with Docker installed

7+* any Linux

8+* GHC 8.2 or later version (Haskell compiler)

9+* cabal (package downloader) installed

8

10

9## Download and Install

11## Download and Install

10

12

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−

17```bash

13```bash

18git clone https://github.com/agentm/project-m36.git

14git clone https://github.com/agentm/project-m36.git

15+cabal sandbox init

16+cabal install --dependencies-only

19−cabal new-run tutd

17+cabal run tutd

20```

18```

21

19

22## Some Basic TutorialD

20## Some Basic TutorialD

@@ -28,10 +26,18 @@ Note that TutorialD is strongly-typed- no type coercions take place automaticall

28### Load the Canonical Chris Date Example

26### Load the Canonical Chris Date Example

29

27

30```

28```

31−TutorialD (master/main): :importexample cjdate

29+TutorialD (master/main): :importexample date

30+```

31+

32+or

33+

34+```

35+TutorialD (master/main): :importtud "scripts/DateExamples.tutd"

32```

36```

33

37

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.

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.

39+

40+```:importexample date``` loads the date example directly without any file I/O, so it is safe to use with the websocket server.

35

41

36### Execute Relational Expressions

42### Execute Relational Expressions

37

43

@@ -158,7 +164,7 @@ Database context expressions change the state of the database, much like "CREATE

158#### Create a Relation Variable

164#### Create a Relation Variable

159

165

160```

166```

161−TutorialD (master/main): x:=relation{name Text, age Integer}{tuple{name "Steve", age 40},tuple{name "Mike", age 31}}

167+TutorialD (master/main): x:=relation{name Text, age Int}{tuple{name "Steve", age 40},tuple{name "Mike", age 31}}

162TutorialD (master/main): :showexpr x

168TutorialD (master/main): :showexpr x

163┌────────┬──────────┐

169┌────────┬──────────┐

164│age::Int│name::Text│

170│age::Int│name::Text│

@@ -173,25 +179,23 @@ This is similar to SQL's "CREATE TABLE" operator.

173#### Insert Additional Tuples

179#### Insert Additional Tuples

174

180

175```

181```

176−TutorialD (master/main): x:=relation{name Text, age Integer}{tuple{name "Steve", age 40},tuple{name "Mike", age 31}}

182+TutorialD (master/main): x:=relation{name Text, age Int}{tuple{name "Steve", age 40},tuple{name "Mike", age 31}}

177TutorialD (master/main): :showexpr x

183TutorialD (master/main): :showexpr x

178−┌────────────┬──────────┐

184+┌────────┬──────────┐

179−│age::Integer│name::Text│

185+│age::Int│name::Text│

180−├────────────┼──────────┤

186+├────────┼──────────┤

187+│40 │"Steve" │

181−│31 │"Mike" │

188+│31 │"Mike" │

182−│40 │"Steve" │

183−└────────────┴──────────┘

189+└────────┴──────────┘

184−

185TutorialD (master/main): insert x relation{tuple{name "Bob", age 24}}

190TutorialD (master/main): insert x relation{tuple{name "Bob", age 24}}

186TutorialD (master/main): :showexpr x

191TutorialD (master/main): :showexpr x

187−┌────────────┬──────────┐

192+┌────────┬──────────┐

188−│age::Integer│name::Text│

193+│age::Int│name::Text│

189−├────────────┼──────────┤

194+├────────┼──────────┤

190−│31 │"Mike" │

191−│40 │"Steve" │

195+│40 │"Steve" │

192−│24 │"Bob" │

196+│24 │"Bob" │

197+│31 │"Mike" │

193−└────────────┴──────────┘

198+└────────┴──────────┘

194−

195```

199```

196

200

197Note that the relational insertion is identical to "x:=x union relation{...}".

201Note that the relational insertion is identical to "x:=x union relation{...}".

@@ -200,51 +204,50 @@ Note that the relational insertion is identical to "x:=x union relation{...}".

200

204

201```

205```

202TutorialD (master/main): :showexpr s

206TutorialD (master/main): :showexpr s

203−┌──────────┬────────┬───────────┬───────────────┐

207+┌──────────┬────────┬───────────┬───────────┐

204−│city::Text│s#::Text│sname::Text│status::Integer│

208+│city::Text│s#::Text│sname::Text│status::Int│

205−├──────────┼────────┼───────────┼───────────────┤

209+├──────────┼────────┼───────────┼───────────┤

210+│"Paris" │"S2" │"Jones" │10 │

211+│"Paris" │"S3" │"Blake" │30 │

206−│"London" │"S1" │"Smith" │20 │

212+│"London" │"S1" │"Smith" │20 │

213+│"London" │"S4" │"Clark" │20 │

207−│"Athens" │"S5" │"Adams" │30 │

214+│"Athens" │"S5" │"Adams" │30 │

208−│"Paris" │"S3" │"Blake" │30 │

209−│"London" │"S4" │"Clark" │20 │

210−│"Paris" │"S2" │"Jones" │10 │

211−└──────────┴────────┴───────────┴───────────────┘

215+└──────────┴────────┴───────────┴───────────┘

212TutorialD (master/main): update s where city="London" (status:=35)

216TutorialD (master/main): update s where city="London" (status:=35)

213TutorialD (master/main): :showexpr s

217TutorialD (master/main): :showexpr s

214−┌──────────┬────────┬───────────┬───────────────┐

218+┌──────────┬────────┬───────────┬───────────┐

215−│city::Text│s#::Text│sname::Text│status::Integer│

219+│city::Text│s#::Text│sname::Text│status::Int│

216−├──────────┼────────┼───────────┼───────────────┤

220+├──────────┼────────┼───────────┼───────────┤

217−│"Athens" │"S5" │"Adams" │30 │

221+│"London" │"S4" │"Clark" │35 │

218−│"London" │"S1" │"Smith" │35 │

222+│"London" │"S1" │"Smith" │35 │

219−│"London" │"S4" │"Clark" │35 │

220−│"Paris" │"S3" │"Blake" │30 │

221−│"Paris" │"S2" │"Jones" │10 │

223+│"Paris" │"S2" │"Jones" │10 │

224+│"Paris" │"S3" │"Blake" │30 │

225+│"Athens" │"S5" │"Adams" │30 │

222−└──────────┴────────┴───────────┴───────────────┘

226+└──────────┴────────┴───────────┴───────────┘

223−

224```

227```

225#### Deleting Tuples from a Relation Variable

228#### Deleting Tuples from a Relation Variable

226

229

227```

230```

228TutorialD (master/main): :showexpr s

231TutorialD (master/main): :showexpr s

229−┌──────────┬────────┬───────────┬───────────────┐

232+┌──────────┬────────┬───────────┬───────────┐

230−│city::Text│s#::Text│sname::Text│status::Integer│

233+│city::Text│s#::Text│sname::Text│status::Int│

231−├──────────┼────────┼───────────┼───────────────┤

234+├──────────┼────────┼───────────┼───────────┤

232−│"Paris" │"S2" │"Jones" │10 │

235+│"Paris" │"S2" │"Jones" │10 │

233−│"Paris" │"S3" │"Blake" │30 │

236+│"Paris" │"S3" │"Blake" │30 │

234−│"London" │"S1" │"Smith" │20 │

237+│"London" │"S1" │"Smith" │20 │

238+│"London" │"S4" │"Clark" │20 │

235−│"Athens" │"S5" │"Adams" │30 │

239+│"Athens" │"S5" │"Adams" │30 │

236−│"London" │"S4" │"Clark" │20 │

237−└──────────┴────────┴───────────┴───────────────┘

240+└──────────┴────────┴───────────┴───────────┘

238TutorialD (master/main): delete s where sname="Adams"

241TutorialD (master/main): delete s where sname="Adams"

239TutorialD (master/main): :showexpr s

242TutorialD (master/main): :showexpr s

240−┌──────────┬────────┬───────────┬───────────────┐

243+┌──────────┬────────┬───────────┬───────────┐

241−│city::Text│s#::Text│sname::Text│status::Integer│

244+│city::Text│s#::Text│sname::Text│status::Int│

242−├──────────┼────────┼───────────┼───────────────┤

245+├──────────┼────────┼───────────┼───────────┤

243−│"Paris" │"S2" │"Jones" │10 │

246+│"Paris" │"S2" │"Jones" │10 │

244−│"London" │"S4" │"Clark" │20 │

245−│"Paris" │"S3" │"Blake" │30 │

247+│"Paris" │"S3" │"Blake" │30 │

246−│"London" │"S1" │"Smith" │20 │

248+│"London" │"S1" │"Smith" │20 │

249+│"London" │"S4" │"Clark" │20 │

247−└──────────┴────────┴───────────┴───────────────┘

250+└──────────┴────────┴───────────┴───────────┘

248```

251```

249

252

250### Execute Transaction Graph Expressions

253### Execute Transaction Graph Expressions

@@ -267,7 +270,7 @@ TutorialD (master/main): :rollback

267

270

268```

271```

269TutorialD (master/main): :branch experimental

272TutorialD (master/main): :branch experimental

270−TutorialD (experimental): employee:=relation{name Text, salary Integer}

273+TutorialD (experimental): employee:=relation{name Text, salary Int}

271TutorialD (experimental): :commit

274TutorialD (experimental): :commit

272```

275```

273

276

docs/data_independence.markdown+2−8

@@ -88,20 +88,14 @@ Typical databases implement various strategies for audit logging, including:

88

89Project:M36, through its inherent ability to travel the append-only transaction graph, enables audit-logging by allowing users to checkout previous transaction states. Committed transaction states are immutable, so no relation pollution or secondary database is necessary.

90

91−### Selective Caching

91+## Selective Caching

92

93Typical databases materialize entire tuple sets representing each named relation (relation variable), but there is nothing special about relations that happen to be named. Data independence allows us to cache answers to common or even anticipated queries- this allows the schema to be normalized and unmaterialized while the *denormalized* query results are materialized cached. This flexibility saves disk space and allows the cache to be much more dynamic than in a typical DBMS.

94

95−### Never-Materialized Tuples Replace Partitions

95+## Never-Materialized Tuples Replace Partitions

96

97Queries on very large relations often very often restricted (filtered by tuple) to generate subsets which are often partitioned, for example, by an event's date. Instead of requiring DBMS users to manually partition and slice their data in one, fixed, particular way, Project:M36's cacheing system will only cache those tuples that serve the interests of the queries. With something like an LRU cache, a data independent architecture will naturally cache "partitions" of the full relation without manual intervention.

98

99−### Elimination of DBA role

100−

101−Databases essential to a business function are often guarded by a human database administrator (DBA) whose role it is to monitor database performance and to play gatekeeper to database schema changes as the database grows. This role is necessary because database tuning can be an arcane skill, rife with pitfalls for those who don't know the database software inside-and-out. This is a direct cause of data dependence, forcing DBAs to manually enforce data partitioning and shuffling data to different servers, configuring database replicas, and making Faustian bargains to "denormalize" tables for analytical workloads.

102−

103−A data independent architecture eliminates this role by allowing the database to make the optimal choices itself. This means that the database can respond to schema changes immediately, without manual repartitioning or denormalization steps.

104−

105## Conclusion

99## Conclusion

106

100

107Project:M36's backend architecture enables new optimizations and features that are sorely lacking in existing DBMSes. By leveraging its novel transaction graph and deferred evaluation, Project:M36 handles more DBMS use-cases.

101Project:M36's backend architecture enables new optimizations and features that are sorely lacking in existing DBMSes. By leveraging its novel transaction graph and deferred evaluation, Project:M36 handles more DBMS use-cases.

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

10

11```

12−TutorialD (master/main): :importexample cjdate

12+TutorialD (master/main): :importexample date

13TutorialD (master/main): :exportcsv s "/tmp/csv"

14```

15```

@@ -37,7 +37,7 @@ s#,sname,status,city

37S6,Samson,100,New York

38```

39```

40−TutorialD (master/main): :importexample cjdate

40+TutorialD (master/main): :importexample date

41TutorialD (master/main): :showexpr s

42┌──────────┬────────┬───────────┬───────────────┐

43│city::Text│s#::Text│sname::Text│status::Integer│

docs/introduction_to_projectm36.markdown+8−27

@@ -15,35 +15,16 @@ The relational algebra is the mathematical model underpinning Project:M36. When

15

16## Binary Releases

17

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.

18+### Windows

19+Project:M36 now provides binary installations for Windows. Check the (releases page)[https://github.com/agentm/project-m36/releases] for downloads.

19

20

20−### Install Docker:

21+### MacOS X

21

22

22−* [Windows 10 Docker Installation](https://docs.docker.com/docker-for-windows/wsl/)

23+Binary releases are not yet available for MacOS X, but compiling from source is easy.

23−* [MacOS Docker Installation](https://docs.docker.com/docker-for-mac/install/)

24−* [Linux Docker Installation](https://docs.docker.com/engine/install/#server)

25

24

26−### Run TutorialD from Docker Image

25+### Linux

27

26

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.

27+The currently-preferred method of installation is from source. A future enhancement would be installation from deb or rpm.

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−```

47

28

48## Source Installation

29## Source Installation

49

30

@@ -51,7 +32,7 @@ Requirements:

51

32

52To build with stack:

33To build with stack:

53

34

54−* [GHC 8.6.5 or greater](https://www.haskell.org/downloads)

35+* [GHC 8.4.4 or greater](https://www.haskell.org/downloads)

55* [Haskell stack](https://docs.haskellstack.org/en/stable/README/)

36* [Haskell stack](https://docs.haskellstack.org/en/stable/README/)

56* Linux, macOS, or Microsoft Windows

37* Linux, macOS, or Microsoft Windows

57

38

@@ -63,7 +44,7 @@ Compilation steps:

63

44

64At this point, the TutorialD interactive interpreter can be run using ```stack exec tutd```.

45At this point, the TutorialD interactive interpreter can be run using ```stack exec tutd```.

65

46

66−Alternative building with GHC 8.6.5 or greater:

47+Alternative building with GHC 8.4.4 or greater:

67

48

68* ```cabal new-build```

49* ```cabal new-build```

69

50

docs/introduction_to_the_relational_algebra.markdown+2−2

@@ -202,7 +202,7 @@ Join (Instructor relation)

202

203(Course Relation)

204

205−|(Course Name, Course Name Type)|(Instructor Name, Instructor Name Type)|(Course Room Number, Room Number Type)|

205+|(Course Name, Course Name Type)|(Instructor, Instructor Name Type)|(Course Room Number, Room Number Type)|

206|-------------------------------|----------------------------------|--------------------------------------|

207|English 1|Steve|Room 104|

208|French 2|Bob|Room 103|

@@ -378,7 +378,7 @@ Since a value can store any (immutable) type, it can certainly hold a relation.

378

379For example, in SQL, if one wants to collect some aggregate data over some tuples while still returning the individual tuples, in the best case, the aggregate information must be repeated for every individual tuple. In the worst case, two separate queries are required since nested tables are not supported.

380

381−In the relational algebra, The aggregate value can be placed alongside the relation value from which the aggregate was derived.

381+In the relational algebra, The aggregate value can be placed alongside the relation value from whic the aggregate was derived.

382

383Example:

384

docs/merkle_transaction_graph.markdowndeleted−33

@@ -1,33 +0,0 @@

1−# Project:M36: Merkle Hashing for Transaction Graph

2−

3−## Introduction

4−

5−Project:M36 supports an append-only transaction graph model (similar to git) whereby new transactions can be added to the graph but not removed. As with any graph, each node can contain a Merkle hash which ensures not only that it's state since being added to the graph has not changed but also that none of its parent nodes all the way to the root node (initial state) have not been modified. This validation has a number of use cases.

6−

7−## Usage

8−

9−Project:M36 automatically adds Merkle hashes to every transaction. All data which represents the database state at that transaction is included in the hash including (but not limited to) relation variable definitions, atom and database context functions, constraints, and types.

10−

11−Project:M36 validates all merkle hashes at database startup. For users who need validation after the database is started, the user can issue `:validatemerklehashes` at the `tutd` command line.

12−

13−### Audit Logging

14−

15−Project:M36 supports audit logging by allowing users to travel to transactions in the past and recreate the database state at that past point-in-time. To ensure that those past states cannot be modified either by malicious on-disk or in-memory changes, each transaction is protected by its own Merkle hash. If the calculated hash does not match the stored hash, Project:M36 can immediately report which transaction triggered the tamper-proof log.

16−

17−### Reproducibility

18−

19−Since a Merkle tree is effectively immutable except to add more nodes, it can be used to save and restore a whole database with very high confidence in the results. This feature could also be used to restore a database partially; for example, to duplicate just the latest database state on a second machine for OLAP analysis.

20−

21−### High-Availability

22−

23−Merkle tree hashes can be used to assert database integrity across high-availibility or database replication. Since the hash covers all database state, it can be used to validate log-shipping-based replication. Corrupted cache tuple data can be easily detected and flushed.

24−

25−## Merkle Hashes in Other DBMSes

26−

27−While Merkle hashes have become prevalent in blockchain-style databases, they have not made many appearances in typical SQL databases. This is likely due to the fact that such databases consider any additional operations against the large tuple stores as prohibitively expensive. Project:M36 is able to skirt this cost by only hashing database update expressions rather than the result of these executed expressions. This also means that the Merkle hash can be computed against transactions which have been created but never executed.

28−

29−## Conclusion

30−

31−Merkle hashes are an obvious improvement to any graph-based transaction log and are a low-cost method of ensuring data integrity.

32−

33−A further improvement could allow users to specify an initial key provided by an admin user to salt the hash used to create the database. Additionally, a multi-user system could allow individual users to sign their committed transactions. The signature would then be included in the Merkle hash.

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:

58

59```

60−TutorialD (master/main): :importexample cjdate

60+TutorialD (master/main): :importexample date

61TutorialD (master/main): :showexpr p

62┌───────────────────┬────────────┬───────────────────┬────────────┬────────────┐

63│address::Address │agent::Agent│dateRegistered::Day│photo::Text │price::Price│

docs/transaction_graph_operators.markdown+4−6

@@ -43,17 +43,15 @@ TutorialD (master/main): :rollback

43In order to navigate the transaction graph, one must specify transaction UUIDs. Viewing the entirety of the transaction graph as a relation is a single command.

44

45```

46+TutorialD (master/main): :showgraph

46−┌─────────────┬────────────────────────────────────────────┬──────────┬──────────────────────────────────────┬────────────────────────────────────────┬─────────────────────────────────┐

47+┌─────────────┬──────────┬──────────────────────────────────────┬────────────────────────────┬──────────────────────────────┐

47−│current::Bool│hash::ByteString │head::Text│id::Text │parents::relation {id::Text} │stamp::DateTime │

48+│current::Bool│head::Text│id::Text │parents::relation {id::Text}│stamp::DateTime │

48−├─────────────┼────────────────────────────────────────────┼──────────┼──────────────────────────────────────┼────────────────────────────────────────┼─────────────────────────────────┤

49+├─────────────┼──────────┼──────────────────────────────────────┼────────────────────────────┼──────────────────────────────┤

49−

50

51<big result elided>

52```

53The "current" attribute is a boolean value. If true, the transaction is the parent of the current database context. Commits will be children of this transaction.

54

55−The "hash" attribute contains the merkle tree hash for the given transaction. This can be used to ensure that the transaction graph has been used in an append-only fashion, ensuring historical state and audit log integrity.

56−

57The "head" attribute is a boolean value indicating whether or not the transaction is a "head" node of its graph. Head nodes are nodes which have no children.

55The "head" attribute is a boolean value indicating whether or not the transaction is a "head" node of its graph. Head nodes are nodes which have no children.

58

56

59The "id" attribute is the UUID needed in order to navigate the graph.

57The "id" attribute is the UUID needed in order to navigate the graph.

docs/tupleable.markdown−19

@@ -23,25 +23,6 @@ instance Tupleable Person

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.

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−

45## Usage

26## Usage

46

27

47The ```Tupleable``` module includes the following functions:

28The ```Tupleable``` module includes the following functions:

docs/tutd_cheatsheet.markdown+1−3

@@ -47,9 +47,7 @@ Database context expressions take the current database context as input and alte

47

48|Database Context Expression |Description |

49|------------------------------------------------------|---------------------------------------|

50−|`:importexample cjdate`|Imports a precooked schema from Chris Date's books resulting in relvars `s`, `sp`, and `p`|

50+|`:importexample date`|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|

53|`newrelvar:=relation{tuple{age 3}}`|Assign a new relation variable named `newrelvar`|

51|`newrelvar:=relation{tuple{age 3}}`|Assign a new relation variable named `newrelvar`|

54|`undefine s`|Remove a relation variable|

52|`undefine s`|Remove a relation variable|

55|`insert s relation{tuple{city "Boston",s# "S10",sname "Gonzalez",status 10}}`| Append to an existing relation variable with another relational expression|

53|`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+2−56

@@ -19,7 +19,7 @@ TutorialD (master/main):

19The examples in this tutorial can be executed after loading Chris Date's sample relations using:

20

21```

22−:importexample cjdate

22+:importexample date

23```

24

25Each section assumes a fresh instance of the Date examples. The relation variables created in the script are:

@@ -30,24 +30,6 @@ Each section assumes a fresh instance of the Date examples. The relation variabl

30|p|parts|

31|sp|contains mapping of which suppliers supply which parts|

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−

51### Types

33### Types

52

34

53TutorialD is strongly-typed. The basic built-in types are:

35TutorialD is strongly-typed. The basic built-in types are:

@@ -215,7 +197,7 @@ TutorialD (master/main): :showexpr s{all but city}

215└────────┴───────────┴───────────────┘

197└────────┴───────────┴───────────────┘

216```

198```

217

199

218−Projection attributes can be derived from a relational expression using `all from`:

200+Projection attributes can also be derived from a relational expression using `all from`:

219

201

220```

202```

221TutorialD (master/main): :showexpr (s join sp){all from s}

203TutorialD (master/main): :showexpr (s join sp){all from s}

@@ -231,42 +213,6 @@ TutorialD (master/main): :showexpr (s join sp){all from s}

231

213

232Above, we join `s` and `sp` but project the result back onto the attributes of `s`.

214Above, we join `s` and `sp` but project the result back onto the attributes of `s`.

233

215

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−

270#### Restriction

216#### Restriction

271

217

272Restriction is applied using a "where" clause, much like in SQL.

218Restriction is applied using a "where" clause, much like in SQL.

examples/DerivingCustomTupleable.hsdeleted−54

@@ -1,54 +0,0 @@

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.hsdeleted−446

@@ -1,446 +0,0 @@

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 ()

7main = do

8 -- 1. create a ConnectionInfo

9− let connInfo = RemoteConnectionInfo "mytestdb" "127.0.0.1" (show defaultServerPort) emptyNotificationCallback

9+ let connInfo = RemoteProcessConnectionInfo "mytestdb" (createNodeId "127.0.0.1" defaultServerPort) emptyNotificationCallback

10 -- 2. conncted to the remote database

11 eConn <- connectProjectM36 connInfo

12 case eConn of

examples/blog.hs+3−4

@@ -1,5 +1,5 @@

1-- a simple example of a blog schema

2−{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings, CPP, DerivingVia #-}

2+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings, CPP #-}

3

4import ProjectM36.Client

5import ProjectM36.Base

@@ -10,6 +10,7 @@ import ProjectM36.Tuple (atomForAttributeName)

10

11import Data.Either

12import GHC.Generics

13+import Data.Binary

13import qualified Data.Text as T

14import qualified Data.Text as T

14import qualified Data.Text.Lazy as TL

15import qualified Data.Text.Lazy as TL

15import Data.Time.Clock

16import Data.Time.Clock

@@ -21,7 +22,6 @@ import Data.Monoid

21#endif

22#endif

22import Data.List

23import Data.List

23import Control.Monad (when, forM_)

24import Control.Monad (when, forM_)

24−import Codec.Winery

25

26import Web.Scotty as S

27import Text.Blaze.Html5 (h1, h2, h3, p, form, input, (!), toHtml, Html, a, toValue, hr, textarea)

@@ -52,8 +52,7 @@ data Comment = Comment {

52instance Tupleable Comment

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

55− deriving (Atomable, Eq, Show, NFData, Generic) -- derive Atomable so that values of this type can be stored as a database value

55+ deriving (Atomable, Eq, Show, NFData, Binary, 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

57

56

58-- add some short-hand error handling- your application should have proper handling

57-- add some short-hand error handling- your application should have proper handling

59handleIOError :: Show e => IO (Either e a) -> IO a

58handleIOError :: Show e => IO (Either e a) -> IO a

examples/hair.hs+3−4

@@ -1,17 +1,16 @@

1−{-# LANGUAGE DeriveGeneric, DeriveAnyClass, OverloadedStrings, DerivingVia #-}

1+{-# LANGUAGE DeriveGeneric, DeriveAnyClass, OverloadedStrings #-}

2import ProjectM36.Client

3import ProjectM36.Relation.Show.Term

4import GHC.Generics

5import Data.Text

6+import Data.Binary

6import Control.DeepSeq

7import Control.DeepSeq

7import qualified Data.Map as M

8import qualified Data.Map as M

8import qualified Data.Text.IO as TIO

9import qualified Data.Text.IO as TIO

9import Data.Proxy

10import Data.Proxy

10−import Codec.Winery

11

12data Hair = Bald | Brown | Blond | OtherColor Text

13− deriving (Generic, Show, Eq, NFData, Atomable)

13+ deriving (Generic, Show, Eq, Binary, NFData, Atomable)

14− deriving Serialise via WineryVariant Hair

15

14

16main :: IO ()

15main :: IO ()

17main = do

16main = do

examples/out_of_the_tarpit.hs+7−11

@@ -1,5 +1,5 @@

1-- the Out-of-the-Tarpit example in Haskell and Project:M36

2−{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings, DerivingVia #-}

2+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings #-}

3import ProjectM36.Client

4import ProjectM36.DataTypes.Primitive

5import ProjectM36.Tupleable

@@ -7,11 +7,11 @@ import ProjectM36.Relation

7import ProjectM36.Error

8import Data.Either

9import GHC.Generics

10+import Data.Binary

10import Control.DeepSeq

11import Control.DeepSeq

11import qualified Data.Text as T

12import qualified Data.Text as T

12import Data.Time.Calendar

13import Data.Time.Calendar

13import Data.Proxy

14import Data.Proxy

14−import Codec.Winery

15

16--create various database value (atom) types

17type Price = Double

@@ -21,20 +21,16 @@ type Name = T.Text

21type Address = T.Text

22

23data RoomType = Kitchen | Bathroom | LivingRoom

24− deriving (Generic, Atomable, Eq, Show, NFData)

24+ deriving (Generic, Atomable, Eq, Show, Binary, NFData)

25− deriving Serialise via WineryVariant RoomType

26

25

27data PriceBand = Low | Medium | High | Premium

26data PriceBand = Low | Medium | High | Premium

28− deriving (Generic, Atomable, Eq, Show, NFData)

27+ deriving (Generic, Atomable, Eq, Show, Binary, NFData)

29− deriving Serialise via WineryVariant PriceBand

30

28

31data AreaCode = City | Suburban | Rural

29data AreaCode = City | Suburban | Rural

32− deriving (Generic, Atomable, Eq, Show, NFData)

30+ deriving (Generic, Atomable, Eq, Show, Binary, NFData)

33− deriving Serialise via WineryVariant AreaCode

34

31

35data SpeedBand = VeryFastBand | FastBand | MediumBand | SlowBand

32data SpeedBand = VeryFastBand | FastBand | MediumBand | SlowBand

36− deriving (Generic, Atomable, Eq, Show, NFData)

33+ deriving (Generic, Atomable, Eq, Show, Binary, NFData)

37− deriving Serialise via WineryVariant SpeedBand

38

34

39main :: IO ()

35main :: IO ()

40main = do

36main = do

@@ -261,4 +257,4 @@ handleIOErrors m = do

261 [] -> pure (rights eErrs)

257 [] -> pure (rights eErrs)

262 errs -> handleError (Left (someErrors errs))

258 errs -> handleError (Left (someErrors errs))

263

259

264−

260+

examples/out_of_the_tarpit.tutd+4−4

@@ -3,9 +3,9 @@

3data Address = Address Text

4data Agent = Agent Text

5data Name = Name Text

6−data Price = Price Integer --dollars

6+data Price = Price Double

7data RoomType = Kitchen | Bathroom | LivingRoom

8−data PriceBand = Low | Med | High | Premium

8+data PriceBand = Low | Medium | High | Premium

9data AreaCode = City | Suburban | Rural

10data SpeedBand = VeryFast | Fast | Medium | Slow

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)

58--2. remove the properties which have been sold

59--3. group and count sub-relation and restrict by greater than 50

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

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

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

64-- sample data

65

jupyter/TutorialD Notebook Walkthrough.ipynb+1−1

@@ -38,7 +38,7 @@

38 }

39 ],

40 "source": [

41− ":importexample cjdate"

41+ ":importexample date"

42 ]

43 },

44 {

nix/sources.jsondeleted−50

@@ -1,50 +0,0 @@

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.nixdeleted−171

@@ -1,171 +0,0 @@

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); }

project-m36.cabal+156−137

@@ -1,8 +1,6 @@

1−Cabal-Version: 2.2

2Name: project-m36

1Name: project-m36

3−Version: 0.9.3

2+Version: 0.8

4−License: MIT

3+License: PublicDomain

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

6Build-Type: Simple

4Build-Type: Simple

7Homepage: https://github.com/agentm/project-m36

5Homepage: https://github.com/agentm/project-m36

8Bug-Reports: https://github.com/agentm/project-m36/issues

6Bug-Reports: https://github.com/agentm/project-m36/issues

@@ -10,6 +8,7 @@ Author: AgentM

10Stability: experimental

8Stability: experimental

11Category: Relational Algebra

9Category: Relational Algebra

12Maintainer: agentm@themactionfaction.com

10Maintainer: agentm@themactionfaction.com

11+Cabal-Version: >= 1.10

13Synopsis: Relational Algebra Engine

12Synopsis: Relational Algebra Engine

14Description: A relational algebra engine which can be used to persist and query Haskell data types.

13Description: A relational algebra engine which can be used to persist and query Haskell data types.

15Extra-Source-Files: Changelog.markdown README.markdown

14Extra-Source-Files: Changelog.markdown README.markdown

@@ -35,9 +34,9 @@ Flag haskell-scripting

35 Default: True

34 Default: True

36

35

37Library

36Library

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

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

39 if flag(haskell-scripting)

38 if flag(haskell-scripting)

40− Build-Depends: ghc >= 8.2 && < 8.11

39+ Build-Depends: ghc >= 8.2 && < 8.9

41 CPP-Options: -DPM36_HASKELL_SCRIPTING

40 CPP-Options: -DPM36_HASKELL_SCRIPTING

42 if impl(ghc>= 8) && flag(haskell-scripting)

41 if impl(ghc>= 8) && flag(haskell-scripting)

43 build-depends:

42 build-depends:

@@ -52,8 +51,6 @@ Library

52 ProjectM36.TransactionGraph.Merge,

51 ProjectM36.TransactionGraph.Merge,

53 ProjectM36.TransGraphRelationalExpression,

52 ProjectM36.TransGraphRelationalExpression,

54 ProjectM36.Base,

53 ProjectM36.Base,

55− ProjectM36.Serialise.Base,

56− ProjectM36.Serialise.Error,

57 ProjectM36.DataFrame,

54 ProjectM36.DataFrame,

58 ProjectM36.Attribute,

55 ProjectM36.Attribute,

59 ProjectM36.AttributeNames,

56 ProjectM36.AttributeNames,

@@ -63,7 +60,6 @@ Library

63 ProjectM36.AtomFunction,

60 ProjectM36.AtomFunction,

64 ProjectM36.AtomFunctionError,

61 ProjectM36.AtomFunctionError,

65 ProjectM36.ScriptSession,

62 ProjectM36.ScriptSession,

66− ProjectM36.Shortcuts,

67 ProjectM36.DatabaseContextFunction,

63 ProjectM36.DatabaseContextFunction,

68 ProjectM36.DatabaseContextFunctionError,

64 ProjectM36.DatabaseContextFunctionError,

69 ProjectM36.DatabaseContextFunctionUtils,

65 ProjectM36.DatabaseContextFunctionUtils,

@@ -83,7 +79,6 @@ Library

83 ProjectM36.Relation.Parse.CSV,

79 ProjectM36.Relation.Parse.CSV,

84 ProjectM36.IsomorphicSchema,

80 ProjectM36.IsomorphicSchema,

85 ProjectM36.InclusionDependency,

81 ProjectM36.InclusionDependency,

86− ProjectM36.MerkleHash,

87 ProjectM36.Client,

82 ProjectM36.Client,

88 ProjectM36.Client.Simple,

83 ProjectM36.Client.Simple,

89 ProjectM36.Persist,

84 ProjectM36.Persist,

@@ -93,7 +88,6 @@ Library

93 ProjectM36.AtomFunctions.Primitive,

88 ProjectM36.AtomFunctions.Primitive,

94 ProjectM36.Atomable,

89 ProjectM36.Atomable,

95 ProjectM36.Tupleable,

90 ProjectM36.Tupleable,

96− ProjectM36.Tupleable.Deriving,

97 ProjectM36.DataConstructorDef,

91 ProjectM36.DataConstructorDef,

98 ProjectM36.DataTypes.Basic,

92 ProjectM36.DataTypes.Basic,

99 ProjectM36.DataTypes.Sorting,

93 ProjectM36.DataTypes.Sorting,

@@ -114,10 +108,6 @@ Library

114 ProjectM36.Server.EntryPoints,

108 ProjectM36.Server.EntryPoints,

115 ProjectM36.Server.ParseArgs,

109 ProjectM36.Server.ParseArgs,

116 ProjectM36.Server.RemoteCallTypes,

110 ProjectM36.Server.RemoteCallTypes,

117− ProjectM36.Serialise.AtomFunctionError,

118− ProjectM36.Serialise.DataFrame,

119− ProjectM36.Serialise.DatabaseContextFunctionError,

120− ProjectM36.Serialise.IsomorphicSchema,

121 ProjectM36.Session,

111 ProjectM36.Session,

122 ProjectM36.Sessions,

112 ProjectM36.Sessions,

123 ProjectM36.Transaction.Persist,

113 ProjectM36.Transaction.Persist,

@@ -136,19 +126,19 @@ Library

136 Other-Modules: ProjectM36.Win32Handle

126 Other-Modules: ProjectM36.Win32Handle

137 else

127 else

138 --219- too many exported symbols under Windows and GHC 8.4

128 --219- too many exported symbols under Windows and GHC 8.4

139− GHC-Options: -rdynamic -fexternal-interpreter

129+ GHC-Options: -rdynamic

140 C-sources: cbits/DirectoryFsync.c, cbits/darwin_statfs.c

130 C-sources: cbits/DirectoryFsync.c, cbits/darwin_statfs.c

141 Build-Depends: unix

131 Build-Depends: unix

142 CC-Options: -fPIC

132 CC-Options: -fPIC

143 Hs-Source-Dirs: ./src/lib

133 Hs-Source-Dirs: ./src/lib

144 Default-Language: Haskell2010

134 Default-Language: Haskell2010

145 Default-Extensions: OverloadedStrings, CPP

135 Default-Extensions: OverloadedStrings, CPP

146− if !flag(stack)

136+ if !flag(stack)

147 Build-Depends: deferred-folds

137 Build-Depends: deferred-folds

148

138

149Executable tutd

139Executable tutd

150 if flag(haskell-scripting)

140 if flag(haskell-scripting)

151− Build-Depends: ghc >= 8.2 && < 8.11

141+ Build-Depends: ghc >= 8.2 && < 8.9

152 Build-Depends: base >=4.8 && <5.0,

142 Build-Depends: base >=4.8 && <5.0,

153 ghc-paths,

143 ghc-paths,

154 project-m36,

144 project-m36,

@@ -163,11 +153,13 @@ Executable tutd

163 MonadRandom, MonadRandom,

153 MonadRandom, MonadRandom,

164 vector,

154 vector,

165 text,

155 text,

156+ vector-binary-instances,

166 time,

157 time,

167 hashable-time,

158 hashable-time,

168 bytestring,

159 bytestring,

169 stm,

160 stm,

170 deepseq,

161 deepseq,

162+ binary,

171 data-interval,

163 data-interval,

172 parallel,

164 parallel,

173 cassava,

165 cassava,

@@ -175,7 +167,7 @@ Executable tutd

175 directory,

167 directory,

176 filepath,

168 filepath,

177 temporary,

169 temporary,

178− megaparsec >= 5.2.0 && < 10,

170+ megaparsec >= 5.2.0 && < 9,

179 haskeline,

171 haskeline,

180 random, MonadRandom,

172 random, MonadRandom,

181 base64-bytestring,

173 base64-bytestring,

@@ -183,15 +175,7 @@ Executable tutd

183 attoparsec,

175 attoparsec,

184 stm-containers >= 1.0.0,

176 stm-containers >= 1.0.0,

185 list-t,

177 list-t,

186− parser-combinators,

178+ 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

195 Other-Modules: TutorialD.Interpreter,

179 Other-Modules: TutorialD.Interpreter,

196 TutorialD.Interpreter.Base,

180 TutorialD.Interpreter.Base,

197 TutorialD.Interpreter.DatabaseContextExpr,

181 TutorialD.Interpreter.DatabaseContextExpr,

@@ -210,7 +194,6 @@ Executable tutd

210 TutorialD.Interpreter.SchemaOperator,

194 TutorialD.Interpreter.SchemaOperator,

211 TutorialD.Interpreter.TransGraphRelationalOperator,

195 TutorialD.Interpreter.TransGraphRelationalOperator,

212 TutorialD.Interpreter.SchemaOperator

196 TutorialD.Interpreter.SchemaOperator

213− TutorialD.Printer

214 main-is: TutorialD/tutd.hs

197 main-is: TutorialD/tutd.hs

215 CC-Options: -fPIC

198 CC-Options: -fPIC

216 GHC-Options: -Wall -threaded

199 GHC-Options: -Wall -threaded

@@ -220,11 +203,12 @@ Executable tutd

220

203

221Executable project-m36-server

204Executable project-m36-server

222 if flag(haskell-scripting)

205 if flag(haskell-scripting)

223− Build-Depends: ghc >= 8.2 && < 8.11

206+ Build-Depends: ghc >= 8.2 && < 8.9

224 Build-Depends: base,

207 Build-Depends: base,

225 ghc-paths,

208 ghc-paths,

226− transformers,

227 project-m36,

209 project-m36,

210+ binary,

211+ transformers,

228 temporary,

212 temporary,

229 data-interval,

213 data-interval,

230 deepseq,

214 deepseq,

@@ -237,6 +221,7 @@ Executable project-m36-server

237 optparse-applicative,

221 optparse-applicative,

238 hashable-time,

222 hashable-time,

239 time,

223 time,

224+ vector-binary-instances,

240 text,

225 text,

241 deepseq-generics,

226 deepseq-generics,

242 mtl,

227 mtl,

@@ -258,7 +243,7 @@ Executable project-m36-server

258Executable bigrel

243Executable bigrel

259 Default-Language: Haskell2010

244 Default-Language: Haskell2010

260 Default-Extensions: OverloadedStrings

245 Default-Extensions: OverloadedStrings

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

246+ 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

262 Other-Modules: TutorialD.Interpreter.Base,

247 Other-Modules: TutorialD.Interpreter.Base,

263 TutorialD.Interpreter.DatabaseContextExpr,

248 TutorialD.Interpreter.DatabaseContextExpr,

264 TutorialD.Interpreter.RelationalExpr,

249 TutorialD.Interpreter.RelationalExpr,

@@ -269,13 +254,6 @@ Executable bigrel

269 if flag(profiler)

254 if flag(profiler)

270 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall

255 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall

271

256

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−

279Benchmark basic-benchmark

257Benchmark basic-benchmark

280 Default-Language: Haskell2010

258 Default-Language: Haskell2010

281 Default-Extensions: OverloadedStrings

259 Default-Extensions: OverloadedStrings

@@ -287,202 +265,240 @@ Benchmark basic-benchmark

287 if flag(profiler)

265 if flag(profiler)

288 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall

266 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall

289

267

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−

302Test-Suite test-tutoriald

268Test-Suite test-tutoriald

303− import: commontest

269+ Default-Language: Haskell2010

270+ Default-Extensions: OverloadedStrings

304 type: exitcode-stdio-1.0

271 type: exitcode-stdio-1.0

305− main-is: TutorialD/InterpreterTest.hs

272+ main-is: test/TutorialD/Interpreter.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

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

273+ 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

274+ 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

275+ GHC-Options: -Wall -threaded

276+ Hs-Source-Dirs: ./src/bin, ., test

308

277

309Test-Suite test-tutoriald-atomfunctionscript

278Test-Suite test-tutoriald-atomfunctionscript

310− import: commontest

279+ Default-Language: Haskell2010

280+ Default-Extensions: OverloadedStrings

311 type: exitcode-stdio-1.0

281 type: exitcode-stdio-1.0

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

282+ 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

313− main-is: TutorialD/Interpreter/AtomFunctionScript.hs

283+ main-is: test/TutorialD/Interpreter/AtomFunctionScript.hs

284+ Build-Depends: base, HUnit, project-m36, uuid, containers, megaparsec, text, vector, directory, bytestring, mtl, haskeline, random, MonadRandom, semigroups, time, parser-combinators

285+ GHC-Options: -Wall -threaded

286+ Hs-Source-Dirs: ./src/bin, ./test, .

314

287

315Test-Suite test-tutoriald-databasecontextfunctionscript

288Test-Suite test-tutoriald-databasecontextfunctionscript

316− import: commontest

289+ Default-Language: Haskell2010

290+ Default-Extensions: OverloadedStrings

317 type: exitcode-stdio-1.0

291 type: exitcode-stdio-1.0

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

292+ 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

319− main-is: TutorialD/Interpreter/DatabaseContextFunctionScript.hs

293+ main-is: test/TutorialD/Interpreter/DatabaseContextFunctionScript.hs

294+ Build-Depends: base, HUnit, project-m36, uuid, containers, megaparsec, text, vector, directory, bytestring, mtl, haskeline, random, MonadRandom, semigroups, time, parser-combinators

295+ GHC-Options: -Wall -threaded

296+ Hs-Source-Dirs: ./src/bin, ./test, .

320

297

321Test-Suite test-relation

298Test-Suite test-relation

322− import: commontest

299+ Default-Language: Haskell2010

300+ Default-Extensions: OverloadedStrings

323 type: exitcode-stdio-1.0

301 type: exitcode-stdio-1.0

324− main-is: Relation/Basic.hs

302+ main-is: test/Relation/Basic.hs

303+ 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

304+ GHC-Options: -Wall -threaded

325

305

326Test-Suite test-static-optimizer

306Test-Suite test-static-optimizer

327− import: commontest

307+ Default-Language: Haskell2010

308+ Default-Extensions: OverloadedStrings

328 type: exitcode-stdio-1.0

309 type: exitcode-stdio-1.0

329− main-is: Relation/StaticOptimizer.hs

310+ main-is: test/Relation/StaticOptimizer.hs

311+ 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

312+ GHC-Options: -Wall -threaded

330

313

331Test-Suite test-transactiongraph-persist

314Test-Suite test-transactiongraph-persist

332− import: commontest

315+ Default-Language: Haskell2010

316+ Default-Extensions: OverloadedStrings

333 type: exitcode-stdio-1.0

317 type: exitcode-stdio-1.0

334− main-is: TransactionGraph/Persist.hs

318+ main-is: test/TransactionGraph/Persist.hs

319+ 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

335− Other-Modules: TutorialD.Interpreter.Base, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Printer

320+ Other-Modules: TutorialD.Interpreter.Base, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.BasicExamples

321+ Hs-Source-Dirs: ., ./src/bin

322+ GHC-Options: -Wall -threaded

336

323

337Test-Suite test-relation-import-csv

324Test-Suite test-relation-import-csv

338− import: commontest

325+ Default-Language: Haskell2010

326+ Default-Extensions: OverloadedStrings

339 type: exitcode-stdio-1.0

327 type: exitcode-stdio-1.0

340− main-is: Relation/Import/CSV.hs

328+ main-is: test/Relation/Import/CSV.hs

329+ 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

330+ GHC-Options: -Wall -threaded

341

331

342Test-Suite test-tutoriald-import-tutoriald

332Test-Suite test-tutoriald-import-tutoriald

343− import: commontest

333+ Default-Language: Haskell2010

334+ Default-Extensions: OverloadedStrings

344 type: exitcode-stdio-1.0

335 type: exitcode-stdio-1.0

345− main-is: TutorialD/Interpreter/Import/ImportTest.hs

336+ main-is: test/TutorialD/Interpreter/Import/TutorialD.hs

337+ 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

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

338+ 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

339+ GHC-Options: -Wall -threaded

340+ Hs-Source-Dirs: ., ./src/bin

347

341

348Test-Suite test-relation-export-csv

342Test-Suite test-relation-export-csv

349− import: commontest

343+ Default-Language: Haskell2010

344+ Default-Extensions: OverloadedStrings

350 type: exitcode-stdio-1.0

345 type: exitcode-stdio-1.0

351− main-is: Relation/Export/CSV.hs

346+ main-is: test/Relation/Export/CSV.hs

347+ 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

348+ GHC-Options: -Wall -threaded

352

349

353Test-Suite test-transactiongraph-merge

350Test-Suite test-transactiongraph-merge

354− import: commontest

351+ Default-Language: Haskell2010

355− type: exitcode-stdio-1.0

352+ Default-Extensions: OverloadedStrings

356− main-is: TransactionGraph/Merge.hs

357−

358−

359−Test-Suite test-prettyprinter

360− import: commontest

361 type: exitcode-stdio-1.0

353 type: exitcode-stdio-1.0

362− main-is: TutorialD/PrinterTest.hs

354+ main-is: test/TransactionGraph/Merge.hs

363− Other-Modules: TutorialD.Printer, TutorialD.Interpreter.Base, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types

355+ 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

356+ GHC-Options: -Wall -threaded

364

357

365benchmark bench

358benchmark bench

366− import: commontest

359+ Default-Language: Haskell2010

360+ Default-Extensions: OverloadedStrings

367 type: exitcode-stdio-1.0

361 type: exitcode-stdio-1.0

368 main-is: benchmark/Relation.hs

362 main-is: benchmark/Relation.hs

363+ 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

364+ GHC-Options: -Wall -rtsopts -threaded

365+ Hs-Source-Dirs: ./src/bin

369

366

370Test-Suite test-server

367Test-Suite test-server

371− import: commontest

368+ Default-Language: Haskell2010

369+ Default-Extensions: OverloadedStrings

372 type: exitcode-stdio-1.0

370 type: exitcode-stdio-1.0

373− main-is: Server/Main.hs

371+ main-is: test/Server/Main.hs

374−

372+ 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

373+ HS-Source-Dirs: ., ./src/bin

374+ GHC-Options: -Wall -threaded

375

376Executable Example-SimpleClient

377 Default-Language: Haskell2010

378 Default-Extensions: OverloadedStrings

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

379+ 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

380 Main-Is: examples/SimpleClient.hs

381 GHC-Options: -Wall -threaded

382

383Executable Example-OutOfTheTarpit

384 Default-Language: Haskell2010

385 Default-Extensions: OverloadedStrings

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

386+ 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

387 Main-Is: examples/out_of_the_tarpit.hs

388 GHC-Options: -Wall -threaded

389

390Executable Example-Blog

391 Default-Language: Haskell2010

392 Default-Extensions: OverloadedStrings

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

393+ 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

394 Main-Is: examples/blog.hs

395 GHC-Options: -Wall -threaded

396

397+

397Executable Example-Hair

398Executable Example-Hair

398 Default-Language: Haskell2010

399 Default-Language: Haskell2010

399 Default-Extensions: OverloadedStrings

400 Default-Extensions: OverloadedStrings

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

401+ 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

401 Main-Is: examples/hair.hs

402 Main-Is: examples/hair.hs

402 GHC-Options: -Wall -threaded

403 GHC-Options: -Wall -threaded

403

404

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−

411Executable Example-CustomTupleable

405Executable Example-CustomTupleable

412 Default-Language: Haskell2010

406 Default-Language: Haskell2010

413 Default-Extensions: OverloadedStrings

407 Default-Extensions: OverloadedStrings

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

408+ 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

415 Main-Is: examples/CustomTupleable.hs

409 Main-Is: examples/CustomTupleable.hs

416 GHC-Options: -Wall -threaded

410 GHC-Options: -Wall -threaded

417

411

418−Executable Example-DerivingCustomTupleable

419− if impl(ghc>=8.6)

420− Buildable: True

421− else

422− Buildable: False

423− Default-Language: Haskell2010

424− Build-Depends: base, text, deepseq, project-m36, winery

425− Main-Is: examples/DerivingCustomTupleable.hs

426− GHC-Options: -Wall -threaded

427−

428Test-Suite test-scripts

412Test-Suite test-scripts

429− import: commontest

413+ Default-Language: Haskell2010

414+ Default-Extensions: OverloadedStrings

430 type: exitcode-stdio-1.0

415 type: exitcode-stdio-1.0

431− main-is: scripts.hs

416+ main-is: test/scripts.hs

417+ 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

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

418+ 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

419+ GHC-Options: -Wall -threaded

420+ Hs-Source-Dirs: ., ./src/bin

433

421

434Executable project-m36-websocket-server

422Executable project-m36-websocket-server

435 Default-Language: Haskell2010

423 Default-Language: Haskell2010

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

424+ 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

437 Main-Is: ProjectM36/Server/WebSocket/websocket-server.hs

425 Main-Is: ProjectM36/Server/WebSocket/websocket-server.hs

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

426+ 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

439 GHC-Options: -Wall -threaded

427 GHC-Options: -Wall -threaded

440 Hs-Source-Dirs: ./src/bin

428 Hs-Source-Dirs: ./src/bin

441 Default-Extensions: OverloadedStrings

429 Default-Extensions: OverloadedStrings

442

430

443Test-Suite test-websocket-server

431Test-Suite test-websocket-server

444− import: commontest

432+ Default-Language: Haskell2010

445 type: exitcode-stdio-1.0

433 type: exitcode-stdio-1.0

446− main-is: Server/WebSocket.hs

434+ main-is: test/Server/WebSocket.hs

435+ 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

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

436+ 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

437+ Default-Extensions: OverloadedStrings

438+ GHC-Options: -Wall -threaded

439+ Hs-Source-Dirs: ./src/bin, .

448

440

449Test-Suite test-isomorphic-schemas

441Test-Suite test-isomorphic-schemas

450− import: commontest

442+ Default-Language: Haskell2010

451 type: exitcode-stdio-1.0

443 type: exitcode-stdio-1.0

452− main-is: IsomorphicSchema.hs

444+ main-is: test/IsomorphicSchema.hs

445+ 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

446+ Default-Extensions: OverloadedStrings

447+ GHC-Options: -Wall -threaded

448+ Hs-Source-Dirs: ./src/bin, .

453

449

454Test-Suite test-atomable

450Test-Suite test-atomable

455− import: commontest

451+ Default-Language: Haskell2010

456 type: exitcode-stdio-1.0

452 type: exitcode-stdio-1.0

457− main-is: Relation/Atomable.hs

453+ main-is: test/Relation/Atomable.hs

454+ 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

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

455+ 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

456+ Default-Extensions: OverloadedStrings

457+ GHC-Options: -Wall -threaded

458+ Hs-Source-Dirs: ./src/bin, ., test/

459

460Test-Suite test-multiprocess-access

461− import: commontest

461+ Default-Language: Haskell2010

462 type: exitcode-stdio-1.0

463− main-is: MultiProcessDatabaseAccess.hs

463+ main-is: test/MultiProcessDatabaseAccess.hs

464+ 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

465+ Default-Extensions: OverloadedStrings

466+ GHC-Options: -Wall -threaded

467+ Hs-Source-Dirs: ./src/bin, ., test/

464

468

465Test-Suite test-transactiongraph-automerge

469Test-Suite test-transactiongraph-automerge

466− import: commontest

470+ Default-Language: Haskell2010

467 type: exitcode-stdio-1.0

471 type: exitcode-stdio-1.0

468− main-is: TransactionGraph/Automerge.hs

472+ main-is: test/TransactionGraph/Automerge.hs

473+ 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

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

474+ 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

475+ Default-Extensions: OverloadedStrings

476+ GHC-Options: -Wall -threaded

477+ Hs-Source-Dirs: ./src/bin, ., test/

470

478

471Test-Suite test-tupleable

479Test-Suite test-tupleable

472− import: commontest

480+ Default-Language: Haskell2010

473 type: exitcode-stdio-1.0

481 type: exitcode-stdio-1.0

474− main-is: Relation/Tupleable.hs

482+ main-is: test/Relation/Tupleable.hs

483+ 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

484+ Default-Extensions: OverloadedStrings

485+ GHC-Options: -Wall -threaded

486+ Hs-Source-Dirs: ./src/bin, ., test/

475

487

476Test-Suite test-client-simple

488Test-Suite test-client-simple

477− import: commontest

489+ Default-Language: Haskell2010

478− Main-Is: Client/Simple.hs

490+ Main-Is: test/Client/Simple.hs

479 type: exitcode-stdio-1.0

491 type: exitcode-stdio-1.0

492+ 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

493+ Default-Extensions: OverloadedStrings

494+ GHC-Options: -Wall -threaded

495+ Hs-Source-Dirs: ./src/bin, ., test/

480

496

481-- test for file handle leaks

497-- test for file handle leaks

482Executable handles

498Executable handles

483 Default-Language: Haskell2010

499 Default-Language: Haskell2010

484 Default-Extensions: OverloadedStrings

500 Default-Extensions: OverloadedStrings

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

501+ 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

486 main-is: benchmark/Handles.hs

502 main-is: benchmark/Handles.hs

487 Other-Modules: TutorialD.Interpreter,

503 Other-Modules: TutorialD.Interpreter,

488 TutorialD.Interpreter.Base,

504 TutorialD.Interpreter.Base,

@@ -501,14 +517,17 @@ Executable handles

501 TutorialD.Interpreter.TransGraphRelationalOperator,

517 TutorialD.Interpreter.TransGraphRelationalOperator,

502 TutorialD.Interpreter.TransactionGraphOperator,

518 TutorialD.Interpreter.TransactionGraphOperator,

503 TutorialD.Interpreter.Types

519 TutorialD.Interpreter.Types

504− TutorialD.Printer

505 GHC-Options: -Wall -threaded -rtsopts

520 GHC-Options: -Wall -threaded -rtsopts

506 HS-Source-Dirs: ./src/bin

521 HS-Source-Dirs: ./src/bin

507 if flag(profiler)

522 if flag(profiler)

508 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall

523 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall

509

524

510Test-Suite test-dataframe

525Test-Suite test-dataframe

511− import: commontest

526+ Default-Language: Haskell2010

527+ Main-Is: test/DataFrame.hs

512 type: exitcode-stdio-1.0

528 type: exitcode-stdio-1.0

513− Main-Is: DataFrame.hs

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

529+ 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

530+ 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

531+ Default-Extensions: OverloadedStrings

532+ GHC-Options: -Wall -threaded

533+ Hs-Source-Dirs: ./src/bin, ., test/

release.nixdeleted−36

@@ -1,36 +0,0 @@

1−{ compiler ? "ghc8104"

2−, sources ? import ./nix/sources.nix

3−, pkgs ? import sources.nixpkgs { }

4−}:

5−let

6− doJailbreak = pkgs.haskell.lib.doJailbreak;

7− needsCocoa = drv:

8− if pkgs.stdenv.isDarwin

9− then drv.overrideDerivation (old:

10− { buildInputs = [ pkgs.darwin.apple_sdk.frameworks.Cocoa ] ++ old.buildInputs; }

11− )

12− else drv;

13−

14− haskellPackages = pkgs.haskell.packages.${compiler}.override {

15− overrides = self: super: {

16− curryer-rpc = self.callCabal2nix "curryer-rpc" sources.curryer { };

17− streamly = doJailbreak (needsCocoa (self.callCabal2nix "streamly" sources.streamly { }));

18− project-m36 = ((self.callCabal2nixWithOptions "project-m36" ./. "-f-haskell-scripting" { }));

19− };

20− };

21−in

22−{

23− project = haskellPackages.project-m36;

24−

25− shell = haskellPackages.shellFor {

26− packages = p: [

27− p.project-m36

28− ];

29− buildInputs = [

30− haskellPackages.ghcid

31− haskellPackages.hlint

32− pkgs.docker

33− ];

34− withHoogle = true;

35− };

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},

21 tuple{s# "S4",p# "P4",qty 300},

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#};

26foreign key p_sp_fk sp{p#} in p{p#};

scripts/multiline.tutddeleted−2

@@ -1,2 +0,0 @@

1−x:=relation{

2−tuple{ x 2}} -- nice

shell.nixdeleted−1

@@ -1 +0,0 @@

1−(import ./release.nix { }).shell

src/bin/ProjectM36/Client/Json.hs+1−4

@@ -3,7 +3,6 @@ module ProjectM36.Client.Json where

3import Data.Aeson

4import ProjectM36.Server.RemoteCallTypes.Json ()

5import ProjectM36.Client

6−import ProjectM36.TransactionGraph

7import Control.Exception (IOException)

6import Control.Exception (IOException)

8

7

9instance ToJSON EvaluatedNotification

8instance ToJSON EvaluatedNotification

@@ -12,6 +11,4 @@ instance FromJSON EvaluatedNotification

12instance ToJSON ConnectionError

11instance ToJSON ConnectionError

13

12

14instance ToJSON IOException where

13instance ToJSON IOException where

15− toJSON err = object ["IOException" .= show err]

14+ toJSON err = object ["IOException" .= show err]

16−

17−instance ToJSON MerkleValidationError

src/bin/ProjectM36/Server/RemoteCallTypes/Json.hs+2−30

@@ -10,8 +10,6 @@ import ProjectM36.DataTypes.Primitive

10import ProjectM36.Error

11import ProjectM36.IsomorphicSchema

12import ProjectM36.Server.RemoteCallTypes

13−import ProjectM36.MerkleHash

14−import ProjectM36.Attribute as A

15

13

16import Data.Aeson

14import Data.Aeson

17import Data.ByteString.Base64 as B64

15import Data.ByteString.Base64 as B64

@@ -45,11 +43,8 @@ instance FromJSON ExecuteRelationalExpr

45instance ToJSON Relation

43instance ToJSON Relation

46instance FromJSON Relation

44instance FromJSON Relation

47

45

48−instance ToJSON Attribute where

46+instance ToJSON Attribute

49− toJSON (Attribute attrName aType) = object [ "name" .= attrName

50− , "type" .= toJSON aType ]

51−instance FromJSON Attribute where

47+instance FromJSON Attribute

52− parseJSON = withObject "Attribute" $ \v -> Attribute <$> v .: "name" <*> v .: "type"

53

48

54instance ToJSON ExtendTupleExpr

49instance ToJSON ExtendTupleExpr

55instance FromJSON ExtendTupleExpr

50instance FromJSON ExtendTupleExpr

@@ -103,8 +98,6 @@ instance ToJSON Atom where

103 "val" .= i ]

98 "val" .= i ]

104 toJSON atom@(RelationAtom i) = object [ "type" .= atomTypeForAtom atom,

99 toJSON atom@(RelationAtom i) = object [ "type" .= atomTypeForAtom atom,

105 "val" .= i ]

100 "val" .= i ]

106− toJSON atom@(RelationalExprAtom i) = object [ "type" .= atomTypeForAtom atom,

107− "val" .= i ]

108 toJSON (ConstructedAtom dConsName atomtype atomlist) = object [

101 toJSON (ConstructedAtom dConsName atomtype atomlist) = object [

109 "dataconstructorname" .= dConsName,

102 "dataconstructorname" .= dConsName,

110 "type" .= toJSON atomtype,

103 "type" .= toJSON atomtype,

@@ -132,7 +125,6 @@ instance FromJSON Atom where

132 Left err -> fail ("Failed to parse base64-encoded ByteString: " ++ err)

125 Left err -> fail ("Failed to parse base64-encoded ByteString: " ++ err)

133 Right bs -> pure (ByteStringAtom bs)

126 Right bs -> pure (ByteStringAtom bs)

134 BoolAtomType -> BoolAtom <$> o .: "val"

127 BoolAtomType -> BoolAtom <$> o .: "val"

135− RelationalExprAtomType -> RelationalExprAtom <$> o .: "val"

136

128

137instance ToJSON Notification

129instance ToJSON Notification

138instance FromJSON Notification

130instance FromJSON Notification

@@ -140,21 +132,6 @@ instance FromJSON Notification

140instance ToJSON ScriptCompilationError

132instance ToJSON ScriptCompilationError

141instance FromJSON ScriptCompilationError

133instance FromJSON ScriptCompilationError

142

134

143−instance ToJSON MerkleHash where

144− toJSON h = object [ "merklehash" .= decodeUtf8 (B64.encode (_unMerkleHash h))]

145−instance FromJSON MerkleHash where

146− parseJSON = withObject "merklehash" $ \o -> do

147− b64bs <- encodeUtf8 <$> o .: "merklehash"

148− case B64.decode b64bs of

149− Left err -> fail ("Failed to parse merkle hash: " ++ err)

150− Right bs -> pure (MerkleHash bs)

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−

158instance ToJSON RelationalError

135instance ToJSON RelationalError

159instance FromJSON RelationalError

136instance FromJSON RelationalError

160

137

@@ -164,9 +141,6 @@ instance FromJSON SchemaError

164instance ToJSON MergeError

141instance ToJSON MergeError

165instance FromJSON MergeError

142instance FromJSON MergeError

166

143

167−instance ToJSON ImportError'

168−instance FromJSON ImportError'

169−

170instance ToJSON DatabaseContextFunctionError

144instance ToJSON DatabaseContextFunctionError

171instance FromJSON DatabaseContextFunctionError

145instance FromJSON DatabaseContextFunctionError

172

146

@@ -181,5 +155,3 @@ instance FromJSON AtomFunctionError

181

155

182instance ToJSON WithNameExpr

156instance ToJSON WithNameExpr

183instance FromJSON WithNameExpr

157instance FromJSON WithNameExpr

184−

185−

src/bin/ProjectM36/Server/WebSocket.hs+2−3

@@ -22,7 +22,6 @@ import Data.Attoparsec.Text

22import Control.Applicative

23import Text.Megaparsec.Error

24import Data.Functor

25−import Data.Either (fromRight)

26

25

27#if MIN_VERSION_megaparsec(7,0,0)

26#if MIN_VERSION_megaparsec(7,0,0)

28import Data.List.NonEmpty as NE

27import Data.List.NonEmpty as NE

@@ -86,7 +85,7 @@ notificationCallback conn notifName evaldNotif = WS.sendTextData conn (encode (o

86

85

87--this creates a new database for each connection- perhaps not what we want (?)

86--this creates a new database for each connection- perhaps not what we want (?)

88createConnection :: WS.Connection -> DatabaseName -> Port -> Hostname -> IO (Either ConnectionError Connection)

87createConnection :: WS.Connection -> DatabaseName -> Port -> Hostname -> IO (Either ConnectionError Connection)

89−createConnection wsconn dbname port host = connectProjectM36 (RemoteConnectionInfo dbname host (show port) (notificationCallback wsconn))

88+createConnection wsconn dbname port host = connectProjectM36 (RemoteProcessConnectionInfo dbname (createNodeId host port) (notificationCallback wsconn))

90

89

91sendError :: (ToJSON a) => WS.Connection -> a -> IO ()

90sendError :: (ToJSON a) => WS.Connection -> a -> IO ()

92sendError conn err = WS.sendTextData conn (encode (object ["displayerror" .= err]))

91sendError conn err = WS.sendTextData conn (encode (object ["displayerror" .= err]))

@@ -118,7 +117,7 @@ promptInfo :: SessionId -> Connection -> IO (HeadName, SchemaName)

118promptInfo sessionId conn = do

117promptInfo sessionId conn = do

119 eHeadName <- headName sessionId conn

118 eHeadName <- headName sessionId conn

120 eSchemaName <- currentSchemaName sessionId conn

119 eSchemaName <- currentSchemaName sessionId conn

121− pure (fromRight "<unknown>" eHeadName, fromRight "<no schema>" eSchemaName)

120+ pure (either (const "<unknown>") id eHeadName, either (const "<no schema>") id eSchemaName)

122

121

123sendPromptInfo :: (HeadName, SchemaName) -> WS.Connection -> IO ()

122sendPromptInfo :: (HeadName, SchemaName) -> WS.Connection -> IO ()

124sendPromptInfo (hName, sName) conn = WS.sendTextData conn (encode (object ["promptInfo" .= object ["headname" .= hName, "schemaname" .= sName]]))

123sendPromptInfo (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>

127 <li>:showexpr true</li>

128 <li>:showexpr false</li>

129− <li>:importexample cjdate</li>

129+ <li>:importexample date</li>

130 <li>:showexpr s join sp</li>

131 <li>update s where city="Paris" (status:=10)</li>

132 <li>:showexpr s</li>

src/bin/ProjectM36/Server/WebSocket/websocket-server.hs+18−48

@@ -1,63 +1,33 @@

1{-# LANGUAGE CPP #-}

2−

3−import Control.Concurrent

4−import 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

2+import ProjectM36.Server.WebSocket

16import ProjectM36.Server.Config

3import ProjectM36.Server.Config

17import ProjectM36.Server.ParseArgs

4import ProjectM36.Server.ParseArgs

18−import ProjectM36.Server.WebSocket

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+

15+import Control.Exception

19

16

20main :: IO ()

17main :: IO ()

21main = do

18main = do

22 -- launch normal project-m36-server

19 -- launch normal project-m36-server

23 addressMVar <- newEmptyMVar

20 addressMVar <- newEmptyMVar

24− wsConfig <- parseWSConfigWithDefaults (defaultServerConfig {bindPort = 8000, bindHost = "127.0.0.1"})

21+ serverConfig <- parseConfigWithDefaults (defaultServerConfig { bindPort = 8000, bindHost = "127.0.0.1" })

25−

26 --usurp the serverConfig for our websocket server and make the proxied server run locally

22 --usurp the serverConfig for our websocket server and make the proxied server run locally

27− let serverConfig = wsServerConfig wsConfig

28− wsHost = bindHost serverConfig

23+ let wsHost = bindHost serverConfig

29 wsPort = bindPort serverConfig

24 wsPort = bindPort serverConfig

30 serverHost = "127.0.0.1"

25 serverHost = "127.0.0.1"

31 serverConfig' = serverConfig {bindPort = 0, bindHost = serverHost}

26 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−

38 _ <- forkFinally (launchServer serverConfig' (Just addressMVar) >> pure ()) (either throwIO pure)

27 _ <- forkFinally (launchServer serverConfig' (Just addressMVar) >> pure ()) (either throwIO pure)

39 --wait for server to be listening

28 --wait for server to be listening

40− addr <- takeMVar addressMVar

29+ address <- takeMVar addressMVar

41− let port =

30+ let Just (_, serverPort, _) = decodeEndPointAddress address

42− case addr of

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

43− SockAddrInet port' _ -> fromIntegral port'

32+ WS.runServer wsHost (fromIntegral wsPort) (websocketProxyServer (read serverPort) serverHost)

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"

55

33

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+2−4

@@ -34,7 +34,6 @@ import Data.Monoid

34import Data.List (isPrefixOf)

35import Control.Exception

36import System.Exit

37−import Data.Either (fromRight)

38

37

39{-

38{-

40context ops are read-only operations which only operate on the database context (relvars and constraints)

39context ops are read-only operations which only operate on the database context (relvars and constraints)

@@ -78,7 +77,7 @@ safeInterpreterParserP = fmap RODatabaseContextOp (roDatabaseContextOperatorP <*

78promptText :: Either RelationalError HeadName -> Either RelationalError SchemaName -> StringType

77promptText :: Either RelationalError HeadName -> Either RelationalError SchemaName -> StringType

79promptText eHeadName eSchemaName = "TutorialD (" <> transInfo <> "): "

78promptText eHeadName eSchemaName = "TutorialD (" <> transInfo <> "): "

80 where

79 where

81− transInfo = fromRight "<unknown>" eHeadName <> "/" <> fromRight "<no schema>" eSchemaName

80+ transInfo = either (const "<unknown>") id eHeadName <> "/" <> either (const "<no schema>") id eSchemaName

82

81

83parseTutorialD :: T.Text -> Either ParserError ParsedOperation

82parseTutorialD :: T.Text -> Either ParserError ParsedOperation

84parseTutorialD = parse interpreterParserP ""

83parseTutorialD = parse interpreterParserP ""

@@ -216,7 +215,6 @@ evalTutorialDInteractive sessionId conn safe interactive expr = case expr of

216 unsafeError = pure $ DisplayErrorResult "File I/O operation prohibited."

215 unsafeError = pure $ DisplayErrorResult "File I/O operation prohibited."

217 barf :: RelationalError -> IO TutorialDOperatorResult

216 barf :: RelationalError -> IO TutorialDOperatorResult

218 barf (ScriptError (OtherScriptCompilationError errStr)) = pure (DisplayErrorResult (T.pack errStr))

217 barf (ScriptError (OtherScriptCompilationError errStr)) = pure (DisplayErrorResult (T.pack errStr))

219− barf (ParseError err) = pure (DisplayErrorResult err)

220 barf err = return $ DisplayErrorResult (T.pack (show err))

218 barf err = return $ DisplayErrorResult (T.pack (show err))

221 eHandler io = do

219 eHandler io = do

222 eErr <- io

220 eErr <- io

@@ -229,7 +227,7 @@ type TutorialDExec = String

229type CheckFS = Bool

227type CheckFS = Bool

230

228

231data InterpreterConfig = LocalInterpreterConfig PersistenceStrategy HeadName (Maybe TutorialDExec) [GhcPkgPath] CheckFS |

229data InterpreterConfig = LocalInterpreterConfig PersistenceStrategy HeadName (Maybe TutorialDExec) [GhcPkgPath] CheckFS |

232− RemoteInterpreterConfig C.Hostname C.Port C.DatabaseName HeadName (Maybe TutorialDExec) CheckFS

230+ RemoteInterpreterConfig C.NodeId C.DatabaseName HeadName (Maybe TutorialDExec) CheckFS

233

231

234outputNotificationCallback :: C.NotificationCallback

232outputNotificationCallback :: C.NotificationCallback

235outputNotificationCallback notName evaldNot = hPutStrLn stderr $ "Notification received " ++ show notName ++ ":\n" ++ "\n" ++ prettyEvaluatedNotification evaldNot

233outputNotificationCallback notName evaldNot = hPutStrLn stderr $ "Notification received " ++ show notName ++ ":\n" ++ "\n" ++ prettyEvaluatedNotification evaldNot

src/bin/TutorialD/Interpreter/Base.hs+8−29

@@ -12,12 +12,11 @@ module TutorialD.Interpreter.Base (

12 where

13import ProjectM36.Base

14import ProjectM36.AtomType

15−import ProjectM36.Attribute as A

16import ProjectM36.Relation

15import ProjectM36.Relation

17import ProjectM36.DataFrame

16import ProjectM36.DataFrame

18

17

19#if MIN_VERSION_megaparsec(6,0,0)

18#if MIN_VERSION_megaparsec(6,0,0)

20−import Text.Megaparsec.Char

19+import Text.Megaparsec.Char

21import qualified Text.Megaparsec.Char.Lexer as Lex

20import qualified Text.Megaparsec.Char.Lexer as Lex

22import Text.Megaparsec

21import Text.Megaparsec

23import Data.Void

22import Data.Void

@@ -31,6 +30,7 @@ import Data.Text hiding (count)

31import System.Random

30import System.Random

32import qualified Data.Text as T

31import qualified Data.Text as T

33import qualified Data.List as L

32import qualified Data.List as L

33+import qualified Data.Vector as V

34import qualified Data.Text.IO as TIO

35import System.IO

36import ProjectM36.Relation.Show.Term

@@ -44,7 +44,6 @@ import Data.List.NonEmpty as NE

44import Data.Time.Clock

45import Data.Time.Format

46import Control.Monad (void)

47−import Data.Char

48

47

49#if !MIN_VERSION_megaparsec(7,0,0)

48#if !MIN_VERSION_megaparsec(7,0,0)

50anySingle :: Parsec Void Text (Token Text)

49anySingle :: Parsec Void Text (Token Text)

@@ -82,9 +81,8 @@ type ParseStr = Text

82type ParseStr = String

81type ParseStr = String

83#endif

82#endif

84

83

85−-- consumes only horizontal spaces

86spaceConsumer :: Parser ()

84spaceConsumer :: Parser ()

87−spaceConsumer = Lex.space space1 (Lex.skipLineComment "--") (Lex.skipBlockComment "{-" "-}")

85+spaceConsumer = Lex.space (void spaceChar) (Lex.skipLineComment "--") (Lex.skipBlockComment "{-" "-}")

88

86

89opChar :: Parser Char

87opChar :: Parser Char

90opChar = oneOf (":!#$%&*+./<=>?\\^|-~" :: String)-- remove "@" so it can be used as attribute marker without spaces

88opChar = oneOf (":!#$%&*+./<=>?\\^|-~" :: String)-- remove "@" so it can be used as attribute marker without spaces

@@ -137,14 +135,11 @@ arrow = symbol "->"

137semi :: Parser Text

135semi :: Parser Text

138semi = symbol ";"

136semi = symbol ";"

139

137

140−nline :: Parser Text

141−nline = (T.singleton <$> newline) <|> crlf

142−

143integer :: Parser Integer

138integer :: Parser Integer

144#if MIN_VERSION_megaparsec(6,0,0)

139#if MIN_VERSION_megaparsec(6,0,0)

145−integer = Lex.signed (pure ()) Lex.decimal <* spaceConsumer

140+integer = Lex.signed spaceConsumer Lex.decimal

146#else

141#else

147−integer = Lex.signed (pure ()) Lex.integer <* spaceConsumer

142+integer = Lex.signed spaceConsumer Lex.integer

148#endif

143#endif

149

144

150natural :: Parser Integer

145natural :: Parser Integer

@@ -155,7 +150,7 @@ natural = Lex.integer <* spaceConsumer

155#endif

150#endif

156

151

157float :: Parser Double

152float :: Parser Double

158−float = Lex.float <* spaceConsumer

153+float = Lex.float

159

154

160capitalizedIdentifier :: Parser Text

155capitalizedIdentifier :: Parser Text

161capitalizedIdentifier =

156capitalizedIdentifier =

@@ -168,8 +163,8 @@ uncapitalizedIdentifier =

168showRelationAttributes :: Attributes -> Text

163showRelationAttributes :: Attributes -> Text

169showRelationAttributes attrs = "{" <> T.concat (L.intersperse ", " $ L.map showAttribute attrsL) <> "}"

164showRelationAttributes attrs = "{" <> T.concat (L.intersperse ", " $ L.map showAttribute attrsL) <> "}"

170 where

165 where

171− showAttribute (Attribute name atomType') = name <> " " <> prettyAtomType atomType'

166+ showAttribute (Attribute name atomType) = name <> " " <> prettyAtomType atomType

172− attrsL = A.toList attrs

167+ attrsL = V.toList attrs

173

168

174type PromptLength = Int

169type PromptLength = Int

175

170

@@ -205,9 +200,6 @@ normalQuotedString = quote *> (T.pack <$> manyTill Lex.charLiteral quote)

205quotedString :: Parser Text

200quotedString :: Parser Text

206quotedString = try tripleQuotedString <|> normalQuotedString

201quotedString = try tripleQuotedString <|> normalQuotedString

207

202

208−quoted :: Parser a -> Parser a

209−quoted = between quote quote

210−

211uuidP :: Parser U.UUID

203uuidP :: Parser U.UUID

212uuidP = do

204uuidP = do

213 uuidStart <- count 8 hexDigitChar

205 uuidStart <- count 8 hexDigitChar

@@ -230,16 +222,3 @@ utcTimeP = do

230 case parseTimeM True defaultTimeLocale "%Y-%m-%d %H:%M:%S" (T.unpack timeStr) of

222 case parseTimeM True defaultTimeLocale "%Y-%m-%d %H:%M:%S" (T.unpack timeStr) of

231 Nothing -> fail "invalid datetime input, use \"YYYY-MM-DD HH:MM:SS\""

223 Nothing -> fail "invalid datetime input, use \"YYYY-MM-DD HH:MM:SS\""

232 Just stamp' -> pure stamp'

224 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+4−4

@@ -53,9 +53,8 @@ multilineSep :: Parser T.Text

53multilineSep = newline >> pure "\n"

54

55multipleDatabaseContextExprP :: Parser DatabaseContextExpr

56−multipleDatabaseContextExprP = do

56+multipleDatabaseContextExprP =

57− exprs <- filter (/= NoOperation) <$> sepBy1 databaseContextExprP semi

57+ MultipleExpr <$> sepBy1 databaseContextExprP semi

58− pure (MultipleExpr exprs)

59

58

60insertP :: Parser DatabaseContextExpr

59insertP :: Parser DatabaseContextExpr

61insertP = do

60insertP = do

@@ -207,7 +206,8 @@ interpretDatabaseContextExpr context transId graph tutdstring =

207 Left err -> Left $ PM36E.ParseError (T.pack (show err))

206 Left err -> Left $ PM36E.ParseError (T.pack (show err))

208 Right parsed -> do

207 Right parsed -> do

209 let env = RE.mkDatabaseContextEvalEnv transId graph

208 let env = RE.mkDatabaseContextEvalEnv transId graph

210− RE.dbc_context <$> RE.runDatabaseContextEvalMonad context env (optimizeAndEvalDatabaseContextExpr True parsed)

209+ x <- RE.dbc_context <$> RE.runDatabaseContextEvalMonad context env (optimizeAndEvalDatabaseContextExpr True parsed)

210+ pure x

211

212{-

213--no optimization

src/bin/TutorialD/Interpreter/Import/Base.hs+3−8

@@ -2,8 +2,6 @@

2module TutorialD.Interpreter.Import.Base where

3import ProjectM36.Base

4import ProjectM36.Error

5−import Text.URI (URI)

6−import Data.Text (Text)

7#if __GLASGOW_HASKELL__ < 804

5#if __GLASGOW_HASKELL__ < 804

8import Data.Monoid

6import Data.Monoid

9#endif

7#endif

@@ -14,14 +12,11 @@ data RelVarDataImportOperator = RelVarDataImportOperator RelVarName FilePath (Re

14instance Show RelVarDataImportOperator where

12instance Show RelVarDataImportOperator where

15 show (RelVarDataImportOperator rv path _) = "RelVarDataImportOperator " <> show rv <> " " <> path

13 show (RelVarDataImportOperator rv path _) = "RelVarDataImportOperator " <> show rv <> " " <> path

16

14

17−type HashVerification = Maybe Text

18−

19-- | import data into a database context

15-- | import data into a database context

20−data DatabaseContextDataImportOperator = DatabaseContextDataImportOperator URI HashVerification (URI -> HashVerification -> IO (Either RelationalError DatabaseContextExpr))

16+data DatabaseContextDataImportOperator = DatabaseContextDataImportOperator FilePath (FilePath -> IO (Either RelationalError DatabaseContextExpr))

21

17

22instance Show DatabaseContextDataImportOperator where

18instance Show DatabaseContextDataImportOperator where

23− show (DatabaseContextDataImportOperator uri hash _) =

19+ show (DatabaseContextDataImportOperator path _) = "DatabaseContextDataImportOperator " <> path

24− "DatabaseContextDataImportOperator " <> show uri <> " " <> show hash

25

20

26-- perhaps create a structure to import a whole transaction graph section in the future

21-- perhaps create a structure to import a whole transaction graph section in the future

27

22

@@ -29,4 +24,4 @@ evalRelVarDataImportOperator :: RelVarDataImportOperator -> TypeConstructorMappi

29evalRelVarDataImportOperator (RelVarDataImportOperator relVarName path importFunc) tConsMap attrs = importFunc relVarName tConsMap attrs path

24evalRelVarDataImportOperator (RelVarDataImportOperator relVarName path importFunc) tConsMap attrs = importFunc relVarName tConsMap attrs path

30

25

31evalDatabaseContextDataImportOperator :: DatabaseContextDataImportOperator -> IO (Either RelationalError DatabaseContextExpr)

26evalDatabaseContextDataImportOperator :: DatabaseContextDataImportOperator -> IO (Either RelationalError DatabaseContextExpr)

32−evalDatabaseContextDataImportOperator (DatabaseContextDataImportOperator uri hash importFunc) = importFunc uri hash

27+evalDatabaseContextDataImportOperator (DatabaseContextDataImportOperator path importFunc) = importFunc path

src/bin/TutorialD/Interpreter/Import/BasicExamples.hs+2−2

@@ -20,8 +20,8 @@ importBasicExampleOperatorP :: Parser ImportBasicExampleOperator

20importBasicExampleOperatorP = do

21 reservedOp ":importexample"

22 example <- identifier

23− if example == "cjdate" then

23+ if example == "date" then

24 pure ImportBasicDateExampleOperator

25 else

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

15 csvData <- try (BS.readFile pathIn) :: IO (Either IOError BS.ByteString)

16 case csvData of

17− Left err -> pure $ Left (ImportError (ImportFileError (T.pack (show err))))

17+ Left err -> return $ Left (ImportError $ T.pack (show err))

18 Right csvData' -> case csvAsRelation attrs tConsMap csvData' of

19− Left err -> pure $ Left (ParseError $ T.pack (show err))

19+ Left err -> return $ Left (ParseError $ T.pack (show err))

20− Right csvRel -> pure $ Right (Insert relVarName (ExistingRelation csvRel))

20+ Right csvRel -> return $ Right (Insert relVarName (ExistingRelation csvRel))

21

22importCSVP :: Parser RelVarDataImportOperator

23importCSVP = do

src/bin/TutorialD/Interpreter/Import/TutorialD.hs+17−70

@@ -9,78 +9,25 @@ import qualified Data.Text as T

9import Control.Exception

10import qualified Data.ByteString as BS

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

18−--import a file containing TutorialD database context expressions via local files or HTTP/HTTPS

12+--import a file containing TutorialD database context expressions

19

13

20−importTutorialDFromFile :: URI -> HashVerification -> IO (Either RelationalError DatabaseContextExpr)

14+importTutorialD :: FilePath -> IO (Either RelationalError DatabaseContextExpr)

21−importTutorialDFromFile fileURI mHash = do

15+importTutorialD pathIn = do

22− case URI.uriPath fileURI of

23− Just (False, _) -> do

24− eTutdBytes <- try (BS.readFile filePath) :: IO (Either IOError BS.ByteString)

16+ eTutdBytes <- try (BS.readFile pathIn) :: IO (Either IOError BS.ByteString)

25− case eTutdBytes of

17+ case eTutdBytes of

26− Left err -> pure $ Left (ImportError (ImportFileError (T.pack (show err))))

18+ Left err -> return $ Left (ImportError $ T.pack (show err))

27− Right tutdBytes ->

19+ Right tutdBytes ->

28− case validateBytes tutdBytes mHash of

29− Left err -> pure (Left err)

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 =

38− case TE.decodeUtf8' tutdBytes of

20+ case TE.decodeUtf8' tutdBytes of

39− Left err -> pure (Left (ImportError (ImportFileDecodeError (T.pack (show err)))))

21+ Left err -> pure (Left (ImportError $ T.pack (show err)))

40− Right tutdUtf8 ->

22+ Right tutdUtf8 ->

41− case parse (multipleDatabaseContextExprP <* eof) "import" tutdUtf8 of

23+ case parse multipleDatabaseContextExprP "import" tutdUtf8 of

42− --parseErrorPretty is new in megaparsec 5

24+ --parseErrorPretty is new in megaparsec 5

43− Left err -> pure (Left (PM36E.ParseError (T.pack (errorBundlePretty err))))

25+ Left err -> pure (Left (PM36E.ParseError (T.pack (show err))))

44− Right expr -> pure (Right expr)

26+ Right expr -> pure (Right expr)

45−

27+

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−

75tutdImportP :: Parser DatabaseContextDataImportOperator

28tutdImportP :: Parser DatabaseContextDataImportOperator

76tutdImportP = do

29tutdImportP = do

77 reserved ":importtutd"

30 reserved ":importtutd"

78− uri <- quoted URI.parser

31+ path <- quotedString

79 spaceConsumer

32 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)

86− pure $ DatabaseContextDataImportOperator uri mhash handler

33+ return $ DatabaseContextDataImportOperator (T.unpack path) importTutorialD

src/bin/TutorialD/Interpreter/RODatabaseContextOperator.hs+16−33

@@ -1,16 +1,13 @@

1{-# LANGUAGE GADTs #-}

2module TutorialD.Interpreter.RODatabaseContextOperator where

3import ProjectM36.Base

4−import ProjectM36.Relation

5import qualified ProjectM36.DataFrame as DF

4import qualified ProjectM36.DataFrame as DF

6import ProjectM36.Error

5import ProjectM36.Error

7−import ProjectM36.Tuple

8import ProjectM36.InclusionDependency

6import ProjectM36.InclusionDependency

9import qualified ProjectM36.Client as C

7import qualified ProjectM36.Client as C

10import TutorialD.Interpreter.Base

8import TutorialD.Interpreter.Base

11import TutorialD.Interpreter.RelationalExpr

9import TutorialD.Interpreter.RelationalExpr

12import TutorialD.Interpreter.DatabaseContextExpr

10import TutorialD.Interpreter.DatabaseContextExpr

13−import TutorialD.Printer

14import Control.Monad.State

11import Control.Monad.State

15import qualified Data.Text as T

12import qualified Data.Text as T

16import ProjectM36.Relation.Show.Gnuplot

13import ProjectM36.Relation.Show.Gnuplot

@@ -22,7 +19,7 @@ data RODatabaseContextOperator where

22 ShowRelation :: RelationalExpr -> RODatabaseContextOperator

19 ShowRelation :: RelationalExpr -> RODatabaseContextOperator

23 PlotRelation :: RelationalExpr -> RODatabaseContextOperator

20 PlotRelation :: RelationalExpr -> RODatabaseContextOperator

24 ShowRelationType :: RelationalExpr -> RODatabaseContextOperator

21 ShowRelationType :: RelationalExpr -> RODatabaseContextOperator

25− ShowConstraints :: StringType -> RODatabaseContextOperator

22+ ShowConstraint :: StringType -> RODatabaseContextOperator

26 ShowPlan :: DatabaseContextExpr -> RODatabaseContextOperator

23 ShowPlan :: DatabaseContextExpr -> RODatabaseContextOperator

27 ShowTypes :: RODatabaseContextOperator

24 ShowTypes :: RODatabaseContextOperator

28 ShowRelationVariables :: RODatabaseContextOperator

25 ShowRelationVariables :: RODatabaseContextOperator

@@ -34,44 +31,44 @@ data RODatabaseContextOperator where

34

31

35typeP :: Parser RODatabaseContextOperator

32typeP :: Parser RODatabaseContextOperator

36typeP = do

33typeP = do

37− colonOp ":type"

34+ reservedOp ":type"

38 ShowRelationType <$> relExprP

35 ShowRelationType <$> relExprP

39

36

40showRelP :: Parser RODatabaseContextOperator

37showRelP :: Parser RODatabaseContextOperator

41showRelP = do

38showRelP = do

42− colonOp ":showexpr"

39+ reservedOp ":showexpr"

43 ShowRelation <$> relExprP

40 ShowRelation <$> relExprP

44

41

45showPlanP :: Parser RODatabaseContextOperator

42showPlanP :: Parser RODatabaseContextOperator

46showPlanP = do

43showPlanP = do

47− colonOp ":showplan"

44+ reservedOp ":showplan"

48 ShowPlan <$> databaseContextExprP

45 ShowPlan <$> databaseContextExprP

49

46

50showTypesP :: Parser RODatabaseContextOperator

47showTypesP :: Parser RODatabaseContextOperator

51−showTypesP = colonOp ":showtypes" >> pure ShowTypes

48+showTypesP = reserved ":showtypes" >> pure ShowTypes

52

49

53showRelationVariables :: Parser RODatabaseContextOperator

50showRelationVariables :: Parser RODatabaseContextOperator

54−showRelationVariables = colonOp ":showrelvars" >> pure ShowRelationVariables

51+showRelationVariables = reserved ":showrelvars" >> pure ShowRelationVariables

55

52

56showAtomFunctionsP :: Parser RODatabaseContextOperator

53showAtomFunctionsP :: Parser RODatabaseContextOperator

57−showAtomFunctionsP = colonOp ":showatomfunctions" >> pure ShowAtomFunctions

54+showAtomFunctionsP = reserved ":showatomfunctions" >> pure ShowAtomFunctions

58

55

59showDatabaseContextFunctionsP :: Parser RODatabaseContextOperator

56showDatabaseContextFunctionsP :: Parser RODatabaseContextOperator

60−showDatabaseContextFunctionsP = colonOp ":showdatabasecontextfunctions" >> pure ShowDatabaseContextFunctions

57+showDatabaseContextFunctionsP = reserved ":showdatabasecontextfunctions" >> pure ShowDatabaseContextFunctions

61

58

62quitP :: Parser RODatabaseContextOperator

59quitP :: Parser RODatabaseContextOperator

63quitP = do

60quitP = do

64− colonOp ":quit"

61+ reservedOp ":quit"

65 return Quit

62 return Quit

66

63

67showConstraintsP :: Parser RODatabaseContextOperator

64showConstraintsP :: Parser RODatabaseContextOperator

68showConstraintsP = do

65showConstraintsP = do

69− colonOp ":constraints"

66+ reservedOp ":constraints"

70− ShowConstraints <$> option "" identifier

67+ ShowConstraint <$> option "" identifier

71

68

72plotRelExprP :: Parser RODatabaseContextOperator

69plotRelExprP :: Parser RODatabaseContextOperator

73plotRelExprP = do

70plotRelExprP = do

74− colonOp ":plotexpr"

71+ reserved ":plotexpr"

75 PlotRelation <$> relExprP

72 PlotRelation <$> relExprP

76

73

77roDatabaseContextOperatorP :: Parser RODatabaseContextOperator

74roDatabaseContextOperatorP :: Parser RODatabaseContextOperator

@@ -109,16 +106,15 @@ evalRODatabaseContextOp sessionId conn (PlotRelation expr) = do

109 err <- plotRelation rel

106 err <- plotRelation rel

110 when (isJust err) $ print err

107 when (isJust err) $ print err

111

108

112−evalRODatabaseContextOp sessionId conn (ShowConstraints name) = do

109+evalRODatabaseContextOp sessionId conn (ShowConstraint name) = do

113 eIncDeps <- C.inclusionDependencies sessionId conn

110 eIncDeps <- C.inclusionDependencies sessionId conn

114 let val = case eIncDeps of

111 let val = case eIncDeps of

115 Left err -> Left err

112 Left err -> Left err

116 Right incDeps -> case name of

113 Right incDeps -> case name of

117− "" -> inclusionDependenciesAsRelation incDeps >>= renderRelExprsInIncDeps

114+ "" -> inclusionDependenciesAsRelation incDeps

118 depName -> case M.lookup depName incDeps of

115 depName -> case M.lookup depName incDeps of

119 Nothing -> Left (InclusionDependencyNameNotInUseError depName)

116 Nothing -> Left (InclusionDependencyNameNotInUseError depName)

120− Just dep ->

121− inclusionDependenciesAsRelation (M.singleton depName dep) >>= renderRelExprsInIncDeps

117+ Just dep -> inclusionDependenciesAsRelation (M.singleton depName dep)

122 pure $ case val of

118 pure $ case val of

123 Left err -> DisplayErrorResult (T.pack (show err))

119 Left err -> DisplayErrorResult (T.pack (show err))

124 Right rel -> DisplayRelationResult rel

120 Right rel -> DisplayRelationResult rel

@@ -168,7 +164,7 @@ interpretRODatabaseContextOp sessionId conn tutdstring = case parse roDatabaseCo

168

164

169showDataFrameP :: Parser RODatabaseContextOperator

165showDataFrameP :: Parser RODatabaseContextOperator

170showDataFrameP = do

166showDataFrameP = do

171− colonOp ":showdataframe"

167+ reservedOp ":showdataframe"

172 relExpr <- relExprP

168 relExpr <- relExprP

173 reservedOp "orderby"

169 reservedOp "orderby"

174 attrOrdersExpr <- attrOrdersExprP

170 attrOrdersExpr <- attrOrdersExprP

@@ -195,16 +191,3 @@ attrOrderExprP = DF.AttributeOrderExpr <$> identifier <*> orderP

195

191

196orderP :: Parser DF.Order

192orderP :: Parser DF.Order

197orderP = try (reservedOp "ascending" >> pure DF.AscendingOrder) <|> try (reservedOp "descending" >> pure DF.DescendingOrder) <|> pure DF.AscendingOrder

193orderP = 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+8−27

@@ -20,18 +20,9 @@ attributeListP :: RelationalMarkerExpr a => Parser (AttributeNamesBase a)

20attributeListP =

21 (reservedOp "all but" >>

22 InvertedAttributeNames . S.fromList <$> sepBy attributeNameP comma) <|>

23−

24 (reservedOp "all from" >>

23 (reservedOp "all from" >>

25 RelationalExprAttributeNames <$> relExprP) <|>

24 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−

33− (AttributeNames . S.fromList <$> sepBy attributeNameP comma)

25+ (AttributeNames . S.fromList <$> sepBy attributeNameP comma)

34−

35

26

36makeRelationP :: RelationalMarkerExpr a => Parser (RelationalExprBase a)

27makeRelationP :: RelationalMarkerExpr a => Parser (RelationalExprBase a)

37makeRelationP = do

28makeRelationP = do

@@ -111,11 +102,7 @@ ungroupP = do

111extendP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a)

102extendP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a)

112extendP = do

103extendP = do

113 reservedOp ":"

104 reservedOp ":"

114− extends <- braces (sepBy extendTupleExpressionP comma)

105+ Extend <$> braces extendTupleExpressionP

115− case extends of

116− [] -> pure (Restrict TruePredicate)

117− extends' ->

118− pure $ \expr -> foldl (flip Extend) expr extends'

119

106

120semijoinP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a -> RelationalExprBase a)

107semijoinP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a -> RelationalExprBase a)

121semijoinP = do

108semijoinP = do

@@ -142,8 +129,7 @@ relOperators = [

142 [InfixL antijoinP],

129 [InfixL antijoinP],

143 [InfixL (reservedOp "union" >> return Union)],

130 [InfixL (reservedOp "union" >> return Union)],

144 [InfixL (reservedOp "minus" >> return Difference)],

131 [InfixL (reservedOp "minus" >> return Difference)],

145− [InfixN (reservedOp "=" >> return Equals),

132+ [InfixN (reservedOp "=" >> return Equals)],

146− InfixN (reservedOp "/=" >> return NotEquals)],

147 [Postfix extendP]

133 [Postfix extendP]

148 ]

134 ]

149

135

@@ -214,9 +200,8 @@ consumeAtomExprP consume = try functionAtomExprP <|>

214 try (parens (constructedAtomExprP True)) <|>

200 try (parens (constructedAtomExprP True)) <|>

215 constructedAtomExprP consume <|>

201 constructedAtomExprP consume <|>

216 attributeAtomExprP <|>

202 attributeAtomExprP <|>

217− try nakedAtomExprP <|>

203+ nakedAtomExprP <|>

218 relationalAtomExprP

204 relationalAtomExprP

219−

220

205

221attributeAtomExprP :: Parser (AtomExprBase a)

206attributeAtomExprP :: Parser (AtomExprBase a)

222attributeAtomExprP = do

207attributeAtomExprP = do

@@ -235,7 +220,7 @@ constructedAtomExprP consume = do

235-- used only for primitive type parsing ?

220-- used only for primitive type parsing ?

236atomP :: Parser Atom

221atomP :: Parser Atom

237atomP = stringAtomP <|>

222atomP = stringAtomP <|>

238− try doubleAtomP <|>

223+ doubleAtomP <|>

239 integerAtomP <|>

224 integerAtomP <|>

240 boolAtomP

225 boolAtomP

241

226

@@ -250,19 +235,15 @@ stringAtomP :: Parser Atom

250stringAtomP = TextAtom <$> quotedString

235stringAtomP = TextAtom <$> quotedString

251

236

252doubleAtomP :: Parser Atom

237doubleAtomP :: Parser Atom

253−doubleAtomP = DoubleAtom <$> float

238+doubleAtomP = DoubleAtom <$> try float

254

239

255integerAtomP :: Parser Atom

240integerAtomP :: Parser Atom

256integerAtomP = IntegerAtom <$> integer

241integerAtomP = IntegerAtom <$> integer

257

242

258boolAtomP :: Parser Atom

243boolAtomP :: Parser Atom

259boolAtomP = do

244boolAtomP = do

260− v <- identifier

245+ val <- char 't' <|> char 'f'

261− if v == "t" || v == "f" then

262− pure $ BoolAtom (v == "t")

246+ return $ BoolAtom (val == 't')

263− else

264− fail "invalid boolAtom"

265−

266

247

267relationAtomExprP :: RelationalMarkerExpr a => Parser (AtomExprBase a)

248relationAtomExprP :: RelationalMarkerExpr a => Parser (AtomExprBase a)

268relationAtomExprP = RelationAtomExpr <$> makeRelationP

249relationAtomExprP = RelationAtomExpr <$> makeRelationP

src/bin/TutorialD/Interpreter/TransactionGraphOperator.hs+3−12

@@ -2,9 +2,8 @@

2module TutorialD.Interpreter.TransactionGraphOperator where

3import TutorialD.Interpreter.Base

4import ProjectM36.TransactionGraph hiding (autoMergeToHead)

5−import ProjectM36.Client as C

5+import ProjectM36.Client

6import ProjectM36.Base

7−import ProjectM36.Relation (relationTrue)

8import Data.Functor

7import Data.Functor

9

8

10data ConvenienceTransactionGraphOperator = AutoMergeToHead MergeStrategy HeadName

9data ConvenienceTransactionGraphOperator = AutoMergeToHead MergeStrategy HeadName

@@ -72,9 +71,6 @@ mergeTransactionsP = do

72 reservedOp ":mergetrans"

71 reservedOp ":mergetrans"

73 MergeTransactions <$> mergeTransactionStrategyP <*> identifier <*> identifier

72 MergeTransactions <$> mergeTransactionStrategyP <*> identifier <*> identifier

74

73

75−validateMerkleHashesP :: Parser ROTransactionGraphOperator

76−validateMerkleHashesP = reservedOp ":validatemerklehashes" $> ValidateMerkleHashes

77−

78transactionGraphOpP :: Parser TransactionGraphOperator

74transactionGraphOpP :: Parser TransactionGraphOperator

79transactionGraphOpP =

75transactionGraphOpP =

80 jumpToHeadP

76 jumpToHeadP

@@ -87,7 +83,7 @@ transactionGraphOpP =

87 <|> mergeTransactionsP

83 <|> mergeTransactionsP

88

84

89roTransactionGraphOpP :: Parser ROTransactionGraphOperator

85roTransactionGraphOpP :: Parser ROTransactionGraphOperator

90−roTransactionGraphOpP = showGraphP <|> validateMerkleHashesP

86+roTransactionGraphOpP = showGraphP

91

87

92

88

93

89

@@ -105,11 +101,6 @@ interpretOps newUUID trans@(DisconnectedTransaction _ context) transGraph instri

105

101

106evalROGraphOp :: SessionId -> Connection -> ROTransactionGraphOperator -> IO (Either RelationalError Relation)

102evalROGraphOp :: SessionId -> Connection -> ROTransactionGraphOperator -> IO (Either RelationalError Relation)

107evalROGraphOp sessionId conn ShowGraph = transactionGraphAsRelation sessionId conn

103evalROGraphOp sessionId conn ShowGraph = transactionGraphAsRelation sessionId conn

108−evalROGraphOp sessionId conn ValidateMerkleHashes = do

109− eVal <- C.validateMerkleHashes sessionId conn

110− case eVal of

111− Left err -> pure (Left err)

112− Right _ -> pure (Right relationTrue)

113

104

114evalConvenienceGraphOp :: SessionId -> Connection -> ConvenienceTransactionGraphOperator -> IO (Either RelationalError ())

105evalConvenienceGraphOp :: SessionId -> Connection -> ConvenienceTransactionGraphOperator -> IO (Either RelationalError ())

115−evalConvenienceGraphOp sessionId conn (AutoMergeToHead strat head') = autoMergeToHead sessionId conn strat head'

106+evalConvenienceGraphOp sessionId conn (AutoMergeToHead strat head') = autoMergeToHead sessionId conn strat head'

src/bin/TutorialD/Printer.hsdeleted−165

@@ -1,165 +0,0 @@

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+18−14

@@ -5,10 +5,8 @@ import ProjectM36.Client

5import ProjectM36.Server.ParseArgs

6import ProjectM36.Server

7import System.IO

8−import GHC.IO.Encoding

9import Options.Applicative

8import Options.Applicative

10import System.Exit

9import System.Exit

11−import Control.Monad

12#if __GLASGOW_HASKELL__ < 804

10#if __GLASGOW_HASKELL__ < 804

13import Data.Monoid

11import Data.Monoid

14#endif

12#endif

@@ -22,7 +20,7 @@ import qualified Data.Text as T

22

20

23parseArgs :: Parser InterpreterConfig

21parseArgs :: Parser InterpreterConfig

24parseArgs = LocalInterpreterConfig <$> parsePersistenceStrategy <*> parseHeadName <*> parseTutDExec <*> many parseGhcPkgPath <*> parseCheckFS <|>

22parseArgs = LocalInterpreterConfig <$> parsePersistenceStrategy <*> parseHeadName <*> parseTutDExec <*> many parseGhcPkgPath <*> parseCheckFS <|>

25− RemoteInterpreterConfig <$> parseHostname "127.0.0.1" <*> parsePort defaultServerPort <*> parseDatabaseName <*> parseHeadName <*> parseTutDExec <*> parseCheckFS

23+ RemoteInterpreterConfig <$> parseNodeId <*> parseDatabaseName <*> parseHeadName <*> parseTutDExec <*> parseCheckFS

26

24

27parseHeadName :: Parser HeadName

25parseHeadName :: Parser HeadName

28parseHeadName = option auto (long "head" <>

26parseHeadName = option auto (long "head" <>

@@ -31,6 +29,19 @@ parseHeadName = option auto (long "head" <>

31 value "master"

29 value "master"

32 )

30 )

33

31

32+parseNodeId :: Parser NodeId

33+parseNodeId = createNodeId <$>

34+ strOption (long "host" <>

35+ short 'h' <>

36+ help "Remote host name" <>

37+ metavar "HOSTNAME" <>

38+ value "127.0.0.1") <*>

39+ option auto (long "port" <>

40+ metavar "PORT NUMBER" <>

41+ short 'p' <>

42+ help "Remote port" <>

43+ value defaultServerPort)

44+

34--just execute some tutd and exit

45--just execute some tutd and exit

35parseTutDExec :: Parser (Maybe TutorialDExec)

46parseTutDExec :: Parser (Maybe TutorialDExec)

36parseTutDExec = optional $ strOption (long "exec-tutd" <>

47parseTutDExec = optional $ strOption (long "exec-tutd" <>

@@ -44,19 +55,19 @@ opts = info (parseArgs <**> helpOption) idm

44

55

45connectionInfoForConfig :: InterpreterConfig -> ConnectionInfo

56connectionInfoForConfig :: InterpreterConfig -> ConnectionInfo

46connectionInfoForConfig (LocalInterpreterConfig pStrategy _ _ ghcPkgPaths _) = InProcessConnectionInfo pStrategy outputNotificationCallback ghcPkgPaths

57connectionInfoForConfig (LocalInterpreterConfig pStrategy _ _ ghcPkgPaths _) = InProcessConnectionInfo pStrategy outputNotificationCallback ghcPkgPaths

47−connectionInfoForConfig (RemoteInterpreterConfig remoteHost remotePort remoteDBName _ _ _) = RemoteConnectionInfo remoteDBName remoteHost (show remotePort) outputNotificationCallback

58+connectionInfoForConfig (RemoteInterpreterConfig remoteNodeId remoteDBName _ _ _) = RemoteProcessConnectionInfo remoteDBName remoteNodeId outputNotificationCallback

48

59

49headNameForConfig :: InterpreterConfig -> HeadName

60headNameForConfig :: InterpreterConfig -> HeadName

50headNameForConfig (LocalInterpreterConfig _ headn _ _ _) = headn

61headNameForConfig (LocalInterpreterConfig _ headn _ _ _) = headn

51−headNameForConfig (RemoteInterpreterConfig _ _ _ headn _ _) = headn

62+headNameForConfig (RemoteInterpreterConfig _ _ headn _ _) = headn

52

63

53execTutDForConfig :: InterpreterConfig -> Maybe String

64execTutDForConfig :: InterpreterConfig -> Maybe String

54execTutDForConfig (LocalInterpreterConfig _ _ t _ _) = t

65execTutDForConfig (LocalInterpreterConfig _ _ t _ _) = t

55−execTutDForConfig (RemoteInterpreterConfig _ _ _ _ t _) = t

66+execTutDForConfig (RemoteInterpreterConfig _ _ _ t _) = t

56

67

57checkFSForConfig :: InterpreterConfig -> Bool

68checkFSForConfig :: InterpreterConfig -> Bool

58checkFSForConfig (LocalInterpreterConfig _ _ _ _ c) = c

69checkFSForConfig (LocalInterpreterConfig _ _ _ _ c) = c

59−checkFSForConfig (RemoteInterpreterConfig _ _ _ _ _ c) = c

70+checkFSForConfig (RemoteInterpreterConfig _ _ _ _ c) = c

60

71

61persistenceStrategyForConfig :: InterpreterConfig -> Maybe PersistenceStrategy

72persistenceStrategyForConfig :: InterpreterConfig -> Maybe PersistenceStrategy

62persistenceStrategyForConfig (LocalInterpreterConfig strat _ _ _ _) = Just strat

73persistenceStrategyForConfig (LocalInterpreterConfig strat _ _ _ _) = Just strat

@@ -75,15 +86,8 @@ printWelcome = do

75 putStrLn "A full tutorial is available at:"

86 putStrLn "A full tutorial is available at:"

76 putStrLn "https://github.com/agentm/project-m36/blob/master/docs/tutd_tutorial.markdown"

87 putStrLn "https://github.com/agentm/project-m36/blob/master/docs/tutd_tutorial.markdown"

77

88

78−-- | If the locale is set to ASCII, upgrade it to UTF-8 because tutd outputs UTF-8-encoded attributes. This is especially important in light docker images where the locale data may be missing.

79−setLocaleIfNecessary :: IO ()

80−setLocaleIfNecessary = do

81− l <- getLocaleEncoding

82− when (textEncodingName l == "ASCII") (setLocaleEncoding utf8)

83−

84main :: IO ()

89main :: IO ()

85main = do

90main = do

86− setLocaleIfNecessary

87 interpreterConfig <- execParser opts

91 interpreterConfig <- execParser opts

88 let connInfo = connectionInfoForConfig interpreterConfig

92 let connInfo = connectionInfoForConfig interpreterConfig

89 fscheck <- checkFSType (checkFSForConfig interpreterConfig) (fromMaybe NoPersistence (persistenceStrategyForConfig interpreterConfig))

93 fscheck <- checkFSType (checkFSForConfig interpreterConfig) (fromMaybe NoPersistence (persistenceStrategyForConfig interpreterConfig))

src/lib/ProjectM36/Arbitrary.hs+1−6

@@ -9,7 +9,6 @@ import ProjectM36.AtomType

9import ProjectM36.Attribute (atomType)

10import ProjectM36.DataConstructorDef as DCD

11import ProjectM36.DataTypes.Interval

12−import ProjectM36.Relation

13import qualified Data.Vector as V

12import qualified Data.Vector as V

14import Data.Text (Text)

13import Data.Text (Text)

15import Test.QuickCheck

14import Test.QuickCheck

@@ -49,10 +48,6 @@ arbitrary' ByteStringAtomType =

49

48

50arbitrary' BoolAtomType =

49arbitrary' BoolAtomType =

51 Right . BoolAtom <$> lift (arbitrary :: Gen Bool)

50 Right . BoolAtom <$> lift (arbitrary :: Gen Bool)

52−

53−arbitrary' RelationalExprAtomType =

54− pure (Right (RelationalExprAtom (ExistingRelation relationTrue))) -- don't bother with arbitrary relational expressions

55−

56arbitrary' constructedAtomType@(ConstructedAtomType tcName tvMap)

51arbitrary' constructedAtomType@(ConstructedAtomType tcName tvMap)

57 --special-casing for Interval type

52 --special-casing for Interval type

58 | isIntervalAtomType constructedAtomType = createArbitraryInterval (intervalSubType constructedAtomType)

53 | isIntervalAtomType constructedAtomType = createArbitraryInterval (intervalSubType constructedAtomType)

@@ -84,7 +79,7 @@ maybeToRight y Nothing = Left y

84arbitraryRelationTuple :: Attributes -> WithTCMap Gen (Either RelationalError RelationTuple)

79arbitraryRelationTuple :: Attributes -> WithTCMap Gen (Either RelationalError RelationTuple)

85arbitraryRelationTuple attris = do

80arbitraryRelationTuple attris = do

86 tcMap <- ask

81 tcMap <- ask

87− listOfMaybeAType <- lift $ mapM ((\aTy -> runReaderT (arbitrary' aTy) tcMap) . atomType) (V.toList (attributesVec attris))

82+ listOfMaybeAType <- lift $ mapM ((\aTy -> runReaderT (arbitrary' aTy) tcMap) . atomType) (V.toList attris)

88 case sequence listOfMaybeAType of

83 case sequence listOfMaybeAType of

89 Left err -> pure $ Left err

84 Left err -> pure $ Left err

90 Right listOfAttr -> do

85 Right listOfAttr -> do

src/lib/ProjectM36/Atom.hs−1

@@ -20,7 +20,6 @@ atomToText (DayAtom i) = (T.pack . show) i

20atomToText (DateTimeAtom i) = (T.pack . show) i

21atomToText (ByteStringAtom i) = (T.pack . show) i

22atomToText (BoolAtom i) = (T.pack . show) i

23−atomToText (RelationalExprAtom re) = (T.pack . show) re

24

23

25atomToText (RelationAtom i) = (T.pack . show) i

24atomToText (RelationAtom i) = (T.pack . show) i

26atomToText (ConstructedAtom dConsName typ atoms)

25atomToText (ConstructedAtom dConsName typ atoms)

src/lib/ProjectM36/AtomFunction.hs+1−13

@@ -1,7 +1,6 @@

1{-# LANGUAGE CPP #-}

2module ProjectM36.AtomFunction where

3import ProjectM36.Base

4−import ProjectM36.Serialise.Base ()

5import ProjectM36.Error

4import ProjectM36.Error

6import ProjectM36.Relation

5import ProjectM36.Relation

7import ProjectM36.AtomType

6import ProjectM36.AtomType

@@ -10,8 +9,7 @@ import ProjectM36.ScriptSession

10import qualified ProjectM36.Attribute as A

9import qualified ProjectM36.Attribute as A

11import qualified Data.HashSet as HS

10import qualified Data.HashSet as HS

12import qualified Data.Text as T

11import qualified Data.Text as T

13−import qualified Data.ByteString.Lazy as BL

12+

14−import Codec.Winery

15

13

16foldAtomFuncType :: AtomType -> AtomType -> [AtomType]

14foldAtomFuncType :: AtomType -> AtomType -> [AtomType]

17--the underscore in the attribute name means that any attributes are acceptable

15--the underscore in the attribute name means that any attributes are acceptable

@@ -89,13 +87,3 @@ atomFunctionsAsRelation funcs = mkRelationFromList attrs tups

89 atomFuncToTuple aFunc = [TextAtom (atomFuncName aFunc),

87 atomFuncToTuple aFunc = [TextAtom (atomFuncName aFunc),

90 TextAtom (atomFuncTypeToText aFunc)]

88 TextAtom (atomFuncTypeToText aFunc)]

91 atomFuncTypeToText aFunc = T.intercalate " -> " (map prettyAtomType (atomFuncType aFunc))

89 atomFuncTypeToText aFunc = T.intercalate " -> " (map prettyAtomType (atomFuncType aFunc))

92−

93−--for calculating the merkle hash

94−hashBytes :: AtomFunction -> BL.ByteString

95−hashBytes func = BL.fromChunks [serialise (atomFuncName func),

96− serialise (atomFuncType func),

97− bodyBin

98− ]

99− where

100− bodyBin = case atomFuncBody func of

101− AtomFunctionBody mScript _ -> serialise mScript

src/lib/ProjectM36/AtomFunctionError.hs+2−1

@@ -1,5 +1,6 @@

1{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}

2module ProjectM36.AtomFunctionError where

3+import Data.Binary

3import GHC.Generics

4import GHC.Generics

4import Control.DeepSeq

5import Control.DeepSeq

5import Data.Text

6import Data.Text

@@ -13,5 +14,5 @@ data AtomFunctionError = AtomFunctionUserError String |

13 AtomTypeDoesNotSupportOrderingError Text |

14 AtomTypeDoesNotSupportOrderingError Text |

14 AtomTypeDoesNotSupportIntervalError Text |

15 AtomTypeDoesNotSupportIntervalError Text |

15 AtomFunctionBytesDecodingError String

16 AtomFunctionBytesDecodingError String

16− deriving(Generic, Eq, Show, NFData)

17+ deriving(Generic, Eq, Show, Binary, NFData)

17

18

src/lib/ProjectM36/AtomType.hs+8−9

@@ -211,7 +211,7 @@ isValidAtomTypeForTypeConstructor (ConstructedAtomType tConsName _) (ADTypeConst

211

212isValidAtomTypeForTypeConstructor (RelationAtomType attrs) (RelationAtomTypeConstructor attrExprs) tConsMap = do

213 evaldAtomTypes <- mapM (\expr -> atomTypeForAttributeExpr expr tConsMap M.empty) attrExprs

214− mapM_ (uncurry resolveAtomType) (zip (A.atomTypesList attrs) evaldAtomTypes)

214+ mapM_ (uncurry resolveAtomType) (zip (map A.atomType (V.toList attrs)) evaldAtomTypes)

215isValidAtomTypeForTypeConstructor aType tCons _ = Left (AtomTypeTypeConstructorReconciliationError aType (TC.name tCons))

216

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.

296resolveTypesInTuple :: Attributes -> TypeConstructorMapping -> RelationTuple -> Either RelationalError RelationTuple

297resolveTypesInTuple resolvedAttrs tConss (RelationTuple _ tupAtoms) = do

298− newAtoms <- mapM (\(atom, resolvedType) -> resolveTypeInAtom resolvedType atom tConss) (zip (V.toList tupAtoms) $ A.atomTypesList resolvedAttrs)

298+ newAtoms <- mapM (\(atom, resolvedType) -> resolveTypeInAtom resolvedType atom tConss) (zip (V.toList tupAtoms) $ map A.atomType (V.toList resolvedAttrs))

299 Right (RelationTuple resolvedAttrs (V.fromList newAtoms))

300

301-- | Validate that the type is provided with complete type variables for type constructors.

@@ -314,18 +314,18 @@ validateAtomType typ@(ConstructedAtomType tConsName tVarMap) tConss =

314 _ -> Right ()

315validateAtomType (RelationAtomType attrs) tConss =

316 mapM_ (\attr ->

317− validateAtomType (A.atomType attr) tConss) (attributesVec attrs)

317+ validateAtomType (A.atomType attr) tConss) (V.toList attrs)

318validateAtomType (TypeVariableType x) _ = Left (TypeConstructorTypeVarMissing x)

319validateAtomType _ _ = pure ()

320

321validateAttributes :: TypeConstructorMapping -> Attributes -> Either RelationalError ()

322validateAttributes tConss attrs =

323− if not (null errs) then

323+ if length errs > 0 then

324 Left (someErrors errs)

325 else

326 pure ()

327 where

328− errs = lefts $ map (`validateAtomType` tConss) (A.atomTypesList attrs)

328+ errs = lefts $ map ((`validateAtomType` tConss) . A.atomType) (V.toList attrs)

329

330--ensure that all type vars are fully resolved

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

359 Left $ AtomTypeMismatchError x y

360 else

361− atomTypeVerify (A.atomType attr1) (A.atomType attr2)) $ V.toList (V.zip (attributesVec attrs1) (attributesVec attrs2))

361+ atomTypeVerify (A.atomType attr1) (A.atomType attr2)) $ V.toList (V.zip attrs1 attrs2)

362 return x

363atomTypeVerify x y = if x == y then

364 Right x

@@ -375,7 +375,7 @@ typeVarMapsVerify a b = M.keysSet a == M.keysSet b && (length . rights) zipped =

375 (M.toAscList b)

376

377prettyAtomType :: AtomType -> T.Text

378−prettyAtomType (RelationAtomType attrs) = "relation {" `T.append` T.intercalate "," (map prettyAttribute (V.toList (attributesVec attrs))) `T.append` "}"

378+prettyAtomType (RelationAtomType attrs) = "relation {" `T.append` T.intercalate "," (map prettyAttribute (V.toList attrs)) `T.append` "}"

379prettyAtomType (ConstructedAtomType tConsName typeVarMap) = tConsName `T.append` T.concat (map showTypeVars (M.toList typeVarMap))

380 where

381 showTypeVars (_, TypeVariableType x) = " " <> x

@@ -442,13 +442,12 @@ isResolvedType typ =

442 DateTimeAtomType -> True

443 ByteStringAtomType -> True

444 BoolAtomType -> True

445− RelationalExprAtomType -> True

446 RelationAtomType attrs -> isResolvedAttributes attrs

445 RelationAtomType attrs -> isResolvedAttributes attrs

447 ConstructedAtomType _ tvMap -> all isResolvedType (M.elems tvMap)

446 ConstructedAtomType _ tvMap -> all isResolvedType (M.elems tvMap)

448 TypeVariableType _ -> False

447 TypeVariableType _ -> False

449

448

450isResolvedAttributes :: Attributes -> Bool

449isResolvedAttributes :: Attributes -> Bool

451−isResolvedAttributes attrs = all isResolvedAttribute (V.toList (attributesVec attrs))

450+isResolvedAttributes attrs = all isResolvedAttribute (V.toList attrs)

452

451

453isResolvedAttribute :: Attribute -> Bool

452isResolvedAttribute :: Attribute -> Bool

454isResolvedAttribute = isResolvedType . A.atomType

453isResolvedAttribute = isResolvedType . A.atomType

src/lib/ProjectM36/Atomable.hs+20−4

@@ -13,16 +13,29 @@ import qualified Data.Map as M

13import qualified Data.Text as T

14import qualified Data.Vector as V

15import Control.DeepSeq (NFData)

16+import Data.Binary

16import Control.Applicative

17import Control.Applicative

17import Data.Time.Calendar

18import Data.Time.Calendar

18import Data.ByteString (ByteString)

19import Data.ByteString (ByteString)

19import Data.Time.Clock

20import Data.Time.Clock

20import Data.Proxy

21import Data.Proxy

21import qualified Data.List.NonEmpty as NE

22import qualified Data.List.NonEmpty as NE

22−import Codec.Winery

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+-}

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.

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.

25−class (Eq a, NFData a, Serialise a, Show a) => Atomable a where

38+class (Eq a, NFData a, Binary a, Show a) => Atomable a where

26 toAtom :: a -> Atom

39 toAtom :: a -> Atom

27 default toAtom :: (Generic a, AtomableG (Rep a)) => a -> Atom

40 default toAtom :: (Generic a, AtomableG (Rep a)) => a -> Atom

28 toAtom v = toAtomG (from v) (toAtomTypeG (from v))

41 toAtom v = toAtomG (from v) (toAtomTypeG (from v))

@@ -152,6 +165,10 @@ instance Atomable a => Atomable (NE.NonEmpty a) where

152 toAtomType _ = ConstructedAtomType "NonEmptyList" (M.singleton "a" (toAtomType (Proxy :: Proxy a)))

165 toAtomType _ = ConstructedAtomType "NonEmptyList" (M.singleton "a" (toAtomType (Proxy :: Proxy a)))

153 toAddTypeExpr _ = NoOperation

166 toAddTypeExpr _ = NoOperation

154

167

168+#if !MIN_VERSION_binary(0,8,4)

169+instance Binary a => Binary (NE.NonEmpty a)

170+#endif

171+

155-- Generics

172-- Generics

156class AtomableG g where

173class AtomableG g where

157 --type AtomTG g

174 --type AtomTG g

@@ -235,9 +252,8 @@ typeToTypeConstructor x@DayAtomType = PrimitiveTypeConstructor "Day" x

235typeToTypeConstructor x@DateTimeAtomType = PrimitiveTypeConstructor "DateTime" x

252typeToTypeConstructor x@DateTimeAtomType = PrimitiveTypeConstructor "DateTime" x

236typeToTypeConstructor x@ByteStringAtomType = PrimitiveTypeConstructor "ByteString" x

253typeToTypeConstructor x@ByteStringAtomType = PrimitiveTypeConstructor "ByteString" x

237typeToTypeConstructor x@BoolAtomType = PrimitiveTypeConstructor "Bool" x

254typeToTypeConstructor x@BoolAtomType = PrimitiveTypeConstructor "Bool" x

238−typeToTypeConstructor x@RelationalExprAtomType = PrimitiveTypeConstructor "RelationalExpr" x

239typeToTypeConstructor (RelationAtomType attrs)

255typeToTypeConstructor (RelationAtomType attrs)

240− = RelationAtomTypeConstructor $ map attrToAttrExpr $ V.toList (attributesVec attrs)

256+ = RelationAtomTypeConstructor $ map attrToAttrExpr $ V.toList attrs

241 where

257 where

242 attrToAttrExpr (Attribute n t) = AttributeAndTypeNameExpr n (typeToTypeConstructor t) ()

258 attrToAttrExpr (Attribute n t) = AttributeAndTypeNameExpr n (typeToTypeConstructor t) ()

243typeToTypeConstructor (ConstructedAtomType tcName tvMap)

259typeToTypeConstructor (ConstructedAtomType tcName tvMap)

src/lib/ProjectM36/Attribute.hs+29−148

@@ -1,4 +1,3 @@

1−{-# OPTIONS_GHC -fno-warn-orphans #-}

2module ProjectM36.Attribute where

1module ProjectM36.Attribute where

3import ProjectM36.Base

2import ProjectM36.Base

4import ProjectM36.Error

3import ProjectM36.Error

@@ -11,54 +10,16 @@ import qualified Data.Map as M

11import Data.Either

10import Data.Either

12

11

13arity :: Attributes -> Int

12arity :: Attributes -> Int

14−arity a = V.length (attributesVec a)

13+arity = V.length

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− }

27

14

28emptyAttributes :: Attributes

15emptyAttributes :: Attributes

29−emptyAttributes = mempty

16+emptyAttributes = V.empty

30

17

31null :: Attributes -> Bool

18null :: Attributes -> Bool

32−null a = V.null (attributesVec a)

19+null = V.null

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)

42

20

43attributesFromList :: [Attribute] -> Attributes

21attributesFromList :: [Attribute] -> Attributes

44−attributesFromList attrsL = Attributes {

22+attributesFromList = V.fromList -- . L.nub --too expensive

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

62

23

63attributeName :: Attribute -> AttributeName

24attributeName :: Attribute -> AttributeName

64attributeName (Attribute name _) = name

25attributeName (Attribute name _) = name

@@ -67,16 +28,17 @@ atomType :: Attribute -> AtomType

67atomType (Attribute _ atype) = atype

28atomType (Attribute _ atype) = atype

68

29

69atomTypes :: Attributes -> V.Vector AtomType

30atomTypes :: Attributes -> V.Vector AtomType

70−atomTypes attrs = V.map atomType (attributesVec attrs)

31+atomTypes = V.map atomType

71

32

72atomTypesList :: Attributes -> [AtomType]

33atomTypesList :: Attributes -> [AtomType]

73atomTypesList = V.toList . atomTypes

34atomTypesList = V.toList . atomTypes

74

35

36+--hm- no error-checking here

75addAttribute :: Attribute -> Attributes -> Attributes

37addAttribute :: Attribute -> Attributes -> Attributes

76−addAttribute attr attrs = attrs <> singleton attr

38+addAttribute attr attrs = attrs `V.snoc` attr

77

39

78--if some attribute names overlap but the types do not, then spit back an error

40--if some attribute names overlap but the types do not, then spit back an error

79−{-joinAttributes :: Attributes -> Attributes -> Either RelationalError Attributes

41+joinAttributes :: Attributes -> Attributes -> Either RelationalError Attributes

80joinAttributes attrs1 attrs2 | V.length uniqueOverlappingAttributes /= V.length overlappingAttributes = Left (TupleAttributeTypeMismatchError overlappingAttributes)

42joinAttributes attrs1 attrs2 | V.length uniqueOverlappingAttributes /= V.length overlappingAttributes = Left (TupleAttributeTypeMismatchError overlappingAttributes)

81 | V.length overlappingAttrsDifferentTypes > 0 = Left (TupleAttributeTypeMismatchError overlappingAttrsDifferentTypes)

43 | V.length overlappingAttrsDifferentTypes > 0 = Left (TupleAttributeTypeMismatchError overlappingAttrsDifferentTypes)

82 | otherwise = Right $ vectorUniqueify (attrs1 V.++ attrs2)

44 | otherwise = Right $ vectorUniqueify (attrs1 V.++ attrs2)

@@ -85,52 +47,20 @@ joinAttributes attrs1 attrs2 | V.length uniqueOverlappingAttributes /= V.length

85 attrNames2 = V.map attributeName attrs2

47 attrNames2 = V.map attributeName attrs2

86 uniqueOverlappingAttributes = vectorUniqueify overlappingAttributes

48 uniqueOverlappingAttributes = vectorUniqueify overlappingAttributes

87 overlappingAttributes = V.filter (`V.elem` attrs2) attrs1

49 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− }

106

50

107addAttributes :: Attributes -> Attributes -> Attributes

51addAttributes :: Attributes -> Attributes -> Attributes

108−addAttributes = (<>)

52+addAttributes = (V.++)

109−

110−member :: Attribute -> Attributes -> Bool

111−member attr attrs = HS.member attr (attributesSet attrs)

112

53

113deleteAttributeName :: AttributeName -> Attributes -> Attributes

54deleteAttributeName :: AttributeName -> Attributes -> Attributes

114−deleteAttributeName attrName = deleteAttributeNames (S.singleton attrName)

55+deleteAttributeName attrName = V.filter (\attr -> attributeName attr /= 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

123

56

124renameAttribute :: AttributeName -> Attribute -> Attribute

57renameAttribute :: AttributeName -> Attribute -> Attribute

125renameAttribute newAttrName (Attribute _ typeo) = Attribute newAttrName typeo

58renameAttribute newAttrName (Attribute _ typeo) = Attribute newAttrName typeo

126

59

127renameAttributes :: AttributeName -> AttributeName -> Attributes -> Attributes

60renameAttributes :: AttributeName -> AttributeName -> Attributes -> Attributes

128−renameAttributes oldAttrName newAttrName attrs = Attributes {

61+renameAttributes oldAttrName newAttrName = V.map renamer

129− attributesVec = vec

130− }

131 where

62 where

132− vec = V.map renamer (attributesVec attrs)

133− renamer attr = if attributeName attr == oldAttrName then

63+ renamer attr = if attributeName attr == oldAttrName then

134 renameAttribute newAttrName attr

64 renameAttribute newAttrName attr

135 else

65 else

136 attr

66 attr

@@ -141,7 +71,7 @@ atomTypeForAttributeName attrName attrs = do

141 return atype

71 return atype

142

72

143attributeForName :: AttributeName -> Attributes -> Either RelationalError Attribute

73attributeForName :: AttributeName -> Attributes -> Either RelationalError Attribute

144−attributeForName attrName attrs = case V.find (\attr -> attributeName attr == attrName) (attributesVec attrs) of

74+attributeForName attrName attrs = case V.find (\attr -> attributeName attr == attrName) attrs of

145 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))

75 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))

146 Just attr -> Right attr

76 Just attr -> Right attr

147

77

@@ -159,18 +89,15 @@ projectionAttributesForNames names attrsIn =

159 missingNames = attributeNamesNotContained names (S.fromList (V.toList (attributeNames attrsIn)))

89 missingNames = attributeNamesNotContained names (S.fromList (V.toList (attributeNames attrsIn)))

160

90

161attributesForNames :: S.Set AttributeName -> Attributes -> Attributes

91attributesForNames :: S.Set AttributeName -> Attributes -> Attributes

162−attributesForNames attrNameSet attrs = Attributes {

92+attributesForNames attrNameSet = V.filter filt

163− attributesVec = vec

164− }

165 where

93 where

166− vec = V.filter filt (attributesVec attrs)

167 filt attr = S.member (attributeName attr) attrNameSet

94 filt attr = S.member (attributeName attr) attrNameSet

168

95

169attributeNameSet :: Attributes -> S.Set AttributeName

96attributeNameSet :: Attributes -> S.Set AttributeName

170−attributeNameSet attrs = S.fromList $ V.toList $ V.map (\(Attribute name _) -> name) (attributesVec attrs)

97+attributeNameSet attrVec = S.fromList $ V.toList $ V.map (\(Attribute name _) -> name) attrVec

171

98

172attributeNames :: Attributes -> V.Vector AttributeName

99attributeNames :: Attributes -> V.Vector AttributeName

173−attributeNames attrs = V.map attributeName (attributesVec attrs)

100+attributeNames = V.map attributeName

174

101

175--checks if set s1 is wholly contained in the set s2

102--checks if set s1 is wholly contained in the set s2

176attributesContained :: Attributes -> Attributes -> Bool

103attributesContained :: Attributes -> Attributes -> Bool

@@ -191,88 +118,42 @@ attributeNamesNotContained subset superset = S.filter (`S.notMember` superset) s

191

118

192-- useful for display

119-- useful for display

193orderedAttributes :: Attributes -> [Attribute]

120orderedAttributes :: Attributes -> [Attribute]

194−orderedAttributes attrs = L.sortBy (\a b -> attributeName a `compare` attributeName b) (V.toList (attributesVec attrs))

121+orderedAttributes attrs = L.sortBy (\a b -> attributeName a `compare` attributeName b) (V.toList attrs)

195

122

196orderedAttributeNames :: Attributes -> [AttributeName]

123orderedAttributeNames :: Attributes -> [AttributeName]

197orderedAttributeNames attrs = map attributeName (orderedAttributes attrs)

124orderedAttributeNames attrs = map attributeName (orderedAttributes attrs)

198

125

199-- take two attribute sets and return an attribute set with the attributes which do not match

126-- 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

201attributesDifference :: Attributes -> Attributes -> Attributes

127attributesDifference :: Attributes -> Attributes -> Attributes

202−{-attributesDifference attrsA attrsB = V.fromList $ diff (V.toList attrsA) (V.toList attrsB)

128+attributesDifference attrsA attrsB = V.fromList $ diff (V.toList attrsA) (V.toList attrsB)

203 where

129 where

204 diff a b = (a L.\\ b) ++ (b L.\\ a)

130 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)

219

131

220vectorUniqueify :: (Hash.Hashable a, Eq a) => V.Vector a -> V.Vector a

132vectorUniqueify :: (Hash.Hashable a, Eq a) => V.Vector a -> V.Vector a

221vectorUniqueify vecIn = V.fromList $ HS.toList $ HS.fromList $ V.toList vecIn

133vectorUniqueify vecIn = V.fromList $ HS.toList $ HS.fromList $ V.toList vecIn

222

134

223--check that each attribute only appears once

135--check that each attribute only appears once

224verifyAttributes :: Attributes -> Either RelationalError Attributes

136verifyAttributes :: Attributes -> Either RelationalError Attributes

225−verifyAttributes attrs =

137+verifyAttributes attrs = if collapsedAttrs /= attrs then

226− if vecSet == attributesSet attrs then

227− pure attrs

228− else

229− Left (TupleAttributeTypeMismatchError diffAttrs)

138+ Left (TupleAttributeTypeMismatchError (attributesDifference collapsedAttrs attrs))

139+ else

140+ Right attrs

230 where

141 where

231− vecSet = V.foldr' HS.insert HS.empty (attributesVec attrs)

142+ collapsedAttrs = vectorUniqueify 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

250

143

251−-- use to determine if the same attributes are contained (but ordering is irrelevant)

252attributesEqual :: Attributes -> Attributes -> Bool

144attributesEqual :: Attributes -> Attributes -> Bool

253−attributesEqual attrsA attrsB =

145+attributesEqual attrs1 attrs2 = V.null (attributesDifference attrs1 attrs2)

254− attributesVec attrsA == attributesVec attrsB ||

255− attributesSet attrsA == attributesSet attrsB

256

146

257attributesAsMap :: Attributes -> M.Map AttributeName Attribute

147attributesAsMap :: Attributes -> M.Map AttributeName Attribute

258−attributesAsMap attrs = V.foldr' (\attr acc -> M.insert (attributeName attr) attr acc) mempty (attributesVec attrs)

148+attributesAsMap attrs = (M.fromList . V.toList) (V.map (\attr -> (attributeName attr, attr)) attrs)

259−

260

149

261-- | Left-biased union of attributes.

150-- | Left-biased union of attributes.

262union :: Attributes -> Attributes -> Attributes

151union :: Attributes -> Attributes -> Attributes

263−union attrsA attrsB = Attributes {

152+union attrsA attrsB = V.fromList (M.elems unioned)

264− attributesVec = vec

265− --,attributesSet = hset

266− }

267 where

153 where

268− hset = HS.union (attributesSet attrsA) (attributesSet attrsB)

154+ unioned = M.union (attributesAsMap attrsA) (attributesAsMap attrsB)

269− vec = HS.foldr (flip V.snoc) mempty hset

270

155

271intersection :: Attributes -> Attributes -> Attributes

156intersection :: Attributes -> Attributes -> Attributes

272−intersection attrsA attrsB = Attributes {

157+intersection attrsA attrsB = V.fromList (M.elems intersected)

273− attributesVec = vec

274− --,attributesSet = hset

275− }

276 where

158 where

277− hset = HS.intersection (attributesSet attrsA) (attributesSet attrsB)

159+ intersected = M.intersection (attributesAsMap attrsA) (attributesAsMap attrsB)

278− vec = HS.foldr (flip V.snoc) mempty hset

src/lib/ProjectM36/Base.hs+109−103

@@ -1,12 +1,10 @@

1−{-# LANGUAGE ExistentialQuantification,DeriveGeneric,DeriveAnyClass,FlexibleInstances,OverloadedStrings, DeriveTraversable, DerivingVia, TemplateHaskell, TypeFamilies #-}

1+{-# LANGUAGE ExistentialQuantification,DeriveGeneric,DeriveAnyClass,FlexibleInstances,OverloadedStrings, DeriveFoldable, DeriveFunctor, DeriveTraversable #-}

2{-# OPTIONS_GHC -fno-warn-orphans #-}

3

4module ProjectM36.Base where

5import ProjectM36.DatabaseContextFunctionError

6import ProjectM36.AtomFunctionError

7−import ProjectM36.MerkleHash

8

7

9−import Data.Functor.Foldable.TH

10import qualified Data.Map as M

8import qualified Data.Map as M

11import qualified Data.HashSet as HS

9import qualified Data.HashSet as HS

12import Data.Hashable (Hashable, hashWithSalt)

10import Data.Hashable (Hashable, hashWithSalt)

@@ -19,17 +17,16 @@ import GHC.Stack

19import qualified Data.Vector as V

17import qualified Data.Vector as V

20import qualified Data.List as L

18import qualified Data.List as L

21import Data.Text (Text,unpack)

19import Data.Text (Text,unpack)

20+import Data.Binary

21+import Data.Vector.Binary()

22import Data.Time.Clock

23+import Data.Time.Clock.POSIX

24+import Data.Time.Calendar (Day,toGregorian,fromGregorian)

23import Data.Hashable.Time ()

25import Data.Hashable.Time ()

24−import Data.Time.Calendar (Day)

25import Data.Typeable

26import Data.Typeable

26import Data.ByteString (ByteString)

27import Data.ByteString (ByteString)

27import qualified Data.List.NonEmpty as NE

28import qualified Data.List.NonEmpty as NE

28−import Data.Vector.Instances ()

29−

30type StringType = Text

29type StringType = Text

31−

32−type DatabaseName = String

33

30

34-- | Database atoms are the smallest, undecomposable units of a tuple. Common examples are integers, text, or unique identity keys.

31-- | Database atoms are the smallest, undecomposable units of a tuple. Common examples are integers, text, or unique identity keys.

35data Atom = IntegerAtom Integer |

32data Atom = IntegerAtom Integer |

@@ -41,9 +38,8 @@ data Atom = IntegerAtom Integer |

41 ByteStringAtom ByteString |

38 ByteStringAtom ByteString |

42 BoolAtom Bool |

39 BoolAtom Bool |

43 RelationAtom Relation |

40 RelationAtom Relation |

44− RelationalExprAtom RelationalExpr | --used for returning inc deps

45 ConstructedAtom DataConstructorName AtomType [Atom]

41 ConstructedAtom DataConstructorName AtomType [Atom]

46− deriving (Eq, Show, Typeable, NFData, Generic, Read)

42+ deriving (Eq, Show, Binary, Typeable, NFData, Generic)

47

43

48instance Hashable Atom where

44instance Hashable Atom where

49 hashWithSalt salt (ConstructedAtom dConsName _ atoms) = salt `hashWithSalt` atoms

45 hashWithSalt salt (ConstructedAtom dConsName _ atoms) = salt `hashWithSalt` atoms

@@ -57,7 +53,16 @@ instance Hashable Atom where

57 hashWithSalt salt (ByteStringAtom bs) = salt `hashWithSalt` bs

53 hashWithSalt salt (ByteStringAtom bs) = salt `hashWithSalt` bs

58 hashWithSalt salt (BoolAtom b) = salt `hashWithSalt` b

54 hashWithSalt salt (BoolAtom b) = salt `hashWithSalt` b

59 hashWithSalt salt (RelationAtom r) = salt `hashWithSalt` r

55 hashWithSalt salt (RelationAtom r) = salt `hashWithSalt` r

60− hashWithSalt salt (RelationalExprAtom re) = salt `hashWithSalt` re

56+

57+instance Binary UTCTime where

58+ put utc = put $ toRational (utcTimeToPOSIXSeconds utc)

59+ get = posixSecondsToUTCTime . fromRational <$> (get :: Get Rational)

60+

61+instance Binary Day where

62+ put day = put $ toGregorian day

63+ get = do

64+ (y,m,d) <- get :: Get (Integer, Int, Int)

65+ return (fromGregorian y m d)

61

66

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.

67-- 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.

63-- | The AtomType uniquely identifies the type of a atom.

68-- | The AtomType uniquely identifies the type of a atom.

@@ -71,15 +76,13 @@ data AtomType = IntAtomType |

71 BoolAtomType |

76 BoolAtomType |

72 RelationAtomType Attributes |

77 RelationAtomType Attributes |

73 ConstructedAtomType TypeConstructorName TypeVarMap |

78 ConstructedAtomType TypeConstructorName TypeVarMap |

74− RelationalExprAtomType |

75 TypeVariableType TypeVarName

79 TypeVariableType TypeVarName

76 --wildcard used in Atom Functions and tuples for data constructors which don't provide all arguments to the type constructor

80 --wildcard used in Atom Functions and tuples for data constructors which don't provide all arguments to the type constructor

77− deriving (Eq, NFData, Generic, Show, Read, Hashable)

81+ deriving (Eq, NFData, Generic, Binary, Show)

78

82

79instance Ord AtomType where

83instance Ord AtomType where

80 compare = undefined

84 compare = undefined

81−

85+

82−-- this should probably be an ordered dictionary in order to be able to round-trip these arguments

83type TypeVarMap = M.Map TypeVarName AtomType

86type TypeVarMap = M.Map TypeVarName AtomType

84

87

85instance Hashable TypeVarMap where

88instance Hashable TypeVarMap where

@@ -94,37 +97,25 @@ isRelationAtomType _ = False

94type AttributeName = StringType

97type AttributeName = StringType

95

98

96-- | A relation's type is composed of attribute names and types.

99-- | A relation's type is composed of attribute names and types.

97−data Attribute = Attribute AttributeName AtomType deriving (Eq, Show, Read, Generic, NFData)

100+data Attribute = Attribute AttributeName AtomType deriving (Eq, Show, Generic, NFData, Binary)

98

101

99instance Hashable Attribute where

102instance Hashable Attribute where

100 hashWithSalt salt (Attribute attrName _) = hashWithSalt salt attrName

103 hashWithSalt salt (Attribute attrName _) = hashWithSalt salt attrName

101

104

102−type AttributesHash = Int

103−

104-- | 'Attributes' represent the head of a relation.

105-- | 'Attributes' represent the head of a relation.

105−newtype Attributes = Attributes {

106− attributesVec :: V.Vector Attribute

106+type Attributes = 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

122

107

108+-- | Equality function for a set of attributes.

109+attributesEqual :: Attributes -> Attributes -> Bool

110+attributesEqual attrs1 attrs2 = attrsAsSet attrs1 == attrsAsSet attrs2

111+ where

112+ attrsAsSet = HS.fromList . V.toList

113+

123sortedAttributesIndices :: Attributes -> [(Int, Attribute)]

114sortedAttributesIndices :: Attributes -> [(Int, Attribute)]

124−sortedAttributesIndices attrs = L.sortBy (\(_, Attribute name1 _) (_,Attribute name2 _) -> compare name1 name2) $ V.toList (V.indexed (attributesVec attrs))

115+sortedAttributesIndices attrs = L.sortBy (\(_, Attribute name1 _) (_,Attribute name2 _) -> compare name1 name2) $ V.toList (V.indexed attrs)

125

116

126-- | The relation's tuple set is the body of the relation.

117-- | The relation's tuple set is the body of the relation.

127−newtype RelationTupleSet = RelationTupleSet { asList :: [RelationTuple] } deriving (Hashable, Show, Generic, Read)

118+newtype RelationTupleSet = RelationTupleSet { asList :: [RelationTuple] } deriving (Hashable, Show, Generic, Binary)

128

119

129instance Read Relation where

120instance Read Relation where

130 readsPrec = error "relation read not supported"

121 readsPrec = error "relation read not supported"

@@ -140,8 +131,8 @@ instance NFData RelationTupleSet where rnf = genericRnf

140instance Hashable RelationTuple where

131instance Hashable RelationTuple where

141 --sanity check the tuple for attribute and tuple counts

132 --sanity check the tuple for attribute and tuple counts

142 --this bit me when tuples were being hashed before being verified

133 --this bit me when tuples were being hashed before being verified

143− hashWithSalt salt (RelationTuple attrs tupVec) = if V.length (attributesVec attrs) /= V.length tupVec then

134+ hashWithSalt salt (RelationTuple attrs tupVec) = if V.length attrs /= V.length tupVec then

144− error ("invalid tuple: attributes and tuple count mismatch " <> show (attributesVec attrs, tupVec))

135+ error "invalid tuple: attributes and tuple count mismatch"

145 else

136 else

146 salt `hashWithSalt`

137 salt `hashWithSalt`

147 sortedAttrs `hashWithSalt`

138 sortedAttrs `hashWithSalt`

@@ -152,23 +143,25 @@ instance Hashable RelationTuple where

152 sortedTupVec = V.map (\(index, _) -> tupVec V.! index) $ V.fromList sortedAttrsIndices

143 sortedTupVec = V.map (\(index, _) -> tupVec V.! index) $ V.fromList sortedAttrsIndices

153

144

154-- | A tuple is a set of attributes mapped to their 'Atom' values.

145-- | A tuple is a set of attributes mapped to their 'Atom' values.

155−data RelationTuple = RelationTuple Attributes (V.Vector Atom) deriving (Show, Read, Generic)

146+data RelationTuple = RelationTuple Attributes (V.Vector Atom) deriving (Show, Generic)

147+

148+instance Binary RelationTuple

156

149

157instance Eq RelationTuple where

150instance Eq RelationTuple where

158− tuple1@(RelationTuple attrs1 _) == tuple2@(RelationTuple attrs2 _) =

151+ (==) tuple1@(RelationTuple attrs1 _) tuple2@(RelationTuple attrs2 _) = attributesEqual attrs1 attrs2 && atomsEqual

159− attrs1 == attrs2 && atomsEqual

160 where

152 where

161− atomForAttribute attr (RelationTuple attrs tupVec) = case V.findIndex (== attr) (attributesVec attrs) of

153+ atomForAttribute attr (RelationTuple attrs tupVec) = case V.findIndex (== attr) attrs of

162 Nothing -> Nothing

154 Nothing -> Nothing

163 Just index -> tupVec V.!? index

155 Just index -> tupVec V.!? index

164− atomsEqual = V.all (== True) $ V.map (\attr -> atomForAttribute attr tuple1 == atomForAttribute attr tuple2) (attributesVec attrs1)

156+ atomsEqual = V.all (== True) $ V.map (\attr -> atomForAttribute attr tuple1 == atomForAttribute attr tuple2) attrs1

165

157

166instance NFData RelationTuple where rnf = genericRnf

158instance NFData RelationTuple where rnf = genericRnf

167

159

160+

168data Relation = Relation Attributes RelationTupleSet deriving (Show, Generic,Typeable)

161data Relation = Relation Attributes RelationTupleSet deriving (Show, Generic,Typeable)

169

162

170instance Eq Relation where

163instance Eq Relation where

171− Relation attrs1 tupSet1 == Relation attrs2 tupSet2 = attrs1 == attrs2 && tupSet1 == tupSet2

164+ Relation attrs1 tupSet1 == Relation attrs2 tupSet2 = attributesEqual attrs1 attrs2 && tupSet1 == tupSet2

172

165

173instance NFData Relation where rnf = genericRnf

166instance NFData Relation where rnf = genericRnf

174

167

@@ -179,6 +172,8 @@ instance Hashable Relation where

179 where

172 where

180 sortedAttrs = map snd (sortedAttributesIndices attrs)

173 sortedAttrs = map snd (sortedAttributesIndices attrs)

181

174

175+instance Binary Relation

176+

182-- | Used to represent the number of tuples in a relation.

177-- | Used to represent the number of tuples in a relation.

183data RelationCardinality = Countable | Finite Int deriving (Eq, Show, Generic, Ord)

178data RelationCardinality = Countable | Finite Int deriving (Eq, Show, Generic, Ord)

184

179

@@ -223,15 +218,17 @@ data RelationalExprBase a =

223 --Summarize :: AtomExpr -> AttributeName -> RelationalExpr -> RelationalExpr -> RelationalExpr -- a special case of Extend

218 --Summarize :: AtomExpr -> AttributeName -> RelationalExpr -> RelationalExpr -> RelationalExpr -- a special case of Extend

224 --Evaluate relationalExpr with scoped views

219 --Evaluate relationalExpr with scoped views

225 With [(WithNameExprBase a, RelationalExprBase a)] (RelationalExprBase a)

220 With [(WithNameExprBase a, RelationalExprBase a)] (RelationalExprBase a)

226− deriving (Show, Read, Eq, Generic, NFData, Foldable, Functor, Traversable)

221+ deriving (Show, Eq, Generic, NFData, Foldable, Functor, Traversable)

222+

223+instance Binary RelationalExpr

227

224

228−instance Hashable RelationalExpr

229−

230data WithNameExprBase a = WithNameExpr RelVarName a

225data WithNameExprBase a = WithNameExpr RelVarName a

231− deriving (Show, Read, Eq, Generic, NFData, Foldable, Functor, Traversable, Hashable)

226+ deriving (Show, Eq, Generic, NFData, Foldable, Functor, Traversable)

232

227

233type WithNameExpr = WithNameExprBase ()

228type WithNameExpr = WithNameExprBase ()

234

229

230+instance Binary WithNameExpr

231+

235type GraphRefWithNameExpr = WithNameExprBase GraphRefTransactionMarker

232type GraphRefWithNameExpr = WithNameExprBase GraphRefTransactionMarker

236

233

237type NotificationName = StringType

234type NotificationName = StringType

@@ -243,22 +240,22 @@ data Notification = Notification {

243 reportOldExpr :: RelationalExpr, --run the expression in the pre-change context

240 reportOldExpr :: RelationalExpr, --run the expression in the pre-change context

244 reportNewExpr :: RelationalExpr --run the expression in the post-change context

241 reportNewExpr :: RelationalExpr --run the expression in the post-change context

245 }

242 }

246− deriving (Show, Eq, Generic, NFData)

243+ deriving (Show, Eq, Binary, Generic, NFData)

247

244

248type TypeVarName = StringType

245type TypeVarName = StringType

249

246

250-- | Metadata definition for type constructors such as @data Either a b@.

247-- | Metadata definition for type constructors such as @data Either a b@.

251data TypeConstructorDef = ADTypeConstructorDef TypeConstructorName [TypeVarName] |

248data TypeConstructorDef = ADTypeConstructorDef TypeConstructorName [TypeVarName] |

252 PrimitiveTypeConstructorDef TypeConstructorName AtomType

249 PrimitiveTypeConstructorDef TypeConstructorName AtomType

253− deriving (Show, Generic, Eq, NFData, Hashable, Read)

250+ deriving (Show, Generic, Binary, Eq, NFData)

254

251

255-- | Found in data constructors and type declarations: Left (Either Int Text) | Right Int

252-- | Found in data constructors and type declarations: Left (Either Int Text) | Right Int

256type TypeConstructor = TypeConstructorBase ()

253type TypeConstructor = TypeConstructorBase ()

257data TypeConstructorBase a = ADTypeConstructor TypeConstructorName [TypeConstructor] |

254data TypeConstructorBase a = ADTypeConstructor TypeConstructorName [TypeConstructor] |

258− PrimitiveTypeConstructor TypeConstructorName AtomType |

255+ PrimitiveTypeConstructor TypeConstructorName AtomType |

259− RelationAtomTypeConstructor [AttributeExprBase a] |

256+ RelationAtomTypeConstructor [AttributeExprBase a] |

260− TypeVariable TypeVarName

257+ TypeVariable TypeVarName

261− deriving (Show, Generic, Eq, NFData, Hashable, Read)

258+ deriving (Show, Generic, Binary, Eq, NFData)

262

259

263type TypeConstructorMapping = [(TypeConstructorDef, DataConstructorDefs)]

260type TypeConstructorMapping = [(TypeConstructorDef, DataConstructorDefs)]

264

261

@@ -268,20 +265,20 @@ type DataConstructorName = StringType

268type AtomTypeName = StringType

265type AtomTypeName = StringType

269

266

270-- | Used to define a data constructor in a type constructor context such as @Left a | Right b@

267-- | Used to define a data constructor in a type constructor context such as @Left a | Right b@

271−data DataConstructorDef = DataConstructorDef DataConstructorName [DataConstructorDefArg] deriving (Eq, Show, Generic, NFData, Hashable, Read)

268+data DataConstructorDef = DataConstructorDef DataConstructorName [DataConstructorDefArg] deriving (Eq, Show, Binary, Generic, NFData)

272

269

273type DataConstructorDefs = [DataConstructorDef]

270type DataConstructorDefs = [DataConstructorDef]

274

271

275data DataConstructorDefArg = DataConstructorDefTypeConstructorArg TypeConstructor |

272data DataConstructorDefArg = DataConstructorDefTypeConstructorArg TypeConstructor |

276 DataConstructorDefTypeVarNameArg TypeVarName

273 DataConstructorDefTypeVarNameArg TypeVarName

277− deriving (Show, Generic, Eq, NFData, Hashable, Read)

274+ deriving (Show, Generic, Binary, Eq, NFData)

278

275

279type InclusionDependencies = M.Map IncDepName InclusionDependency

276type InclusionDependencies = M.Map IncDepName InclusionDependency

280type RelationVariables = M.Map RelVarName GraphRefRelationalExpr

277type RelationVariables = M.Map RelVarName GraphRefRelationalExpr

281

278

282data GraphRefTransactionMarker = TransactionMarker TransactionId |

279data GraphRefTransactionMarker = TransactionMarker TransactionId |

283 UncommittedContextMarker

280 UncommittedContextMarker

284− deriving (Eq, Show, Generic, NFData, Ord)

281+ deriving (Eq, Show, Binary, Generic, NFData, Ord)

285

282

286-- a fundamental relational expr to which other relational expressions compile

283-- a fundamental relational expr to which other relational expressions compile

287type GraphRefRelationalExpr = RelationalExprBase GraphRefTransactionMarker

284type GraphRefRelationalExpr = RelationalExprBase GraphRefTransactionMarker

@@ -292,18 +289,17 @@ type Subschemas = M.Map SchemaName Schema

292

289

293-- | Every transaction has one concrete database context and any number of isomorphic subschemas.

290-- | Every transaction has one concrete database context and any number of isomorphic subschemas.

294data Schemas = Schemas DatabaseContext Subschemas

291data Schemas = Schemas DatabaseContext Subschemas

295− deriving (Generic)

296

292

297-- | The DatabaseContext is a snapshot of a database's evolving state and contains everything a database client can change over time.

293-- | The DatabaseContext is a snapshot of a database's evolving state and contains everything a database client can change over time.

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.

294-- 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.

299newtype Schema = Schema SchemaIsomorphs

295newtype Schema = Schema SchemaIsomorphs

300− deriving (Generic)

296+ deriving (Generic, Binary)

301

297

302data SchemaIsomorph = IsoRestrict RelVarName RestrictionPredicateExpr (RelVarName, RelVarName) |

298data SchemaIsomorph = IsoRestrict RelVarName RestrictionPredicateExpr (RelVarName, RelVarName) |

303 IsoRename RelVarName RelVarName |

299 IsoRename RelVarName RelVarName |

304 IsoUnion (RelVarName, RelVarName) RestrictionPredicateExpr RelVarName --maps two relvars to one relvar

300 IsoUnion (RelVarName, RelVarName) RestrictionPredicateExpr RelVarName --maps two relvars to one relvar

305 -- IsoTypeConstructor in morphAttrExpr

301 -- IsoTypeConstructor in morphAttrExpr

306− deriving (Generic, Show)

302+ deriving (Generic, Binary, Show)

307

303

308type SchemaIsomorphs = [SchemaIsomorph]

304type SchemaIsomorphs = [SchemaIsomorph]

309

305

@@ -319,7 +315,9 @@ data DatabaseContext = DatabaseContext {

319type IncDepName = StringType

315type IncDepName = StringType

320

316

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.

317-- | Inclusion dependencies represent every possible database constraint. Constraints enforce specific, arbitrarily-complex rules to which the database context's relation variables must adhere unconditionally.

322−data InclusionDependency = InclusionDependency RelationalExpr RelationalExpr deriving (Show, Eq, Generic, NFData, Hashable, Read)

318+data InclusionDependency = InclusionDependency RelationalExpr RelationalExpr deriving (Show, Eq, Generic, NFData)

319+

320+instance Binary InclusionDependency

323

321

324type AttributeNameAtomExprMap = M.Map AttributeName AtomExpr

322type AttributeNameAtomExprMap = M.Map AttributeName AtomExpr

325

323

@@ -328,10 +326,10 @@ type DatabaseContextExprName = StringType

328

326

329type DatabaseContextExpr = DatabaseContextExprBase ()

327type DatabaseContextExpr = DatabaseContextExprBase ()

330

328

331−instance Hashable DatabaseContextExpr

332−

333type GraphRefDatabaseContextExpr = DatabaseContextExprBase GraphRefTransactionMarker

329type GraphRefDatabaseContextExpr = DatabaseContextExprBase GraphRefTransactionMarker

334

330

331+instance Binary GraphRefDatabaseContextExpr

332+

335-- | Database context expressions modify the database context.

333-- | Database context expressions modify the database context.

336data DatabaseContextExprBase a =

334data DatabaseContextExprBase a =

337 NoOperation |

335 NoOperation |

@@ -359,10 +357,9 @@ data DatabaseContextExprBase a =

359 ExecuteDatabaseContextFunction DatabaseContextFunctionName [AtomExprBase a] |

357 ExecuteDatabaseContextFunction DatabaseContextFunctionName [AtomExprBase a] |

360

358

361 MultipleExpr [DatabaseContextExprBase a]

359 MultipleExpr [DatabaseContextExprBase a]

362− deriving (Show, Read, Eq, Generic, NFData)

360+ deriving (Show, Eq, Generic)

363

361

364−instance Hashable (M.Map AttributeName AtomExpr) where

362+instance Binary DatabaseContextExpr

365− hashWithSalt salt m = salt `hashWithSalt` M.toList m

366

363

367type ObjModuleName = StringType

364type ObjModuleName = StringType

368type ObjFunctionName = StringType

365type ObjFunctionName = StringType

@@ -374,7 +371,7 @@ data DatabaseContextIOExprBase a =

374 AddDatabaseContextFunction DatabaseContextFunctionName [TypeConstructor] DatabaseContextFunctionBodyScript |

371 AddDatabaseContextFunction DatabaseContextFunctionName [TypeConstructor] DatabaseContextFunctionBodyScript |

375 LoadDatabaseContextFunctions ObjModuleName ObjFunctionName FilePath |

372 LoadDatabaseContextFunctions ObjModuleName ObjFunctionName FilePath |

376 CreateArbitraryRelation RelVarName [AttributeExprBase a] Range

373 CreateArbitraryRelation RelVarName [AttributeExprBase a] Range

377− deriving (Show, Eq, Generic)

374+ deriving (Show, Eq, Generic, Binary)

378

375

379type GraphRefDatabaseContextIOExpr = DatabaseContextIOExprBase GraphRefTransactionMarker

376type GraphRefDatabaseContextIOExpr = DatabaseContextIOExprBase GraphRefTransactionMarker

380

377

@@ -382,8 +379,6 @@ type DatabaseContextIOExpr = DatabaseContextIOExprBase ()

382

379

383type RestrictionPredicateExpr = RestrictionPredicateExprBase ()

380type RestrictionPredicateExpr = RestrictionPredicateExprBase ()

384

381

385−instance Hashable RestrictionPredicateExpr

386−

387type GraphRefRestrictionPredicateExpr = RestrictionPredicateExprBase GraphRefTransactionMarker

382type GraphRefRestrictionPredicateExpr = RestrictionPredicateExprBase GraphRefTransactionMarker

388

383

389-- | Restriction predicates are boolean algebra components which, when composed, indicate whether or not a tuple should be retained during a restriction (filtering) operation.

384-- | Restriction predicates are boolean algebra components which, when composed, indicate whether or not a tuple should be retained during a restriction (filtering) operation.

@@ -395,7 +390,9 @@ data RestrictionPredicateExprBase a =

395 RelationalExprPredicate (RelationalExprBase a) | --type must be same as true and false relations (no attributes)

390 RelationalExprPredicate (RelationalExprBase a) | --type must be same as true and false relations (no attributes)

396 AtomExprPredicate (AtomExprBase a) | --atom must evaluate to boolean

391 AtomExprPredicate (AtomExprBase a) | --atom must evaluate to boolean

397 AttributeEqualityPredicate AttributeName (AtomExprBase a) -- relationalexpr must result in relation with single tuple

392 AttributeEqualityPredicate AttributeName (AtomExprBase a) -- relationalexpr must result in relation with single tuple

398− deriving (Show, Read, Eq, Generic, NFData, Foldable, Functor, Traversable)

393+ deriving (Show, Eq, Generic, NFData, Foldable, Functor, Traversable)

394+

395+instance Binary RestrictionPredicateExpr

399

396

400-- child + parent links

397-- child + parent links

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.

398-- | 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.

@@ -405,7 +402,6 @@ type TransactionHeads = M.Map HeadName Transaction

405

402

406-- | The transaction graph is the global database's state which references every committed transaction.

403-- | The transaction graph is the global database's state which references every committed transaction.

407data TransactionGraph = TransactionGraph TransactionHeads (S.Set Transaction)

404data TransactionGraph = TransactionGraph TransactionHeads (S.Set Transaction)

408− deriving Generic

409

405

410transactionHeadsForGraph :: TransactionGraph -> TransactionHeads

406transactionHeadsForGraph :: TransactionGraph -> TransactionHeads

411transactionHeadsForGraph (TransactionGraph hs _) = hs

407transactionHeadsForGraph (TransactionGraph hs _) = hs

@@ -417,8 +413,7 @@ transactionsForGraph (TransactionGraph _ ts) = ts

417-- The `TransactionDiff`s represent child/edge relationships to previous transactions (branches or continuations of the same branch).

413-- The `TransactionDiff`s represent child/edge relationships to previous transactions (branches or continuations of the same branch).

418data TransactionInfo = TransactionInfo {

414data TransactionInfo = TransactionInfo {

419 parents :: TransactionParents,

415 parents :: TransactionParents,

420− stamp :: UTCTime,

416+ stamp :: UTCTime

421− merkleHash :: MerkleHash

422 } deriving (Show, Generic)

417 } deriving (Show, Generic)

423

418

424type TransactionParents = NE.NonEmpty TransactionId

419type TransactionParents = NE.NonEmpty TransactionId

@@ -428,11 +423,12 @@ data TransactionInfo = TransactionInfo TransactionId TransactionDiffs UTCTime |

428 deriving (Show, Generic)

423 deriving (Show, Generic)

429-}

424-}

430

425

426+instance Binary TransactionInfo

427+

431-- | Every set of modifications made to the database are atomically committed to the transaction graph as a transaction.

428-- | Every set of modifications made to the database are atomically committed to the transaction graph as a transaction.

432type TransactionId = UUID

429type TransactionId = UUID

433

430

434data Transaction = Transaction TransactionId TransactionInfo Schemas

431data Transaction = Transaction TransactionId TransactionInfo Schemas

435− deriving Generic

436

432

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.

433-- | 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.

438data DisconnectedTransaction = DisconnectedTransaction TransactionId Schemas DirtyFlag

434data DisconnectedTransaction = DisconnectedTransaction TransactionId Schemas DirtyFlag

@@ -456,8 +452,6 @@ instance Ord Transaction where

456

452

457type AtomExpr = AtomExprBase ()

453type AtomExpr = AtomExprBase ()

458

454

459−instance Hashable AtomExpr

460−

461type GraphRefAtomExpr = AtomExprBase GraphRefTransactionMarker

455type GraphRefAtomExpr = AtomExprBase GraphRefTransactionMarker

462

456

463-- | An atom expression represents an action to take when extending a relation or when statically defining a relation or a new tuple.

457-- | An atom expression represents an action to take when extending a relation or when statically defining a relation or a new tuple.

@@ -466,18 +460,19 @@ data AtomExprBase a = AttributeAtomExpr AttributeName |

466 FunctionAtomExpr AtomFunctionName [AtomExprBase a] a |

460 FunctionAtomExpr AtomFunctionName [AtomExprBase a] a |

467 RelationAtomExpr (RelationalExprBase a) |

461 RelationAtomExpr (RelationalExprBase a) |

468 ConstructedAtomExpr DataConstructorName [AtomExprBase a] a

462 ConstructedAtomExpr DataConstructorName [AtomExprBase a] a

469− deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable)

463+ deriving (Eq,Show,Generic, NFData, Foldable, Functor, Traversable)

470

464

465+instance Binary AtomExpr

466+

471-- | Used in tuple creation when creating a relation.

467-- | Used in tuple creation when creating a relation.

472data ExtendTupleExprBase a = AttributeExtendTupleExpr AttributeName (AtomExprBase a)

468data ExtendTupleExprBase a = AttributeExtendTupleExpr AttributeName (AtomExprBase a)

473− deriving (Show, Read, Eq, Generic, NFData, Foldable, Functor, Traversable)

469+ deriving (Show, Eq, Generic, NFData, Foldable, Functor, Traversable)

474

470

475type ExtendTupleExpr = ExtendTupleExprBase ()

471type ExtendTupleExpr = ExtendTupleExprBase ()

476−

477−instance Hashable ExtendTupleExpr

478−

479type GraphRefExtendTupleExpr = ExtendTupleExprBase GraphRefTransactionMarker

472type GraphRefExtendTupleExpr = ExtendTupleExprBase GraphRefTransactionMarker

480

473

474+instance Binary ExtendTupleExpr

475+

481--enumerates the list of functions available to be run as part of tuple expressions

476--enumerates the list of functions available to be run as part of tuple expressions

482type AtomFunctions = HS.HashSet AtomFunction

477type AtomFunctions = HS.HashSet AtomFunction

483

478

@@ -488,7 +483,6 @@ type AtomFunctionBodyScript = StringType

488type AtomFunctionBodyType = [Atom] -> Either AtomFunctionError Atom

483type AtomFunctionBodyType = [Atom] -> Either AtomFunctionError Atom

489

484

490data AtomFunctionBody = AtomFunctionBody (Maybe AtomFunctionBodyScript) AtomFunctionBodyType

485data AtomFunctionBody = AtomFunctionBody (Maybe AtomFunctionBodyScript) AtomFunctionBodyType

491− deriving Generic

492

486

493instance NFData AtomFunctionBody where

487instance NFData AtomFunctionBody where

494 rnf (AtomFunctionBody mScript _) = rnf mScript

488 rnf (AtomFunctionBody mScript _) = rnf mScript

@@ -523,17 +517,14 @@ data AttributeNamesBase a = AttributeNames (S.Set AttributeName) |

523 UnionAttributeNames (AttributeNamesBase a) (AttributeNamesBase a) |

517 UnionAttributeNames (AttributeNamesBase a) (AttributeNamesBase a) |

524 IntersectAttributeNames (AttributeNamesBase a) (AttributeNamesBase a) |

518 IntersectAttributeNames (AttributeNamesBase a) (AttributeNamesBase a) |

525 RelationalExprAttributeNames (RelationalExprBase a) -- use attribute names from the relational expression's type

519 RelationalExprAttributeNames (RelationalExprBase a) -- use attribute names from the relational expression's type

526− deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable)

520+ deriving (Eq, Show, 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

532

521

533type AttributeNames = AttributeNamesBase ()

522type AttributeNames = AttributeNamesBase ()

534

523

535type GraphRefAttributeNames = AttributeNamesBase GraphRefTransactionMarker

524type GraphRefAttributeNames = AttributeNamesBase GraphRefTransactionMarker

536

525

526+instance Binary AttributeNames

527+

537-- | The persistence strategy is a global database option which represents how to persist the database in the filesystem, if at all.

528-- | The persistence strategy is a global database option which represents how to persist the database in the filesystem, if at all.

538data PersistenceStrategy = NoPersistence | -- ^ no filesystem persistence/memory-only database

529data PersistenceStrategy = NoPersistence | -- ^ no filesystem persistence/memory-only database

539 MinimalPersistence FilePath | -- ^ fsync off, not crash-safe

530 MinimalPersistence FilePath | -- ^ fsync off, not crash-safe

@@ -546,27 +537,27 @@ type GraphRefAttributeExpr = AttributeExprBase GraphRefTransactionMarker

546-- | Create attributes dynamically.

537-- | Create attributes dynamically.

547data AttributeExprBase a = AttributeAndTypeNameExpr AttributeName TypeConstructor a |

538data AttributeExprBase a = AttributeAndTypeNameExpr AttributeName TypeConstructor a |

548 NakedAttributeExpr Attribute

539 NakedAttributeExpr Attribute

549− deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable, Hashable)

540+ deriving (Eq, Show, Generic, Binary, NFData, Foldable, Functor, Traversable)

550

541

551-- | Dynamically create a tuple from attribute names and 'AtomExpr's.

542-- | Dynamically create a tuple from attribute names and 'AtomExpr's.

552newtype TupleExprBase a = TupleExpr (M.Map AttributeName (AtomExprBase a))

543newtype TupleExprBase a = TupleExpr (M.Map AttributeName (AtomExprBase a))

553− deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable)

544+ deriving (Eq, Show, Generic, NFData, Foldable, Functor, Traversable)

554−

545+

555−instance Hashable TupleExpr

546+instance Binary TupleExpr

556

547

557type TupleExpr = TupleExprBase ()

548type TupleExpr = TupleExprBase ()

558

549

559type GraphRefTupleExpr = TupleExprBase GraphRefTransactionMarker

550type GraphRefTupleExpr = TupleExprBase GraphRefTransactionMarker

560

551

561data TupleExprsBase a = TupleExprs a [TupleExprBase a]

552data TupleExprsBase a = TupleExprs a [TupleExprBase a]

562− deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable)

553+ deriving (Eq, Show, Generic, NFData, Foldable, Functor, Traversable)

563−

564−instance Hashable TupleExprs

565

554

566type GraphRefTupleExprs = TupleExprsBase GraphRefTransactionMarker

555type GraphRefTupleExprs = TupleExprsBase GraphRefTransactionMarker

567

556

568type TupleExprs = TupleExprsBase ()

557type TupleExprs = TupleExprsBase ()

569

558

559+instance Binary TupleExprs

560+

570data MergeStrategy =

561data MergeStrategy =

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)

562 -- | 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)

572 UnionMergeStrategy |

563 UnionMergeStrategy |

@@ -574,7 +565,7 @@ data MergeStrategy =

574 UnionPreferMergeStrategy HeadName |

565 UnionPreferMergeStrategy HeadName |

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.

566 -- | 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.

576 SelectedBranchMergeStrategy HeadName

567 SelectedBranchMergeStrategy HeadName

577− deriving (Eq, Show, Generic, NFData)

568+ deriving (Eq, Show, Binary, Generic, NFData)

578

569

579type DatabaseContextFunctionName = StringType

570type DatabaseContextFunctionName = StringType

580

571

@@ -611,8 +602,7 @@ attrTypeVars (Attribute _ aType) = case aType of

611 DateTimeAtomType -> S.empty

602 DateTimeAtomType -> S.empty

612 ByteStringAtomType -> S.empty

603 ByteStringAtomType -> S.empty

613 BoolAtomType -> S.empty

604 BoolAtomType -> S.empty

614− RelationalExprAtomType -> S.empty

615− (RelationAtomType attrs) -> S.unions (map attrTypeVars (V.toList (attributesVec attrs)))

605+ (RelationAtomType attrs) -> S.unions (map attrTypeVars (V.toList attrs))

616 (ConstructedAtomType _ tvMap) -> M.keysSet tvMap

606 (ConstructedAtomType _ tvMap) -> M.keysSet tvMap

617 (TypeVariableType nam) -> S.singleton nam

607 (TypeVariableType nam) -> S.singleton nam

618

608

@@ -635,12 +625,28 @@ atomTypeVars DayAtomType = S.empty

635atomTypeVars DateTimeAtomType = S.empty

625atomTypeVars DateTimeAtomType = S.empty

636atomTypeVars ByteStringAtomType = S.empty

626atomTypeVars ByteStringAtomType = S.empty

637atomTypeVars BoolAtomType = S.empty

627atomTypeVars BoolAtomType = S.empty

638−atomTypeVars RelationalExprAtomType = S.empty

639−atomTypeVars (RelationAtomType attrs) = S.unions (map attrTypeVars (V.toList (attributesVec attrs)))

628+atomTypeVars (RelationAtomType attrs) = S.unions (map attrTypeVars (V.toList attrs))

640atomTypeVars (ConstructedAtomType _ tvMap) = M.keysSet tvMap

629atomTypeVars (ConstructedAtomType _ tvMap) = M.keysSet tvMap

641atomTypeVars (TypeVariableType nam) = S.singleton nam

630atomTypeVars (TypeVariableType nam) = S.singleton nam

642

631

643unimplemented :: HasCallStack => a

632unimplemented :: HasCallStack => a

644−unimplemented = error "unimplemented"

633+unimplemented = undefined

634+

635+--for serializing GraphRefRelationalExpr as part of transaction serialization

636+instance Binary (TupleExprsBase GraphRefTransactionMarker)

637+

638+instance Binary (TupleExprBase GraphRefTransactionMarker)

639+

640+instance Binary GraphRefRelationalExpr

641+

642+instance Binary (AtomExprBase GraphRefTransactionMarker)

643+

644+instance Binary (AttributeNamesBase GraphRefTransactionMarker)

645+

646+instance Binary (RestrictionPredicateExprBase GraphRefTransactionMarker)

647+

648+instance Binary (ExtendTupleExprBase GraphRefTransactionMarker)

649+

650+instance Binary GraphRefWithNameExpr

645

651

646−makeBaseFunctor ''RelationalExprBase

652+

src/lib/ProjectM36/Client.hs+298−186

@@ -1,4 +1,4 @@

1−{-# LANGUAGE DeriveGeneric, ScopedTypeVariables, MonoLocalBinds, DerivingVia #-}

1+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, ScopedTypeVariables, BangPatterns, MonoLocalBinds #-}

2{-|

3Module: ProjectM36.Client

4

@@ -9,7 +9,6 @@ module ProjectM36.Client

9 Connection(..),

10 Port,

11 Hostname,

12− ServiceName,

13 DatabaseName,

12 DatabaseName,

14 ConnectionError(..),

13 ConnectionError(..),

15 connectProjectM36,

14 connectProjectM36,

@@ -44,7 +43,6 @@ module ProjectM36.Client

44 defaultDatabaseName,

43 defaultDatabaseName,

45 defaultRemoteConnectionInfo,

44 defaultRemoteConnectionInfo,

46 defaultHeadName,

45 defaultHeadName,

47− addClientNode,

48 PersistenceStrategy(..),

46 PersistenceStrategy(..),

49 RelationalExpr,

47 RelationalExpr,

50 RelationalExprBase(..),

48 RelationalExprBase(..),

@@ -55,9 +53,11 @@ module ProjectM36.Client

55 Attribute(..),

53 Attribute(..),

56 MergeStrategy(..),

54 MergeStrategy(..),

57 attributesFromList,

55 attributesFromList,

56+ createNodeId,

58 createSessionAtCommit,

57 createSessionAtCommit,

59 createSessionAtHead,

58 createSessionAtHead,

60 closeSession,

59 closeSession,

60+ addClientNode,

61 callTestTimeout_,

62 RelationCardinality(..),

63 TransactionGraphOperator(..),

@@ -67,6 +67,7 @@ module ProjectM36.Client

67 TransGraphRelationalExpr,

68 TransactionIdLookup(..),

69 TransactionIdHeadBacktrack(..),

70+ NodeId(..),

70 Atom(..),

71 Atom(..),

71 Session,

72 Session,

72 SessionId,

73 SessionId,

@@ -79,7 +80,6 @@ module ProjectM36.Client

79 databaseContextExprForUniqueKey,

80 databaseContextExprForUniqueKey,

80 databaseContextExprForForeignKey,

81 databaseContextExprForForeignKey,

81 createScriptedAtomFunction,

82 createScriptedAtomFunction,

82− ProjectM36.Client.validateMerkleHashes,

83 AttributeExprBase(..),

84 TypeConstructorBase(..),

85 TypeConstructorDef(..),

@@ -106,7 +106,6 @@ module ProjectM36.Client

106 ) where

107import ProjectM36.Base hiding (inclusionDependencies) --defined in this module as well

108import qualified ProjectM36.Base as B

109−import ProjectM36.Serialise.Error ()

110import ProjectM36.Error

109import ProjectM36.Error

111import ProjectM36.Atomable

110import ProjectM36.Atomable

112import ProjectM36.AtomFunction as AF

111import ProjectM36.AtomFunction as AF

@@ -119,7 +118,7 @@ import Control.Monad.State

119import qualified ProjectM36.RelationalExpression as RE

118import qualified ProjectM36.RelationalExpression as RE

120import ProjectM36.DatabaseContext (basicDatabaseContext)

119import ProjectM36.DatabaseContext (basicDatabaseContext)

121import qualified ProjectM36.TransactionGraph as Graph

120import qualified ProjectM36.TransactionGraph as Graph

122−import ProjectM36.TransactionGraph as TG

121+import ProjectM36.TransactionGraph

123import qualified ProjectM36.Transaction as Trans

122import qualified ProjectM36.Transaction as Trans

124import ProjectM36.TransactionGraph.Persist

123import ProjectM36.TransactionGraph.Persist

125import ProjectM36.Attribute

124import ProjectM36.Attribute

@@ -134,16 +133,28 @@ import ProjectM36.Relation (typesAsRelation)

134import ProjectM36.ScriptSession (initScriptSession, ScriptSession)

133import ProjectM36.ScriptSession (initScriptSession, ScriptSession)

135import qualified ProjectM36.Relation as R

134import qualified ProjectM36.Relation as R

136import Control.Exception.Base

135import Control.Exception.Base

137−import Control.Concurrent.STM

136+import GHC.Conc.Sync

138−import Control.Concurrent.Async

137+

138+import Network.Transport (Transport(closeTransport))

139+#if MIN_VERSION_network_transport_tcp(0,7,0)

140+import Network.Transport.TCP (createTransport, defaultTCPParameters, defaultTCPAddr)

141+import Network.Transport.TCP.Internal (encodeEndPointAddress)

142+#elif MIN_VERSION_network_transport_tcp(0,6,0)

143+import Network.Transport.TCP (createTransport, defaultTCPParameters)

144+import Network.Transport.TCP.Internal (encodeEndPointAddress)

145+#else

146+import Network.Transport.TCP (encodeEndPointAddress, createTransport, defaultTCPParameters)

147+#endif

139

148

149+import Control.Distributed.Process.Node (newLocalNode, initRemoteTable, runProcess, LocalNode, forkProcess, closeLocalNode)

150+import Control.Distributed.Process.Extras.Internal.Types (whereisRemote)

151+import Control.Distributed.Process.ManagedProcess.Client (call, safeCall)

140import Data.Either (isRight)

152import Data.Either (isRight)

141import Data.UUID.V4 (nextRandom)

153import Data.UUID.V4 (nextRandom)

142import Data.Word

154import Data.Word

143−import Data.Hashable

155+import Control.Distributed.Process (ProcessId, Process, receiveWait, send, match, NodeId(..), reconnect)

144import Control.Exception (IOException, handle, AsyncException, throwIO, fromException, Exception)

156import Control.Exception (IOException, handle, AsyncException, throwIO, fromException, Exception)

145import Control.Concurrent.MVar

157import Control.Concurrent.MVar

146−import Codec.Winery hiding (Schema, schema)

147import qualified Data.Map as M

158import qualified Data.Map as M

148#if MIN_VERSION_stm_containers(1,0,0)

159#if MIN_VERSION_stm_containers(1,0,0)

149import qualified StmContainers.Map as StmMap

160import qualified StmContainers.Map as StmMap

@@ -155,19 +166,19 @@ import qualified STMContainers.Set as StmSet

155import qualified ProjectM36.Session as Sess

166import qualified ProjectM36.Session as Sess

156import ProjectM36.Session

167import ProjectM36.Session

157import ProjectM36.Sessions

168import ProjectM36.Sessions

169+import Data.Binary (Binary)

158import GHC.Generics (Generic)

170import GHC.Generics (Generic)

159import Control.DeepSeq (force)

171import Control.DeepSeq (force)

160import System.IO

172import System.IO

161import Data.Time.Clock

173import Data.Time.Clock

162−import qualified Network.RPC.Curryer.Client as RPC

174+import Data.Typeable

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)

166

175

167type Hostname = String

176type Hostname = String

168

177

169type Port = Word16

178type Port = Word16

170

179

180+type DatabaseName = String

181+

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.

182-- | 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.

172type NotificationCallback = NotificationName -> EvaluatedNotification -> IO ()

183type NotificationCallback = NotificationName -> EvaluatedNotification -> IO ()

173

184

@@ -187,16 +198,15 @@ data RequestTimeoutException = RequestTimeoutException

187

198

188instance Exception RequestTimeoutException

199instance Exception RequestTimeoutException

189

200

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.

201+-- | 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.

191−data ConnectionInfo = InProcessConnectionInfo PersistenceStrategy NotificationCallback [GhcPkgPath] |

202+data ConnectionInfo = InProcessConnectionInfo PersistenceStrategy NotificationCallback [GhcPkgPath]|

192− RemoteConnectionInfo DatabaseName Hostname ServiceName NotificationCallback

203+ RemoteProcessConnectionInfo DatabaseName NodeId NotificationCallback

193

204

194type EvaluatedNotifications = M.Map NotificationName EvaluatedNotification

205type EvaluatedNotifications = M.Map NotificationName EvaluatedNotification

195

206

196-- | Used for callbacks from the server when monitored changes have been made.

207-- | Used for callbacks from the server when monitored changes have been made.

197newtype NotificationMessage = NotificationMessage EvaluatedNotifications

208newtype NotificationMessage = NotificationMessage EvaluatedNotifications

198− deriving (Eq, Show, Generic)

209+ deriving (Binary, Eq, Show, Generic)

199− deriving Serialise via WineryVariant NotificationMessage

200

210

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.

211-- | 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.

202data EvaluatedNotification = EvaluatedNotification {

212data EvaluatedNotification = EvaluatedNotification {

@@ -204,10 +214,13 @@ data EvaluatedNotification = EvaluatedNotification {

204 reportOldRelation :: Either RelationalError Relation,

214 reportOldRelation :: Either RelationalError Relation,

205 reportNewRelation :: Either RelationalError Relation

215 reportNewRelation :: Either RelationalError Relation

206 }

216 }

207− deriving (Eq, Show, Generic)

217+ deriving(Binary, Eq, Show, Generic)

208− deriving Serialise via WineryRecord EvaluatedNotification

209

218

210

219

220+-- | Create a 'NodeId' for use in connecting to a remote server using distributed-process.

221+createNodeId :: Hostname -> Port -> NodeId

222+createNodeId host port = NodeId $ encodeEndPointAddress host (show port) 1

223+

211-- | Use this for connecting to remote servers on the default port.

224-- | Use this for connecting to remote servers on the default port.

212defaultServerPort :: Port

225defaultServerPort :: Port

213defaultServerPort = 6543

226defaultServerPort = 6543

@@ -222,36 +235,82 @@ defaultHeadName = "master"

222

235

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.

236-- | 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.

224defaultRemoteConnectionInfo :: ConnectionInfo

237defaultRemoteConnectionInfo :: ConnectionInfo

225−defaultRemoteConnectionInfo =

226− RemoteConnectionInfo defaultDatabaseName defaultServerHostname (show defaultServerPort) emptyNotificationCallback

238+defaultRemoteConnectionInfo = RemoteProcessConnectionInfo defaultDatabaseName (createNodeId "127.0.0.1" defaultServerPort) emptyNotificationCallback

227

239

228−defaultServerHostname :: Hostname

240+-- | The 'Connection' represents either local or remote access to a database. All operations flow through the connection.

229−defaultServerHostname = "localhost"

241+type ClientNodes = StmSet.Set ProcessId

230

242

231−newtype RemoteConnectionConf = RemoteConnectionConf RPC.Connection

243+-- internal structure specific to in-process connections

244+data InProcessConnectionConf = InProcessConnectionConf {

245+ ipPersistenceStrategy :: PersistenceStrategy,

246+ ipClientNodes :: ClientNodes,

247+ ipSessions :: Sessions,

248+ ipTransactionGraph :: TVar TransactionGraph,

249+ ipScriptSession :: Maybe ScriptSession,

250+ ipLocalNode :: LocalNode,

251+ ipTransport :: Transport, -- we hold onto this so that we can close it gracefully

252+ ipLocks :: Maybe (LockFile, MVar LockFileHash) -- nothing when NoPersistence

253+ }

254+

255+data RemoteProcessConnectionConf = RemoteProcessConnectionConf {

256+ rLocalNode :: LocalNode,

257+ rProcessId :: ProcessId, --remote processId

258+ rTransport :: Transport --the TCP socket transport

259+ }

232

260

233data Connection = InProcessConnection InProcessConnectionConf |

261data Connection = InProcessConnection InProcessConnectionConf |

234− RemoteConnection RemoteConnectionConf

262+ RemoteProcessConnection RemoteProcessConnectionConf

235

263

236-- | There are several reasons why a connection can fail.

264-- | There are several reasons why a connection can fail.

237data ConnectionError = SetupDatabaseDirectoryError PersistenceError |

265data ConnectionError = SetupDatabaseDirectoryError PersistenceError |

238 IOExceptionError IOException |

266 IOExceptionError IOException |

239 NoSuchDatabaseByNameError DatabaseName |

267 NoSuchDatabaseByNameError DatabaseName |

240− DatabaseValidationError [MerkleValidationError] |

241 LoginError

268 LoginError

242 deriving (Show, Eq, Generic)

269 deriving (Show, Eq, Generic)

243

270

244remoteDBLookupName :: DatabaseName -> String

271remoteDBLookupName :: DatabaseName -> String

245remoteDBLookupName = (++) "db-"

272remoteDBLookupName = (++) "db-"

246

273

274+createLocalNode :: IO (LocalNode, Transport)

275+createLocalNode = do

276+#if MIN_VERSION_network_transport_tcp(0,7,0)

277+ eLocalTransport <- createTransport (defaultTCPAddr "127.0.0.1" "0") defaultTCPParameters

278+#elif MIN_VERSION_network_transport_tcp(0,6,0)

279+ eLocalTransport <- createTransport "127.0.0.1" "0" (\sn -> ("127.0.0.1", sn)) defaultTCPParameters

280+#else

281+ eLocalTransport <- createTransport "127.0.0.1" "0" defaultTCPParameters

282+#endif

283+ case eLocalTransport of

284+ Left err -> error ("failed to create transport: " ++ show err)

285+ Right localTransport -> do

286+ localNode <- newLocalNode localTransport initRemoteTable

287+ pure (localNode, localTransport)

288+

289+notificationListener :: NotificationCallback -> Process ()

290+notificationListener callback = do

291+ --pid <- getSelfPid

292+ --liftIO $ putStrLn $ "LISTENER THREAD START " ++ show pid

293+ _ <- forever $

294+ receiveWait [

295+ match (\(NotificationMessage eNots) ->

296+ --say $ "NOTIFICATION: " ++ show eNots

297+ -- 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

298+ liftIO $ mapM_ (uncurry callback) (M.toList eNots)

299+ )

300+ ]

301+ --say "LISTENER THREAD EXIT"

302+ pure ()

303+

304+startNotificationListener :: LocalNode -> NotificationCallback -> IO ProcessId

305+startNotificationListener localNode callback = forkProcess localNode (notificationListener callback)

306+

247createScriptSession :: [String] -> IO (Maybe ScriptSession)

307createScriptSession :: [String] -> IO (Maybe ScriptSession)

248createScriptSession ghcPkgPaths = do

308createScriptSession ghcPkgPaths = do

249 eScriptSession <- initScriptSession ghcPkgPaths

309 eScriptSession <- initScriptSession ghcPkgPaths

250 case eScriptSession of

310 case eScriptSession of

251− Left err -> hPutStrLn stderr ("Warning: Haskell scripting disabled: " ++ show err) >> pure Nothing --not a fatal error, but the scripting feature must be disabled

311+ 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

252 Right s -> pure (Just s)

312 Right s -> pure (Just s)

253

313

254−

255-- | To create a 'Connection' to a remote or local database, create a 'ConnectionInfo' and call 'connectProjectM36'.

314-- | To create a 'Connection' to a remote or local database, create a 'ConnectionInfo' and call 'connectProjectM36'.

256connectProjectM36 :: ConnectionInfo -> IO (Either ConnectionError Connection)

315connectProjectM36 :: ConnectionInfo -> IO (Either ConnectionError Connection)

257--create a new in-memory database/transaction graph

316--create a new in-memory database/transaction graph

@@ -266,63 +325,42 @@ connectProjectM36 (InProcessConnectionInfo strat notificationCallback ghcPkgPath

266 graphTvar <- newTVarIO freshGraph

325 graphTvar <- newTVarIO freshGraph

267 clientNodes <- StmSet.newIO

326 clientNodes <- StmSet.newIO

268 sessions <- StmMap.newIO

327 sessions <- StmMap.newIO

328+ (localNode, transport) <- createLocalNode

329+ notificationPid <- startNotificationListener localNode notificationCallback

269 mScriptSession <- createScriptSession ghcPkgPaths

330 mScriptSession <- createScriptSession ghcPkgPaths

270− notifAsync <- startNotificationListener clientNodes notificationCallback

331+

271 let conn = InProcessConnection InProcessConnectionConf {

332 let conn = InProcessConnection InProcessConnectionConf {

272 ipPersistenceStrategy = strat,

333 ipPersistenceStrategy = strat,

273 ipClientNodes = clientNodes,

334 ipClientNodes = clientNodes,

274 ipSessions = sessions,

335 ipSessions = sessions,

275 ipTransactionGraph = graphTvar,

336 ipTransactionGraph = graphTvar,

276 ipScriptSession = mScriptSession,

337 ipScriptSession = mScriptSession,

338+ ipLocalNode = localNode,

339+ ipTransport = transport,

277− ipLocks = Nothing,

340+ ipLocks = Nothing}

278− ipCallbackAsync = notifAsync

341+ addClientNode conn notificationPid

279− }

280 pure (Right conn)

342 pure (Right conn)

281 MinimalPersistence dbdir -> connectPersistentProjectM36 strat NoDiskSync dbdir freshGraph notificationCallback ghcPkgPaths

343 MinimalPersistence dbdir -> connectPersistentProjectM36 strat NoDiskSync dbdir freshGraph notificationCallback ghcPkgPaths

282 CrashSafePersistence dbdir -> connectPersistentProjectM36 strat FsyncDiskSync dbdir freshGraph notificationCallback ghcPkgPaths

344 CrashSafePersistence dbdir -> connectPersistentProjectM36 strat FsyncDiskSync dbdir freshGraph notificationCallback ghcPkgPaths

283

345

284−connectProjectM36 (RemoteConnectionInfo dbName hostName servicePort notificationCallback) = do

346+connectProjectM36 (RemoteProcessConnectionInfo databaseName serverNodeId notificationCallback) = do

285− --TODO- add notification callback thread

347+ connStatus <- newEmptyMVar

286− let resolutionHints = defaultHints { addrFlags = [AI_NUMERICHOST, AI_NUMERICSERV],

348+ (localNode, transport) <- createLocalNode

287− addrSocketType = Stream

349+ let dbName = remoteDBLookupName databaseName

288− }

350+ --putStrLn $ "Connecting to " ++ show serverNodeId ++ " " ++ dbName

289− resolved <- getAddrInfo (Just resolutionHints) (Just hostName) (Just servicePort)

351+ notificationListenerPid <- startNotificationListener localNode notificationCallback

290− case resolved of

352+ runProcess localNode $ do

291− [] -> error ("DNS resolution failed for" <> hostName <> ":" <> servicePort)

353+ --even a failed connection retains an open socket!

292− addrInfo:_ -> do

354+ mServerProcessId <- whereisRemote serverNodeId dbName

293− --supports IPv4 only for now

355+ case mServerProcessId of

294− let (SockAddrInet port addr) = addrAddress addrInfo

356+ Nothing -> liftIO $ putMVar connStatus $ Left (NoSuchDatabaseByNameError databaseName)

295− notificationHandlers =

357+ Just serverProcessId -> do

296− [RPC.ClientAsyncRequestHandler $

358+ loginConfirmation <- safeLogin (Login notificationListenerPid) serverProcessId

297− \(NotificationMessage notifications') ->

359+ if not loginConfirmation then

298− forM_ (M.toList notifications') (uncurry notificationCallback)

360+ liftIO $ putMVar connStatus (Left LoginError)

299− ]

361+ else

300− let connectExcHandler (e :: IOException) = pure $ Left (IOExceptionError e)

362+ liftIO $ putMVar connStatus (Right $ RemoteProcessConnection RemoteProcessConnectionConf {rLocalNode = localNode, rProcessId = serverProcessId, rTransport = transport})

301− eConn <- (Right <$> RPC.connect notificationHandlers (hostAddressToTuple addr) port) `catch` connectExcHandler

363+ takeMVar connStatus

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

326

364

327connectPersistentProjectM36 :: PersistenceStrategy ->

365connectPersistentProjectM36 :: PersistenceStrategy ->

328 DiskSync ->

366 DiskSync ->

@@ -341,40 +379,32 @@ connectPersistentProjectM36 strat sync dbdir freshGraph notificationCallback ghc

341 case graph of

379 case graph of

342 Left err' -> return $ Left (SetupDatabaseDirectoryError err')

380 Left err' -> return $ Left (SetupDatabaseDirectoryError err')

343 Right graph' -> do

381 Right graph' -> do

344− case TG.validateMerkleHashes graph' of

345− Left merkleErrs -> pure (Left (DatabaseValidationError merkleErrs))

346− Right _ -> do

347− tvarGraph <- newTVarIO graph'

382+ tvarGraph <- newTVarIO graph'

348− sessions <- StmMap.newIO

383+ sessions <- StmMap.newIO

349− clientNodes <- StmSet.newIO

384+ clientNodes <- StmSet.newIO

385+ (localNode, transport) <- createLocalNode

350− lockMVar <- newMVar digest

386+ lockMVar <- newMVar digest

351− notifAsync <- startNotificationListener clientNodes notificationCallback

352− let conn = InProcessConnection InProcessConnectionConf {

387+ let conn = InProcessConnection InProcessConnectionConf {

353 ipPersistenceStrategy = strat,

388 ipPersistenceStrategy = strat,

354 ipClientNodes = clientNodes,

389 ipClientNodes = clientNodes,

355 ipSessions = sessions,

390 ipSessions = sessions,

356 ipTransactionGraph = tvarGraph,

391 ipTransactionGraph = tvarGraph,

357 ipScriptSession = mScriptSession,

392 ipScriptSession = mScriptSession,

393+ ipLocalNode = localNode,

394+ ipTransport = transport,

358− ipLocks = Just (lockFileH, lockMVar),

395+ ipLocks = Just (lockFileH, lockMVar)

359− ipCallbackAsync = notifAsync

360 }

396 }

361− pure (Right conn)

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

397

398+ notificationPid <- startNotificationListener localNode notificationCallback

399+ addClientNode conn notificationPid

400+ pure (Right conn)

401+

372-- | Create a new session at the transaction id and return the session's Id.

402-- | Create a new session at the transaction id and return the session's Id.

373createSessionAtCommit :: Connection -> TransactionId -> IO (Either RelationalError SessionId)

403createSessionAtCommit :: Connection -> TransactionId -> IO (Either RelationalError SessionId)

374createSessionAtCommit conn@(InProcessConnection _) commitId = do

404createSessionAtCommit conn@(InProcessConnection _) commitId = do

375 newSessionId <- nextRandom

405 newSessionId <- nextRandom

376 atomically $ createSessionAtCommit_ commitId newSessionId conn

406 atomically $ createSessionAtCommit_ commitId newSessionId conn

377−createSessionAtCommit conn@(RemoteConnection _) uuid = remoteCall conn (CreateSessionAtCommit uuid)

407+createSessionAtCommit conn@(RemoteProcessConnection _) uuid = remoteCall conn (CreateSessionAtCommit uuid)

378

408

379createSessionAtCommit_ :: TransactionId -> SessionId -> Connection -> STM (Either RelationalError SessionId)

409createSessionAtCommit_ :: TransactionId -> SessionId -> Connection -> STM (Either RelationalError SessionId)

380createSessionAtCommit_ commitId newSessionId (InProcessConnection conf) = do

410createSessionAtCommit_ commitId newSessionId (InProcessConnection conf) = do

@@ -391,7 +421,7 @@ createSessionAtCommit_ commitId newSessionId (InProcessConnection conf) = do

391 Nothing -> do

421 Nothing -> do

392 StmMap.insert (Session freshDiscon defaultSchemaName) newSessionId sessions

422 StmMap.insert (Session freshDiscon defaultSchemaName) newSessionId sessions

393 pure $ Right newSessionId

423 pure $ Right newSessionId

394−createSessionAtCommit_ _ _ (RemoteConnection _) = error "createSessionAtCommit_ called on remote connection"

424+createSessionAtCommit_ _ _ (RemoteProcessConnection _) = error "createSessionAtCommit_ called on remote connection"

395

425

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.

426-- | 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.

397createSessionAtHead :: Connection -> HeadName -> IO (Either RelationalError SessionId)

427createSessionAtHead :: Connection -> HeadName -> IO (Either RelationalError SessionId)

@@ -403,18 +433,22 @@ createSessionAtHead conn@(InProcessConnection conf) headn = do

403 case transactionForHead headn graph of

433 case transactionForHead headn graph of

404 Nothing -> pure $ Left (NoSuchHeadNameError headn)

434 Nothing -> pure $ Left (NoSuchHeadNameError headn)

405 Just trans -> createSessionAtCommit_ (transactionId trans) newSessionId conn

435 Just trans -> createSessionAtCommit_ (transactionId trans) newSessionId conn

406−createSessionAtHead conn@(RemoteConnection _) headn = remoteCall conn (CreateSessionAtHead headn)

436+createSessionAtHead conn@(RemoteProcessConnection _) headn = remoteCall conn (CreateSessionAtHead headn)

437+

438+-- | Used internally for server connections to keep track of remote nodes for the purpose of sending notifications later.

439+addClientNode :: Connection -> ProcessId -> IO ()

440+addClientNode (RemoteProcessConnection _) _ = error "addClientNode called on remote connection"

441+addClientNode (InProcessConnection conf) newProcessId = atomically (StmSet.insert newProcessId (ipClientNodes conf))

407

442

408-- | Discards a session, eliminating any uncommitted changes present in the session.

443-- | Discards a session, eliminating any uncommitted changes present in the session.

409closeSession :: SessionId -> Connection -> IO ()

444closeSession :: SessionId -> Connection -> IO ()

410closeSession sessionId (InProcessConnection conf) =

445closeSession sessionId (InProcessConnection conf) =

411 atomically $ StmMap.delete sessionId (ipSessions conf)

446 atomically $ StmMap.delete sessionId (ipSessions conf)

412−closeSession sessionId conn@(RemoteConnection _) = remoteCall conn (CloseSession sessionId)

447+closeSession sessionId conn@(RemoteProcessConnection _) = remoteCall conn (CloseSession sessionId)

413

448

414-- | 'close' cleans up the database access connection and closes any relevant sockets.

449-- | 'close' cleans up the database access connection and closes any relevant sockets.

415close :: Connection -> IO ()

450close :: Connection -> IO ()

416close (InProcessConnection conf) = do

451close (InProcessConnection conf) = do

417− cancel (ipCallbackAsync conf)

418 atomically $ do

452 atomically $ do

419 let sessions = ipSessions conf

453 let sessions = ipSessions conf

420#if MIN_VERSION_stm_containers(1,0,0)

454#if MIN_VERSION_stm_containers(1,0,0)

@@ -423,18 +457,22 @@ close (InProcessConnection conf) = do

423 StmMap.deleteAll sessions

457 StmMap.deleteAll sessions

424#endif

458#endif

425 pure ()

459 pure ()

460+ closeLocalNode (ipLocalNode conf)

461+ closeTransport (ipTransport conf)

426 let mLocks = ipLocks conf

462 let mLocks = ipLocks conf

427 case mLocks of

463 case mLocks of

428 Nothing -> pure ()

464 Nothing -> pure ()

429 Just (lockFileH, _) -> closeLockFile lockFileH

465 Just (lockFileH, _) -> closeLockFile lockFileH

430

466

431−close (RemoteConnection (RemoteConnectionConf conn)) =

467+close conn@(RemoteProcessConnection conf) = do

432− RPC.close conn

468+ _ <- remoteCall conn Logout :: IO Bool

469+ closeLocalNode (rLocalNode conf)

470+ closeTransport (rTransport conf)

433

471

434--used only by the server EntryPoints

472--used only by the server EntryPoints

435closeRemote_ :: Connection -> IO ()

473closeRemote_ :: Connection -> IO ()

436closeRemote_ (InProcessConnection _) = error "invalid call of closeRemote_ on InProcessConnection"

474closeRemote_ (InProcessConnection _) = error "invalid call of closeRemote_ on InProcessConnection"

437−closeRemote_ (RemoteConnection (RemoteConnectionConf conn)) = RPC.close conn

475+closeRemote_ (RemoteProcessConnection conf) = runProcess (rLocalNode conf) (reconnect (rProcessId conf))

438

476

439 --we need to actually close the localNode's connection to the remote

477 --we need to actually close the localNode's connection to the remote

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

478--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

@@ -445,15 +483,35 @@ excEither = handle handler

445 where

483 where

446 handler exc | Just (_ :: AsyncException) <- fromException exc = throwIO exc

484 handler exc | Just (_ :: AsyncException) <- fromException exc = throwIO exc

447 | otherwise = pure (Left (UnhandledExceptionError (show exc)))

485 | otherwise = pure (Left (UnhandledExceptionError (show exc)))

486+

487+runProcessResult :: LocalNode -> Process a -> IO a

488+runProcessResult localNode proc = do

489+ ret <- newEmptyMVar

490+ runProcess localNode $ do

491+ val <- proc

492+ liftIO $ putMVar ret val

493+ takeMVar ret

494+

495+safeLogin :: Login -> ProcessId -> Process Bool

496+safeLogin login procId = do

497+ ret <- call procId login

498+ case ret of

499+ Left (_ :: ServerError) -> pure False

500+ Right val -> pure val

448

501

449−

450−remoteCall :: (Serialise a, Serialise b) => Connection -> a -> IO b

502+remoteCall :: (Binary a, Binary b, Typeable a, Typeable b) => Connection -> a -> IO b

451remoteCall (InProcessConnection _ ) _ = error "remoteCall called on local connection"

503remoteCall (InProcessConnection _ ) _ = error "remoteCall called on local connection"

452−remoteCall (RemoteConnection (RemoteConnectionConf rpcConn)) arg = do

504+remoteCall (RemoteProcessConnection conf) arg = runProcessResult localNode $ do

453− eRet <- RPC.call rpcConn arg

505+ ret <- safeCall serverProcessId arg

454− case eRet of

506+ case ret of

455− Left err -> convertRPCErrors err

507+ Left err -> error ("server died: " ++ show err)

508+ Right ret' -> case ret' of

509+ Left RequestTimeoutError -> liftIO (throwIO RequestTimeoutException)

510+ Left (ProcessDiedError _) -> liftIO (throwIO RemoteProcessDiedException)

456− Right val -> pure val

511+ Right val -> pure val

512+ where

513+ localNode = rLocalNode conf

514+ serverProcessId = rProcessId conf

457

515

458sessionForSessionId :: SessionId -> Sessions -> STM (Either RelationalError Session)

516sessionForSessionId :: SessionId -> Sessions -> STM (Either RelationalError Session)

459sessionForSessionId sessionId sessions =

517sessionForSessionId sessionId sessions =

@@ -488,7 +546,7 @@ currentSchemaName sessionId (InProcessConnection conf) = atomically $ do

488 case eSession of

546 case eSession of

489 Left err -> pure (Left err)

547 Left err -> pure (Left err)

490 Right session -> pure (Right (Sess.schemaName session))

548 Right session -> pure (Right (Sess.schemaName session))

491−currentSchemaName sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveCurrentSchemaName sessionId)

549+currentSchemaName sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveCurrentSchemaName sessionId)

492

550

493-- | Switch to the named isomorphic schema.

551-- | Switch to the named isomorphic schema.

494setCurrentSchemaName :: SessionId -> Connection -> SchemaName -> IO (Either RelationalError ())

552setCurrentSchemaName :: SessionId -> Connection -> SchemaName -> IO (Either RelationalError ())

@@ -500,7 +558,7 @@ setCurrentSchemaName sessionId (InProcessConnection conf) sname = atomically $ d

500 Right session -> case Sess.setSchemaName sname session of

558 Right session -> case Sess.setSchemaName sname session of

501 Left err -> pure (Left err)

559 Left err -> pure (Left err)

502 Right newSession -> StmMap.insert newSession sessionId sessions >> pure (Right ())

560 Right newSession -> StmMap.insert newSession sessionId sessions >> pure (Right ())

503−setCurrentSchemaName sessionId conn@(RemoteConnection _) sname = remoteCall conn (ExecuteSetCurrentSchema sessionId sname)

561+setCurrentSchemaName sessionId conn@(RemoteProcessConnection _) sname = remoteCall conn (ExecuteSetCurrentSchema sessionId sname)

504

562

505-- | Execute a relational expression in the context of the session and connection. Relational expressions are queries and therefore cannot alter the database.

563-- | Execute a relational expression in the context of the session and connection. Relational expressions are queries and therefore cannot alter the database.

506executeRelationalExpr :: SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)

564executeRelationalExpr :: SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)

@@ -524,7 +582,7 @@ executeRelationalExpr sessionId (InProcessConnection conf) expr = excEither $ at

524 Right rel -> pure (force (Right rel)) -- this is necessary so that any undefined/error exceptions are spit out here

582 Right rel -> pure (force (Right rel)) -- this is necessary so that any undefined/error exceptions are spit out here

525 Left err -> pure (Left err)

583 Left err -> pure (Left err)

526

584

527−executeRelationalExpr sessionId conn@(RemoteConnection _) relExpr = remoteCall conn (ExecuteRelationalExpr sessionId relExpr)

585+executeRelationalExpr sessionId conn@(RemoteProcessConnection _) relExpr = remoteCall conn (ExecuteRelationalExpr sessionId relExpr)

528

586

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.

587-- | 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.

530executeDatabaseContextExpr :: SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError ())

588executeDatabaseContextExpr :: SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError ())

@@ -558,7 +616,7 @@ executeDatabaseContextExpr sessionId (InProcessConnection conf) expr = excEither

558 newSession = Session newDiscon (Sess.schemaName session)

616 newSession = Session newDiscon (Sess.schemaName session)

559 StmMap.insert newSession sessionId sessions

617 StmMap.insert newSession sessionId sessions

560 pure (Right ())

618 pure (Right ())

561−executeDatabaseContextExpr sessionId conn@(RemoteConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextExpr sessionId dbExpr)

619+executeDatabaseContextExpr sessionId conn@(RemoteProcessConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextExpr sessionId dbExpr)

562

620

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.

621-- | 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.

564autoMergeToHead :: SessionId -> Connection -> MergeStrategy -> HeadName -> IO (Either RelationalError ())

622autoMergeToHead :: SessionId -> Connection -> MergeStrategy -> HeadName -> IO (Either RelationalError ())

@@ -587,7 +645,7 @@ autoMergeToHead sessionId (InProcessConnection conf) strat headName' = do

587 Left err -> pure (Left err)

645 Left err -> pure (Left err)

588 Right ((discon', graph'), transactionIdsAdded) ->

646 Right ((discon', graph'), transactionIdsAdded) ->

589 pure (Right (discon', graph', transactionIdsAdded))

647 pure (Right (discon', graph', transactionIdsAdded))

590−autoMergeToHead sessionId conn@(RemoteConnection _) strat headName' = remoteCall conn (ExecuteAutoMergeToHead sessionId strat headName')

648+autoMergeToHead sessionId conn@(RemoteProcessConnection _) strat headName' = remoteCall conn (ExecuteAutoMergeToHead sessionId strat headName')

591

649

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.

650-- | Execute a database context IO-monad-based expression for the given session and connection. `DatabaseContextIOExpr`s modify the DatabaseContext but cannot be purely implemented.

593--this is almost completely identical to executeDatabaseContextExpr above

651--this is almost completely identical to executeDatabaseContextExpr above

@@ -613,8 +671,22 @@ executeDatabaseContextIOExpr sessionId (InProcessConnection conf) expr = excEith

613 context' = RE.dbc_context newState

671 context' = RE.dbc_context newState

614 atomically $ StmMap.insert newSession sessionId sessions

672 atomically $ StmMap.insert newSession sessionId sessions

615 pure (Right ())

673 pure (Right ())

616−executeDatabaseContextIOExpr sessionId conn@(RemoteConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextIOExpr sessionId dbExpr)

674+executeDatabaseContextIOExpr sessionId conn@(RemoteProcessConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextIOExpr sessionId dbExpr)

617

675

676+{-

677+executeGraphExprSTM_ :: TransactionId -> SessionId -> Session -> Sessions -> TransactionGraphOperator -> TransactionGraph -> TVar TransactionGraph -> STM (Either RelationalError (TransactionGraph, DisconnectedTransaction)

678+executeGraphExprSTM_ freshId sessionId session sessions graphExpr graph graphTVar= do

679+ case evalGraphOp freshId (Sess.disconnectedTransaction session) graph graphExpr of

680+ Left err -> do

681+ when updateGraphOnError (writeTVar graphTVar graph)

682+ pure $ Left err

683+ Right (discon', graph') -> do

684+ writeTVar graphTVar graph'

685+ let newSession = Session discon' (Sess.schemaName session)

686+ STMMap.insert newSession sessionId sessions

687+ pure $ Right graph'

688+-}

689+

618-- process notifications for commits

690-- process notifications for commits

619executeCommitExprSTM_

691executeCommitExprSTM_

620 :: TransactionGraph

692 :: TransactionGraph

@@ -655,8 +727,78 @@ executeGraphExpr sessionId (InProcessConnection conf) graphExpr = excEither $ do

655 --if freshId appears in the graph, then we need to pass it on

727 --if freshId appears in the graph, then we need to pass it on

656 let transIds = [freshId | isRight (RE.transactionForId freshId graph')]

728 let transIds = [freshId | isRight (RE.transactionForId freshId graph')]

657 pure (Right (discon', graph', transIds))

729 pure (Right (discon', graph', transIds))

658−

730+{-

731+executeGraphExpr sessionId (InProcessConnection conf) graphExpr = excEither $ do

732+ let strat = ipPersistenceStrategy conf

733+ clientNodes = ipClientNodes conf

734+ sessions = ipSessions conf

735+ graphTvar = ipTransactionGraph conf

736+ mLockFileH = ipLocks conf

737+ lockHandler body = case graphExpr of

738+ Commit -> case mLockFileH of

739+ Nothing -> body False

740+ Just (lockFileH, lockMVar) -> let acquireLocks = do

741+ lastWrittenDigest <- takeMVar lockMVar

742+ lockFile lockFileH WriteLock

743+ latestDigest <- readGraphTransactionIdDigest strat

744+ pure (latestDigest /= lastWrittenDigest)

745+

746+ releaseLocks _ = do

747+ --still holding the lock- get the latest digest

748+ gDigest <- readGraphTransactionIdDigest strat

749+ unlockFile lockFileH

750+ putMVar lockMVar gDigest

751+ in bracket acquireLocks releaseLocks body

752+ _ -> body False

753+ freshId <- nextRandom

754+ lockHandler $ \dbWrittenByOtherProcess -> do

755+ --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

756+ --read transaction data and compare to existing graph

757+ --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)

758+ manip <- atomically $ do

759+ eSession <- sessionForSessionId sessionId sessions

760+ --handle graph update by other process

761+ oldGraph <- readTVar graphTvar

762+ case eSession of

763+ Left err -> pure (Left err)

764+ Right session -> do

765+ let mScriptSession = ipScriptSession conf

766+ dbdir = case strat of

767+ MinimalPersistence x -> x

768+ CrashSafePersistence x -> x

769+ _ -> error "accessing dbdir on non-persisted connection"

770+ eRefreshedGraph <- if dbWrittenByOtherProcess then

771+ unsafeIOToSTM (transactionGraphLoad dbdir oldGraph mScriptSession)

772+ else

773+ pure (Right oldGraph)

774+ case eRefreshedGraph of

775+ Left err -> pure (Left (DatabaseLoadError err))

776+ Right refreshedGraph -> do

777+ --snip it

778+ eGraph <- executeGraphExprSTM_ dbWrittenByOtherProcess freshId sessionId session sessions graphExpr refreshedGraph graphTvar

779+ --snip it

780+ case eGraph of

781+ Left err -> pure (Left err)

782+ Right newGraph -> do

783+ --handle commit

784+ if isCommit graphExpr then do

785+ case transactionForId (Sess.parentId session) oldGraph of

786+ Left err -> pure $ Left err

787+ Right previousTrans -> do

788+ (evaldNots, nodes) <- executeCommitExprSTM_ (Trans.concreteDatabaseContext previousTrans) (Sess.concreteDatabaseContext session) clientNodes

789+ nodesToNotify <- toList (StmSet.stream nodes)

790+ pure $ Right (evaldNots, nodesToNotify, newGraph)

791+ else

792+ pure $ Right (M.empty, [], newGraph)

793+ case manip of

794+ Left err -> return $ Just err

795+ Right (notsToFire, nodesToNotify, newGraph) -> do

796+ --update filesystem database, if necessary

797+ processTransactionGraphPersistence strat newGraph

798+ sendNotifications nodesToNotify (ipLocalNode conf) notsToFire

799+ pure Nothing

800+-}

659−executeGraphExpr sessionId conn@(RemoteConnection _) graphExpr = remoteCall conn (ExecuteGraphExpr sessionId graphExpr)

801+executeGraphExpr sessionId conn@(RemoteProcessConnection _) graphExpr = remoteCall conn (ExecuteGraphExpr sessionId graphExpr)

660

802

661-- | A trans-graph expression is a relational query executed against the entirety of a transaction graph.

803-- | A trans-graph expression is a relational query executed against the entirety of a transaction graph.

662executeTransGraphRelationalExpr :: SessionId -> Connection -> TransGraphRelationalExpr -> IO (Either RelationalError Relation)

804executeTransGraphRelationalExpr :: SessionId -> Connection -> TransGraphRelationalExpr -> IO (Either RelationalError Relation)

@@ -664,7 +806,10 @@ executeTransGraphRelationalExpr _ (InProcessConnection conf) tgraphExpr = excEit

664 let graphTvar = ipTransactionGraph conf

806 let graphTvar = ipTransactionGraph conf

665 graph <- readTVar graphTvar

807 graph <- readTVar graphTvar

666 pure $ force $ optimizeAndEvalTransGraphRelationalExpr graph tgraphExpr

808 pure $ force $ optimizeAndEvalTransGraphRelationalExpr graph tgraphExpr

809+{- case runReader (RE.evalRelationalExpr relExpr) (RE.mkRelationalExprState DBC.empty) of

810+ Left err -> pure (Left err)

811+ Right rel -> pure (force (Right rel))-}

667−executeTransGraphRelationalExpr sessionId conn@(RemoteConnection _) tgraphExpr = remoteCall conn (ExecuteTransGraphRelationalExpr sessionId tgraphExpr)

812+executeTransGraphRelationalExpr sessionId conn@(RemoteProcessConnection _) tgraphExpr = remoteCall conn (ExecuteTransGraphRelationalExpr sessionId tgraphExpr)

668

813

669-- | Schema expressions manipulate the isomorphic schemas for the current 'DatabaseContext'.

814-- | Schema expressions manipulate the isomorphic schemas for the current 'DatabaseContext'.

670executeSchemaExpr :: SessionId -> Connection -> Schema.SchemaExpr -> IO (Either RelationalError ())

815executeSchemaExpr :: SessionId -> Connection -> Schema.SchemaExpr -> IO (Either RelationalError ())

@@ -687,24 +832,23 @@ executeSchemaExpr sessionId (InProcessConnection conf) schemaExpr = atomically $

687 newSession = Session (DisconnectedTransaction (Discon.parentId discon) newSchemas False) (Sess.schemaName session)

832 newSession = Session (DisconnectedTransaction (Discon.parentId discon) newSchemas False) (Sess.schemaName session)

688 StmMap.insert newSession sessionId sessions

833 StmMap.insert newSession sessionId sessions

689 pure (Right ())

834 pure (Right ())

690−executeSchemaExpr sessionId conn@(RemoteConnection _) schemaExpr = remoteCall conn (ExecuteSchemaExpr sessionId schemaExpr)

835+executeSchemaExpr sessionId conn@(RemoteProcessConnection _) schemaExpr = remoteCall conn (ExecuteSchemaExpr sessionId schemaExpr)

691

836

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.

837-- | 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.

693commit :: SessionId -> Connection -> IO (Either RelationalError ())

838commit :: SessionId -> Connection -> IO (Either RelationalError ())

694commit sessionId conn@(InProcessConnection _) = executeGraphExpr sessionId conn Commit

839commit sessionId conn@(InProcessConnection _) = executeGraphExpr sessionId conn Commit

695−commit sessionId conn@(RemoteConnection _) = remoteCall conn (ExecuteGraphExpr sessionId Commit)

840+commit sessionId conn@(RemoteProcessConnection _) = remoteCall conn (ExecuteGraphExpr sessionId Commit)

696−

841+

697−sendNotifications :: [ClientInfo] -> EvaluatedNotifications -> IO ()

842+sendNotifications :: [ProcessId] -> LocalNode -> EvaluatedNotifications -> IO ()

698−sendNotifications clients notifs =

843+sendNotifications pids localNode nots = mapM_ sendNots pids

699− unless (M.null notifs) $ forM_ clients sender

844+ where

700− where

845+ sendNots remoteClientPid =

701− sender (RemoteClientInfo sock) = RPC.sendMessage sock (NotificationMessage notifs)

846+ unless (M.null nots) $ runProcess localNode $ send remoteClientPid (NotificationMessage nots)

702− sender (InProcessClientInfo tvar) = putMVar tvar notifs

847+

703−

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.

848-- | 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.

705rollback :: SessionId -> Connection -> IO (Either RelationalError ())

849rollback :: SessionId -> Connection -> IO (Either RelationalError ())

706rollback sessionId conn@(InProcessConnection _) = executeGraphExpr sessionId conn Rollback

850rollback sessionId conn@(InProcessConnection _) = executeGraphExpr sessionId conn Rollback

707−rollback sessionId conn@(RemoteConnection _) = remoteCall conn (ExecuteGraphExpr sessionId Rollback)

851+rollback sessionId conn@(RemoteProcessConnection _) = remoteCall conn (ExecuteGraphExpr sessionId Rollback)

708

852

709-- | Write the transaction graph to disk. This function can be used to incrementally write new transactions to disk.

853-- | Write the transaction graph to disk. This function can be used to incrementally write new transactions to disk.

710processTransactionGraphPersistence :: PersistenceStrategy -> [TransactionId] -> TransactionGraph -> IO ()

854processTransactionGraphPersistence :: PersistenceStrategy -> [TransactionId] -> TransactionGraph -> IO ()

@@ -720,7 +864,7 @@ readGraphTransactionIdDigest (CrashSafePersistence dbdir) = readGraphTransaction

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.

864-- | 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.

721typeForRelationalExpr :: SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)

865typeForRelationalExpr :: SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)

722typeForRelationalExpr sessionId conn@(InProcessConnection _) relExpr = atomically $ typeForRelationalExprSTM sessionId conn relExpr

866typeForRelationalExpr sessionId conn@(InProcessConnection _) relExpr = atomically $ typeForRelationalExprSTM sessionId conn relExpr

723−typeForRelationalExpr sessionId conn@(RemoteConnection _) relExpr = remoteCall conn (ExecuteTypeForRelationalExpr sessionId relExpr)

867+typeForRelationalExpr sessionId conn@(RemoteProcessConnection _) relExpr = remoteCall conn (ExecuteTypeForRelationalExpr sessionId relExpr)

724

868

725typeForRelationalExprSTM :: SessionId -> Connection -> RelationalExpr -> STM (Either RelationalError Relation)

869typeForRelationalExprSTM :: SessionId -> Connection -> RelationalExpr -> STM (Either RelationalError Relation)

726typeForRelationalExprSTM sessionId (InProcessConnection conf) relExpr = do

870typeForRelationalExprSTM sessionId (InProcessConnection conf) relExpr = do

@@ -757,7 +901,7 @@ inclusionDependencies sessionId (InProcessConnection conf) = do

757 else

901 else

758 pure (Schema.inclusionDependenciesInSchema schema (B.inclusionDependencies context))

902 pure (Schema.inclusionDependenciesInSchema schema (B.inclusionDependencies context))

759

903

760−inclusionDependencies sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveInclusionDependencies sessionId)

904+inclusionDependencies sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveInclusionDependencies sessionId)

761

905

762typeConstructorMapping :: SessionId -> Connection -> IO (Either RelationalError TypeConstructorMapping)

906typeConstructorMapping :: SessionId -> Connection -> IO (Either RelationalError TypeConstructorMapping)

763typeConstructorMapping sessionId (InProcessConnection conf) = do

907typeConstructorMapping sessionId (InProcessConnection conf) = do

@@ -768,7 +912,7 @@ typeConstructorMapping sessionId (InProcessConnection conf) = do

768 Left err -> pure $ Left err

912 Left err -> pure $ Left err

769 Right (session, _) -> --warning, no schema support for typeconstructors

913 Right (session, _) -> --warning, no schema support for typeconstructors

770 pure (Right (B.typeConstructorMapping (Sess.concreteDatabaseContext session)))

914 pure (Right (B.typeConstructorMapping (Sess.concreteDatabaseContext session)))

771−typeConstructorMapping sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveTypeConstructorMapping sessionId)

915+typeConstructorMapping sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveTypeConstructorMapping sessionId)

772

916

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.

917-- | 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.

774planForDatabaseContextExpr :: SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError GraphRefDatabaseContextExpr)

918planForDatabaseContextExpr :: SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError GraphRefDatabaseContextExpr)

@@ -788,7 +932,7 @@ planForDatabaseContextExpr sessionId (InProcessConnection conf) dbExpr = do

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-}

932 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-}

789 pure (Left NonConcreteSchemaPlanError)

933 pure (Left NonConcreteSchemaPlanError)

790

934

791−planForDatabaseContextExpr sessionId conn@(RemoteConnection _) dbExpr = remoteCall conn (RetrievePlanForDatabaseContextExpr sessionId dbExpr)

935+planForDatabaseContextExpr sessionId conn@(RemoteProcessConnection _) dbExpr = remoteCall conn (RetrievePlanForDatabaseContextExpr sessionId dbExpr)

792

936

793-- | Return a relation which represents the current state of the global transaction graph. The attributes are

937-- | Return a relation which represents the current state of the global transaction graph. The attributes are

794-- * current- boolean attribute representing whether or not the current session references this transaction

938-- * current- boolean attribute representing whether or not the current session references this transaction

@@ -806,7 +950,7 @@ transactionGraphAsRelation sessionId (InProcessConnection conf) = do

806 Right session ->

950 Right session ->

807 graphAsRelation (Sess.disconnectedTransaction session) <$> readTVar tvar

951 graphAsRelation (Sess.disconnectedTransaction session) <$> readTVar tvar

808

952

809−transactionGraphAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveTransactionGraph sessionId)

953+transactionGraphAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveTransactionGraph sessionId)

810

954

811-- | Returns the names and types of the relation variables in the current 'Session'.

955-- | Returns the names and types of the relation variables in the current 'Session'.

812relationVariablesAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)

956relationVariablesAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)

@@ -828,7 +972,7 @@ relationVariablesAsRelation sessionId (InProcessConnection conf) = do

828 let schemaContext = context {relationVariables = relvars }

972 let schemaContext = context {relationVariables = relvars }

829 pure $ RE.relationVariablesAsRelation schemaContext graph

973 pure $ RE.relationVariablesAsRelation schemaContext graph

830

974

831−relationVariablesAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveRelationVariableSummary sessionId)

975+relationVariablesAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveRelationVariableSummary sessionId)

832

976

833-- | Returns the names and types of the atom functions in the current 'Session'.

977-- | Returns the names and types of the atom functions in the current 'Session'.

834atomFunctionsAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)

978atomFunctionsAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)

@@ -841,7 +985,7 @@ atomFunctionsAsRelation sessionId (InProcessConnection conf) = do

841 Right (session, _) ->

985 Right (session, _) ->

842 pure (AF.atomFunctionsAsRelation (atomFunctions (concreteDatabaseContext session)))

986 pure (AF.atomFunctionsAsRelation (atomFunctions (concreteDatabaseContext session)))

843

987

844−atomFunctionsAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveAtomFunctionSummary sessionId)

988+atomFunctionsAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveAtomFunctionSummary sessionId)

845

989

846databaseContextFunctionsAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)

990databaseContextFunctionsAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)

847databaseContextFunctionsAsRelation sessionId (InProcessConnection conf) = do

991databaseContextFunctionsAsRelation sessionId (InProcessConnection conf) = do

@@ -853,7 +997,7 @@ databaseContextFunctionsAsRelation sessionId (InProcessConnection conf) = do

853 Right (session, _) ->

997 Right (session, _) ->

854 pure (DCF.databaseContextFunctionsAsRelation (dbcFunctions (concreteDatabaseContext session)))

998 pure (DCF.databaseContextFunctionsAsRelation (dbcFunctions (concreteDatabaseContext session)))

855

999

856−databaseContextFunctionsAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveDatabaseContextFunctionSummary sessionId)

1000+databaseContextFunctionsAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveDatabaseContextFunctionSummary sessionId)

857

1001

858-- | Returns the transaction id for the connection's disconnected transaction committed parent transaction.

1002-- | Returns the transaction id for the connection's disconnected transaction committed parent transaction.

859headTransactionId :: SessionId -> Connection -> IO (Either RelationalError TransactionId)

1003headTransactionId :: SessionId -> Connection -> IO (Either RelationalError TransactionId)

@@ -864,7 +1008,7 @@ headTransactionId sessionId (InProcessConnection conf) = do

864 case eSession of

1008 case eSession of

865 Left err -> pure (Left err)

1009 Left err -> pure (Left err)

866 Right session -> pure $ Right (Sess.parentId session)

1010 Right session -> pure $ Right (Sess.parentId session)

867−headTransactionId sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveHeadTransactionId sessionId)

1011+headTransactionId sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveHeadTransactionId sessionId)

868

1012

869headNameSTM_ :: SessionId -> Sessions -> TVar TransactionGraph -> STM (Either RelationalError HeadName)

1013headNameSTM_ :: SessionId -> Sessions -> TVar TransactionGraph -> STM (Either RelationalError HeadName)

870headNameSTM_ sessionId sessions graphTvar = do

1014headNameSTM_ sessionId sessions graphTvar = do

@@ -884,7 +1028,7 @@ headName sessionId (InProcessConnection conf) = do

884 let sessions = ipSessions conf

1028 let sessions = ipSessions conf

885 graphTvar = ipTransactionGraph conf

1029 graphTvar = ipTransactionGraph conf

886 atomically (headNameSTM_ sessionId sessions graphTvar)

1030 atomically (headNameSTM_ sessionId sessions graphTvar)

887−headName sessionId conn@(RemoteConnection _) = remoteCall conn (ExecuteHeadName sessionId)

1031+headName sessionId conn@(RemoteProcessConnection _) = remoteCall conn (ExecuteHeadName sessionId)

888

1032

889-- | Returns a listing of all available atom types.

1033-- | Returns a listing of all available atom types.

890atomTypesAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)

1034atomTypesAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)

@@ -898,7 +1042,7 @@ atomTypesAsRelation sessionId (InProcessConnection conf) = do

898 case typesAsRelation (B.typeConstructorMapping (Sess.concreteDatabaseContext session)) of

1042 case typesAsRelation (B.typeConstructorMapping (Sess.concreteDatabaseContext session)) of

899 Left err -> pure (Left err)

1043 Left err -> pure (Left err)

900 Right rel -> pure (Right rel)

1044 Right rel -> pure (Right rel)

901−atomTypesAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveAtomTypesAsRelation sessionId)

1045+atomTypesAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveAtomTypesAsRelation sessionId)

902

1046

903disconnectedTransactionIsDirty :: SessionId -> Connection -> IO (Either RelationalError Bool)

1047disconnectedTransactionIsDirty :: SessionId -> Connection -> IO (Either RelationalError Bool)

904disconnectedTransactionIsDirty sessionId (InProcessConnection conf) = do

1048disconnectedTransactionIsDirty sessionId (InProcessConnection conf) = do

@@ -909,12 +1053,12 @@ disconnectedTransactionIsDirty sessionId (InProcessConnection conf) = do

909 Left err -> pure (Left err)

1053 Left err -> pure (Left err)

910 Right session ->

1054 Right session ->

911 pure (Right (isDirty session))

1055 pure (Right (isDirty session))

912−disconnectedTransactionIsDirty sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveSessionIsDirty sessionId)

1056+disconnectedTransactionIsDirty sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveSessionIsDirty sessionId)

913

1057

914--used only for testing- we expect this to throw an exception

1058--used only for testing- we expect this to throw an exception

915callTestTimeout_ :: SessionId -> Connection -> IO Bool

1059callTestTimeout_ :: SessionId -> Connection -> IO Bool

916callTestTimeout_ _ (InProcessConnection _) = error "bad testing call"

1060callTestTimeout_ _ (InProcessConnection _) = error "bad testing call"

917−callTestTimeout_ sessionId conn@(RemoteConnection _) = remoteCall conn (TestTimeout sessionId)

1061+callTestTimeout_ sessionId conn@(RemoteProcessConnection _) = remoteCall conn (TestTimeout sessionId)

918

1062

919--used in tests only

1063--used in tests only

920transactionGraph_ :: Connection -> IO TransactionGraph

1064transactionGraph_ :: Connection -> IO TransactionGraph

@@ -999,8 +1143,15 @@ commitLock_ sessionId conf stmBlock = do

999 Right (notsToFire, nodesToNotify, newGraph, transactionIdsToPersist) -> do

1143 Right (notsToFire, nodesToNotify, newGraph, transactionIdsToPersist) -> do

1000 --update filesystem database, if necessary

1144 --update filesystem database, if necessary

1001 processTransactionGraphPersistence strat transactionIdsToPersist newGraph

1145 processTransactionGraphPersistence strat transactionIdsToPersist newGraph

1002− sendNotifications nodesToNotify notsToFire

1146+ sendNotifications nodesToNotify (ipLocalNode conf) notsToFire

1003 pure (Right ())

1147 pure (Right ())

1148+{-

1149+writeDisconAndGraph_ :: TVar TransactionGraph -> SessionId -> Session -> Sessions -> DisconnectedTransaction -> TransactionGraph -> STM ()

1150+writeDisconAndGraph_ graphTvar sessionId session sessions discon graph = do

1151+ writeTVar graphTvar graph

1152+ let newSession = Session discon (Sess.schemaName session)

1153+ StmMap.insert newSession sessionId sessions

1154+-}

1004

1155

1005-- | Runs an IO monad, commits the result when the monad returns no errors, otherwise, rolls back the changes and the error.

1156-- | Runs an IO monad, commits the result when the monad returns no errors, otherwise, rolls back the changes and the error.

1006withTransaction :: SessionId -> Connection -> IO (Either RelationalError a) -> IO (Either RelationalError ()) -> IO (Either RelationalError a)

1157withTransaction :: SessionId -> Connection -> IO (Either RelationalError a) -> IO (Either RelationalError ()) -> IO (Either RelationalError a)

@@ -1052,44 +1203,5 @@ executeDataFrameExpr sessionId conn@(InProcessConnection _) dfExpr = do

1052 let dFrame' = maybe dFrame (`DF.drop'` dFrame) (DF.offset dfExpr)

1203 let dFrame' = maybe dFrame (`DF.drop'` dFrame) (DF.offset dfExpr)

1053 dFrame'' = maybe dFrame' (`DF.take'` dFrame') (DF.limit dfExpr)

1204 dFrame'' = maybe dFrame' (`DF.take'` dFrame') (DF.limit dfExpr)

1054 pure (Right dFrame'')

1205 pure (Right dFrame'')

1055−executeDataFrameExpr sessionId conn@(RemoteConnection _) dfExpr = remoteCall conn (ExecuteDataFrameExpr sessionId dfExpr)

1206+executeDataFrameExpr sessionId conn@(RemoteProcessConnection _) dfExpr = remoteCall conn (ExecuteDataFrameExpr sessionId dfExpr)

1056

1207

1057−validateMerkleHashes :: SessionId -> Connection -> IO (Either RelationalError ())

1058−validateMerkleHashes sessionId (InProcessConnection conf) = do

1059− let sessions = ipSessions conf

1060− atomically $ do

1061− eSession <- sessionForSessionId sessionId sessions

1062− case eSession of

1063− Left err -> pure (Left err)

1064− Right _ -> do

1065− graph <- readTVar (ipTransactionGraph conf)

1066− case Graph.validateMerkleHashes graph of

1067− Left merkleErrs -> pure $ Left $ someErrors (map (\(MerkleValidationError tid expected actual) -> MerkleHashValidationError tid expected actual) merkleErrs)

1068− Right () -> pure (Right ())

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+14−21

@@ -1,8 +1,8 @@

1−{-# LANGUAGE DeriveGeneric, DerivingVia #-}

1+{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}

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

4import ProjectM36.Base

5−import ProjectM36.Attribute as A hiding (drop)

5+import ProjectM36.Attribute as A

6import ProjectM36.Error

7import qualified ProjectM36.Relation as R

8import ProjectM36.Relation.Show.Term

@@ -16,19 +16,15 @@ import qualified Data.List as L

16import qualified Data.Set as S

17import Data.Maybe

18import qualified Data.Text as T

19+import Data.Binary

19import Control.Arrow

20import Control.Arrow

20#if __GLASGOW_HASKELL__ < 804

21#if __GLASGOW_HASKELL__ < 804

21import Data.Monoid

22import Data.Monoid

22#endif

23#endif

23

24

24−data AttributeOrderExpr = AttributeOrderExpr AttributeName Order

25+data AttributeOrderExpr = AttributeOrderExpr AttributeName Order deriving (Show, Generic, Binary)

25− deriving (Show, Generic)

26−

27−data AttributeOrder = AttributeOrder AttributeName Order

26+data AttributeOrder = AttributeOrder AttributeName Order deriving (Show, Generic, Binary)

28− deriving (Show, Generic)

29−

30−data Order = AscendingOrder | DescendingOrder

27+data Order = AscendingOrder | DescendingOrder deriving (Eq, Show, Generic, Binary)

31− deriving (Eq, Show, Generic)

32

28

33ascending :: T.Text

29ascending :: T.Text

34ascending = "⬆"

30ascending = "⬆"

@@ -43,11 +39,9 @@ data DataFrame = DataFrame {

43 orders :: [AttributeOrder],

39 orders :: [AttributeOrder],

44 attributes :: Attributes,

40 attributes :: Attributes,

45 tuples :: [DataFrameTuple]

41 tuples :: [DataFrameTuple]

46− }

47− deriving (Show, Generic)

42+ } deriving (Show, Generic, Binary)

48

43

49−data DataFrameTuple = DataFrameTuple Attributes (V.Vector Atom)

44+data DataFrameTuple = DataFrameTuple Attributes (V.Vector Atom) deriving (Eq, Show, Generic, Binary)

50− deriving (Eq, Show, Generic)

51

45

52sortDataFrameBy :: [AttributeOrder] -> DataFrame -> Either RelationalError DataFrame

46sortDataFrameBy :: [AttributeOrder] -> DataFrame -> Either RelationalError DataFrame

53sortDataFrameBy attrOrders frame = do

47sortDataFrameBy attrOrders frame = do

@@ -81,7 +75,7 @@ compareTupleByOneAttributeName attr tuple1 tuple2 =

81 Right atom2 -> compareAtoms atom1 atom2

75 Right atom2 -> compareAtoms atom1 atom2

82

76

83atomForAttributeName :: AttributeName -> DataFrameTuple -> Either RelationalError Atom

77atomForAttributeName :: AttributeName -> DataFrameTuple -> Either RelationalError Atom

84−atomForAttributeName attrName (DataFrameTuple tupAttrs tupVec) = case V.findIndex (\attr -> attributeName attr == attrName) (attributesVec tupAttrs) of

78+atomForAttributeName attrName (DataFrameTuple tupAttrs tupVec) = case V.findIndex (\attr -> attributeName attr == attrName) tupAttrs of

85 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))

79 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))

86 Just index -> case tupVec V.!? index of

80 Just index -> case tupVec V.!? index of

87 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))

81 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))

@@ -128,18 +122,17 @@ data DataFrameExpr = DataFrameExpr {

128 orderExprs :: [AttributeOrderExpr],

122 orderExprs :: [AttributeOrderExpr],

129 offset :: Maybe Integer,

123 offset :: Maybe Integer,

130 limit :: Maybe Integer

124 limit :: Maybe Integer

131− }

132− deriving (Show, Generic)

125+ } deriving (Show, Binary, Generic)

133

126

134dataFrameAsHTML :: DataFrame -> T.Text

127dataFrameAsHTML :: DataFrame -> T.Text

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

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

136dataFrameAsHTML df

129dataFrameAsHTML df

137− | length (tuples df) == 1 && A.null (attributes df) = style <>

130+ | length (tuples df) == 1 && L.null (attributes df) = style <>

138 tablestart <>

131 tablestart <>

139 "<tr><th></th></tr>" <>

132 "<tr><th></th></tr>" <>

140 "<tr><td></td></tr>" <>

133 "<tr><td></td></tr>" <>

141 tablefooter <> "</table>"

134 tablefooter <> "</table>"

142− | L.null (tuples df) && A.null (attributes df) = style <>

135+ | L.null (tuples df) && L.null (attributes df) = style <>

143 tablestart <>

136 tablestart <>

144 "<tr><th></th></tr>" <>

137 "<tr><th></th></tr>" <>

145 tablefooter <>

138 tablefooter <>

@@ -162,7 +155,7 @@ tuplesAsHTML = foldr folder ""

162 folder tuple acc = acc <> tupleAsHTML tuple

155 folder tuple acc = acc <> tupleAsHTML tuple

163

156

164tupleAssocs :: DataFrameTuple -> [(AttributeName, Atom)]

157tupleAssocs :: DataFrameTuple -> [(AttributeName, Atom)]

165−tupleAssocs (DataFrameTuple attrs tupVec) = V.toList $ V.map (first attributeName) (V.zip (attributesVec attrs) tupVec)

158+tupleAssocs (DataFrameTuple attrVec tupVec) = V.toList $ V.map (first attributeName) (V.zip attrVec tupVec)

166

159

167

160

168tupleAsHTML :: DataFrameTuple -> T.Text

161tupleAsHTML :: DataFrameTuple -> T.Text

@@ -174,7 +167,7 @@ tupleAsHTML tuple = "<tr>" <> T.concat (L.map tupleFrag (tupleAssocs tuple)) <>

174 atomAsHTML atom = atomToText atom

167 atomAsHTML atom = atomToText atom

175

168

176attributesAsHTML :: Attributes -> [AttributeOrder] -> T.Text

169attributesAsHTML :: Attributes -> [AttributeOrder] -> T.Text

177−attributesAsHTML attrs orders' = "<tr>" <> T.concat (map oneAttrHTML (A.toList attrs)) <> "</tr>"

170+attributesAsHTML attrs orders' = "<tr>" <> T.concat (map oneAttrHTML (V.toList attrs)) <> "</tr>"

178 where

171 where

179 oneAttrHTML attr = "<th>" <> prettyAttribute attr <> ordering (attributeName attr) <> "</th>"

172 oneAttrHTML attr = "<th>" <> prettyAttribute attr <> ordering (attributeName attr) <> "</th>"

180 ordering attrName = " " <> case L.find (\(AttributeOrder nam _) -> nam == attrName) orders' of

173 ordering attrName = " " <> case L.find (\(AttributeOrder nam _) -> nam == attrName) orders' of

src/lib/ProjectM36/DataTypes/Interval.hs−2

@@ -37,7 +37,6 @@ supportsInterval typ = case typ of

37 BoolAtomType -> False

38 RelationAtomType _ -> False

39 ConstructedAtomType _ _ -> False --once we support an interval-style typeclass, we might enable this

40− RelationalExprAtomType -> False

41 TypeVariableType _ -> False

40 TypeVariableType _ -> False

42

41

43supportsOrdering :: AtomType -> Bool

42supportsOrdering :: AtomType -> Bool

@@ -51,7 +50,6 @@ supportsOrdering typ = case typ of

51 ByteStringAtomType -> False

50 ByteStringAtomType -> False

52 BoolAtomType -> False

51 BoolAtomType -> False

53 RelationAtomType _ -> False

52 RelationAtomType _ -> False

54− RelationalExprAtomType -> False

55 ConstructedAtomType _ _ -> False --once we support an interval-style typeclass, we might enable this

53 ConstructedAtomType _ _ -> False --once we support an interval-style typeclass, we might enable this

56 TypeVariableType _ -> False

54 TypeVariableType _ -> False

57

55

src/lib/ProjectM36/DataTypes/Primitive.hs−1

@@ -42,4 +42,3 @@ atomTypeForAtom (ByteStringAtom _) = ByteStringAtomType

42atomTypeForAtom (BoolAtom _) = BoolAtomType

43atomTypeForAtom (RelationAtom (Relation attrs _)) = RelationAtomType attrs

44atomTypeForAtom (ConstructedAtom _ aType _) = aType

45−atomTypeForAtom (RelationalExprAtom _) = RelationalExprAtomType

src/lib/ProjectM36/DataTypes/Sorting.hs−1

@@ -24,7 +24,6 @@ isSortableAtomType typ = case typ of

24 DateTimeAtomType -> True

25 ByteStringAtomType -> False

26 BoolAtomType -> True

27− RelationalExprAtomType -> False

28 RelationAtomType _ -> False

27 RelationAtomType _ -> False

29 ConstructedAtomType _ _ -> False

28 ConstructedAtomType _ _ -> False

30 TypeVariableType _ -> False

29 TypeVariableType _ -> False

src/lib/ProjectM36/DatabaseContext.hs+2−17

@@ -1,15 +1,11 @@

1module ProjectM36.DatabaseContext where

2import ProjectM36.Base

3−import Control.Monad (void)

4import qualified Data.Map as M

3import qualified Data.Map as M

5import qualified Data.HashSet as HS

4import qualified Data.HashSet as HS

6import ProjectM36.DataTypes.Basic

5import ProjectM36.DataTypes.Basic

7import ProjectM36.AtomFunctions.Basic

6import ProjectM36.AtomFunctions.Basic

7+import ProjectM36.DatabaseContextFunction

8import ProjectM36.Relation

9−import qualified Data.ByteString.Lazy as BL

10−import ProjectM36.AtomFunction as AF

11−import ProjectM36.DatabaseContextFunction as DBCF

12−import Codec.Winery

13

9

14empty :: DatabaseContext

10empty :: DatabaseContext

15empty = DatabaseContext { inclusionDependencies = M.empty,

11empty = DatabaseContext { inclusionDependencies = M.empty,

@@ -21,7 +17,7 @@ empty = DatabaseContext { inclusionDependencies = M.empty,

21

17

22-- | Remove TransactionId markers on GraphRefRelationalExpr

18-- | Remove TransactionId markers on GraphRefRelationalExpr

23stripGraphRefRelationalExpr :: GraphRefRelationalExpr -> RelationalExpr

19stripGraphRefRelationalExpr :: GraphRefRelationalExpr -> RelationalExpr

24−stripGraphRefRelationalExpr = void

20+stripGraphRefRelationalExpr = fmap (const ())

25

21

26-- | convert an existing database context into its constituent expression.

22-- | convert an existing database context into its constituent expression.

27databaseContextAsDatabaseContextExpr :: DatabaseContext -> DatabaseContextExpr

23databaseContextAsDatabaseContextExpr :: DatabaseContext -> DatabaseContextExpr

@@ -41,14 +37,3 @@ basicDatabaseContext = DatabaseContext { inclusionDependencies = M.empty,

41 notifications = M.empty,

37 notifications = M.empty,

42 typeConstructorMapping = basicTypeConstructorMapping

38 typeConstructorMapping = basicTypeConstructorMapping

43 }

39 }

44−

45−--for building the Merkle hash

46−hashBytes :: DatabaseContext -> BL.ByteString

47−hashBytes ctx = BL.fromChunks [incDeps, rvs, nots, tConsMap] <> atomFs <> dbcFs

48− where

49− incDeps = serialise (inclusionDependencies ctx)

50− rvs = serialise (relationVariables ctx)

51− atomFs = HS.foldr (mappend . AF.hashBytes) mempty (atomFunctions ctx)

52− dbcFs = HS.foldr (mappend . DBCF.hashBytes) mempty (dbcFunctions ctx)

53− nots = serialise (notifications ctx)

54− tConsMap = serialise (typeConstructorMapping ctx)

src/lib/ProjectM36/DatabaseContextFunction.hs+1−12

@@ -3,7 +3,6 @@ module ProjectM36.DatabaseContextFunction where

3--implements functions which operate as: [Atom] -> DatabaseContextExpr -> Either RelationalError DatabaseContextExpr

4import ProjectM36.Base

5import ProjectM36.Error

6−import ProjectM36.Serialise.Base ()

7import ProjectM36.Attribute as A

6import ProjectM36.Attribute as A

8import ProjectM36.Relation

7import ProjectM36.Relation

9import ProjectM36.AtomType

8import ProjectM36.AtomType

@@ -11,8 +10,6 @@ import qualified Data.HashSet as HS

11import qualified Data.Map as M

10import qualified Data.Map as M

12import ProjectM36.ScriptSession

11import ProjectM36.ScriptSession

13import qualified Data.Text as T

12import qualified Data.Text as T

14−import qualified Data.ByteString.Lazy as BL

15−import Codec.Winery

16

13

17emptyDatabaseContextFunction :: DatabaseContextFunctionName -> DatabaseContextFunction

14emptyDatabaseContextFunction :: DatabaseContextFunctionName -> DatabaseContextFunction

18emptyDatabaseContextFunction name = DatabaseContextFunction {

15emptyDatabaseContextFunction name = DatabaseContextFunction {

@@ -80,12 +77,4 @@ databaseContextFunctionsAsRelation dbcFuncs = mkRelationFromList attrs tups

80 dbcFuncToTuple func = [TextAtom (dbcFuncName func),

77 dbcFuncToTuple func = [TextAtom (dbcFuncName func),

81 TextAtom (dbcTextType (dbcFuncType func))]

78 TextAtom (dbcTextType (dbcFuncType func))]

82 dbcTextType typ = T.intercalate " -> " (map prettyAtomType typ ++ ["DatabaseContext", "DatabaseContext"])

79 dbcTextType typ = T.intercalate " -> " (map prettyAtomType typ ++ ["DatabaseContext", "DatabaseContext"])

83−

80+

84−-- for merkle hash

85−hashBytes :: DatabaseContextFunction -> BL.ByteString

86−hashBytes func = BL.fromChunks [fname, ftype, fbody]

87− where

88− fname = serialise (dbcFuncName func)

89− ftype = serialise (dbcFuncType func)

90− fbody = case dbcFuncBody func of

91− DatabaseContextFunctionBody mBody _ -> serialise mBody

src/lib/ProjectM36/DatabaseContextFunctionError.hs+2−1

@@ -1,8 +1,9 @@

1{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}

2module ProjectM36.DatabaseContextFunctionError where

3import GHC.Generics

4+import Data.Binary

4import Control.DeepSeq

5import Control.DeepSeq

5

6

6{-# ANN module ("HLint: ignore Use newtype instead of data" :: String) #-}

7{-# ANN module ("HLint: ignore Use newtype instead of data" :: String) #-}

7data DatabaseContextFunctionError = DatabaseContextFunctionUserError String

8data DatabaseContextFunctionError = DatabaseContextFunctionUserError String

8− deriving (Generic, Eq, Show, NFData)

9+ deriving (Generic, Eq, Show, Binary, NFData)

src/lib/ProjectM36/Error.hs+14−19

@@ -1,7 +1,6 @@

1{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}

2module ProjectM36.Error where

3import ProjectM36.Base

4−import ProjectM36.MerkleHash

5import ProjectM36.DatabaseContextFunctionError

4import ProjectM36.DatabaseContextFunctionError

6import ProjectM36.AtomFunctionError

5import ProjectM36.AtomFunctionError

7import qualified Data.Set as S

6import qualified Data.Set as S

@@ -9,6 +8,7 @@ import Control.DeepSeq (NFData, rnf)

9import Control.DeepSeq.Generics (genericRnf)

8import Control.DeepSeq.Generics (genericRnf)

10import GHC.Generics (Generic)

9import GHC.Generics (Generic)

11import qualified Data.Text as T

10import qualified Data.Text as T

11+import Data.Binary

12import Data.Typeable

13import Control.Exception

14

@@ -81,7 +81,7 @@ data RelationalError = NoSuchAttributeNamesError (S.Set AttributeName)

81 | RelationValuedAttributesNotSupportedError [AttributeName]

82 | NotificationNameInUseError NotificationName

83 | NotificationNameNotInUseError NotificationName

84− | ImportError ImportError'

84+ | ImportError T.Text -- really? This should be broken out into some other error type- this has nothing to do with relational algebra

85 | ExportError T.Text

86 | UnhandledExceptionError String

87 | MergeTransactionError MergeError

@@ -101,16 +101,14 @@ data RelationalError = NoSuchAttributeNamesError (S.Set AttributeName)

101

102 | NoUncommittedContextInEvalError

103 | TupleExprsReferenceMultipleMarkersError

104−

104+

105− | MerkleHashValidationError TransactionId MerkleHash MerkleHash

106−

107 | MultipleErrors [RelationalError]

105 | MultipleErrors [RelationalError]

108− deriving (Show,Eq,Generic,Typeable, NFData)

106+ deriving (Show,Eq,Generic,Binary,Typeable, NFData)

109

107

110data PersistenceError = InvalidDirectoryError FilePath |

108data PersistenceError = InvalidDirectoryError FilePath |

111 MissingTransactionError TransactionId |

109 MissingTransactionError TransactionId |

112 WrongDatabaseFormatVersionError String String

110 WrongDatabaseFormatVersionError String String

113− deriving (Show, Eq, Generic, NFData)

111+ deriving (Show, Eq, Generic, Binary, NFData)

114

112

115--collapse list of errors into normal error- if there is just one, just return one

113--collapse list of errors into normal error- if there is just one, just return one

116someErrors :: [RelationalError] -> RelationalError

114someErrors :: [RelationalError] -> RelationalError

@@ -128,7 +126,7 @@ data MergeError = SelectedHeadMismatchMergeError |

128 StrategyViolatesComponentMergeError | --failed merge in inc deps, relvars, etc.

126 StrategyViolatesComponentMergeError | --failed merge in inc deps, relvars, etc.

129 StrategyViolatesRelationVariableMergeError |

127 StrategyViolatesRelationVariableMergeError |

130 StrategyViolatesTypeConstructorMergeError

128 StrategyViolatesTypeConstructorMergeError

131− deriving (Show, Eq, Generic, Typeable)

129+ deriving (Show, Eq, Generic, Binary, Typeable)

132

130

133instance NFData MergeError where rnf = genericRnf

131instance NFData MergeError where rnf = genericRnf

134

132

@@ -136,20 +134,17 @@ data ScriptCompilationError = TypeCheckCompilationError String String | --expect

136 SyntaxErrorCompilationError String |

134 SyntaxErrorCompilationError String |

137 ScriptCompilationDisabledError |

135 ScriptCompilationDisabledError |

138 OtherScriptCompilationError String

136 OtherScriptCompilationError String

139− deriving (Show, Eq, Generic, Typeable, NFData)

137+ deriving (Show, Eq, Generic, Binary, Typeable, NFData)

140

138

141instance Exception ScriptCompilationError

139instance Exception ScriptCompilationError

142

140

143data SchemaError = RelVarReferencesMissing (S.Set RelVarName) |

141data SchemaError = RelVarReferencesMissing (S.Set RelVarName) |

144 RelVarInReferencedMoreThanOnce RelVarName |

142 RelVarInReferencedMoreThanOnce RelVarName |

145 RelVarOutReferencedMoreThanOnce RelVarName

143 RelVarOutReferencedMoreThanOnce RelVarName

146− deriving (Show, Eq, Generic, Typeable, NFData)

144+ deriving (Show, Eq, Generic, Binary, Typeable, NFData)

147−

145+

148−

146+

149−data ImportError' = InvalidSHA256Error T.Text

147+-- errors returned from the distributed-process call handlers

150− | SHA256MismatchError T.Text T.Text

148+data ServerError = RequestTimeoutError |

151− | InvalidFileURIError T.Text

149+ ProcessDiedError String

152− | ImportFileDecodeError T.Text

153− | ImportFileError T.Text

154− | ImportDownloadError T.Text

155− deriving (Show, Eq, Generic, Typeable, NFData)

150+ deriving (Generic, Binary, Eq)

src/lib/ProjectM36/GraphRefRelationalExpr.hs+9−6

@@ -26,12 +26,15 @@ instance Monoid SingularTransactionRef where

26

27-- | return `Just transid` if this GraphRefRelationalExpr refers to just one transaction in the graph. This is useful for determining if certain optimizations can apply.

28singularTransaction :: Foldable t => t GraphRefTransactionMarker -> SingularTransactionRef

29−singularTransaction expr

29+singularTransaction expr =

30+ if S.null transSet then

30− | S.null transSet = NoTransactionsRef

31+ NoTransactionsRef

32+ else if S.size transSet == 1 then

31− | S.size transSet == 1 = SingularTransactionRef (head (S.toList transSet))

33+ SingularTransactionRef (head (S.toList transSet))

34+ else

32− | otherwise = MultipleTransactionsRef

35+ MultipleTransactionsRef

33 where

36 where

34− transSet = foldr S.insert S.empty expr

37+ transSet = foldr (\transId acc -> S.insert transId acc) S.empty expr

35

38

36-- | Return True if two 'GraphRefRelationalExpr's both refer exclusively to the same transaction (or none at all).

39-- | Return True if two 'GraphRefRelationalExpr's both refer exclusively to the same transaction (or none at all).

37inSameTransaction :: GraphRefRelationalExpr -> GraphRefRelationalExpr -> Maybe GraphRefTransactionMarker

40inSameTransaction :: GraphRefRelationalExpr -> GraphRefRelationalExpr -> Maybe GraphRefTransactionMarker

@@ -42,4 +45,4 @@ inSameTransaction exprA exprB = case (stA, stB) of

42 stB = singularTransaction exprB

45 stB = singularTransaction exprB

43

46

44singularTransactions :: (Foldable f, Foldable t) => f (t GraphRefTransactionMarker) -> SingularTransactionRef

47singularTransactions :: (Foldable f, Foldable t) => f (t GraphRefTransactionMarker) -> SingularTransactionRef

45−singularTransactions = foldMap singularTransaction

48+singularTransactions fs = foldMap singularTransaction fs

src/lib/ProjectM36/InclusionDependency.hs+6−5

@@ -4,16 +4,17 @@ import ProjectM36.Attribute

4import ProjectM36.Error

5import ProjectM36.Relation

6import qualified Data.Map as M

7+import qualified Data.Text as T

7

8

8inclusionDependenciesAsRelation :: InclusionDependencies -> Either RelationalError Relation

9inclusionDependenciesAsRelation :: InclusionDependencies -> Either RelationalError Relation

9inclusionDependenciesAsRelation incDeps =

10inclusionDependenciesAsRelation incDeps =

10 mkRelationFromList attrs (map incDepAsAtoms (M.toList incDeps))

11 mkRelationFromList attrs (map incDepAsAtoms (M.toList incDeps))

11 where

12 where

12 attrs = attributesFromList [Attribute "name" TextAtomType,

13 attrs = attributesFromList [Attribute "name" TextAtomType,

13− Attribute "sub" RelationalExprAtomType,

14+ Attribute "sub" TextAtomType,

14− Attribute "super" RelationalExprAtomType

15+ Attribute "super" TextAtomType

15 ]

16 ]

16 incDepAsAtoms (name, InclusionDependency exprA exprB) = [TextAtom name,

17 incDepAsAtoms (name, InclusionDependency exprA exprB) = [TextAtom name,

17− RelationalExprAtom exprA,

18+ TextAtom (T.pack (show exprA)),

18− RelationalExprAtom exprB]

19+ TextAtom (T.pack (show exprB))]

19−

20+

src/lib/ProjectM36/IsomorphicSchema.hs+4−2

@@ -1,4 +1,4 @@

1−{-# LANGUAGE DeriveGeneric, LambdaCase, DerivingVia #-}

1+{-# LANGUAGE DeriveGeneric, DeriveAnyClass, LambdaCase #-}

2module ProjectM36.IsomorphicSchema where

3import ProjectM36.Base

4import ProjectM36.Error

@@ -9,6 +9,7 @@ import ProjectM36.RelationalExpression

9import qualified ProjectM36.AttributeNames as AN

10import Control.Monad

11import GHC.Generics

12+import Data.Binary

12import qualified Data.Map as M

13import qualified Data.Map as M

13import qualified Data.Set as S

14import qualified Data.Set as S

14import qualified Data.List as L

15import qualified Data.List as L

@@ -27,7 +28,8 @@ import Data.Monoid

27

28

28data SchemaExpr = AddSubschema SchemaName SchemaIsomorphs |

29data SchemaExpr = AddSubschema SchemaName SchemaIsomorphs |

29 RemoveSubschema SchemaName

30 RemoveSubschema SchemaName

30− deriving (Generic, Show)

31+ deriving (Generic, Binary, Show)

32+

31

33

32isomorphs :: Schema -> SchemaIsomorphs

34isomorphs :: Schema -> SchemaIsomorphs

33isomorphs (Schema i) = i

35isomorphs (Schema i) = i

src/lib/ProjectM36/MerkleHash.hsdeleted−9

@@ -1,9 +0,0 @@

1−{-# LANGUAGE GeneralizedNewtypeDeriving, DeriveGeneric, DerivingVia #-}

2−module ProjectM36.MerkleHash where

3−import Data.ByteString (ByteString)

4−import GHC.Generics

5−import Control.DeepSeq (NFData)

6−

7−newtype MerkleHash = MerkleHash { _unMerkleHash :: ByteString }

8− deriving (Show, Eq, Generic, Monoid, Semigroup, NFData)

9−

src/lib/ProjectM36/NormalizeExpr.hs+1−1

@@ -121,7 +121,7 @@ processTupleExprs (TupleExprs () tupleExprs) = do

121 TupleExprs marker <$> mapM processTupleExpr tupleExprs

122

123processTupleExpr :: TupleExpr -> ProcessExprM GraphRefTupleExpr

124−processTupleExpr (TupleExpr tMap) =

124+processTupleExpr (TupleExpr tMap) = do

125 TupleExpr . M.fromList <$> mapM (\(k,v) -> (,) k <$> processAtomExpr v) (M.toList tMap)

126

127--convert AttributeExpr to GraphRefAttributeExpr

src/lib/ProjectM36/Persist.hs+4−3

@@ -36,6 +36,7 @@ import Foreign.C

36#endif

37

38import System.IO (withFile, IOMode(WriteMode), Handle)

39+import qualified Data.ByteString.Lazy as BS

39import qualified Data.ByteString as BS'

40import qualified Data.ByteString as BS'

40import qualified Data.Text.Encoding as TE

41import qualified Data.Text.Encoding as TE

41

42

@@ -99,10 +100,10 @@ syncDirectory :: DiskSync -> FilePath -> IO ()

99syncDirectory FsyncDiskSync path = directoryFsync path

100syncDirectory FsyncDiskSync path = directoryFsync path

100syncDirectory NoDiskSync _ = pure ()

101syncDirectory NoDiskSync _ = pure ()

101

102

102−writeBSFileSync :: DiskSync -> FilePath -> BS'.ByteString -> IO ()

103+writeBSFileSync :: DiskSync -> FilePath -> BS.ByteString -> IO ()

103writeBSFileSync sync path bstring =

104writeBSFileSync sync path bstring =

104 withFile path WriteMode $ \handle -> do

105 withFile path WriteMode $ \handle -> do

105− BS'.hPut handle bstring

106+ BS.hPut handle bstring

106 syncHandle sync handle

107 syncHandle sync handle

107

108

108directoryFsync :: FilePath -> IO ()

109directoryFsync :: FilePath -> IO ()

@@ -130,4 +131,4 @@ fdCount = do

130 fds <- getDirectoryContents FDDIR

131 fds <- getDirectoryContents FDDIR

131 pure ((length fds) - 2)

132 pure ((length fds) - 2)

132--not supported on non-linux

133--not supported on non-linux

133−#endif

134+#endif

src/lib/ProjectM36/Relation.hs+22−17

@@ -9,6 +9,7 @@ import ProjectM36.Tuple

9import qualified ProjectM36.Attribute as A

10import ProjectM36.TupleSet

11import ProjectM36.Error

12+import ProjectM36.MiscUtils

12--import qualified Control.Parallel.Strategies as P

13--import qualified Control.Parallel.Strategies as P

13import qualified ProjectM36.TypeConstructorDef as TCD

14import qualified ProjectM36.TypeConstructorDef as TCD

14import qualified ProjectM36.DataConstructorDef as DCD

15import qualified ProjectM36.DataConstructorDef as DCD

@@ -16,6 +17,7 @@ import qualified Data.Text as T

16import Data.Either (isRight)

17import Data.Either (isRight)

17import System.Random.Shuffle

18import System.Random.Shuffle

18import Control.Monad.Random

19import Control.Monad.Random

20+import Data.List (sort)

19

21

20attributes :: Relation -> Attributes

22attributes :: Relation -> Attributes

21attributes (Relation attrs _ ) = attrs

23attributes (Relation attrs _ ) = attrs

@@ -33,7 +35,7 @@ atomTypeForName :: AttributeName -> Relation -> Either RelationalError AtomType

33atomTypeForName attrName (Relation attrs _) = A.atomTypeForAttributeName attrName attrs

35atomTypeForName attrName (Relation attrs _) = A.atomTypeForAttributeName attrName attrs

34

36

35mkRelationFromList :: Attributes -> [[Atom]] -> Either RelationalError Relation

37mkRelationFromList :: Attributes -> [[Atom]] -> Either RelationalError Relation

36−mkRelationFromList attrs atomMatrix = do

38+mkRelationFromList attrs atomMatrix =

37 Relation attrs <$> mkTupleSetFromList attrs atomMatrix

39 Relation attrs <$> mkTupleSetFromList attrs atomMatrix

38

40

39emptyRelationWithAttrs :: Attributes -> Relation

41emptyRelationWithAttrs :: Attributes -> Relation

@@ -41,6 +43,11 @@ emptyRelationWithAttrs attrs = Relation attrs emptyTupleSet

41

43

42mkRelation :: Attributes -> RelationTupleSet -> Either RelationalError Relation

44mkRelation :: Attributes -> RelationTupleSet -> Either RelationalError Relation

43mkRelation attrs tupleSet =

45mkRelation 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

44 --check that all tuples have the same keys

51 --check that all tuples have the same keys

45 --check that all tuples have keys (1-N) where N is the attribute count

52 --check that all tuples have keys (1-N) where N is the attribute count

46 case verifyTupleSet attrs tupleSet of

53 case verifyTupleSet attrs tupleSet of

@@ -86,12 +93,13 @@ union (Relation attrs1 tupSet1) (Relation attrs2 tupSet2) =

86 else

93 else

87 Right $ Relation attrs1 newtuples

94 Right $ Relation attrs1 newtuples

88 where

95 where

89− newtuples = tupleSetUnion attrs1 tupSet1 tupSet2

96+ newtuples = RelationTupleSet $ HS.toList . HS.fromList $ asList tupSet1 ++ map (reorderTuple attrs1) (asList tupSet2)

90−

97+

91project :: S.Set AttributeName -> Relation -> Either RelationalError Relation

98project :: S.Set AttributeName -> Relation -> Either RelationalError Relation

92project attrNames rel@(Relation _ tupSet) = do

99project attrNames rel@(Relation _ tupSet) = do

93 newAttrs <- A.projectionAttributesForNames attrNames (attributes rel)

100 newAttrs <- A.projectionAttributesForNames attrNames (attributes rel)

101+ let newAttrNameSet = A.attributeNameSet newAttrs

94− newTupleList <- mapM (tupleProject newAttrs) (asList tupSet)

102+ newTupleList = map (tupleProject newAttrNameSet) (asList tupSet)

95 pure (Relation newAttrs (RelationTupleSet (HS.toList (HS.fromList newTupleList))))

103 pure (Relation newAttrs (RelationTupleSet (HS.toList (HS.fromList newTupleList))))

96

104

97rename :: AttributeName -> AttributeName -> Relation -> Either RelationalError Relation

105rename :: AttributeName -> AttributeName -> Relation -> Either RelationalError Relation

@@ -146,7 +154,7 @@ group groupAttrNames newAttrName rel = do

146 groupProjectionAttributes <- A.projectionAttributesForNames groupAttrNames (attributes rel)

154 groupProjectionAttributes <- A.projectionAttributesForNames groupAttrNames (attributes rel)

147 let groupAttr = Attribute newAttrName (RelationAtomType groupProjectionAttributes)

155 let groupAttr = Attribute newAttrName (RelationAtomType groupProjectionAttributes)

148 matchingRelTuple tupIn = case imageRelationFor tupIn rel of

156 matchingRelTuple tupIn = case imageRelationFor tupIn rel of

149− Right rel2 -> RelationTuple (A.singleton groupAttr) (V.singleton (RelationAtom rel2))

157+ Right rel2 -> RelationTuple (V.singleton groupAttr) (V.singleton (RelationAtom rel2))

150 Left _ -> undefined

158 Left _ -> undefined

151 mogrifier tupIn = pure (tupleExtend tupIn (matchingRelTuple tupIn))

159 mogrifier tupIn = pure (tupleExtend tupIn (matchingRelTuple tupIn))

152 newAttrs = A.addAttribute groupAttr nonGroupProjectionAttributes

160 newAttrs = A.addAttribute groupAttr nonGroupProjectionAttributes

@@ -160,8 +168,7 @@ restrictEq :: RelationTuple -> Relation -> Either RelationalError Relation

160restrictEq tuple = restrict rfilter

168restrictEq tuple = restrict rfilter

161 where

169 where

162 rfilter :: RelationTuple -> Either RelationalError Bool

170 rfilter :: RelationTuple -> Either RelationalError Bool

163− rfilter tupleIn = do

164− pure (tupleIntersection tuple tupleIn == tuple)

171+ rfilter tupleIn = pure (tupleIntersection tuple tupleIn == tuple)

165

172

166-- unwrap relation-valued attribute

173-- unwrap relation-valued attribute

167-- return error if relval attrs and nongroup attrs overlap

174-- return error if relval attrs and nongroup attrs overlap

@@ -183,13 +190,13 @@ ungroup relvalAttrName rel = case attributesForRelval relvalAttrName rel of

183tupleUngroup :: AttributeName -> Attributes -> RelationTuple -> Either RelationalError Relation

190tupleUngroup :: AttributeName -> Attributes -> RelationTuple -> Either RelationalError Relation

184tupleUngroup relvalAttrName newAttrs tuple = do

191tupleUngroup relvalAttrName newAttrs tuple = do

185 relvalRelation <- relationForAttributeName relvalAttrName tuple

192 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])

192 relFold folder (Right $ Relation newAttrs emptyTupleSet) relvalRelation

193 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])

193

200

194attributesForRelval :: AttributeName -> Relation -> Either RelationalError Attributes

201attributesForRelval :: AttributeName -> Relation -> Either RelationalError Attributes

195attributesForRelval relvalAttrName (Relation attrs _) = do

202attributesForRelval relvalAttrName (Relation attrs _) = do

@@ -244,8 +251,7 @@ relMap mapper (Relation attrs tupleSet) =

244

251

245relMogrify :: (RelationTuple -> Either RelationalError RelationTuple) -> Attributes -> Relation -> Either RelationalError Relation

252relMogrify :: (RelationTuple -> Either RelationalError RelationTuple) -> Attributes -> Relation -> Either RelationalError Relation

246relMogrify mapper newAttributes (Relation _ tupSet) = do

253relMogrify mapper newAttributes (Relation _ tupSet) = do

247− newTuples <- mapM (fmap (reorderTuple newAttributes) . mapper) (asList tupSet)

254+ newTuples <- mapM mapper (asList tupSet)

248−

249 mkRelationFromTuples newAttributes newTuples

255 mkRelationFromTuples newAttributes newTuples

250

256

251relFold :: (RelationTuple -> a -> a) -> a -> Relation -> a

257relFold :: (RelationTuple -> a -> a) -> a -> Relation -> a

@@ -291,8 +297,7 @@ typesAsRelation types = mkRelationFromTuples attrs tuples

291 dConsType = RelationAtomType subAttrs

297 dConsType = RelationAtomType subAttrs

292 tuples = map mkTypeConsDescription types

298 tuples = map mkTypeConsDescription types

293

299

294− mkTypeConsDescription (tCons, dConsList) =

295− RelationTuple attrs (V.fromList [TextAtom (TCD.name tCons), mkDataConsRelation dConsList])

300+ mkTypeConsDescription (tCons, dConsList) = RelationTuple attrs (V.fromList [TextAtom (TCD.name tCons), mkDataConsRelation dConsList])

296

301

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

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

298 Left err -> error ("mkRelationFromTuples pooped " ++ show err)

303 Left err -> error ("mkRelationFromTuples pooped " ++ show err)

src/lib/ProjectM36/Relation/Parse/CSV.hs+3−7

@@ -38,7 +38,8 @@ csvAsRelation attrs tConsMap inString = case APBL.parse (csvWithHeader csvDecode

38 let strHeader = V.map decodeUtf8 headerRaw

39 strMapRecords = V.map convertMap vecMapsRaw

40 convertMap hmap = HM.fromList $ L.map (decodeUtf8 *** (T.unpack . decodeUtf8)) (HM.toList hmap)

41− attrNameSet = A.attributeNameSet attrs

41+ attrNames = V.map A.attributeName attrs

42+ attrNameSet = S.fromList (V.toList attrNames)

42 headerSet = S.fromList (V.toList strHeader)

43 headerSet = S.fromList (V.toList strHeader)

43 parseAtom attrName aType textIn = case APT.parseOnly (parseCSVAtomP attrName tConsMap aType <* APT.endOfInput) textIn of

44 parseAtom attrName aType textIn = case APT.parseOnly (parseCSVAtomP attrName tConsMap aType <* APT.endOfInput) textIn of

44 Left err -> Left (ParseError (T.pack err))

45 Left err -> Left (ParseError (T.pack err))

@@ -46,7 +47,7 @@ csvAsRelation attrs tConsMap inString = case APBL.parse (csvWithHeader csvDecode

46 makeTupleList :: HM.HashMap AttributeName String -> [Either CsvImportError Atom]

47 makeTupleList :: HM.HashMap AttributeName String -> [Either CsvImportError Atom]

47 makeTupleList tupMap = V.toList $ V.map (\attr ->

48 makeTupleList tupMap = V.toList $ V.map (\attr ->

48 either (Left . AttributeMappingError) Right $

49 either (Left . AttributeMappingError) Right $

49− parseAtom (A.attributeName attr) (A.atomType attr) (T.pack $ tupMap HM.! A.attributeName attr)) (attributesVec attrs)

50+ parseAtom (A.attributeName attr) (A.atomType attr) (T.pack $ tupMap HM.! A.attributeName attr)) attrs

50 if attrNameSet == headerSet then do

51 if attrNameSet == headerSet then do

51 tupleList <- mapM sequence $ V.toList (V.map makeTupleList strMapRecords)

52 tupleList <- mapM sequence $ V.toList (V.map makeTupleList strMapRecords)

52 case mkRelationFromList attrs tupleList of

53 case mkRelationFromList attrs tupleList of

@@ -82,11 +83,6 @@ parseCSVAtomP _ _ BoolAtomType = do

82 case readMaybe bString of

83 case readMaybe bString of

83 Nothing -> fail ("invalid BoolAtom string: " ++ bString)

84 Nothing -> fail ("invalid BoolAtom string: " ++ bString)

84 Just b -> pure (Right (BoolAtom b))

85 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))

90parseCSVAtomP attrName tConsMap typ@(ConstructedAtomType _ tvmap)

86parseCSVAtomP attrName tConsMap typ@(ConstructedAtomType _ tvmap)

91 | isIntervalAtomType typ = do

87 | isIntervalAtomType typ = do

92 begin <- (APT.char '[' >> pure False) <|> (APT.char '(' >> pure True)

88 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 #-}

2module ProjectM36.Relation.Show.CSV where

3import ProjectM36.Base

4−import ProjectM36.Attribute as A

4+import ProjectM36.Attribute

5import Data.Csv

6import ProjectM36.Tuple

7import qualified Data.ByteString.Lazy as BS

@@ -17,13 +17,13 @@ relationAsCSV (Relation attrs tupleSet)

17 | relValAttrs /= [] =

18 Left $ RelationValuedAttributesNotSupportedError (map attributeName relValAttrs)

19 --check that there is at least one attribute

20− | A.null attrs =

20+ | V.null attrs =

21 Left $ TupleAttributeCountMismatchError 0

22 | otherwise =

23 Right $ encodeByName bsAttrNames $ map RecordRelationTuple (asList tupleSet)

24 where

25− relValAttrs = V.toList $ V.filter (isRelationAtomType . atomType) (attributesVec attrs)

25+ relValAttrs = V.toList $ V.filter (isRelationAtomType . atomType) attrs

26− bsAttrNames = V.map (TE.encodeUtf8 . attributeName) (attributesVec attrs)

26+ bsAttrNames = V.map (TE.encodeUtf8 . attributeName) attrs

27

28{-

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)

37

38instance DefaultOrdered RecordRelationTuple where

39− headerOrder (RecordRelationTuple tuple) = V.map (TE.encodeUtf8 . attributeName) (attributesVec (tupleAttributes tuple))

39+ headerOrder (RecordRelationTuple tuple) = V.map (TE.encodeUtf8 . attributeName) (tupleAttributes tuple)

40

41newtype RecordAtom = RecordAtom {unAtom :: Atom}

42

src/lib/ProjectM36/Relation/Show/HTML.hs+2−2

@@ -3,7 +3,6 @@ import ProjectM36.Base

3import ProjectM36.Relation

4import ProjectM36.Tuple

5import ProjectM36.Atom

6−import ProjectM36.Attribute as A

7import ProjectM36.AtomType

6import ProjectM36.AtomType

8import qualified Data.List as L

7import qualified Data.List as L

9import Data.Text (Text, pack)

8import Data.Text (Text, pack)

@@ -12,9 +11,10 @@ import qualified Data.Text.IO as TIO

12#if __GLASGOW_HASKELL__ < 804

11#if __GLASGOW_HASKELL__ < 804

13import Data.Monoid

12import Data.Monoid

14#endif

13#endif

14+import qualified Data.Vector as V

15

16attributesAsHTML :: Attributes -> Text

17−attributesAsHTML attrs = "<tr>" <> T.concat (map oneAttrHTML (A.toList attrs)) <> "</tr>"

17+attributesAsHTML attrs = "<tr>" <> T.concat (map oneAttrHTML (V.toList attrs)) <> "</tr>"

18 where

19 oneAttrHTML attr = "<th>" <> prettyAttribute attr <> "</th>"

20

src/lib/ProjectM36/Relation/Show/Term.hs−3

@@ -9,8 +9,6 @@ import ProjectM36.Attribute hiding (null)

9import qualified Data.List as L

10import qualified Data.Text as T

11import Control.Arrow hiding (left)

12−import Data.ByteString.Base64 as B64

13−import qualified Data.Text.Encoding as TE

14#if __GLASGOW_HASKELL__ < 804

12#if __GLASGOW_HASKELL__ < 804

15import Data.Monoid

13import Data.Monoid

16#endif

14#endif

@@ -99,7 +97,6 @@ showAtom :: Int -> Atom -> StringType

99showAtom _ (RelationAtom rel) = renderTable $ relationAsTable rel

97showAtom _ (RelationAtom rel) = renderTable $ relationAsTable rel

100showAtom level (ConstructedAtom dConsName _ atoms) = showParens (level >= 1 && not (null atoms)) $ T.concat (L.intersperse " " (dConsName : map (showAtom 1) atoms))

98showAtom level (ConstructedAtom dConsName _ atoms) = showParens (level >= 1 && not (null atoms)) $ T.concat (L.intersperse " " (dConsName : map (showAtom 1) atoms))

101showAtom _ (TextAtom t) = "\"" <> t <> "\""

99showAtom _ (TextAtom t) = "\"" <> t <> "\""

102−showAtom _ (ByteStringAtom bs) = TE.decodeUtf8 (B64.encode bs)

103showAtom _ atom = atomToText atom

100showAtom _ atom = atomToText atom

104

101

105renderTable :: Table -> StringType

102renderTable :: Table -> StringType

src/lib/ProjectM36/RelationalExpression.hs+339−204

@@ -1,7 +1,6 @@

1{-# LANGUAGE ScopedTypeVariables #-}

2{-# LANGUAGE FlexibleInstances #-}

3{-# LANGUAGE FlexibleContexts #-}

4−{-# LANGUAGE OverloadedStrings #-}

5module ProjectM36.RelationalExpression where

4module ProjectM36.RelationalExpression where

6import ProjectM36.Relation

5import ProjectM36.Relation

7import ProjectM36.Tuple

6import ProjectM36.Tuple

@@ -23,7 +22,6 @@ import qualified Data.Map as M

23import qualified Data.HashSet as HS

22import qualified Data.HashSet as HS

24import qualified Data.Set as S

23import qualified Data.Set as S

25import Control.Monad.State hiding (join)

24import Control.Monad.State hiding (join)

26−import Data.Bifunctor (second)

27import Data.Maybe

25import Data.Maybe

28import Data.Either

26import Data.Either

29import Data.Char (isUpper)

27import Data.Char (isUpper)

@@ -41,8 +39,6 @@ import Control.Monad.Reader as R hiding (join)

41import ProjectM36.NormalizeExpr

39import ProjectM36.NormalizeExpr

42import ProjectM36.WithNameExpr

40import ProjectM36.WithNameExpr

43import Test.QuickCheck

41import Test.QuickCheck

44−import qualified Data.Functor.Foldable as Fold

45−import Control.Applicative

46#ifdef PM36_HASKELL_SCRIPTING

42#ifdef PM36_HASKELL_SCRIPTING

47import GHC hiding (getContext)

43import GHC hiding (getContext)

48import Control.Exception

44import Control.Exception

@@ -94,10 +90,10 @@ runRelationalExprM :: RelationalExprEnv -> RelationalExprM a -> Either Relationa

94runRelationalExprM env m = runIdentity (runExceptT (runReaderT m env))

90runRelationalExprM env m = runIdentity (runExceptT (runReaderT m env))

95

91

96reGraph :: RelationalExprM TransactionGraph

92reGraph :: RelationalExprM TransactionGraph

97−reGraph = asks re_graph

93+reGraph = re_graph <$> R.ask

98

94

99reContext :: RelationalExprM DatabaseContext

95reContext :: RelationalExprM DatabaseContext

100−reContext = asks re_context

96+reContext = re_context <$> R.ask

101

97

102mkRelationalExprEnv :: DatabaseContext -> TransactionGraph -> RelationalExprEnv

98mkRelationalExprEnv :: DatabaseContext -> TransactionGraph -> RelationalExprEnv

103mkRelationalExprEnv ctx graph =

99mkRelationalExprEnv ctx graph =

@@ -110,11 +106,11 @@ askEnv :: GraphRefRelationalExprM GraphRefRelationalExprEnv

110askEnv = R.ask

106askEnv = R.ask

111

107

112mergeTuplesIntoGraphRefRelationalExprEnv :: RelationTuple -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv

108mergeTuplesIntoGraphRefRelationalExprEnv :: RelationTuple -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv

113−mergeTuplesIntoGraphRefRelationalExprEnv tupIn env =

109+mergeTuplesIntoGraphRefRelationalExprEnv tupIn e =

114− env { gre_extra = new_elems }

110+ e{ gre_extra = new_elems }

115 where

111 where

116 new_elems = Just (Left newTuple)

112 new_elems = Just (Left newTuple)

117− mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (envTuple env))

113+ mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (envTuple e))

118 newTuple = mkRelationTupleFromMap mergedTupMap

114 newTuple = mkRelationTupleFromMap mergedTupMap

119

115

120mergeAttributesIntoGraphRefRelationalExprEnv :: Attributes -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv

116mergeAttributesIntoGraphRefRelationalExprEnv :: Attributes -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv

@@ -142,12 +138,12 @@ data DatabaseContextEvalEnv = DatabaseContextEvalEnv

142 }

138 }

143

139

144mkDatabaseContextEvalEnv :: TransactionId -> TransactionGraph -> DatabaseContextEvalEnv

140mkDatabaseContextEvalEnv :: TransactionId -> TransactionGraph -> DatabaseContextEvalEnv

145−mkDatabaseContextEvalEnv = DatabaseContextEvalEnv

141+mkDatabaseContextEvalEnv tid graph = DatabaseContextEvalEnv tid graph

146

142

147type DatabaseContextEvalMonad a = RWST DatabaseContextEvalEnv () DatabaseContextEvalState (ExceptT RelationalError Identity) a

143type DatabaseContextEvalMonad a = RWST DatabaseContextEvalEnv () DatabaseContextEvalState (ExceptT RelationalError Identity) a

148

144

149runDatabaseContextEvalMonad :: DatabaseContext -> DatabaseContextEvalEnv -> DatabaseContextEvalMonad () -> Either RelationalError DatabaseContextEvalState

145runDatabaseContextEvalMonad :: DatabaseContext -> DatabaseContextEvalEnv -> DatabaseContextEvalMonad () -> Either RelationalError DatabaseContextEvalState

150−runDatabaseContextEvalMonad ctx env m = runIdentity (runExceptT (fst <$> execRWST m env freshEnv))

146+runDatabaseContextEvalMonad ctx env m = runIdentity (runExceptT (fst <$> (execRWST m env freshEnv)))

151 where

147 where

152 freshEnv = mkDatabaseContextEvalState ctx

148 freshEnv = mkDatabaseContextEvalState ctx

153

149

@@ -163,7 +159,7 @@ dbcRelationalExprEnv =

163 mkRelationalExprEnv <$> getStateContext <*> dbcGraph

159 mkRelationalExprEnv <$> getStateContext <*> dbcGraph

164

160

165getStateContext :: DatabaseContextEvalMonad DatabaseContext

161getStateContext :: DatabaseContextEvalMonad DatabaseContext

166−getStateContext = gets dbc_context

162+getStateContext = dbc_context <$> get

167

163

168putStateContext :: DatabaseContext -> DatabaseContextEvalMonad ()

164putStateContext :: DatabaseContext -> DatabaseContextEvalMonad ()

169putStateContext ctx' = do

165putStateContext ctx' = do

@@ -204,7 +200,7 @@ freshGraphRefRelationalExprEnv mctx graph = GraphRefRelationalExprEnv {

204 }

200 }

205

201

206gfGraph :: GraphRefRelationalExprM TransactionGraph

202gfGraph :: GraphRefRelationalExprM TransactionGraph

207−gfGraph = asks gre_graph

203+gfGraph = gre_graph <$> R.ask

208

204

209envContext :: RelationalExprEnv -> DatabaseContext

205envContext :: RelationalExprEnv -> DatabaseContext

210envContext = re_context

206envContext = re_context

@@ -212,13 +208,166 @@ envContext = re_context

212setEnvContext :: RelationalExprEnv -> DatabaseContext -> RelationalExprEnv

208setEnvContext :: RelationalExprEnv -> DatabaseContext -> RelationalExprEnv

213setEnvContext e ctx = e { re_context = ctx }

209setEnvContext e ctx = e { re_context = ctx }

214

210

211+{-

212+--full evaluation down the graph

213+eval :: RelationalExpr -> RelationalExprState (Either RelationalError Relation)

214+eval expr = do

215+ env <- askEnv

216+ eGfExpr <- processRelationalExpr expr

217+ case eGfExpr of

218+ Left err -> pure (Left err)

219+ Right gfExpr -> pure $ evalGraphRefRelationalExpr gfExpr (re_graph env)

220+-}

221+{-

222+--relvar state is needed in evaluation of relational expression but only as read-only in order to extract current relvar values

223+evalRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError GraphRefRelationalExpr)

224+evalRelationalExpr (RelationVariable name _) = do

225+ relvarTable <- fmap (relationVariables . envContext) askEnv

226+ return $ case M.lookup name relvarTable of

227+ Just res -> Right res

228+ Nothing -> Left $ RelVarNotDefinedError name

229+

230+evalRelationalExpr (Project attrNames expr) = do

231+ eAttrNameSet <- evalAttributeNames attrNames expr

232+ case eAttrNameSet of

233+ Left err -> pure (Left err)

234+ Right attrNameSet -> do

235+ rel <- evalRelationalExpr expr

236+ case rel of

237+ Right rel2 -> pure $ Right (Project (AttributeNames attrNameSet) rel2)

238+ Left err -> pure $ Left err

239+

240+evalRelationalExpr (Union exprA exprB) = do

241+ relA <- evalRelationalExpr exprA

242+ relB <- evalRelationalExpr exprB

243+ case relA of

244+ Left err -> return $ Left err

245+ Right relA2 -> case relB of

246+ Left err -> return $ Left err

247+ Right relB2 -> return $ Right (Union relA2 relB2)

248+

249+evalRelationalExpr (Join exprA exprB) = do

250+ relA <- evalRelationalExpr exprA

251+ relB <- evalRelationalExpr exprB

252+ case relA of

253+ Left err -> return $ Left err

254+ Right relA2 -> case relB of

255+ Left err -> return $ Left err

256+ Right relB2 -> return $ Right (Join relA2 relB2)

257+

258+evalRelationalExpr (Difference exprA exprB) = do

259+ relA <- evalRelationalExpr exprA

260+ relB <- evalRelationalExpr exprB

261+ case relA of

262+ Left err -> return $ Left err

263+ Right relA2 -> case relB of

264+ Left err -> return $ Left err

265+ Right relB2 -> return $ Right (Difference relA2 relB2)

266+

267+evalRelationalExpr (MakeStaticRelation attributeSet tupleSet) =

268+ case mkRelation attributeSet tupleSet of

269+ Right rel -> return $ Right (ExistingRelation rel)

270+ Left err -> return $ Left err

271+

272+evalRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do

273+ currentContext <- fmap envContext askEnv

274+ let tConss = typeConstructorMapping currentContext

275+ -- 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

276+ runExceptT $ do

277+ mAttrs <- case mAttrExprs of

278+ Just _ ->

279+ Just . A.attributesFromList <$> mapM evalGraphRefAttrExpr (fromMaybe [] mAttrExprs)

280+ Nothing -> pure Nothing

281+ tuples <- mapM (liftE . evalTupleExpr mAttrs) tupleExprs

282+ let attrs = fromMaybe firstTupleAttrs mAttrs

283+ firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)

284+ expr <- either throwE pure (mkRelation attrs (RelationTupleSet tuples))

285+ pure (ExistingRelation expr)

286+

287+evalRelationalExpr (ExistingRelation rel) = pure (Right (ExistingRelation rel))

288+

289+evalRelationalExpr (Rename oldAttrName newAttrName relExpr) = do

290+ evald <- evalRelationalExpr relExpr

291+ case evald of

292+ Right expr -> return $ Right (Rename oldAttrName newAttrName expr)

293+ Left err -> return $ Left err

294+

295+evalRelationalExpr (Group oldAttrNames newAttrName relExpr) = do

296+ eOldAttrNameSet <- evalAttributeNames oldAttrNames relExpr

297+ case eOldAttrNameSet of

298+ Left err -> pure (Left err)

299+ Right oldAttrNameSet -> do

300+ evald <- evalRelationalExpr relExpr

301+ case evald of

302+ Right expr -> return $ Right (Group (AttributeNames oldAttrNameSet) newAttrName expr)

303+ Left err -> return $ Left err

304+

305+evalRelationalExpr (Ungroup attrName relExpr) = do

306+ evald <- evalRelationalExpr relExpr

307+ case evald of

308+ Right expr -> return $ Right (Ungroup attrName expr)

309+ Left err -> return $ Left err

310+

311+evalRelationalExpr (Restrict predicateExpr relExpr) = do

312+ evald <- evalRelationalExpr relExpr

313+ pred <- processRestrictionPredicateExpr predicateExpr

314+ case evald of

315+ Left err -> return $ Left err

316+ Right expr ->

317+ pure $ Right (Restrict pred expr)

318+

319+evalRelationalExpr (Equals relExprA relExprB) = do

320+ evaldA <- evalRelationalExpr relExprA

321+ evaldB <- evalRelationalExpr relExprB

322+ case evaldA of

323+ Left err -> return $ Left err

324+ Right exprA -> case evaldB of

325+ Left err -> return $ Left err

326+ Right exprB -> return $ Right (Equals exprA exprB)

327+{-

328+evalRelationalExpr (With views mainExpr) = do

329+ rstate <- ask

330+

331+ let addScopedView ctx (vname,vexpr) = if vname `M.member` relationVariables ctx then

332+ Left (RelVarAlreadyDefinedError vname)

333+ else

334+ case runState (evalDatabaseContextExpr (Assign vname vexpr)) (freshDatabaseState ctx) of

335+ (Left err,_) -> Left err

336+ (Right (), (ctx',_,_)) -> Right ctx'

337+

338+ case foldM addScopedView (stateElemsContext rstate) views of

339+ Left err -> return $ Left err

340+ Right ctx'' -> do

341+ let evalMainExpr expr = runReader (evalRelationalExpr expr) (RelationalExprEnv ctx'')

342+ case evalMainExpr mainExpr of

343+ Left err -> return $ Left err

344+ Right rel -> return $ Right rel

345+-}

346+--warning: copy-pasta from above- refactor

347+evalRelationalExpr (NotEquals relExprA relExprB) = do

348+ evaldA <- evalRelationalExpr relExprA

349+ evaldB <- evalRelationalExpr relExprB

350+ case evaldA of

351+ Left err -> return $ Left err

352+ Right exprA -> case evaldB of

353+ Left err -> return $ Left err

354+ Right exprB -> return $ Right (NotEquals exprA exprB)

355+

356+-- extending a relation adds a single attribute with the results of the per-tuple expression evaluated

357+evalRelationalExpr (Extend tupleExpression relExpr) = do

358+ eExpr <- evalRelationalExpr relExpr

359+ case eExpr of

360+ Left err -> pure (Left err)

361+ Right expr -> do

362+ tupProc <- processExtendTupleExpr tupleExpression

363+ pure (Right (Extend tupProc expr))

364+-}

215--helper function to process relation variable creation/assignment

365--helper function to process relation variable creation/assignment

216setRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()

366setRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()

217setRelVar relVarName relExpr = do

367setRelVar relVarName relExpr = do

218 currentContext <- getStateContext

368 currentContext <- getStateContext

219− --prevent recursive relvar definition by resolving references to relvars in previous states

369+ --prevent recursive relvar definition

220− relExpr' <- resolve relExpr

221− let newRelVars = M.insert relVarName relExpr' $ relationVariables currentContext

370+ let newRelVars = M.insert relVarName relExpr $ relationVariables currentContext

222 potentialContext = currentContext { relationVariables = newRelVars }

371 potentialContext = currentContext { relationVariables = newRelVars }

223 --optimization: if the relexpr is unchanged, skip the update

372 --optimization: if the relexpr is unchanged, skip the update

224 if M.lookup relVarName (relationVariables currentContext) == Just relExpr then

373 if M.lookup relVarName (relationVariables currentContext) == Just relExpr then

@@ -231,9 +380,6 @@ setRelVar relVarName relExpr = do

231 Left err -> dbErr err

380 Left err -> dbErr err

232 Right _ -> putStateContext potentialContext

381 Right _ -> putStateContext potentialContext

233

382

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−

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

383-- 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

238deleteRelVar :: RelVarName -> DatabaseContextEvalMonad ()

384deleteRelVar :: RelVarName -> DatabaseContextEvalMonad ()

239deleteRelVar relVarName = do

385deleteRelVar relVarName = do

@@ -299,36 +445,20 @@ evalGraphRefDatabaseContextExpr (Assign relVarName expr) = do

299

445

300evalGraphRefDatabaseContextExpr (Insert relVarName relExpr) = do

446evalGraphRefDatabaseContextExpr (Insert relVarName relExpr) = do

301 gfExpr <- relVarByName relVarName

447 gfExpr <- relVarByName relVarName

302− let optExpr = applyUnionCollapse (Union

303− relExpr

304− gfExpr)

305− evalGraphRefDatabaseContextExpr (Assign relVarName optExpr)

448+ evalGraphRefDatabaseContextExpr (Assign relVarName

449+ (Union

450+ gfExpr

451+ relExpr))

306

452

307evalGraphRefDatabaseContextExpr (Delete relVarName predicate) = do

453evalGraphRefDatabaseContextExpr (Delete relVarName predicate) = do

308 gfExpr <- relVarByName relVarName

454 gfExpr <- relVarByName relVarName

309− let optExpr = applyRestrictionCollapse (Restrict (NotPredicate predicate) gfExpr)

455+ setRelVar relVarName (Restrict (NotPredicate predicate) gfExpr)

310− setRelVar relVarName optExpr

311

456

312--union of restricted+updated portion and the unrestricted+unupdated portion

457--union of restricted+updated portion and the unrestricted+unupdated portion

313evalGraphRefDatabaseContextExpr (Update relVarName atomExprMap pred') = do

458evalGraphRefDatabaseContextExpr (Update relVarName atomExprMap pred') = do

314 rvExpr <- relVarByName relVarName

459 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

323 let unrestrictedPortion = Restrict (NotPredicate pred') rvExpr

460 let unrestrictedPortion = Restrict (NotPredicate pred') rvExpr

324− tmpAttr = tmpAttrC 1

461+ tmpAttr attr = "_tmp_" <> attr --this could certainly be improved to verify that there is no attribute name conflict

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

332 updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)

462 updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)

333 projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)

463 projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)

334 restrictedPortion = Restrict pred' rvExpr

464 restrictedPortion = Restrict pred' rvExpr

@@ -414,9 +544,9 @@ evalGraphRefDatabaseContextExpr (RemoveTypeConstructor tConsName) = do

414 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes

544 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes

415 putStateContext $ currentContext { typeConstructorMapping = newTypes }

545 putStateContext $ currentContext { typeConstructorMapping = newTypes }

416

546

417−evalGraphRefDatabaseContextExpr (MultipleExpr exprs) =

547+evalGraphRefDatabaseContextExpr (MultipleExpr exprs) = do

418 --the multiple expressions must pass the same context around- not the old unmodified context

548 --the multiple expressions must pass the same context around- not the old unmodified context

419− mapM_ evalGraphRefDatabaseContextExpr exprs

549+ mapM_ (\expr -> evalGraphRefDatabaseContextExpr expr) exprs

420

550

421evalGraphRefDatabaseContextExpr (RemoveAtomFunction funcName) = do

551evalGraphRefDatabaseContextExpr (RemoveAtomFunction funcName) = do

422 currentContext <- getStateContext

552 currentContext <- getStateContext

@@ -446,7 +576,7 @@ evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArg

446 context <- getStateContext

576 context <- getStateContext

447 graph <- dbcGraph

577 graph <- dbcGraph

448 --resolve atom arguments

578 --resolve atom arguments

449− let eAtomTypes = mapM (runGraphRefRelationalExprM gfEnv . typeForGraphRefAtomExpr emptyAttributes) atomArgExprs

579+ let eAtomTypes = mapM (\atomExpr -> runGraphRefRelationalExprM gfEnv (typeForGraphRefAtomExpr emptyAttributes atomExpr)) atomArgExprs

450 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)

580 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)

451 gfEnv = freshGraphRefRelationalExprEnv (Just context) graph

581 gfEnv = freshGraphRefRelationalExprEnv (Just context) graph

452 case eFunc of

582 case eFunc of

@@ -461,13 +591,11 @@ evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArg

461 case eAtomTypes of

591 case eAtomTypes of

462 Left err -> dbErr err

592 Left err -> dbErr err

463 Right atomTypes -> do

593 Right atomTypes -> do

464− let mValidTypes = zipWith (\ expType actType

465− -> case atomTypeVerify expType actType of

594+ let mValidTypes = map (\(expType, actType) -> case atomTypeVerify expType actType of

466− Left err -> Just err

595+ Left err -> Just err

467− Right _ -> Nothing)

468− (dbcFuncType func) atomTypes

596+ Right _ -> Nothing) (zip (dbcFuncType func) atomTypes)

469 typeErrors = catMaybes mValidTypes

597 typeErrors = catMaybes mValidTypes

470− eAtomArgs = map (runGraphRefRelationalExprM gfEnv . evalGraphRefAtomExpr emptyTuple) atomArgExprs

598+ eAtomArgs = map (\arg -> runGraphRefRelationalExprM gfEnv (evalGraphRefAtomExpr emptyTuple arg)) atomArgExprs

471 if length (lefts eAtomArgs) > 1 then

599 if length (lefts eAtomArgs) > 1 then

472 dbErr (someErrors (lefts eAtomArgs))

600 dbErr (someErrors (lefts eAtomArgs))

473 else if not (null typeErrors) then

601 else if not (null typeErrors) then

@@ -511,7 +639,8 @@ getDBCIOContext = dbc_context <$> RWS.get

511getDBCIORelationalExprEnv :: DatabaseContextIOEvalMonad RelationalExprEnv

639getDBCIORelationalExprEnv :: DatabaseContextIOEvalMonad RelationalExprEnv

512getDBCIORelationalExprEnv = do

640getDBCIORelationalExprEnv = do

513 context <- getDBCIOContext

641 context <- getDBCIOContext

642+ env <- RWS.ask

514− mkRelationalExprEnv context . dbcio_graph <$> RWS.ask

643+ pure $ mkRelationalExprEnv context (dbcio_graph env)

515

644

516evalGraphRefDatabaseContextIOExpr :: GraphRefDatabaseContextIOExpr -> DatabaseContextIOEvalMonad (Either RelationalError ())

645evalGraphRefDatabaseContextIOExpr :: GraphRefDatabaseContextIOExpr -> DatabaseContextIOEvalMonad (Either RelationalError ())

517#if !defined(PM36_HASKELL_SCRIPTING)

646#if !defined(PM36_HASKELL_SCRIPTING)

@@ -610,7 +739,6 @@ evalGraphRefDatabaseContextIOExpr (LoadDatabaseContextFunctions modName funcName

610 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }

739 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }

611 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)

740 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)

612 in putDBCIOContext newContext

741 in putDBCIOContext newContext

613−#endif

614evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs range) = do

742evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs range) = do

615 --Define

743 --Define

616 currentContext <- getDBCIOContext

744 currentContext <- getDBCIOContext

@@ -641,21 +769,29 @@ evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs

641 case runDatabaseContextEvalMonad currentContext evalEnv (setRelVar relVarName (ExistingRelation rel)) of

769 case runDatabaseContextEvalMonad currentContext evalEnv (setRelVar relVarName (ExistingRelation rel)) of

642 Left err -> pure (Left err)

770 Left err -> pure (Left err)

643 Right dbstate' -> putDBCIOContext (dbc_context dbstate')

771 Right dbstate' -> putDBCIOContext (dbc_context dbstate')

644−

772+#endif

773+{-

774+updateTupleWithAtomExprs :: M.Map AttributeName AtomExpr -> DatabaseContext -> TransactionGraph -> RelationTuple -> Either RelationalError RelationTuple

775+updateTupleWithAtomExprs exprMap context graph tupIn = do

776+ --resolve all atom exprs

777+ let

778+ atomsAssoc <- mapM (\(attrName, atomExpr) -> do

779+ let atom = unimplemented

780+ --atom <- runReader (evalAtomExpr tupIn atomExpr) (mkRelationalExprState context graph)

781+ pure (attrName, atom)

782+ ) (M.toList exprMap)

783+ pure (updateTupleWithAtoms (M.fromList atomsAssoc) tupIn)

784+-}

645--run verification on all constraints

785--run verification on all constraints

646checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()

786checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()

647−checkConstraints context transId graph@(TransactionGraph graphHeads transSet) = do

787+checkConstraints context transId graph@(TransactionGraph graphHeads transSet) =

648 mapM_ (uncurry checkIncDep) (M.toList deps)

788 mapM_ (uncurry checkIncDep) (M.toList deps)

649 where

789 where

650 potentialGraph = TransactionGraph graphHeads (S.insert tempTrans transSet)

790 potentialGraph = TransactionGraph graphHeads (S.insert tempTrans transSet)

651 tempStamp = UTCTime { utctDay = fromGregorian 2000 1 1,

791 tempStamp = UTCTime { utctDay = fromGregorian 2000 1 1,

652 utctDayTime = secondsToDiffTime 0 }

792 utctDayTime = secondsToDiffTime 0 }

653 tempSchemas = Schemas context M.empty

793 tempSchemas = Schemas context M.empty

654− tempTrans = Transaction U.nil tempTransInfo tempSchemas

655− tempTransInfo = TransactionInfo { parents = transId NE.:| [],

794+ tempTrans = Transaction U.nil (TransactionInfo (transId NE.:| []) tempStamp) tempSchemas

656− stamp = tempStamp,

657− merkleHash = mempty

658− }

659

795

660 deps = inclusionDependencies context

796 deps = inclusionDependencies context

661 -- no optimization available here, really? perhaps the optimizer should be passed down to here or the eval function should be passed through the environment

797 -- no optimization available here, really? perhaps the optimizer should be passed down to here or the eval function should be passed through the environment

@@ -691,7 +827,16 @@ typeForRelationalExpr expr = do

691 let gfExpr = runProcessExprM UncommittedContextMarker (processRelationalExpr expr)

827 let gfExpr = runProcessExprM UncommittedContextMarker (processRelationalExpr expr)

692 gfEnv = freshGraphRefRelationalExprEnv (Just context) graph

828 gfEnv = freshGraphRefRelationalExprEnv (Just context) graph

693 runGf = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)

829 runGf = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)

694− lift $ except runGf

830+ lift $ except $ runGf

831+

832+--returns a database context with all tuples removed

833+--this is useful for type checking and optimization

834+{-

835+contextWithEmptyTupleSets :: DatabaseContext -> DatabaseContext

836+contextWithEmptyTupleSets contextIn = contextIn { relationVariables = relVars }

837+ where

838+ relVars = M.map (\rel -> ExistingRelation (Relation (attributes rel) emptyTupleSet)) (relationVariables contextIn)

839+-}

695

840

696liftE :: (Monad m) => m (Either a b) -> ExceptT a m b

841liftE :: (Monad m) => m (Either a b) -> ExceptT a m b

697liftE v = do

842liftE v = do

@@ -784,7 +929,7 @@ tupleExprCheckNewAttrName attrName rel = if isRight (attributeForName attrName r

784 Right rel

929 Right rel

785

930

786extendGraphRefTupleExpressionProcessor :: Relation -> GraphRefExtendTupleExpr -> GraphRefRelationalExprM (Attributes, RelationTuple -> Either RelationalError RelationTuple)

931extendGraphRefTupleExpressionProcessor :: Relation -> GraphRefExtendTupleExpr -> GraphRefRelationalExprM (Attributes, RelationTuple -> Either RelationalError RelationTuple)

787−extendGraphRefTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) =

932+extendGraphRefTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) = do

788-- renv <- askEnv

933-- renv <- askEnv

789 -- check that the attribute name is not in use

934 -- check that the attribute name is not in use

790 case tupleExprCheckNewAttrName newAttrName relIn of

935 case tupleExprCheckNewAttrName newAttrName relIn of

@@ -826,7 +971,7 @@ evalGraphRefAtomExpr tupIn (FunctionAtomExpr funcName arguments tid) = do

826 throwError (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)

971 throwError (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)

827 else do

972 else do

828 let zippedArgs = zip (safeInit (atomFuncType func)) argTypes

973 let zippedArgs = zip (safeInit (atomFuncType func)) argTypes

829− mapM_ (\(expType, actType) ->

974+ mapM_ (\(expType, actType) -> do

830 lift $ except (atomTypeVerify expType actType)) zippedArgs

975 lift $ except (atomTypeVerify expType actType)) zippedArgs

831 evaldArgs <- mapM (evalGraphRefAtomExpr tupIn) arguments

976 evaldArgs <- mapM (evalGraphRefAtomExpr tupIn) arguments

832 case evalAtomFunction func evaldArgs of

977 case evalAtomFunction func evaldArgs of

@@ -848,6 +993,58 @@ evalGraphRefAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs _) = do

848 mapM (evalGraphRefAtomExpr tupIn) dConsArgs

993 mapM (evalGraphRefAtomExpr tupIn) dConsArgs

849 pure (ConstructedAtom dConsName aType argAtoms)

994 pure (ConstructedAtom dConsName aType argAtoms)

850

995

996+{-

997+evalAtomExpr :: RelationTuple -> AtomExpr -> RelationalExprM Atom

998+evalAtomExpr tupIn expr =

999+ -}

1000+{-

1001+

1002+evalAtomExpr tupIn (AttributeAtomExpr attrName) = case atomForAttributeName attrName tupIn of

1003+ Right atom -> pure (Right atom)

1004+ err@(Left (NoSuchAttributeNamesError _)) -> do

1005+ rstate <- ask

1006+ let stateTup = stateTuple rstate

1007+ pure (atomForAttributeName attrName stateTup)

1008+ Left err -> pure (Left err)

1009+evalAtomExpr _ (NakedAtomExpr atom) = pure (Right atom)

1010+evalAtomExpr tupIn (FunctionAtomExpr funcName arguments ()) = do

1011+ argTypes <- mapM (typeFromAtomExpr (tupleAttributes tupIn)) arguments

1012+ context <- fmap stateElemsContext ask

1013+ runExceptT $ do

1014+ let functions = atomFunctions context

1015+ func <- either throwE pure (atomFunctionForName funcName functions)

1016+ let expectedArgCount = length (atomFuncType func) - 1

1017+ actualArgCount = length argTypes

1018+ safeInit [] = [] -- different behavior from normal init

1019+ safeInit xs = init xs

1020+ if expectedArgCount /= actualArgCount then

1021+ throwE (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)

1022+ else do

1023+ let zippedArgs = zip (safeInit (atomFuncType func)) argTypes

1024+ mapM_ (\(expType, eActType) -> do

1025+ actType <- either throwE pure eActType

1026+ either throwE pure (atomTypeVerify expType actType)) zippedArgs

1027+ evaldArgs <- mapM (liftE . evalAtomExpr tupIn) arguments

1028+ case evalAtomFunction func evaldArgs of

1029+ Left err -> throwE (AtomFunctionUserError err)

1030+ Right result -> do

1031+ --validate that the result matches the expected type

1032+ _ <- either throwE pure (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))

1033+ pure result

1034+evalAtomExpr tupIn (RelationAtomExpr relExpr) = do

1035+ --merge existing state tuple context into new state tuple context to support an arbitrary number of levels, but new attributes trounce old attributes

1036+ rstate <- ask

1037+ runExceptT $ do

1038+ let newState = mergeTuplesIntoRelationalExprState tupIn rstate

1039+ relAtom <- either throwE pure (runReader (evalRelationalExpr relExpr) newState)

1040+ pure (RelationAtom relAtom)

1041+evalAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs ()) = runExceptT $ do

1042+ rstate <- lift ask

1043+ let newState = mergeTuplesIntoRelationalExprState tupIn rstate

1044+ aType <- either throwE pure (runReader (typeFromAtomExpr (tupleAttributes tupIn) cons) newState)

1045+ argAtoms <- mapM (\arg -> either throwE pure (runReader (evalAtomExpr tupIn arg) newState)) dConsArgs

1046+ pure (ConstructedAtom dConsName aType argAtoms)

1047+-}

851typeForGraphRefAtomExpr :: Attributes -> GraphRefAtomExpr -> GraphRefRelationalExprM AtomType

1048typeForGraphRefAtomExpr :: Attributes -> GraphRefAtomExpr -> GraphRefRelationalExprM AtomType

852typeForGraphRefAtomExpr attrs (AttributeAtomExpr attrName) = do

1049typeForGraphRefAtomExpr attrs (AttributeAtomExpr attrName) = do

853 renv <- askEnv

1050 renv <- askEnv

@@ -914,7 +1111,7 @@ verifyGraphRefAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs tid) e

914 let handler :: RelationalError -> GraphRefRelationalExprM AtomType

1111 let handler :: RelationalError -> GraphRefRelationalExprM AtomType

915 handler (AtomTypeMismatchError expSubType actSubType) = throwError (AtomFunctionTypeError funcName argCount expSubType actSubType)

1112 handler (AtomTypeMismatchError expSubType actSubType) = throwError (AtomFunctionTypeError funcName argCount expSubType actSubType)

916 handler err = throwError err

1113 handler err = throwError err

917− verifyGraphRefAtomExprTypes relIn atomExpr expectedType2 `catchError` handler

1114+ verifyGraphRefAtomExprTypes relIn atomExpr expectedType2 `catchError` handler

918 funcArgTypes <- mapM funcArgVerifier $ zip3 funcArgExprs expectedArgTypes [1..]

1115 funcArgTypes <- mapM funcArgVerifier $ zip3 funcArgExprs expectedArgTypes [1..]

919 if length funcArgTypes /= length expectedArgTypes - 1 then

1116 if length funcArgTypes /= length expectedArgTypes - 1 then

920 throwError (AtomTypeCountError funcArgTypes expectedArgTypes)

1117 throwError (AtomTypeCountError funcArgTypes expectedArgTypes)

@@ -951,38 +1148,26 @@ evalGraphRefTupleExprs mAttrs (TupleExprs fixedMarker tupleExprL) = do

951 [] -> pure emptyAttributes

1148 [] -> pure emptyAttributes

952 (headTuple:tailTuples) -> do

1149 (headTuple:tailTuples) -> do

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])

1150 --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])

954− let

1151+ let mostResolvedTypes =

955− processTupleAttrs (tupAttr, accAttr) =

1152+ foldr (\tup acc ->

956− --if the attribute is a constructedatomtype, we can recurse into it to potentially resolve type variables

1153+ fmap (\(tupAttr,accAttr) -> --if the attribute is a constructedatomtype, we can recurse into it to potentially resolve type variables

957− if isResolvedAttribute accAttr && tupAttr == accAttr then

1154+ if isResolvedAttribute accAttr then

958− pure accAttr

1155+ accAttr

959− else

1156+ else

960− lift $ except $ resolveAttributes accAttr tupAttr

1157+ case resolveAttributes accAttr tupAttr of

961− mostResolvedTypes <-

1158+ Left _ -> accAttr

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)

974− ) (V.toList . attributesVec $ tupleAttributes headTuple) tailTuples

1159+ Right val -> val) (zip (V.toList $ tupleAttributes tup) acc)) (V.toList $ tupleAttributes headTuple) tailTuples

975 pure (A.attributesFromList mostResolvedTypes)

1160 pure (A.attributesFromList mostResolvedTypes)

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

1161 --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

977 tConsMap <- case singularTransactions tupleExprL of

1162 tConsMap <- case singularTransactions tupleExprL of

978− SingularTransactionRef commonTransId ->

1163+ SingularTransactionRef commonTransId -> do

979 typeConstructorMapping <$> gfDatabaseContextForMarker commonTransId

1164 typeConstructorMapping <$> gfDatabaseContextForMarker commonTransId

980− NoTransactionsRef ->

1165+ NoTransactionsRef -> do

981 typeConstructorMapping <$> gfDatabaseContextForMarker fixedMarker

1166 typeConstructorMapping <$> gfDatabaseContextForMarker fixedMarker

982 -- if there are multiple transaction markers in the TupleExprs, then we can't assume a single type constructor mapping- this could be improved in the future, but if all the tuples are fully resolved, then we don't need further resolution

1167 -- if there are multiple transaction markers in the TupleExprs, then we can't assume a single type constructor mapping- this could be improved in the future, but if all the tuples are fully resolved, then we don't need further resolution

983 _ -> throwError TupleExprsReferenceMultipleMarkersError

1168 _ -> throwError TupleExprsReferenceMultipleMarkersError

984 lift $ except $ validateAttributes tConsMap finalAttrs

1169 lift $ except $ validateAttributes tConsMap finalAttrs

985− mapM (lift . except . resolveTypesInTuple finalAttrs tConsMap) tuples

1170+ mapM (\tup -> lift $ except $ resolveTypesInTuple finalAttrs tConsMap tup) tuples

986

1171

987

1172

988--resolveAttributes (Attribute "gonk" (ConstructedAtomType "Either" (fromList [("a",IntegerAtomType),("b",TypeVariableType "b")]))) (Attribute "gonk" (ConstructedAtomType "Either" (fromList [("a",TypeVariableType "a"),("b",TextAtomType)])))

1173--resolveAttributes (Attribute "gonk" (ConstructedAtomType "Either" (fromList [("a",IntegerAtomType),("b",TypeVariableType "b")]))) (Attribute "gonk" (ConstructedAtomType "Either" (fromList [("a",TypeVariableType "a"),("b",TextAtomType)])))

@@ -1017,6 +1202,56 @@ evalGraphRefTupleExpr mAttrs (TupleExpr tupMap) = do

1017-- _ <- lift $ except (validateTuple tup' tConss)

1202-- _ <- lift $ except (validateTuple tup' tConss)

1018 pure tup'

1203 pure tup'

1019

1204

1205+{-

1206+evalAttributeNames :: AttributeNames -> RelationalExpr -> RelationalExprM (Either RelationalError (S.Set AttributeName))

1207+evalAttributeNames attrNames expr = do

1208+ eExprType <- typeForRelationalExpr expr

1209+ case eExprType of

1210+ Left err -> throwError err

1211+ Right exprTyp -> do

1212+ let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))

1213+ case attrNames of

1214+ AttributeNames names ->

1215+ case A.projectionAttributesForNames names (attributes exprTyp) of

1216+ Left err -> pure (Left err)

1217+ Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))

1218+

1219+ InvertedAttributeNames names -> do

1220+ let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet

1221+ if not (S.null nonExistentAttributeNames) then

1222+ pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))

1223+ else

1224+ pure (Right (A.nonMatchingAttributeNameSet names typeNameSet))

1225+

1226+ UnionAttributeNames namesA namesB -> do

1227+ eNameSetA <- evalAttributeNames namesA expr

1228+ case eNameSetA of

1229+ Left err -> pure (Left err)

1230+ Right nameSetA -> do

1231+ eNameSetB <- evalAttributeNames namesB expr

1232+ case eNameSetB of

1233+ Left err -> pure (Left err)

1234+ Right nameSetB ->

1235+ pure (Right (S.union nameSetA nameSetB))

1236+

1237+ IntersectAttributeNames namesA namesB -> do

1238+ eNameSetA <- evalAttributeNames namesA expr

1239+ case eNameSetA of

1240+ Left err -> pure (Left err)

1241+ Right nameSetA -> do

1242+ eNameSetB <- evalAttributeNames namesB expr

1243+ case eNameSetB of

1244+ Left err -> pure (Left err)

1245+ Right nameSetB ->

1246+ pure (Right (S.intersection nameSetA nameSetB))

1247+

1248+ RelationalExprAttributeNames attrExpr -> do

1249+ eAttrExprType <- typeForRelationalExpr attrExpr

1250+ case eAttrExprType of

1251+ Left err -> pure (Left err)

1252+ Right attrExprType -> pure (Right (A.attributeNameSet (attributes attrExprType)))

1253+-}

1254+

1020--temporary implementation until we have a proper planner+executor

1255--temporary implementation until we have a proper planner+executor

1021evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation

1256evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation

1022evalGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do

1257evalGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do

@@ -1078,7 +1313,7 @@ evalGraphRefRelationalExpr (Extend extendTupleExpr expr) = do

1078 rel <- evalGraphRefRelationalExpr expr

1313 rel <- evalGraphRefRelationalExpr expr

1079 (newAttrs, tupProc) <- extendGraphRefTupleExpressionProcessor rel extendTupleExpr

1314 (newAttrs, tupProc) <- extendGraphRefTupleExpressionProcessor rel extendTupleExpr

1080 lift $ except $ relMogrify tupProc newAttrs rel

1315 lift $ except $ relMogrify tupProc newAttrs rel

1081−evalGraphRefRelationalExpr expr@With{} =

1316+evalGraphRefRelationalExpr expr@With{} = do

1082 --strategy A: add relation variables to the contexts in the graph

1317 --strategy A: add relation variables to the contexts in the graph

1083 --strategy B: drop in macros in place (easier programmatically)

1318 --strategy B: drop in macros in place (easier programmatically)

1084 --strategy B implementation

1319 --strategy B implementation

@@ -1106,7 +1341,7 @@ typeForGraphRefRelationalExpr (ExistingRelation rel) = pure (emptyRelationWithAt

1106typeForGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do

1341typeForGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do

1107 mAttrs <- case mAttrExprs of

1342 mAttrs <- case mAttrExprs of

1108 Just attrExprs -> do

1343 Just attrExprs -> do

1109− attrs <- mapM evalGraphRefAttributeExpr attrExprs

1344+ attrs <- mapM (\e -> evalGraphRefAttributeExpr e) attrExprs

1110 pure (Just (attributesFromList attrs))

1345 pure (Just (attributesFromList attrs))

1111 Nothing -> pure Nothing

1346 Nothing -> pure Nothing

1112 tuples <- evalGraphRefTupleExprs mAttrs tupleExprs

1347 tuples <- evalGraphRefTupleExprs mAttrs tupleExprs

@@ -1151,9 +1386,9 @@ typeForGraphRefRelationalExpr (Restrict pred' expr) = do

1151 expr' <- typeForGraphRefRelationalExpr expr

1386 expr' <- typeForGraphRefRelationalExpr expr

1152 filt <- predicateRestrictionFilter (attributes expr') pred'

1387 filt <- predicateRestrictionFilter (attributes expr') pred'

1153 lift $ except $ restrict filt expr'

1388 lift $ except $ restrict filt expr'

1154−typeForGraphRefRelationalExpr Equals{} =

1389+typeForGraphRefRelationalExpr Equals{} = do

1155 pure relationFalse

1390 pure relationFalse

1156−typeForGraphRefRelationalExpr NotEquals{} =

1391+typeForGraphRefRelationalExpr NotEquals{} = do

1157 pure relationFalse

1392 pure relationFalse

1158typeForGraphRefRelationalExpr (Extend extendTupleExpr expr) = do

1393typeForGraphRefRelationalExpr (Extend extendTupleExpr expr) = do

1159 rel <- typeForGraphRefRelationalExpr expr

1394 rel <- typeForGraphRefRelationalExpr expr

@@ -1165,7 +1400,7 @@ typeForGraphRefRelationalExpr expr@(With withs _) = do

1165 case M.lookup macroName rvs of

1400 case M.lookup macroName rvs of

1166 Just _ -> lift $ except $ Left (RelVarAlreadyDefinedError macroName) --this error does not include the transaction marker, but should be good enough to identify the cause

1401 Just _ -> lift $ except $ Left (RelVarAlreadyDefinedError macroName) --this error does not include the transaction marker, but should be good enough to identify the cause

1167 Nothing -> pure ()

1402 Nothing -> pure ()

1168− mapM_ (checkMacroName . fst) withs

1403+ mapM_ checkMacroName (map fst withs)

1169 typeForGraphRefRelationalExpr expr'

1404 typeForGraphRefRelationalExpr expr'

1170

1405

1171evalGraphRefAttributeNames :: GraphRefAttributeNames -> GraphRefRelationalExpr -> GraphRefRelationalExprM (S.Set AttributeName)

1406evalGraphRefAttributeNames :: GraphRefAttributeNames -> GraphRefRelationalExpr -> GraphRefRelationalExprM (S.Set AttributeName)

@@ -1211,7 +1446,7 @@ evalGraphRefAttributeExpr (AttributeAndTypeNameExpr attrName tCons tid) = do

1211evalGraphRefAttributeExpr (NakedAttributeExpr attr) = pure attr

1446evalGraphRefAttributeExpr (NakedAttributeExpr attr) = pure attr

1212

1447

1213mkEmptyRelVars :: RelationVariables -> RelationVariables

1448mkEmptyRelVars :: RelationVariables -> RelationVariables

1214−mkEmptyRelVars = M.map mkEmptyRelVar

1449+mkEmptyRelVars rvMap = M.map mkEmptyRelVar rvMap

1215 where

1450 where

1216 mkEmptyRelVar expr@MakeRelationFromExprs{} = expr --do not truncate here because we might lose essential type information in emptying the tuples

1451 mkEmptyRelVar expr@MakeRelationFromExprs{} = expr --do not truncate here because we might lose essential type information in emptying the tuples

1217 mkEmptyRelVar (MakeStaticRelation attrs _) = MakeStaticRelation attrs emptyTupleSet

1452 mkEmptyRelVar (MakeStaticRelation attrs _) = MakeStaticRelation attrs emptyTupleSet

@@ -1228,7 +1463,7 @@ mkEmptyRelVars = M.map mkEmptyRelVar

1228 mkEmptyRelVar (Equals exprA exprB) = Equals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)

1463 mkEmptyRelVar (Equals exprA exprB) = Equals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)

1229 mkEmptyRelVar (NotEquals exprA exprB) = NotEquals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)

1464 mkEmptyRelVar (NotEquals exprA exprB) = NotEquals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)

1230 mkEmptyRelVar (Extend extTuple expr) = Extend extTuple (mkEmptyRelVar expr)

1465 mkEmptyRelVar (Extend extTuple expr) = Extend extTuple (mkEmptyRelVar expr)

1231− mkEmptyRelVar (With macros expr) = With (map (second mkEmptyRelVar) macros) (mkEmptyRelVar expr)

1466+ mkEmptyRelVar (With macros expr) = With (map (\(rv, expr') -> (rv, mkEmptyRelVar expr')) macros) (mkEmptyRelVar expr)

1232

1467

1233

1468

1234dbErr :: RelationalError -> DatabaseContextEvalMonad ()

1469dbErr :: RelationalError -> DatabaseContextEvalMonad ()

@@ -1245,7 +1480,7 @@ relationVariablesAsRelation ctx graph = do

1245 let gfEnv = freshGraphRefRelationalExprEnv (Just ctx) graph

1480 let gfEnv = freshGraphRefRelationalExprEnv (Just ctx) graph

1246 gfType <- runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)

1481 gfType <- runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)

1247 pure (rvName, gfType)

1482 pure (rvName, gfType)

1248− relVarToAtomList (rvName, rel) = [TextAtom rvName, attributesToRel (attributesVec (attributes rel))]

1483+ relVarToAtomList (rvName, rel) = [TextAtom rvName, attributesToRel (attributes rel)]

1249 attrAtoms a = [TextAtom (A.attributeName a), TextAtom (prettyAtomType (A.atomType a))]

1484 attrAtoms a = [TextAtom (A.attributeName a), TextAtom (prettyAtomType (A.atomType a))]

1250 attributesToRel attrl = case mkRelationFromList subrelAttrs (map attrAtoms (V.toList attrl)) of

1485 attributesToRel attrl = case mkRelationFromList subrelAttrs (map attrAtoms (V.toList attrl)) of

1251 Left err -> error ("relationVariablesAsRelation pooped " ++ show err)

1486 Left err -> error ("relationVariablesAsRelation pooped " ++ show err)

@@ -1265,6 +1500,15 @@ evalRelationalExpr expr = do

1265 Left err -> throwError err

1500 Left err -> throwError err

1266 Right rel -> pure rel

1501 Right rel -> pure rel

1267

1502

1503+{-

1504+relVarByName :: RelVarName -> GraphRefRelationalExprM GraphRefRelationalExpr

1505+relVarByName = do

1506+ relvars <- relationVariables <$> getStateContext

1507+ case M.lookup relVarName relvars of

1508+ Nothing -> dbErr (RelVarNotDefinedError relVarName)

1509+ Just gfexpr -> pure gfExpr

1510+-}

1511+

1268class (MonadError RelationalError m, Monad m) => DatabaseContextM m where

1512class (MonadError RelationalError m, Monad m) => DatabaseContextM m where

1269 getContext :: m DatabaseContext

1513 getContext :: m DatabaseContext

1270

1514

@@ -1281,112 +1525,3 @@ relVarByName rvName = do

1281 Nothing -> throwError (RelVarNotDefinedError rvName)

1525 Nothing -> throwError (RelVarNotDefinedError rvName)

1282 Just gfexpr -> pure gfexpr

1526 Just gfexpr -> pure gfexpr

1283

1527

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+4−11

@@ -18,7 +18,6 @@ import System.Info (os, arch)

18import Data.Text (Text, unpack)

19import Data.Maybe

20import GHC.Paths (libdir)

21−import System.Environment

22#if __GLASGOW_HASKELL__ >= 800

21#if __GLASGOW_HASKELL__ >= 800

23import GHC.LanguageExtensions

22import GHC.LanguageExtensions

24import GHCi.ObjLink

23import GHCi.ObjLink

@@ -79,8 +78,6 @@ initScriptSession ghcPkgPaths = do

79 handleGhcException excHandler $ runGhc (Just libdir) $ do

78 handleGhcException excHandler $ runGhc (Just libdir) $ do

80 dflags <- getSessionDynFlags

79 dflags <- getSessionDynFlags

81 let ghcVersion = projectVersion dflags

80 let ghcVersion = projectVersion dflags

82− -- get nix packages dir, if available

83− mNixLibDir <- liftIO $ lookupEnv "NIX_GHC_LIBDIR"

84

81

85 sandboxPkgPaths <- liftIO $ concat <$> mapM glob [

82 sandboxPkgPaths <- liftIO $ concat <$> mapM glob [

86 --"./dist-newstyle/packagedb/ghc-" ++ ghcVersion, --rely on cabal 3's ghc.environment install: "cabal install --lib project-m36"

83 --"./dist-newstyle/packagedb/ghc-" ++ ghcVersion, --rely on cabal 3's ghc.environment install: "cabal install --lib project-m36"

@@ -92,7 +89,7 @@ initScriptSession ghcPkgPaths = do

92 --homeDir </> ".cabal/store/ghc-" ++ ghcVersion ++ "/package.db"

89 --homeDir </> ".cabal/store/ghc-" ++ ghcVersion ++ "/package.db"

93 ]

90 ]

94

91

95− let localPkgPaths = map PkgConfFile (ghcPkgPaths ++ sandboxPkgPaths ++ maybeToList mNixLibDir)

92+ let localPkgPaths = map PkgConfFile (ghcPkgPaths ++ sandboxPkgPaths)

96

93

97 let dflags' = applyGopts . applyXopts $ dflags { hscTarget = HscInterpreted ,

94 let dflags' = applyGopts . applyXopts $ dflags { hscTarget = HscInterpreted ,

98 ghcLink = LinkInMemory,

95 ghcLink = LinkInMemory,

@@ -128,6 +125,8 @@ initScriptSession ghcPkgPaths = do

128 "uuid",

125 "uuid",

129 "vector",

126 "vector",

130 "text",

127 "text",

128+ "binary",

129+ "vector-binary-instances",

131 "time",

130 "time",

132 "project-m36",

131 "project-m36",

133 "bytestring"]

132 "bytestring"]

@@ -145,9 +144,7 @@ initScriptSession ghcPkgPaths = do

145 ideclSourceSrc = Nothing,

144 ideclSourceSrc = Nothing,

146#endif

145#endif

147

146

148−#if __GLASGOW_HASKELL__ >= 810

147+#if __GLASGOW_HASKELL__ >= 806

149− ideclExt = noExtField,

150−#elif __GLASGOW_HASKELL__ >= 806

151 ideclExt = NoExt,

148 ideclExt = NoExt,

152#endif

149#endif

153 ideclName = noLoc mn,

150 ideclName = noLoc mn,

@@ -155,11 +152,7 @@ initScriptSession ghcPkgPaths = do

155 ideclSource = False,

152 ideclSource = False,

156 ideclSafe = True,

153 ideclSafe = True,

157 ideclImplicit = False,

154 ideclImplicit = False,

158−#if __GLASGOW_HASKELL__ >= 810

159− ideclQualified = if isJust mQual then QualifiedPre else NotQualified,

160−#else

161 ideclQualified = isJust mQual,

155 ideclQualified = isJust mQual,

162−#endif

163 ideclAs = mQual,

156 ideclAs = mQual,

164 ideclHiding = Nothing

157 ideclHiding = Nothing

165 }

158 }

src/lib/ProjectM36/Serialise/AtomFunctionError.hsdeleted−7

@@ -1,7 +0,0 @@

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.hsdeleted−85

@@ -1,85 +0,0 @@

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.hsdeleted−13

@@ -1,13 +0,0 @@

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.hsdeleted−7

@@ -1,7 +0,0 @@

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.hsdeleted−15

@@ -1,15 +0,0 @@

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.hsdeleted−7

@@ -1,7 +0,0 @@

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.hsdeleted−1

@@ -1 +0,0 @@

1−

src/lib/ProjectM36/Server.hs+90−166

@@ -7,119 +7,76 @@ import ProjectM36.Server.RemoteCallTypes

7import ProjectM36.Server.Config (ServerConfig(..))

8import ProjectM36.FSType

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(..))

10−import Control.Concurrent.MVar (MVar)

21+import Control.Concurrent.MVar (putMVar, MVar)

11import System.IO (stderr, hPutStrLn)

22import System.IO (stderr, hPutStrLn)

12import System.FilePath (takeDirectory)

23import System.FilePath (takeDirectory)

13import System.Directory (doesDirectoryExist)

24import 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

18−

19−type TestMode = Bool

20−

21−requestHandlers :: TestMode -> Maybe Timeout -> RequestHandlers ServerState

22−requestHandlers testFlag ti =

23− [

24− RequestHandler (\sState (Login dbName) -> do

25− addClientLogin dbName sState

26− conn <- getConn sState

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

25

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

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 Logout -> handleLogout ti conn)

57+ ] ++ testModeHandlers,

58+ unhandledMessagePolicy = Terminate

59+ --unhandledMessagePolicy = Log

60+ }

61+ where

62+ testModeHandlers = [handleCall (\conn (TestTimeout sessionId) -> handleTestTimeout ti sessionId conn) | testBool]

122

63

64+initServer :: InitHandler (Connection, DatabaseName, Maybe (MVar EndPointAddress), EndPointAddress) Connection

65+initServer (conn, dbname, mAddressMVar, saddress) = do

66+ registerDB dbname

67+ case mAddressMVar of

68+ Nothing -> pure ()

69+ Just addressMVar -> liftIO $ putMVar addressMVar saddress

70+ --traceShowM ("server started on " ++ show saddress)

71+ pure $ InitOk conn Infinity

72+

73+registerDB :: DatabaseName -> Process ()

74+registerDB dbname = do

75+ self <- getSelfPid

76+ let dbname' = remoteDBLookupName dbname

77+ register dbname' self

78+ --liftIO $ putStrLn $ "registered " ++ (show self) ++ " " ++ dbname'

79+

123-- | A notification callback which logs the notification to stderr and does nothing else.

80-- | A notification callback which logs the notification to stderr and does nothing else.

124loggingNotificationCallback :: NotificationCallback

81loggingNotificationCallback :: NotificationCallback

125loggingNotificationCallback notName evaldNot = hPutStrLn stderr $ "Notification received \"" ++ show notName ++ "\": " ++ show evaldNot

82loggingNotificationCallback notName evaldNot = hPutStrLn stderr $ "Notification received \"" ++ show notName ++ "\": " ++ show evaldNot

@@ -144,47 +101,9 @@ checkFSType performCheck strat =

144checkFSErrorMsg :: String

101checkFSErrorMsg :: String

145checkFSErrorMsg = "The filesystem does not support journaling so writes may not be crash-safe. Use --disable-fscheck to disable this fatal error."

102checkFSErrorMsg = "The filesystem does not support journaling so writes may not be crash-safe. Use --disable-fscheck to disable this fatal error."

146

103

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 })

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.

104-- | 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.

186−launchServer :: ServerConfig -> Maybe (MVar SockAddr) -> IO Bool

105+launchServer :: ServerConfig -> Maybe (MVar EndPointAddress) -> IO Bool

187−launchServer daemonConfig mAddr = do

106+launchServer daemonConfig mAddressMVar = do

188 checkFSResult <- checkFSType (checkFS daemonConfig) (persistenceStrategy daemonConfig)

107 checkFSResult <- checkFSType (checkFS daemonConfig) (persistenceStrategy daemonConfig)

189 if not checkFSResult then do

108 if not checkFSResult then do

190 hPutStrLn stderr checkFSErrorMsg

109 hPutStrLn stderr checkFSErrorMsg

@@ -197,21 +116,26 @@ launchServer daemonConfig mAddr = do

197 pure False

116 pure False

198 Right conn -> do

117 Right conn -> do

199 let hostname = bindHost daemonConfig

118 let hostname = bindHost daemonConfig

200− port = fromIntegral (bindPort daemonConfig)

119+ port = bindPort daemonConfig

201−

120+#if MIN_VERSION_network_transport_tcp(0,7,0)

202−

121+ etransport <- createTransport (defaultTCPAddr hostname (show port)) defaultTCPParameters

203− --curryer only supports IPv4 for now

122+#elif MIN_VERSION_network_transport_tcp(0,6,0)

204− let addrHints = defaultHints { addrSocketType = Stream, addrFamily = AF_INET }

123+ etransport <- createTransport hostname (show port) (\nam -> (hostname, nam)) defaultTCPParameters

205− hostAddrs <- getAddrInfo (Just addrHints) (Just hostname) Nothing

124+#else

125+ etransport <- createTransport hostname (show port) defaultTCPParameters

126+#endif

127+ case etransport of

128+ Left err -> error ("failed to create transport: " ++ show err)

129+ Right transport -> do

130+ eEndpoint <- newEndPoint transport

206− case hostAddrs of

131+ case eEndpoint of

207− [] -> hPutStrLn stderr ("Failed to resolve: " <> hostname) >> pure False

132+ Left err -> hPutStrLn stderr ("Failed to create transport: " ++ show err) >> pure False

208− (AddrInfo _ _ _ _ (SockAddrInet _ addr32) _):_ -> do

133+ Right endpoint -> do

209− let hostAddr = hostAddressToTuple addr32

134+ localTCPNode <- newLocalNode transport initRemoteTable

135+ --traceShowM ("newLocalNode in Server " ++ show (localNodeId localTCPNode))

136+ runProcess localTCPNode $ do

137+ let testBool = testMode daemonConfig

210− mTimeout = fromIntegral <$> case perRequestTimeout daemonConfig of

138+ reqTimeout = perRequestTimeout daemonConfig

211− 0 -> Nothing

139+ serve (conn, databaseName daemonConfig, mAddressMVar, address endpoint) initServer (serverDefinition testBool reqTimeout)

212− v -> Just v

140+ liftIO $ putStrLn "serve returned"

213−

141+ pure True

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,12 +12,6 @@ data ServerConfig = ServerConfig { persistenceStrategy :: PersistenceStrategy,

12 }

13 deriving (Show)

14

15−data WebsocketServerConfig = WebsocketServerConfig { wsServerConfig :: ServerConfig,

16− tlsCertificatePath :: Maybe String,

17− tlsKeyPath :: Maybe String

18− }

19− deriving (Show)

20−

21defaultServerConfig :: ServerConfig

15defaultServerConfig :: ServerConfig

22defaultServerConfig = ServerConfig { persistenceStrategy = NoPersistence,

16defaultServerConfig = ServerConfig { persistenceStrategy = NoPersistence,

23 checkFS = True,

17 checkFS = True,

src/lib/ProjectM36/Server/EntryPoints.hs+153−125

@@ -3,144 +3,172 @@ module ProjectM36.Server.EntryPoints where

3import ProjectM36.Base hiding (inclusionDependencies)

4import ProjectM36.IsomorphicSchema

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)

6import Data.Map

12import Data.Map

7import Control.Concurrent (threadDelay)

13import Control.Concurrent (threadDelay)

8−import Network.RPC.Curryer.Server

14+import Data.Typeable

9−import System.Timeout hiding (Timeout)

15+import Data.Binary

10−import Network.Socket

11−import Control.Exception

12

16

13−timeoutOrDie :: Maybe Timeout -> IO a -> IO (Maybe a)

17+timeoutOrDie :: (Binary a, Typeable a) => Timeout -> IO a -> Process (Either ServerError a)

14−timeoutOrDie mMicros act =

18+timeoutOrDie micros act =

15− case mMicros of

19+ if micros == 0 then

16− Nothing -> Just <$> act

20+ liftIO act >>= \x -> pure (Right x)

17− Just micros ->

21+ else do

18− timeout (fromIntegral micros) act

22+ asyncUnit <- async (task (liftIO act))

19−

23+ asyncRes <- waitCancelTimeout micros asyncUnit

20−timeoutRelErr :: Maybe Timeout -> IO (Either RelationalError a) -> IO (Either RelationalError a)

21−timeoutRelErr mMicros act = do

22− ret <- timeoutOrDie mMicros act

23− case ret of

24+ case asyncRes of

24− Nothing -> throw TimeoutException

25+ AsyncDone x -> pure (Right x)

25− Just v -> pure v

26+ AsyncCancelled -> pure (Left RequestTimeoutError)

26−

27+ AsyncFailed reason -> pure (Left (ProcessDiedError (show reason)))

28+ AsyncLinkFailed reason -> pure (Left (ProcessDiedError (show reason)))

29+ AsyncPending -> pure (Left (ProcessDiedError "process pending"))

30+

31+type Timeout = Int

27

32

33+type Reply a = Process (ProcessReply (Either ServerError a) Connection)

34+

28−handleExecuteRelationalExpr :: Maybe Timeout -> SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)

35+handleExecuteRelationalExpr :: Timeout -> SessionId -> Connection -> RelationalExpr -> Reply (Either RelationalError Relation)

29−handleExecuteRelationalExpr ti sessionId conn expr =

36+handleExecuteRelationalExpr ti sessionId conn expr = do

30− timeoutRelErr ti (executeRelationalExpr sessionId conn expr)

37+ ret <- timeoutOrDie ti (executeRelationalExpr sessionId conn expr)

38+ reply ret conn

31

39

32−handleExecuteDataFrameExpr :: Maybe Timeout -> SessionId -> Connection -> DataFrameExpr -> IO (Either RelationalError DataFrame)

40+handleExecuteDataFrameExpr :: Timeout -> SessionId -> Connection -> DataFrameExpr -> Reply (Either RelationalError DataFrame)

33−handleExecuteDataFrameExpr ti sessionId conn expr =

41+handleExecuteDataFrameExpr ti sessionId conn expr = do

34− timeoutRelErr ti (executeDataFrameExpr sessionId conn expr)

42+ ret <- timeoutOrDie ti (executeDataFrameExpr sessionId conn expr)

35−

43+ reply ret conn

44+

36−handleExecuteDatabaseContextExpr :: Maybe Timeout -> SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError ())

45+handleExecuteDatabaseContextExpr :: Timeout -> SessionId -> Connection -> DatabaseContextExpr -> Reply (Either RelationalError ())

37−handleExecuteDatabaseContextExpr ti sessionId conn dbexpr =

46+handleExecuteDatabaseContextExpr ti sessionId conn dbexpr = do

38− timeoutRelErr ti (executeDatabaseContextExpr sessionId conn dbexpr)

47+ ret <- timeoutOrDie ti (executeDatabaseContextExpr sessionId conn dbexpr)

39−

48+ reply ret conn

49+

40−handleExecuteDatabaseContextIOExpr :: Maybe Timeout -> SessionId -> Connection -> DatabaseContextIOExpr -> IO (Either RelationalError ())

50+handleExecuteDatabaseContextIOExpr :: Timeout -> SessionId -> Connection -> DatabaseContextIOExpr -> Reply (Either RelationalError ())

41−handleExecuteDatabaseContextIOExpr ti sessionId conn dbexpr =

51+handleExecuteDatabaseContextIOExpr ti sessionId conn dbexpr = do

42− timeoutRelErr ti (executeDatabaseContextIOExpr sessionId conn dbexpr)

52+ ret <- timeoutOrDie ti (executeDatabaseContextIOExpr sessionId conn dbexpr)

43−

53+ reply ret conn

54+

44−handleExecuteHeadName :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError HeadName)

55+handleExecuteHeadName :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError HeadName)

45−handleExecuteHeadName ti sessionId conn =

56+handleExecuteHeadName ti sessionId conn = do

46− timeoutRelErr ti (headName sessionId conn)

57+ ret <- timeoutOrDie ti (headName sessionId conn)

47−

58+ reply ret conn

48−handleLogin :: Connection -> Locking Socket -> IO Bool

59+

60+handleLogin :: Timeout -> Connection -> ProcessId -> Reply Bool

49−handleLogin conn lockSock = do

61+handleLogin ti conn newClientProcessId = do

50− addClientNode conn lockSock

62+ ret <- timeoutOrDie ti (addClientNode conn newClientProcessId)

51− pure True

63+ case ret of

52−

64+ Right () -> reply (Right True) conn

65+ Left err -> reply (Left err) conn

66+

53−handleExecuteGraphExpr :: Maybe Timeout -> SessionId -> Connection -> TransactionGraphOperator -> IO (Either RelationalError ())

67+handleExecuteGraphExpr :: Timeout -> SessionId -> Connection -> TransactionGraphOperator -> Reply (Either RelationalError ())

54−handleExecuteGraphExpr ti sessionId conn graphExpr =

68+handleExecuteGraphExpr ti sessionId conn graphExpr = do

55− timeoutRelErr ti (executeGraphExpr sessionId conn graphExpr)

69+ ret <- timeoutOrDie ti (executeGraphExpr sessionId conn graphExpr)

56−

70+ reply ret conn

71+

57−handleExecuteTransGraphRelationalExpr :: Maybe Timeout -> SessionId -> Connection -> TransGraphRelationalExpr -> IO (Either RelationalError Relation)

72+handleExecuteTransGraphRelationalExpr :: Timeout -> SessionId -> Connection -> TransGraphRelationalExpr -> Reply (Either RelationalError Relation)

58−handleExecuteTransGraphRelationalExpr ti sessionId conn graphExpr =

73+handleExecuteTransGraphRelationalExpr ti sessionId conn graphExpr = do

59− timeoutRelErr ti (executeTransGraphRelationalExpr sessionId conn graphExpr)

74+ ret <- timeoutOrDie ti (executeTransGraphRelationalExpr sessionId conn graphExpr)

75+ reply ret conn

60

76

61−handleExecuteTypeForRelationalExpr :: Maybe Timeout -> SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)

77+handleExecuteTypeForRelationalExpr :: Timeout -> SessionId -> Connection -> RelationalExpr -> Reply (Either RelationalError Relation)

62−handleExecuteTypeForRelationalExpr ti sessionId conn relExpr =

78+handleExecuteTypeForRelationalExpr ti sessionId conn relExpr = do

63− timeoutRelErr ti (typeForRelationalExpr sessionId conn relExpr)

79+ ret <- timeoutOrDie ti (typeForRelationalExpr sessionId conn relExpr)

64−

80+ reply ret conn

81+

65−handleRetrieveInclusionDependencies :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError (Map IncDepName InclusionDependency))

82+handleRetrieveInclusionDependencies :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError (Map IncDepName InclusionDependency))

66−handleRetrieveInclusionDependencies ti sessionId conn =

83+handleRetrieveInclusionDependencies ti sessionId conn = do

67− timeoutRelErr ti (inclusionDependencies sessionId conn)

84+ ret <- timeoutOrDie ti (inclusionDependencies sessionId conn)

68−

85+ reply ret conn

86+

69−handleRetrievePlanForDatabaseContextExpr :: Maybe Timeout -> SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError GraphRefDatabaseContextExpr)

87+handleRetrievePlanForDatabaseContextExpr :: Timeout -> SessionId -> Connection -> DatabaseContextExpr -> Reply (Either RelationalError GraphRefDatabaseContextExpr)

70−handleRetrievePlanForDatabaseContextExpr ti sessionId conn dbExpr =

88+handleRetrievePlanForDatabaseContextExpr ti sessionId conn dbExpr = do

71− timeoutRelErr ti (planForDatabaseContextExpr sessionId conn dbExpr)

89+ ret <- timeoutOrDie ti (planForDatabaseContextExpr sessionId conn dbExpr)

72−

90+ reply ret conn

91+

73−handleRetrieveTransactionGraph :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)

92+handleRetrieveTransactionGraph :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)

74−handleRetrieveTransactionGraph ti sessionId conn =

93+handleRetrieveTransactionGraph ti sessionId conn = do

75− timeoutRelErr ti (transactionGraphAsRelation sessionId conn)

94+ ret <- timeoutOrDie ti (transactionGraphAsRelation sessionId conn)

76−

95+ reply ret conn

96+

77−handleRetrieveHeadTransactionId :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError TransactionId)

97+handleRetrieveHeadTransactionId :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError TransactionId)

78−handleRetrieveHeadTransactionId ti sessionId conn =

98+handleRetrieveHeadTransactionId ti sessionId conn = do

79− timeoutRelErr ti (headTransactionId sessionId conn)

99+ ret <- timeoutOrDie ti (headTransactionId sessionId conn)

80−

100+ reply ret conn

101+

81−handleCreateSessionAtCommit :: Maybe Timeout -> Connection -> TransactionId -> IO (Either RelationalError SessionId)

102+handleCreateSessionAtCommit :: Timeout -> Connection -> TransactionId -> Reply (Either RelationalError SessionId)

82−handleCreateSessionAtCommit ti conn commitId =

103+handleCreateSessionAtCommit ti conn commitId = do

83− timeoutRelErr ti (createSessionAtCommit conn commitId)

104+ ret <- timeoutOrDie ti (createSessionAtCommit conn commitId)

84−

105+ reply ret conn

106+

85−handleCreateSessionAtHead :: Maybe Timeout -> Connection -> HeadName -> IO (Either RelationalError SessionId)

107+handleCreateSessionAtHead :: Timeout -> Connection -> HeadName -> Reply (Either RelationalError SessionId)

86−handleCreateSessionAtHead ti conn headn =

108+handleCreateSessionAtHead ti conn headn = do

87− timeoutRelErr ti (createSessionAtHead conn headn)

109+ ret <- timeoutOrDie ti (createSessionAtHead conn headn)

88−

110+ reply ret conn

111+

89−handleCloseSession :: SessionId -> Connection -> IO ()

112+handleCloseSession :: Timeout -> SessionId -> Connection -> Reply ()

90−handleCloseSession =

113+handleCloseSession ti sessionId conn = do

91− closeSession

114+ ret <- timeoutOrDie ti (closeSession sessionId conn)

115+ case ret of

116+ Right () -> reply (Right ()) conn

117+ Left err -> reply (Left err) conn

92

118

93−handleRetrieveAtomTypesAsRelation :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)

119+handleRetrieveAtomTypesAsRelation :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)

94−handleRetrieveAtomTypesAsRelation ti sessionId conn =

120+handleRetrieveAtomTypesAsRelation ti sessionId conn = do

95− timeoutRelErr ti (atomTypesAsRelation sessionId conn)

121+ ret <- timeoutOrDie ti (atomTypesAsRelation sessionId conn)

122+ reply ret conn

96

123

97-- | Returns a relation which lists the names of relvars in the current session as well as its types.

124-- | Returns a relation which lists the names of relvars in the current session as well as its types.

98−handleRetrieveRelationVariableSummary :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)

125+handleRetrieveRelationVariableSummary :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)

99−handleRetrieveRelationVariableSummary ti sessionId conn =

126+handleRetrieveRelationVariableSummary ti sessionId conn = do

100− timeoutRelErr ti (relationVariablesAsRelation sessionId conn)

127+ ret <- timeoutOrDie ti (relationVariablesAsRelation sessionId conn)

101−

128+ reply ret conn

129+

102−handleRetrieveAtomFunctionSummary :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)

130+handleRetrieveAtomFunctionSummary :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)

103−handleRetrieveAtomFunctionSummary ti sessionId conn =

131+handleRetrieveAtomFunctionSummary ti sessionId conn = do

104− timeoutRelErr ti (atomFunctionsAsRelation sessionId conn)

132+ ret <- timeoutOrDie ti (atomFunctionsAsRelation sessionId conn)

105−

133+ reply ret conn

134+

106−handleRetrieveDatabaseContextFunctionSummary :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)

135+handleRetrieveDatabaseContextFunctionSummary :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)

107−handleRetrieveDatabaseContextFunctionSummary ti sessionId conn =

136+handleRetrieveDatabaseContextFunctionSummary ti sessionId conn = do

108− timeoutRelErr ti (databaseContextFunctionsAsRelation sessionId conn)

137+ ret <- timeoutOrDie ti (databaseContextFunctionsAsRelation sessionId conn)

109−

138+ reply ret conn

139+

110−handleRetrieveCurrentSchemaName :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError SchemaName)

140+handleRetrieveCurrentSchemaName :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError SchemaName)

111−handleRetrieveCurrentSchemaName ti sessionId conn =

141+handleRetrieveCurrentSchemaName ti sessionId conn = do

112− timeoutRelErr ti (currentSchemaName sessionId conn)

142+ ret <- timeoutOrDie ti (currentSchemaName sessionId conn)

143+ reply ret conn

113

144

114−handleExecuteSchemaExpr :: Maybe Timeout -> SessionId -> Connection -> SchemaExpr -> IO (Either RelationalError ())

145+handleExecuteSchemaExpr :: Timeout -> SessionId -> Connection -> SchemaExpr -> Reply (Either RelationalError ())

115−handleExecuteSchemaExpr ti sessionId conn schemaExpr =

146+handleExecuteSchemaExpr ti sessionId conn schemaExpr = do

116− timeoutRelErr ti (executeSchemaExpr sessionId conn schemaExpr)

147+ ret <- timeoutOrDie ti (executeSchemaExpr sessionId conn schemaExpr)

148+ reply ret conn

117

149

118−handleLogout :: Maybe Timeout -> Connection -> IO Bool

150+handleLogout :: Timeout -> Connection -> Reply Bool

119−handleLogout _ _ =

151+handleLogout _ =

120 --liftIO $ closeRemote_ conn

152 --liftIO $ closeRemote_ conn

121− pure True

153+ reply (pure True)

122

154

123−handleTestTimeout :: Maybe Timeout -> SessionId -> Connection -> IO Bool

155+handleTestTimeout :: Timeout -> SessionId -> Connection -> Reply Bool

124−handleTestTimeout ti _ _ = do

156+handleTestTimeout ti _ conn = do

125− ret <- timeoutRelErr ti (threadDelay 100000 >> pure (Right ()))

157+ ret <- timeoutOrDie ti (threadDelay 100000 >> pure True)

126− case ret of

158+ reply ret conn

127− Right () -> pure True

128− Left _ -> pure False

129

159

130−

131−

132−handleRetrieveSessionIsDirty :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Bool)

160+handleRetrieveSessionIsDirty :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Bool)

133−handleRetrieveSessionIsDirty ti sessionId conn =

161+handleRetrieveSessionIsDirty ti sessionId conn = do

134− timeoutRelErr ti (disconnectedTransactionIsDirty sessionId conn)

162+ ret <- timeoutOrDie ti (disconnectedTransactionIsDirty sessionId conn)

135−

163+ reply ret conn

164+

136−handleExecuteAutoMergeToHead :: Maybe Timeout -> SessionId -> Connection -> MergeStrategy -> HeadName -> IO (Either RelationalError ())

165+handleExecuteAutoMergeToHead :: Timeout -> SessionId -> Connection -> MergeStrategy -> HeadName -> Reply (Either RelationalError ())

137−handleExecuteAutoMergeToHead ti sessionId conn strat headName' =

166+handleExecuteAutoMergeToHead ti sessionId conn strat headName' = do

138− timeoutRelErr ti (autoMergeToHead sessionId conn strat headName')

167+ ret <- timeoutOrDie ti (autoMergeToHead sessionId conn strat headName')

168+ reply ret conn

139

169

140−handleRetrieveTypeConstructorMapping :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError TypeConstructorMapping)

170+handleRetrieveTypeConstructorMapping :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError TypeConstructorMapping)

141−handleRetrieveTypeConstructorMapping ti sessionId conn =

171+handleRetrieveTypeConstructorMapping ti sessionId conn = do

142− timeoutRelErr ti (C.typeConstructorMapping sessionId conn)

172+ ret <- timeoutOrDie ti (C.typeConstructorMapping sessionId conn)

173+ reply ret conn

143

174

144−handleValidateMerkleHashes :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError ())

145−handleValidateMerkleHashes ti sessionId conn =

146− timeoutRelErr ti (C.validateMerkleHashes sessionId conn)

src/lib/ProjectM36/Server/ParseArgs.hs+15−38

@@ -17,14 +17,14 @@ parseArgsWithDefaults defaults = ServerConfig <$>

17 many parseGhcPkgPath <*>

18 parseTimeout (perRequestTimeout defaults) <*>

19 parseTestMode

20−

20+

21parsePersistenceStrategy :: Parser PersistenceStrategy

22parsePersistenceStrategy = CrashSafePersistence <$> (dbdirOpt <* fsyncOpt) <|>

23 MinimalPersistence <$> dbdirOpt <|>

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" <>

29 showDefaultWith show

30 )

@@ -34,69 +34,46 @@ parsePersistenceStrategy = CrashSafePersistence <$> (dbdirOpt <* fsyncOpt) <|>

34

35parseTestMode :: Parser Bool

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" <>

40 help "Disable filesystem check for journaling.")

41−

41+

42parseDatabaseName :: Parser DatabaseName

43parseDatabaseName = strOption (short 'n' <>

44 long "database" <>

45 metavar "DATABASE_NAME")

46

47−parseHostname :: Hostname -> Parser Hostname

47+parseHostname :: Hostname -> Parser Hostname

48parseHostname defHostname = strOption (short 'h' <>

49 long "hostname" <>

50 metavar "HOST_NAME" <>

51 value defHostname)

52−

52+

53−parsePort :: Port -> Parser Port

53+parsePort :: Port -> Parser Port

54parsePort defPort = option auto (short 'p' <>

55 long "port" <>

56 metavar "PORT_NUMBER" <>

57 value defPort)

58−

58+

59parseGhcPkgPath :: Parser String

60parseGhcPkgPath = strOption (long "ghc-pkg-dir" <>

61 metavar "GHC_PACKAGE_DIRECTORY")

62−

62+

63−parseTimeout :: Int -> Parser Int

63+parseTimeout :: Int -> Parser Int

64parseTimeout defTimeout = option auto (long "timeout" <>

65 metavar "MICROSECONDS" <>

66 value defTimeout)

67

68parseConfig :: IO ServerConfig

69parseConfig = parseConfigWithDefaults defaultServerConfig

70−

70+

71parseConfigWithDefaults :: ServerConfig -> IO ServerConfig

72parseConfigWithDefaults defaults = execParser (info (parseArgsWithDefaults defaults <**> helpOption) idm)

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")

91

74

92helpOption :: Parser (a -> a)

75helpOption :: Parser (a -> a)

93−helpOption = abortOption helpText $ mconcat

76+helpOption = abortOption ShowHelpText $ mconcat

94 [ long "help"

77 [ long "help"

95 , help "Show this help text"

78 , help "Show this help text"

96 , hidden ]

79 , 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+35−67

@@ -1,4 +1,4 @@

1−{-# LANGUAGE DeriveGeneric, DerivingVia, CPP #-}

1+{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}

2module ProjectM36.Server.RemoteCallTypes where

3import ProjectM36.Base

4import ProjectM36.IsomorphicSchema

@@ -6,98 +6,66 @@ import ProjectM36.TransactionGraph

6import ProjectM36.DataFrame

7import ProjectM36.TransGraphRelationalExpression

8import ProjectM36.Session

9−import ProjectM36.Serialise.DataFrame ()

10−import ProjectM36.Serialise.IsomorphicSchema ()

11import GHC.Generics

9import GHC.Generics

12−import Codec.Winery

10+import Data.Binary

13−

11+import Control.Distributed.Process (ProcessId)

14−#define RPCData(typeName) deriving Generic \

15− deriving Serialise via WineryVariant typeName

16

12

17{-# ANN module ("HLint: ignore Use newtype instead of data" :: String) #-}

13{-# ANN module ("HLint: ignore Use newtype instead of data" :: String) #-}

18-- | The initial login message. The argument should be the process id of the initiating client. This ProcessId will receive notification callbacks.

14-- | The initial login message. The argument should be the process id of the initiating client. This ProcessId will receive notification callbacks.

19−data Login = Login DatabaseName

15+data Login = Login ProcessId

20− RPCData(Login)

16+ deriving (Binary, Generic)

21

17

22data Logout = Logout

18data Logout = Logout

23− RPCData(Logout)

19+ deriving (Binary, Generic)

24−

25−data ExecuteRelationalExpr = ExecuteRelationalExpr SessionId RelationalExpr

20+data ExecuteRelationalExpr = ExecuteRelationalExpr SessionId RelationalExpr

26− RPCData(ExecuteRelationalExpr)

21+ deriving (Binary, Generic)

27−

28data ExecuteDataFrameExpr = ExecuteDataFrameExpr SessionId DataFrameExpr

22data ExecuteDataFrameExpr = ExecuteDataFrameExpr SessionId DataFrameExpr

29− RPCData(ExecuteDataFrameExpr)

23+ deriving (Binary, Generic)

30−

31data ExecuteDatabaseContextExpr = ExecuteDatabaseContextExpr SessionId DatabaseContextExpr

24data ExecuteDatabaseContextExpr = ExecuteDatabaseContextExpr SessionId DatabaseContextExpr

32− RPCData(ExecuteDatabaseContextExpr)

25+ deriving (Binary, Generic)

33−

34data ExecuteDatabaseContextIOExpr = ExecuteDatabaseContextIOExpr SessionId DatabaseContextIOExpr

26data ExecuteDatabaseContextIOExpr = ExecuteDatabaseContextIOExpr SessionId DatabaseContextIOExpr

35− RPCData(ExecuteDatabaseContextIOExpr)

27+ deriving (Binary, Generic)

36−

37data ExecuteGraphExpr = ExecuteGraphExpr SessionId TransactionGraphOperator

28data ExecuteGraphExpr = ExecuteGraphExpr SessionId TransactionGraphOperator

38− RPCData(ExecuteGraphExpr)

29+ deriving (Binary, Generic)

39−

40data ExecuteTransGraphRelationalExpr = ExecuteTransGraphRelationalExpr SessionId TransGraphRelationalExpr

30data ExecuteTransGraphRelationalExpr = ExecuteTransGraphRelationalExpr SessionId TransGraphRelationalExpr

41− RPCData(ExecuteTransGraphRelationalExpr)

31+ deriving (Binary, Generic)

42−

43data ExecuteHeadName = ExecuteHeadName SessionId

32data ExecuteHeadName = ExecuteHeadName SessionId

44− RPCData(ExecuteHeadName)

33+ deriving (Binary, Generic)

45−

46data ExecuteTypeForRelationalExpr = ExecuteTypeForRelationalExpr SessionId RelationalExpr

34data ExecuteTypeForRelationalExpr = ExecuteTypeForRelationalExpr SessionId RelationalExpr

47− RPCData(ExecuteTypeForRelationalExpr)

35+ deriving (Binary, Generic)

48−

49−data ExecuteSchemaExpr = ExecuteSchemaExpr SessionId SchemaExpr RPCData(ExecuteSchemaExpr)

36+data ExecuteSchemaExpr = ExecuteSchemaExpr SessionId SchemaExpr

50−

37+ deriving (Binary, Generic)

51data ExecuteSetCurrentSchema = ExecuteSetCurrentSchema SessionId SchemaName

38data ExecuteSetCurrentSchema = ExecuteSetCurrentSchema SessionId SchemaName

52− RPCData(ExecuteSetCurrentSchema)

39+ deriving (Binary, Generic)

53−

54data RetrieveInclusionDependencies = RetrieveInclusionDependencies SessionId

40data RetrieveInclusionDependencies = RetrieveInclusionDependencies SessionId

55− RPCData(RetrieveInclusionDependencies)

41+ deriving (Binary, Generic)

56−

57data RetrievePlanForDatabaseContextExpr = RetrievePlanForDatabaseContextExpr SessionId DatabaseContextExpr

42data RetrievePlanForDatabaseContextExpr = RetrievePlanForDatabaseContextExpr SessionId DatabaseContextExpr

58− RPCData(RetrievePlanForDatabaseContextExpr)

43+ deriving (Binary, Generic)

59−

60data RetrieveTransactionGraph = RetrieveTransactionGraph SessionId

44data RetrieveTransactionGraph = RetrieveTransactionGraph SessionId

61− RPCData(RetrieveTransactionGraph)

45+ deriving (Binary, Generic)

62−

63data RetrieveHeadTransactionId = RetrieveHeadTransactionId SessionId

46data RetrieveHeadTransactionId = RetrieveHeadTransactionId SessionId

64− RPCData(RetrieveHeadTransactionId)

47+ deriving (Binary, Generic)

65−

66data CreateSessionAtCommit = CreateSessionAtCommit TransactionId

48data CreateSessionAtCommit = CreateSessionAtCommit TransactionId

67− RPCData(CreateSessionAtCommit)

49+ deriving (Binary, Generic)

68−

69data CreateSessionAtHead = CreateSessionAtHead HeadName

50data CreateSessionAtHead = CreateSessionAtHead HeadName

70− RPCData(CreateSessionAtHead)

51+ deriving (Binary, Generic)

71−

72data CloseSession = CloseSession SessionId

52data CloseSession = CloseSession SessionId

73− RPCData(CloseSession)

53+ deriving (Binary, Generic)

74−

75data RetrieveAtomTypesAsRelation = RetrieveAtomTypesAsRelation SessionId

54data RetrieveAtomTypesAsRelation = RetrieveAtomTypesAsRelation SessionId

76− RPCData(RetrieveAtomTypesAsRelation)

55+ deriving (Binary, Generic)

77−

78data RetrieveRelationVariableSummary = RetrieveRelationVariableSummary SessionId

56data RetrieveRelationVariableSummary = RetrieveRelationVariableSummary SessionId

79− RPCData(RetrieveRelationVariableSummary)

57+ deriving (Binary, Generic)

80−

81data RetrieveAtomFunctionSummary = RetrieveAtomFunctionSummary SessionId

58data RetrieveAtomFunctionSummary = RetrieveAtomFunctionSummary SessionId

82− RPCData(RetrieveAtomFunctionSummary)

59+ deriving (Binary, Generic)

83−

84data RetrieveDatabaseContextFunctionSummary = RetrieveDatabaseContextFunctionSummary SessionId

60data RetrieveDatabaseContextFunctionSummary = RetrieveDatabaseContextFunctionSummary SessionId

85− RPCData(RetrieveDatabaseContextFunctionSummary)

61+ deriving (Binary, Generic)

86−

87data RetrieveCurrentSchemaName = RetrieveCurrentSchemaName SessionId

62data RetrieveCurrentSchemaName = RetrieveCurrentSchemaName SessionId

88− RPCData(RetrieveCurrentSchemaName)

63+ deriving (Binary, Generic)

89−

90data TestTimeout = TestTimeout SessionId

64data TestTimeout = TestTimeout SessionId

91− RPCData(TestTimeout)

65+ deriving (Binary, Generic)

92−

93−data RetrieveSessionIsDirty = RetrieveSessionIsDirty SessionId

66+data RetrieveSessionIsDirty = RetrieveSessionIsDirty SessionId

94− RPCData(RetrieveSessionIsDirty)

67+ deriving (Binary, Generic)

95−

96data ExecuteAutoMergeToHead = ExecuteAutoMergeToHead SessionId MergeStrategy HeadName

68data ExecuteAutoMergeToHead = ExecuteAutoMergeToHead SessionId MergeStrategy HeadName

97− RPCData(ExecuteAutoMergeToHead)

69+ deriving (Binary, Generic)

98−

99data RetrieveTypeConstructorMapping = RetrieveTypeConstructorMapping SessionId

70data RetrieveTypeConstructorMapping = RetrieveTypeConstructorMapping SessionId

100− RPCData(RetrieveTypeConstructorMapping)

71+ deriving (Binary, Generic)

101−

102−data ExecuteValidateMerkleHashes = ExecuteValidateMerkleHashes SessionId

103− RPCData(ExecuteValidateMerkleHashes)

src/lib/ProjectM36/Shortcuts.hsdeleted−247

@@ -1,247 +0,0 @@

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+20−18

@@ -1,3 +1,4 @@

1+{-# LANGUAGE TypeSynonymInstances #-}

1{-# LANGUAGE FlexibleInstances #-}

2{-# LANGUAGE FlexibleInstances #-}

2{-# LANGUAGE FlexibleContexts #-}

3{-# LANGUAGE FlexibleContexts #-}

3module ProjectM36.StaticOptimizer where

4module ProjectM36.StaticOptimizer where

@@ -22,6 +23,8 @@ import qualified Data.Set as S

22

23

23-- the static optimizer performs optimizations which need not take any specific-relation statistics into account

24-- the static optimizer performs optimizations which need not take any specific-relation statistics into account

24

25

26+--import Debug.Trace

27+

25data GraphRefSOptRelationalExprEnv =

28data GraphRefSOptRelationalExprEnv =

26 GraphRefSOptRelationalExprEnv

29 GraphRefSOptRelationalExprEnv

27 {

30 {

@@ -56,22 +59,22 @@ class Monad m => AskGraphContext m where

56 askContext :: m DatabaseContext

59 askContext :: m DatabaseContext

57

60

58instance AskGraphContext (ReaderT GraphRefSOptDatabaseContextExprEnv (ExceptT RelationalError Identity)) where

61instance AskGraphContext (ReaderT GraphRefSOptDatabaseContextExprEnv (ExceptT RelationalError Identity)) where

59− askGraph = asks odce_graph

62+ askGraph = odce_graph <$> ask

60− askContext = asks odce_context

63+ askContext = odce_context <$> ask

61

64

62instance AskGraphContext (ReaderT GraphRefSOptRelationalExprEnv (ExceptT RelationalError Identity)) where

65instance AskGraphContext (ReaderT GraphRefSOptRelationalExprEnv (ExceptT RelationalError Identity)) where

63− askGraph = asks ore_graph

66+ askGraph = ore_graph <$> ask

64 askContext = do

67 askContext = do

65− mctx <- asks ore_mcontext

68+ mctx <- ore_mcontext <$> ask

66 case mctx of

69 case mctx of

67 Nothing -> throwError NoUncommittedContextInEvalError

70 Nothing -> throwError NoUncommittedContextInEvalError

68 Just ctx -> pure ctx

71 Just ctx -> pure ctx

69

72

70askTransId :: GraphRefSOptDatabaseContextExprM TransactionId

73askTransId :: GraphRefSOptDatabaseContextExprM TransactionId

71−askTransId = asks odce_transId

74+askTransId = odce_transId <$> ask

72

75

73askMaybeContext :: GraphRefSOptRelationalExprM (Maybe DatabaseContext)

76askMaybeContext :: GraphRefSOptRelationalExprM (Maybe DatabaseContext)

74−askMaybeContext = asks ore_mcontext

77+askMaybeContext = ore_mcontext <$> ask

75

78

76optimizeDatabaseContextExpr :: DatabaseContextExpr -> GraphRefSOptDatabaseContextExprM GraphRefDatabaseContextExpr

79optimizeDatabaseContextExpr :: DatabaseContextExpr -> GraphRefSOptDatabaseContextExprM GraphRefDatabaseContextExpr

77optimizeDatabaseContextExpr expr = do

80optimizeDatabaseContextExpr expr = do

@@ -80,8 +83,8 @@ optimizeDatabaseContextExpr expr = do

80

83

81optimizeAndEvalDatabaseContextExpr :: Bool -> DatabaseContextExpr -> DatabaseContextEvalMonad ()

84optimizeAndEvalDatabaseContextExpr :: Bool -> DatabaseContextExpr -> DatabaseContextEvalMonad ()

82optimizeAndEvalDatabaseContextExpr optimize expr = do

85optimizeAndEvalDatabaseContextExpr optimize expr = do

83− graph <- asks dce_graph

86+ graph <- dce_graph <$> ask

84− transId <- asks dce_transId

87+ transId <- dce_transId <$> ask

85 context <- getStateContext

88 context <- getStateContext

86 let gfExpr = runProcessExprM UncommittedContextMarker (processDatabaseContextExpr expr)

89 let gfExpr = runProcessExprM UncommittedContextMarker (processDatabaseContextExpr expr)

87 eOptExpr = if optimize then

90 eOptExpr = if optimize then

@@ -102,9 +105,9 @@ optimizeAndEvalTransGraphRelationalExpr graph tgExpr = do

102

105

103optimizeAndEvalDatabaseContextIOExpr :: DatabaseContextIOExpr -> DatabaseContextIOEvalMonad (Either RelationalError ())

106optimizeAndEvalDatabaseContextIOExpr :: DatabaseContextIOExpr -> DatabaseContextIOEvalMonad (Either RelationalError ())

104optimizeAndEvalDatabaseContextIOExpr expr = do

107optimizeAndEvalDatabaseContextIOExpr expr = do

105− transId <- asks dbcio_transId

108+ transId <- dbcio_transId <$> ask

106 ctx <- getDBCIOContext

109 ctx <- getDBCIOContext

107− graph <- asks dbcio_graph

110+ graph <- dbcio_graph <$> ask

108 let gfExpr = runProcessExprM UncommittedContextMarker (processDatabaseContextIOExpr expr)

111 let gfExpr = runProcessExprM UncommittedContextMarker (processDatabaseContextIOExpr expr)

109 eOptExpr = runGraphRefSOptDatabaseContextExprM transId ctx graph (optimizeDatabaseContextIOExpr gfExpr)

112 eOptExpr = runGraphRefSOptDatabaseContextExprM transId ctx graph (optimizeDatabaseContextIOExpr gfExpr)

110 case eOptExpr of

113 case eOptExpr of

@@ -161,8 +164,8 @@ optimizeGraphRefRelationalExpr' mctx graph expr =

161-- | optimize relational expression within database context expr monad

164-- | optimize relational expression within database context expr monad

162liftGraphRefRelExpr :: GraphRefSOptRelationalExprM a -> GraphRefSOptDatabaseContextExprM a

165liftGraphRefRelExpr :: GraphRefSOptRelationalExprM a -> GraphRefSOptDatabaseContextExprM a

163liftGraphRefRelExpr m = do

166liftGraphRefRelExpr m = do

164− context <- asks odce_context

167+ context <- odce_context <$> ask

165− graph <- asks odce_graph

168+ graph <- odce_graph <$> ask

166 lift $ except $ runGraphRefSOptRelationalExprM (Just context) graph m

169 lift $ except $ runGraphRefSOptRelationalExprM (Just context) graph m

167

170

168fullOptimizeGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefSOptRelationalExprM GraphRefRelationalExpr

171fullOptimizeGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefSOptRelationalExprM GraphRefRelationalExpr

@@ -177,7 +180,7 @@ fullOptimizeGraphRefRelationalExpr expr = do

177optimizeGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefSOptRelationalExprM GraphRefRelationalExpr

180optimizeGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefSOptRelationalExprM GraphRefRelationalExpr

178optimizeGraphRefRelationalExpr e@(MakeStaticRelation _ _) = pure e

181optimizeGraphRefRelationalExpr e@(MakeStaticRelation _ _) = pure e

179

182

180−optimizeGraphRefRelationalExpr e@MakeRelationFromExprs{} = pure e

183+optimizeGraphRefRelationalExpr e@(MakeRelationFromExprs _ _) = pure e

181

184

182optimizeGraphRefRelationalExpr e@(ExistingRelation _) = pure e

185optimizeGraphRefRelationalExpr e@(ExistingRelation _) = pure e

183

186

@@ -207,8 +210,6 @@ optimizeGraphRefRelationalExpr (Union exprA exprB) = do

207 case (optExprA, optExprB) of

210 case (optExprA, optExprB) of

208 (Restrict predA (RelationVariable nameA sA),

211 (Restrict predA (RelationVariable nameA sA),

209 Restrict predB (RelationVariable nameB sB)) | nameA == nameB && sA == sB -> pure (Restrict (AndPredicate predA predB) (RelationVariable nameA sA))

212 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

213 _ -> if optExprA == optExprB then

213 pure optExprA

214 pure optExprA

214 else

215 else

@@ -357,8 +358,10 @@ applyStaticPredicateOptimization predi = do

357 OrPredicate pred1 pred2 -> do

358 OrPredicate pred1 pred2 -> do

358 optPredA <- applyStaticPredicateOptimization pred1

359 optPredA <- applyStaticPredicateOptimization pred1

359 optPredB <- applyStaticPredicateOptimization pred2

360 optPredB <- applyStaticPredicateOptimization pred2

360− if (optPredA == optPredB) || isTrueExpr optPredA then

361+ if optPredA == optPredB then

361 pure optPredA

362 pure optPredA

363+ else if isTrueExpr optPredA then

364+ pure optPredA -- True or x -> True

362 else if isTrueExpr optPredB then

365 else if isTrueExpr optPredB then

363 pure optPredB

366 pure optPredB

364 else

367 else

@@ -574,5 +577,4 @@ applyStaticRestrictionPushdown expr = case expr of

574

577

575-- no optimizations available

578-- no optimizations available

576optimizeDatabaseContextIOExpr :: GraphRefDatabaseContextIOExpr -> GraphRefSOptDatabaseContextExprM GraphRefDatabaseContextIOExpr

579optimizeDatabaseContextIOExpr :: GraphRefDatabaseContextIOExpr -> GraphRefSOptDatabaseContextExprM GraphRefDatabaseContextIOExpr

577−optimizeDatabaseContextIOExpr = pure

580+optimizeDatabaseContextIOExpr x = pure x

578−

src/lib/ProjectM36/TransGraphPlanExpr.hsnew file+5

@@ -0,0 +1,5 @@

1+module ProjectM36.TransGraphPlanExpr where

2+import ProjectM36.Base

3+-- used to create an execution plan which can potentially read from the query cache

4+

5+data TransGraphPlanExpr = ExecuteTransGraphRelationalExprPlan TransGraphRelationalExpr

src/lib/ProjectM36/TransGraphRelationalExpression.hs+19−2

@@ -10,27 +10,44 @@ import Control.Monad.Trans.Reader

10import Control.Monad.Trans.Class

11import Control.Monad.Trans.Except

12import Data.Functor.Identity

13+import Data.Binary

13

14

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).

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).

15type TransGraphRelationalExpr = RelationalExprBase TransactionIdLookup

16type TransGraphRelationalExpr = RelationalExprBase TransactionIdLookup

16

17

18+instance Binary TransGraphRelationalExpr

19+

17type TransGraphAttributeNames = AttributeNamesBase TransactionIdLookup

20type TransGraphAttributeNames = AttributeNamesBase TransactionIdLookup

18

21

22+instance Binary TransGraphAttributeNames

23+

19type TransGraphExtendTupleExpr = ExtendTupleExprBase TransactionIdLookup

24type TransGraphExtendTupleExpr = ExtendTupleExprBase TransactionIdLookup

20

25

26+instance Binary TransGraphExtendTupleExpr

27+

21type TransGraphTupleExpr = TupleExprBase TransactionIdLookup

28type TransGraphTupleExpr = TupleExprBase TransactionIdLookup

22

29

30+instance Binary TransGraphTupleExpr

31+

23type TransGraphTupleExprs = TupleExprsBase TransactionIdLookup

32type TransGraphTupleExprs = TupleExprsBase TransactionIdLookup

24

33

34+instance Binary TransGraphTupleExprs

35+

25type TransGraphRestrictionPredicateExpr = RestrictionPredicateExprBase TransactionIdLookup

36type TransGraphRestrictionPredicateExpr = RestrictionPredicateExprBase TransactionIdLookup

26

37

38+instance Binary TransGraphRestrictionPredicateExpr

39+

27type TransGraphAtomExpr = AtomExprBase TransactionIdLookup

40type TransGraphAtomExpr = AtomExprBase TransactionIdLookup

28

41

42+instance Binary TransGraphAtomExpr

43+

29type TransGraphAttributeExpr = AttributeExprBase TransactionIdLookup

44type TransGraphAttributeExpr = AttributeExprBase TransactionIdLookup

30

45

31type TransGraphWithNameExpr = WithNameExprBase TransactionIdLookup

46type TransGraphWithNameExpr = WithNameExprBase TransactionIdLookup

32

47

48+instance Binary TransGraphWithNameExpr

49+

33−newtype TransGraphEvalEnv = TransGraphEvalEnv {

50+data TransGraphEvalEnv = TransGraphEvalEnv {

34 tge_graph :: TransactionGraph

51 tge_graph :: TransactionGraph

35 }

52 }

36

53

@@ -152,7 +169,7 @@ evalTransGraphRestrictionPredicateExpr (AttributeEqualityPredicate attrName expr

152 AttributeEqualityPredicate attrName <$> expr'

169 AttributeEqualityPredicate attrName <$> expr'

153

170

154processTransGraphExtendTupleExpr :: TransGraphExtendTupleExpr -> TransGraphEvalMonad GraphRefExtendTupleExpr

171processTransGraphExtendTupleExpr :: TransGraphExtendTupleExpr -> TransGraphEvalMonad GraphRefExtendTupleExpr

155−processTransGraphExtendTupleExpr (AttributeExtendTupleExpr attrName expr) =

172+processTransGraphExtendTupleExpr (AttributeExtendTupleExpr attrName expr) = do

156 AttributeExtendTupleExpr attrName <$> processTransGraphAtomExpr expr

173 AttributeExtendTupleExpr attrName <$> processTransGraphAtomExpr expr

157

174

158processTransGraphAttributeExpr :: TransGraphAttributeExpr -> TransGraphEvalMonad GraphRefAttributeExpr

175processTransGraphAttributeExpr :: TransGraphAttributeExpr -> TransGraphEvalMonad GraphRefAttributeExpr

src/lib/ProjectM36/Transaction.hs+5−10

@@ -17,10 +17,11 @@ singleParent tid = tid NE.:| []

17-- | Return the same transaction but referencing only the specific child transactions. This is useful when traversing a graph and returning a subgraph. This doesn't filter parent transactions because it assumes a head-to-root traversal.

18filterTransactionInfoTransactions :: S.Set TransactionId -> TransactionInfo -> TransactionInfo

19filterTransactionInfoTransactions filterIds tinfo =

20− tinfo { parents = case

20+ TransactionInfo { parents = case

21− NE.filter (`S.member` filterIds) (parents tinfo) of

21+ NE.filter (\parent -> S.member parent filterIds) (parents tinfo) of

22 [] -> rootParent

23− xs -> NE.fromList xs}

23+ xs -> NE.fromList xs,

24+ stamp = stamp tinfo }

24

25

25filterParent :: TransactionId -> S.Set TransactionId -> TransactionId

26filterParent :: TransactionId -> S.Set TransactionId -> TransactionId

26filterParent parentId validIds = if S.member parentId validIds then parentId else U.nil

27filterParent parentId validIds = if S.member parentId validIds then parentId else U.nil

@@ -42,13 +43,7 @@ subschemas :: Transaction -> Subschemas

42subschemas (Transaction _ _ (Schemas _ sschemas)) = sschemas

43subschemas (Transaction _ _ (Schemas _ sschemas)) = sschemas

43

44

44fresh :: TransactionId -> UTCTime -> Schemas -> Transaction

45fresh :: TransactionId -> UTCTime -> Schemas -> Transaction

45−fresh freshId stamp' = Transaction freshId tinfo

46+fresh freshId stamp' newSchemas = Transaction freshId (TransactionInfo rootParent stamp') newSchemas

46− where

47− tinfo = TransactionInfo {parents = rootParent,

48− stamp = stamp',

49− merkleHash = mempty

50− }

51

47

52timestamp :: Transaction -> UTCTime

48timestamp :: Transaction -> UTCTime

53timestamp (Transaction _ tinfo _) = stamp tinfo

49timestamp (Transaction _ tinfo _) = stamp tinfo

54−

src/lib/ProjectM36/Transaction/Persist.hs+17−17

@@ -8,13 +8,13 @@ import ProjectM36.AtomFunction

8import ProjectM36.Persist (writeBSFileSync, DiskSync, renameSync)

9import qualified Data.Map as M

10import qualified Data.HashSet as HS

11+import qualified Data.Binary as B

11import System.FilePath

12import System.FilePath

12import System.Directory

13import System.Directory

13import qualified Data.Text as T

14import qualified Data.Text as T

14import Control.Monad

15import Control.Monad

15import ProjectM36.ScriptSession

16import ProjectM36.ScriptSession

16import ProjectM36.AtomFunctions.Basic (precompiledAtomFunctions)

17import ProjectM36.AtomFunctions.Basic (precompiledAtomFunctions)

17−import Codec.Winery

18

19#ifdef PM36_HASKELL_SCRIPTING

20import GHC

@@ -62,7 +62,7 @@ readTransaction dbdir transId mScriptSession = do

62 return $ Left $ MissingTransactionError transId

63 else do

64 relvars <- readRelVars transDir

65− transInfo <- readFileDeserialise (transactionInfoPath transDir)

65+ transInfo <- B.decodeFile (transactionInfoPath transDir)

66 incDeps <- readIncDeps transDir

67 typeCons <- readTypeConstructorMapping transDir

68 sschemas <- readSubschemas transDir

@@ -92,28 +92,28 @@ writeTransaction sync dbdir trans = do

92 writeDBCFuncs sync tempTransDir (dbcFunctions context)

93 writeTypeConstructorMapping sync tempTransDir (typeConstructorMapping context)

94 writeSubschemas sync tempTransDir (subschemas trans)

95− writeFileSerialise (transactionInfoPath tempTransDir) (transactionInfo trans)

95+ B.encodeFile (transactionInfoPath tempTransDir) (transactionInfo trans)

96 --move the temp directory to final location

97 renameSync sync tempTransDir finalTransDir

98

99writeRelVars :: DiskSync -> FilePath -> RelationVariables -> IO ()

100writeRelVars sync transDir relvars = do

101 let path = relvarsPath transDir

102− writeBSFileSync sync path (serialise relvars)

102+ writeBSFileSync sync path (B.encode relvars)

103

104readRelVars :: FilePath -> IO RelationVariables

105−readRelVars transDir =

105+readRelVars transDir = do

106− readFileDeserialise (relvarsPath transDir)

106+ B.decodeFile (relvarsPath transDir)

107

108writeAtomFuncs :: DiskSync -> FilePath -> AtomFunctions -> IO ()

109writeAtomFuncs sync transDir funcs = do

110 let atomFuncPath = atomFuncsPath transDir

111− writeBSFileSync sync atomFuncPath (serialise $ map (\f -> (atomFuncType f, atomFuncName f, atomFunctionScript f)) (HS.toList funcs))

111+ writeBSFileSync sync atomFuncPath (B.encode $ map (\f -> (atomFuncType f, atomFuncName f, atomFunctionScript f)) (HS.toList funcs))

112

113--all the atom functions are in one file

114readAtomFuncs :: FilePath -> Maybe ScriptSession -> IO AtomFunctions

115readAtomFuncs transDir mScriptSession = do

116− atomFuncsList <- readFileDeserialise (atomFuncsPath transDir)

116+ atomFuncsList <- B.decodeFile (atomFuncsPath transDir)

117 --only Haskell script functions can be serialized

118 --we always return the pre-compiled functions

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

154readAtomFunc transDir funcName mScriptSession precompiledFuncs = do

155 let atomFuncPath = atomFuncsPath transDir

156− (funcType, mFuncScript) <- readFileDeserialise @([AtomType],Maybe T.Text) atomFuncPath

156+ (funcType, mFuncScript) <- B.decodeFile @([AtomType],Maybe T.Text) atomFuncPath

157 case mFuncScript of

158 --handle pre-compiled case- pull it from the precompiled list

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 ()

185writeDBCFunc sync transDir func = do

186 let dbcFuncPath = dbcFuncsDir transDir </> T.unpack (dbcFuncName func)

187− writeBSFileSync sync dbcFuncPath (serialise (dbcFuncType func, databaseContextFunctionScript func))

187+ writeBSFileSync sync dbcFuncPath (B.encode (dbcFuncType func, databaseContextFunctionScript func))

188

189readDBCFuncs :: FilePath -> Maybe ScriptSession -> IO DatabaseContextFunctions

190readDBCFuncs transDir mScriptSession = do

@@ -201,7 +201,7 @@ readDBCFunc transDir funcName _ precompiledFuncs = do

201readDBCFunc transDir funcName mScriptSession precompiledFuncs = do

202#endif

203 let dbcFuncPath = dbcFuncsDir transDir </> T.unpack funcName

204− (_funcType, mFuncScript) <- readFileDeserialise @([AtomType], Maybe T.Text) dbcFuncPath

204+ (_funcType, mFuncScript) <- B.decodeFile @([AtomType], Maybe T.Text) dbcFuncPath

205 case mFuncScript of

206 Nothing -> case databaseContextFunctionForName funcName precompiledFuncs of

207 Left _ -> error ("expected precompiled dbc function: " ++ T.unpack funcName)

@@ -225,7 +225,7 @@ readDBCFunc transDir funcName mScriptSession precompiledFuncs = do

225

226writeIncDep :: DiskSync -> FilePath -> (IncDepName, InclusionDependency) -> IO ()

227writeIncDep sync transDir (incDepName, incDep) =

228− writeBSFileSync sync (incDepsDir transDir </> T.unpack incDepName) $ serialise incDep

228+ writeBSFileSync sync (incDepsDir transDir </> T.unpack incDepName) $ B.encode incDep

229

230writeIncDeps :: DiskSync -> FilePath -> M.Map IncDepName InclusionDependency -> IO ()

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)

234readIncDep transDir incdepName = do

235 let incDepPath = incDepsDir transDir </> T.unpack incdepName

236− incDepData <- readFileDeserialise incDepPath

236+ incDepData <- B.decodeFile incDepPath

237 pure (incdepName, incDepData)

238

239readIncDeps :: FilePath -> IO (M.Map IncDepName InclusionDependency)

@@ -245,20 +245,20 @@ readIncDeps transDir = do

245readSubschemas :: FilePath -> IO Subschemas

246readSubschemas transDir = do

247 let sschemasPath = subschemasPath transDir

248− readFileDeserialise sschemasPath

248+ B.decodeFile sschemasPath

249

250writeSubschemas :: DiskSync -> FilePath -> Subschemas -> IO ()

251writeSubschemas sync transDir sschemas = do

252 let sschemasPath = subschemasPath transDir

253− writeBSFileSync sync sschemasPath (serialise sschemas)

253+ writeBSFileSync sync sschemasPath (B.encode sschemas)

254

255writeTypeConstructorMapping :: DiskSync -> FilePath -> TypeConstructorMapping -> IO ()

256writeTypeConstructorMapping sync path types = let atPath = typeConsPath path in

257− writeBSFileSync sync atPath $ serialise types

257+ writeBSFileSync sync atPath $ B.encode types

258

259readTypeConstructorMapping :: FilePath -> IO TypeConstructorMapping

260readTypeConstructorMapping path = do

261 let atPath = typeConsPath path

262− readFileDeserialise atPath

262+ B.decodeFile atPath

263

264

src/lib/ProjectM36/TransactionGraph.hs+27−83

@@ -1,4 +1,4 @@

1−{-# LANGUAGE DeriveGeneric, CPP, FlexibleContexts, DerivingVia #-}

1+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, CPP, FlexibleContexts #-}

2module ProjectM36.TransactionGraph where

3import ProjectM36.Base

4import ProjectM36.Error

@@ -9,11 +9,9 @@ import ProjectM36.TupleSet

9import ProjectM36.Tuple

10import ProjectM36.RelationalExpression

11import ProjectM36.TransactionGraph.Merge

12−import ProjectM36.MerkleHash

13import qualified ProjectM36.DisconnectedTransaction as Discon

12import qualified ProjectM36.DisconnectedTransaction as Discon

14import qualified ProjectM36.Attribute as A

13import qualified ProjectM36.Attribute as A

15

14

16−import Codec.Winery

17import Control.Monad.Except hiding (join)

15import Control.Monad.Except hiding (join)

18import Control.Monad.Reader hiding (join)

16import Control.Monad.Reader hiding (join)

19import qualified Data.Vector as V

17import qualified Data.Vector as V

@@ -24,6 +22,7 @@ import qualified Data.List.NonEmpty as NE

24import Data.Time.Clock

22import Data.Time.Clock

25import qualified Data.Text as T

23import qualified Data.Text as T

26import GHC.Generics

24import GHC.Generics

25+import Data.Binary

27import Data.Either (lefts, rights, isRight)

26import Data.Either (lefts, rights, isRight)

28#if __GLASGOW_HASKELL__ < 804

27#if __GLASGOW_HASKELL__ < 804

29import Data.Monoid

28import Data.Monoid

@@ -31,22 +30,22 @@ import Data.Monoid

31import Control.Arrow

30import Control.Arrow

32import Data.Maybe

31import Data.Maybe

33import Data.UUID.V4

32import Data.UUID.V4

34−import qualified Data.ByteString.Lazy as BL

33+#if __GLASGOW_HASKELL__ <= 802

35−import ProjectM36.DatabaseContext as DBC

34+import Data.Monoid

36−import Crypto.Hash.SHA256

35+#endif

36+

37+--import Debug.Trace

37

38

38-- | Record a lookup for a specific transaction in the graph.

39-- | Record a lookup for a specific transaction in the graph.

39data TransactionIdLookup = TransactionIdLookup TransactionId |

40data TransactionIdLookup = TransactionIdLookup TransactionId |

40 TransactionIdHeadNameLookup HeadName [TransactionIdHeadBacktrack]

41 TransactionIdHeadNameLookup HeadName [TransactionIdHeadBacktrack]

41− deriving (Show, Eq, Generic)

42+ deriving (Show, Eq, Binary, Generic)

42− deriving Serialise via WineryVariant TransactionIdLookup

43

44-- | Used for git-style head backtracking such as topic~3^2.

45−data TransactionIdHeadBacktrack = TransactionIdHeadParentBacktrack Int | -- ^ git equivalent of ~v: walk back n parents, arbitrarily choosing a parent when a choice must be made

45+data TransactionIdHeadBacktrack = TransactionIdHeadParentBacktrack Int | -- ^ git equivalent of ~: walk back n parents, arbitrarily choosing a parent when a choice must be made

46 TransactionIdHeadBranchBacktrack Int | -- ^ git equivalent of ^: walk back one parent level to the nth arbitrarily-chosen parent

47 TransactionStampHeadBacktrack UTCTime -- ^ git equivalent of 'git-rev-list -n 1 --before X' find the first transaction which was created before the timestamp

48− deriving (Show, Eq, Generic)

48+ deriving (Show, Eq, Binary, Generic)

49− deriving Serialise via WineryVariant TransactionIdHeadBacktrack

50

49

51

50

52-- | Operators which manipulate a transaction graph and which transaction the current 'Session' is based upon.

51-- | Operators which manipulate a transaction graph and which transaction the current 'Session' is based upon.

@@ -58,14 +57,13 @@ data TransactionGraphOperator = JumpToHead HeadName |

58 MergeTransactions MergeStrategy HeadName HeadName |

57 MergeTransactions MergeStrategy HeadName HeadName |

59 Commit |

58 Commit |

60 Rollback

59 Rollback

61− deriving (Eq, Show, Generic)

60+ deriving (Eq, Show, Binary, Generic)

62− deriving Serialise via WineryVariant TransactionGraphOperator

63

61

64isCommit :: TransactionGraphOperator -> Bool

62isCommit :: TransactionGraphOperator -> Bool

65isCommit Commit = True

63isCommit Commit = True

66isCommit _ = False

64isCommit _ = False

67

65

68−data ROTransactionGraphOperator = ShowGraph | ValidateMerkleHashes

66+data ROTransactionGraphOperator = ShowGraph

69 deriving Show

67 deriving Show

70

68

71bootstrapTransactionGraph :: UTCTime -> TransactionId -> DatabaseContext -> TransactionGraph

69bootstrapTransactionGraph :: UTCTime -> TransactionId -> DatabaseContext -> TransactionGraph

@@ -74,15 +72,14 @@ bootstrapTransactionGraph stamp' freshId context = TransactionGraph bootstrapHea

74 bootstrapHeads = M.singleton "master" freshTransaction

72 bootstrapHeads = M.singleton "master" freshTransaction

75 newSchemas = Schemas context M.empty

73 newSchemas = Schemas context M.empty

76 freshTransaction = fresh freshId stamp' newSchemas

74 freshTransaction = fresh freshId stamp' newSchemas

77− hashedTransaction = Transaction freshId ((transactionInfo freshTransaction) { merkleHash = calculateMerkleHash freshTransaction emptyTransactionGraph }) newSchemas

78− bootstrapTransactions = S.singleton hashedTransaction

75+ bootstrapTransactions = S.singleton freshTransaction

79

76

80-- | Create a transaction graph from a context.

77-- | Create a transaction graph from a context.

81freshTransactionGraph :: DatabaseContext -> IO (TransactionGraph, TransactionId)

78freshTransactionGraph :: DatabaseContext -> IO (TransactionGraph, TransactionId)

82freshTransactionGraph ctx = do

79freshTransactionGraph ctx = do

83 now <- getCurrentTime

80 now <- getCurrentTime

84 freshId <- nextRandom

81 freshId <- nextRandom

85− pure (bootstrapTransactionGraph now freshId ctx, freshId)

82+ pure $ (bootstrapTransactionGraph now freshId ctx, freshId)

86

83

87

84

88emptyTransactionGraph :: TransactionGraph

85emptyTransactionGraph :: TransactionGraph

@@ -115,7 +112,7 @@ rootTransactions graph = S.filter isRootTransaction (transactionsForGraph graph)

115

112

116-- the first transaction has no parent - all other do have parents- merges have two parents

113-- the first transaction has no parent - all other do have parents- merges have two parents

117parentTransactions :: Transaction -> TransactionGraph -> Either RelationalError (S.Set Transaction)

114parentTransactions :: Transaction -> TransactionGraph -> Either RelationalError (S.Set Transaction)

118−parentTransactions trans = transactionsForIds (parentIds trans)

115+parentTransactions trans graph = transactionsForIds (parentIds trans) graph

119

116

120childTransactions :: Transaction -> TransactionGraph -> Either RelationalError (S.Set Transaction)

117childTransactions :: Transaction -> TransactionGraph -> Either RelationalError (S.Set Transaction)

121childTransactions trans graph = transactionsForIds childIds graph

118childTransactions trans graph = transactionsForIds childIds graph

@@ -133,13 +130,10 @@ addBranch stamp' newId newBranchName branchPointId graph = do

133

130

134--adds a disconnected transaction to a transaction graph at some head

131--adds a disconnected transaction to a transaction graph at some head

135addDisconnectedTransaction :: UTCTime -> TransactionId -> HeadName -> DisconnectedTransaction -> TransactionGraph -> Either RelationalError (Transaction, TransactionGraph)

132addDisconnectedTransaction :: UTCTime -> TransactionId -> HeadName -> DisconnectedTransaction -> TransactionGraph -> Either RelationalError (Transaction, TransactionGraph)

136−addDisconnectedTransaction stamp' newId headName (DisconnectedTransaction parentId schemas' _) graph = addTransactionToGraph headName newTrans' graph

133+addDisconnectedTransaction stamp' newId headName (DisconnectedTransaction parentId schemas' _) = addTransactionToGraph headName newTrans

137 where

134 where

138− newTrans = Transaction newId newTInfo schemas'

139− newTInfo = TI.singleParent parentId stamp'

135+ newTrans = Transaction newId (TI.singleParent parentId stamp') schemas'

140− newTrans' = Transaction newId (newTInfo { merkleHash = newHash }) schemas'

136+

141− newHash = calculateMerkleHash newTrans graph--lookup parents in graph to calculate

142−--LOOP

143addTransactionToGraph :: HeadName -> Transaction -> TransactionGraph -> Either RelationalError (Transaction, TransactionGraph)

137addTransactionToGraph :: HeadName -> Transaction -> TransactionGraph -> Either RelationalError (Transaction, TransactionGraph)

144addTransactionToGraph headName newTrans graph = do

138addTransactionToGraph headName newTrans graph = do

145 let parentIds' = parentIds newTrans

139 let parentIds' = parentIds newTrans

@@ -306,7 +300,6 @@ graphAsRelation (DisconnectedTransaction parentId _ _) graph@(TransactionGraph _

306 mkRelationFromList attrs tupleMatrix

300 mkRelationFromList attrs tupleMatrix

307 where

301 where

308 attrs = A.attributesFromList [Attribute "id" TextAtomType,

302 attrs = A.attributesFromList [Attribute "id" TextAtomType,

309− Attribute "hash" ByteStringAtomType,

310 Attribute "stamp" DateTimeAtomType,

303 Attribute "stamp" DateTimeAtomType,

311 Attribute "parents" (RelationAtomType parentAttributes),

304 Attribute "parents" (RelationAtomType parentAttributes),

312 Attribute "current" BoolAtomType,

305 Attribute "current" BoolAtomType,

@@ -316,7 +309,6 @@ graphAsRelation (DisconnectedTransaction parentId _ _) graph@(TransactionGraph _

316 tupleGenerator transaction = case transactionParentsRelation transaction graph of

309 tupleGenerator transaction = case transactionParentsRelation transaction graph of

317 Left err -> Left err

310 Left err -> Left err

318 Right parentTransRel -> Right [TextAtom $ T.pack $ show (transactionId transaction),

311 Right parentTransRel -> Right [TextAtom $ T.pack $ show (transactionId transaction),

319− ByteStringAtom $ _unMerkleHash (merkleHash (transactionInfo transaction)),

320 DateTimeAtom (timestamp transaction),

312 DateTimeAtom (timestamp transaction),

321 RelationAtom parentTransRel,

313 RelationAtom parentTransRel,

322 BoolAtom $ parentId == transactionId transaction,

314 BoolAtom $ parentId == transactionId transaction,

@@ -348,12 +340,10 @@ createMergeTransaction :: UTCTime -> TransactionId -> MergeStrategy -> (Transact

348createMergeTransaction stamp' newId (SelectedBranchMergeStrategy selectedBranch) t2@(trans1, trans2) = do

340createMergeTransaction stamp' newId (SelectedBranchMergeStrategy selectedBranch) t2@(trans1, trans2) = do

349 graph <- gfGraph

341 graph <- gfGraph

350 selectedTrans <- validateHeadName selectedBranch graph t2

342 selectedTrans <- validateHeadName selectedBranch graph t2

351− pure $ addMerkleHash graph $

352− Transaction newId (TransactionInfo {

343+ pure $ Transaction newId (TransactionInfo {

353− parents = NE.fromList [transactionId trans1,

344+ parents = NE.fromList [transactionId trans1,

354− transactionId trans2],

345+ transactionId trans2],

355− stamp = stamp',

356− merkleHash = mempty }) (schemas selectedTrans)

346+ stamp = stamp' }) (schemas selectedTrans)

357

347

358-- merge functions, relvars, individually

348-- merge functions, relvars, individually

359createMergeTransaction stamp' newId strat@UnionMergeStrategy t2 =

349createMergeTransaction stamp' newId strat@UnionMergeStrategy t2 =

@@ -384,7 +374,7 @@ subGraphOfFirstCommonAncestor origGraph resultHeads currentTrans' goalTrans trav

384 else do

374 else do

385 currentTransChildren <- childTransactions currentTrans' origGraph

375 currentTransChildren <- childTransactions currentTrans' origGraph

386 let searchChildren = S.difference (S.insert currentTrans' traverseSet) currentTransChildren

376 let searchChildren = S.difference (S.insert currentTrans' traverseSet) currentTransChildren

387− searchChild start' = pathToTransaction origGraph start' goalTrans (S.insert currentTrans' traverseSet)

377+ searchChild start = pathToTransaction origGraph start goalTrans (S.insert currentTrans' traverseSet)

388 childSearches = map searchChild (S.toList searchChildren)

378 childSearches = map searchChild (S.toList searchChildren)

389 errors = lefts childSearches

379 errors = lefts childSearches

390 pathsFound = rights childSearches

380 pathsFound = rights childSearches

@@ -508,12 +498,10 @@ createUnionMergeTransaction stamp' newId strategy (t1,t2) = do

508 typeConstructorMapping = types

498 typeConstructorMapping = types

509 }

499 }

510 newSchemas = Schemas newContext (subschemas t1)

500 newSchemas = Schemas newContext (subschemas t1)

511− pure $ addMerkleHash graph $

512− Transaction newId (TransactionInfo {

501+ pure (Transaction newId (TransactionInfo {

513− parents = NE.fromList [transactionId t1,

502+ parents = NE.fromList [transactionId t1,

514− transactionId t2],

503+ transactionId t2],

515− stamp = stamp',

504+ stamp = stamp'}) newSchemas)

516− merkleHash = mempty }) newSchemas

517

505

518lookupTransaction :: TransactionGraph -> TransactionIdLookup -> Either RelationalError Transaction

506lookupTransaction :: TransactionGraph -> TransactionIdLookup -> Either RelationalError Transaction

519lookupTransaction graph (TransactionIdLookup tid) = transactionForId tid graph

507lookupTransaction graph (TransactionIdLookup tid) = transactionForId tid graph

@@ -589,47 +577,3 @@ autoMergeToHead stamp' (tempBranchTransId, tempCommitTransId, mergeTransId) disc

589 pure (discon''''', graph''''')

577 pure (discon''''', graph''''')

590

578

591

579

592−addMerkleHash :: TransactionGraph -> Transaction -> Transaction

593−addMerkleHash graph trans = Transaction (transactionId trans) newInfo (schemas trans)

594− where

595− newInfo = (transactionInfo trans) { merkleHash = calculateMerkleHash trans graph }

596−

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

598−calculateMerkleHash :: Transaction -> TransactionGraph -> MerkleHash

599−calculateMerkleHash trans graph = MerkleHash $ hashlazy (BL.fromChunks [transIds,

600− schemasBytes

601− ] <> dbcBytes <> parentMerkleHashes)

602− where

603− parentMerkleHashes = BL.fromChunks $ map (_unMerkleHash . getMerkleHash) parentTranses

604− parentTranses =

605− case transactionsForIds (parentIds trans) graph of

606− Left RootTransactionTraversalError -> []

607− Left e -> error ("failed to find transaction in Merkle hash construction: " ++ show e)

608− Right t -> S.toList t

609− getMerkleHash t = merkleHash (transactionInfo t)

610− transIds = serialise (transactionId trans : S.toList (parentIds trans))

611− dbcBytes = DBC.hashBytes (concreteDatabaseContext trans)

612− schemasBytes = serialise (subschemas trans)

613−

614−validateMerkleHash :: Transaction -> TransactionGraph -> Either MerkleValidationError ()

615−validateMerkleHash trans graph =

616− if expectedHash /= actualHash then

617− Left (MerkleValidationError (transactionId trans) expectedHash actualHash)

618− else

619− pure ()

620− where

621− expectedHash = merkleHash (transactionInfo trans)

622− actualHash = calculateMerkleHash trans graph

623−

624−data MerkleValidationError = MerkleValidationError TransactionId MerkleHash MerkleHash

625− deriving (Show, Eq, Generic)

626−

627−validateMerkleHashes :: TransactionGraph -> Either [MerkleValidationError] ()

628−validateMerkleHashes graph =

629− if null errs then pure () else Left errs

630− where

631− errs = S.foldr validateTrans [] (transactionsForGraph graph)

632− validateTrans trans acc =

633− case validateMerkleHash trans graph of

634− Left err -> err : acc

635− _ -> acc

src/lib/ProjectM36/TransactionGraph/Merge.hs+1−1

@@ -47,7 +47,7 @@ unionMergeRelVars prefer relvarsA relvarsB = do

47 lookupA = findRel relvarsA

48 lookupB = findRel relvarsB

49 case (lookupA, lookupB) of

50− (Just relA, Just relB) ->

50+ (Just relA, Just relB) -> do

51 unionMergeRelation prefer relA relB

52 (Nothing, Just relB) -> pure relB

53 (Just relA, Nothing) -> pure relA

src/lib/ProjectM36/TransactionGraph/Persist.hs+3

@@ -32,6 +32,9 @@ import Control.Arrow

32import Data.Time.Clock

33import Data.Text.Read

34import System.FilePath.Glob

35+#if __GLASGOW_HASKELL__ <= 802

36+import Data.Monoid

37+#endif

35

38

36type LockFileHash = ByteString

39type LockFileHash = ByteString

37

40

src/lib/ProjectM36/TransactionInfo.hs+3−5

@@ -1,12 +1,10 @@

1module ProjectM36.TransactionInfo where

2import ProjectM36.Base

3import Data.Time.Clock

4−import qualified Data.List.NonEmpty as NE

4+import Data.List.NonEmpty

5

6-- | Create a TransactionInfo with just one parent transaction ID.

7singleParent :: TransactionId -> UTCTime -> TransactionInfo

8singleParent tid stamp' = TransactionInfo {

9− parents = tid NE.:| [],

9+ parents = tid :| [],

10− stamp = stamp',

10+ stamp = stamp' }

11− merkleHash = mempty }

12−

src/lib/ProjectM36/Tuple.hs+33−47

@@ -1,7 +1,7 @@

1module ProjectM36.Tuple where

2import ProjectM36.Base

3import ProjectM36.Error

4−import ProjectM36.Attribute as A

4+import ProjectM36.Attribute

5import ProjectM36.Atom

6import ProjectM36.AtomType

7import ProjectM36.DataTypes.Primitive

@@ -15,19 +15,19 @@ import Control.Arrow

15import Data.Maybe

16

17emptyTuple :: RelationTuple

18−emptyTuple = RelationTuple mempty mempty

18+emptyTuple = RelationTuple V.empty V.empty

19

20tupleSize :: RelationTuple -> Int

21−tupleSize (RelationTuple tupAttrs _) = arity tupAttrs

21+tupleSize (RelationTuple tupAttrs _) = V.length tupAttrs

22

23tupleAttributeNameSet :: RelationTuple -> S.Set AttributeName

24−tupleAttributeNameSet (RelationTuple tupAttrs _) = attributeNameSet tupAttrs

24+tupleAttributeNameSet (RelationTuple tupAttrs _) = S.fromList $ V.toList $ V.map attributeName tupAttrs

25

26tupleAttributes :: RelationTuple -> Attributes

27tupleAttributes (RelationTuple tupAttrs _) = tupAttrs

28

29tupleAssocs :: RelationTuple -> [(AttributeName, Atom)]

30−tupleAssocs (RelationTuple attrs tupVec) = V.toList $ V.map (first attributeName) (V.zip (attributesVec attrs) tupVec)

30+tupleAssocs (RelationTuple attrVec tupVec) = V.toList $ V.map (first attributeName) (V.zip attrVec tupVec)

31

32orderedTupleAssocs :: RelationTuple -> [(AttributeName, Atom)]

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

43

44atomForAttributeName :: AttributeName -> RelationTuple -> Either RelationalError Atom

45−atomForAttributeName attrName (RelationTuple tupAttrs tupVec) = case V.findIndex (\attr -> attributeName attr == attrName) (attributesVec tupAttrs) of

45+atomForAttributeName attrName (RelationTuple tupAttrs tupVec) = case V.findIndex (\attr -> attributeName attr == attrName) tupAttrs of

46 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))

47 Just index -> case tupVec V.!? index of

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

60 where

61 unknownAttrNames = V.filter (`V.notElem` attributeNames attrs) attrNameVec

62− mapper attrName = fromMaybe (error "logic failure in vectorIndicesForAttributeNames") (V.elemIndex attrName (attributeNames attrs))

62+ mapper attrName = fromMaybe (error "logic failure in vectorIndicesForAttributeNames") (V.elemIndex attrName (V.map attributeName attrs))

63

64

65relationForAttributeName :: AttributeName -> RelationTuple -> Either RelationalError Relation

@@ -86,10 +86,10 @@ mkRelationTuples attrs = map mapper

86 mapper = mkRelationTuple attrs

87

88mkRelationTupleFromMap :: M.Map AttributeName Atom -> RelationTuple

89−mkRelationTupleFromMap attrMap = RelationTuple (attributesFromList attrs) (V.map (attrMap M.!) (V.fromList attrNames))

89+mkRelationTupleFromMap attrMap = RelationTuple attrs (V.map (attrMap M.!) attrNames)

90 where

91− attrNames = M.keys attrMap

91+ attrNames = V.fromList (M.keys attrMap)

92− attrs = map (\attrName -> Attribute attrName (atomTypeForAtom (attrMap M.! attrName))) attrNames

92+ attrs = V.map (\attrName -> Attribute attrName (atomTypeForAtom (attrMap M.! attrName))) attrNames

93

94--return error if attribute names match but their types do not

95singleTupleSetJoin :: Attributes -> RelationTuple -> RelationTupleSet -> Either RelationalError [RelationTuple]

@@ -120,8 +120,8 @@ singleTupleJoin joinedAttrs tup1@(RelationTuple tupAttrs1 _) tup2@(RelationTuple

120 return $ Just $ RelationTuple joinedAttrs newVec

121 where

122 keysIntersection = V.map attributeName attrsIntersection

123− attrsIntersection = V.filter (`V.elem` attributesVec tupAttrs1) (attributesVec tupAttrs2)

123+ attrsIntersection = V.filter (`V.elem` tupAttrs1) tupAttrs2

124− newVec = V.map (findAtomForAttributeName . attributeName) (attributesVec joinedAttrs)

124+ newVec = V.map (findAtomForAttributeName . attributeName) joinedAttrs

125 --search both tuples for the attribute

126 findAtomForAttributeName attrName = head $ rights $ fmap (atomForAttributeName attrName) [tup1, tup2]

127

@@ -138,31 +138,23 @@ vectorUnion v1 v2 = V.foldr folder v1 v2

138tupleExtend :: RelationTuple -> RelationTuple -> RelationTuple

139tupleExtend (RelationTuple tupAttrs1 tupVec1) (RelationTuple tupAttrs2 tupVec2) = RelationTuple newAttrs newVec

140 where

141− newAttrs = tupAttrs1 <> tupAttrs2

141+ newAttrs = tupAttrs1 V.++ tupAttrs2

142− newVec = tupVec1 <> tupVec2

142+ newVec = tupVec1 V.++ tupVec2

143

144tupleAtomExtend :: AttributeName -> Atom -> RelationTuple -> RelationTuple

145tupleAtomExtend newAttrName atom tupIn = tupleExtend tupIn newTup

146 where

147− newTup = RelationTuple (A.singleton $ Attribute newAttrName (atomTypeForAtom atom)) (V.singleton atom)

147+ newTup = RelationTuple (V.singleton $ Attribute newAttrName (atomTypeForAtom atom)) (V.singleton atom)

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)]

149−{-tupleProject :: S.Set AttributeName -> RelationTuple -> RelationTuple

150+tupleProject :: S.Set AttributeName -> RelationTuple -> RelationTuple

150tupleProject projectAttrs (RelationTuple attrs tupVec) = RelationTuple newAttrs newTupVec

151tupleProject projectAttrs (RelationTuple attrs tupVec) = RelationTuple newAttrs newTupVec

151 where

152 where

152− deleteIndices = V.findIndices (\attr -> S.notMember (attributeName attr) projectAttrs) (attributesVec attrs)

153+ deleteIndices = V.findIndices (\attr -> S.notMember (attributeName attr) projectAttrs) attrs

153 indexDeleter = V.ifilter (\index _ -> V.notElem index deleteIndices)

154 indexDeleter = V.ifilter (\index _ -> V.notElem index deleteIndices)

154− newAttrs = case A.projectionAttributesForNames projectAttrs attrs of

155+ newAttrs = indexDeleter attrs

155− Left err -> error (show (err, projectAttrs, attrs))

156− Right attrs' -> attrs'

157 newTupVec = indexDeleter tupVec

156 newTupVec = indexDeleter tupVec

158−-}

157+

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)

166--return the attributes and atoms which are equal in both vectors

158--return the attributes and atoms which are equal in both vectors

167--semi-join

159--semi-join

168tupleIntersection :: RelationTuple -> RelationTuple -> RelationTuple

160tupleIntersection :: RelationTuple -> RelationTuple -> RelationTuple

@@ -170,14 +162,12 @@ tupleIntersection tuple1 tuple2 = RelationTuple newAttrs newTupVec

170 where

162 where

171 attrs1 = tupleAttributes tuple1

163 attrs1 = tupleAttributes tuple1

172 attrs2 = tupleAttributes tuple2

164 attrs2 = tupleAttributes tuple2

173− intersectAttrs = A.intersection attrs1 attrs2

174− matchingIndices = V.findIndices (\attr -> A.member attr intersectAttrs &&

165+ matchingIndices = V.findIndices (\attr -> V.elem attr attrs2 &&

175− atomForAttributeName (attributeName attr) tuple1 ==

166+ atomForAttributeName (attributeName attr) tuple1 ==

176− atomForAttributeName (attributeName attr) tuple2) (attributesVec attrs1)

167+ atomForAttributeName (attributeName attr) tuple2

168+ ) attrs1

177 indexFilter = V.ifilter (\index _ -> V.elem index matchingIndices)

169 indexFilter = V.ifilter (\index _ -> V.elem index matchingIndices)

178− newAttrs = case A.projectionAttributesForNames (A.attributeNameSet intersectAttrs) attrs1 of

170+ newAttrs = indexFilter attrs1

179− Left _ -> mempty

180− Right attrs' -> attrs'

181 newTupVec = indexFilter (tupleAtoms tuple1)

171 newTupVec = indexFilter (tupleAtoms tuple1)

182

172

183-- | An optimized form of tuple update which updates vectors efficiently.

173-- | An optimized form of tuple update which updates vectors efficiently.

@@ -185,20 +175,19 @@ updateTupleWithAtoms :: M.Map AttributeName Atom -> RelationTuple -> RelationTup

185updateTupleWithAtoms updateMap (RelationTuple attrs tupVec) = RelationTuple attrs newVec

175updateTupleWithAtoms updateMap (RelationTuple attrs tupVec) = RelationTuple attrs newVec

186 where

176 where

187 updateKeysSet = M.keysSet updateMap

177 updateKeysSet = M.keysSet updateMap

188− updateKeysIVec = V.filter (\(_,attr) -> S.member (attributeName attr) updateKeysSet) (V.indexed (attributesVec attrs))

178+ updateKeysIVec = V.filter (\(_,attr) -> S.member (attributeName attr) updateKeysSet) (V.indexed attrs)

189 newVec = V.update tupVec updateVec

179 newVec = V.update tupVec updateVec

190 updateVec = V.map (\(index, attr) -> (index, updateMap M.! attributeName attr)) updateKeysIVec

180 updateVec = V.map (\(index, attr) -> (index, updateMap M.! attributeName attr)) updateKeysIVec

191

181

192tupleToMap :: RelationTuple -> M.Map AttributeName Atom

182tupleToMap :: RelationTuple -> M.Map AttributeName Atom

193tupleToMap (RelationTuple attrs tupVec) = M.fromList assocList

183tupleToMap (RelationTuple attrs tupVec) = M.fromList assocList

194 where

184 where

195− assocList = V.toList $ V.map (\(index, attr) -> (attributeName attr, tupVec V.! index)) (V.indexed (attributesVec attrs))

185+ assocList = V.toList $ V.map (\(index, attr) -> (attributeName attr, tupVec V.! index)) (V.indexed attrs)

196

186

197−-- | Validate that the tuple has the correct attributes in the correct order

198verifyTuple :: Attributes -> RelationTuple -> Either RelationalError RelationTuple

187verifyTuple :: Attributes -> RelationTuple -> Either RelationalError RelationTuple

199−verifyTuple attrs tuple = let attrsTypes = A.atomTypes attrs

188+verifyTuple attrs tuple = let attrsTypes = V.map atomType attrs

200 tupleTypes = V.map atomTypeForAtom (tupleAtoms tuple) in

189 tupleTypes = V.map atomTypeForAtom (tupleAtoms tuple) in

201− if A.arity attrs /= V.length tupleTypes then

190+ if V.length attrs /= V.length tupleTypes then

202 Left $ TupleAttributeCountMismatchError 0

191 Left $ TupleAttributeCountMismatchError 0

203 else do

192 else do

204 mapM_ (uncurry atomTypeVerify) (V.zip attrsTypes tupleTypes)

193 mapM_ (uncurry atomTypeVerify) (V.zip attrsTypes tupleTypes)

@@ -207,18 +196,15 @@ verifyTuple attrs tuple = let attrsTypes = A.atomTypes attrs

207--two tuples can be equal but the vectors of attributes could be out-of-order

196--two tuples can be equal but the vectors of attributes could be out-of-order

208--reorder if necessary- this is useful during relMogrify so that all the relation's tuples have identical atom/attribute ordering

197--reorder if necessary- this is useful during relMogrify so that all the relation's tuples have identical atom/attribute ordering

209reorderTuple :: Attributes -> RelationTuple -> RelationTuple

198reorderTuple :: Attributes -> RelationTuple -> RelationTuple

210−reorderTuple attrs tupIn = if attributesAndOrderEqual (tupleAttributes tupIn) attrs then

199+reorderTuple attrs tupIn = if tupleAttributes tupIn == attrs then

211 tupIn

200 tupIn

212 else

201 else

213− RelationTuple attrs (V.map mapper (attributesVec attrs))

202+ RelationTuple attrs (V.map mapper attrs)

214 where

203 where

215 mapper attr = case atomForAttributeName (attributeName attr) tupIn of

204 mapper attr = case atomForAttributeName (attributeName attr) tupIn of

216− Left err -> error ("logic bug in reorderTuple: " ++ show err <> show tupIn)

205+ Left err -> error ("logic bug in reorderTuple: " ++ show err)

217 Right atom -> atom

206 Right atom -> atom

218

207

219--used in Generics derivation for ADTs without named attributes

208--used in Generics derivation for ADTs without named attributes

220trimTuple :: Int -> RelationTuple -> RelationTuple

209trimTuple :: Int -> RelationTuple -> RelationTuple

221−trimTuple index (RelationTuple attrs vals) =

210+trimTuple index (RelationTuple attrs vals) = RelationTuple (V.drop index attrs) (V.drop index vals)

222− RelationTuple newAttrs (V.drop index vals)

223− where

224− newAttrs = A.drop index attrs

src/lib/ProjectM36/TupleSet.hs−7

@@ -31,10 +31,3 @@ mkTupleSet attrs tuples = verifyTupleSet attrs (RelationTupleSet tuples)

31

32mkTupleSetFromList :: Attributes -> [[Atom]] -> Either RelationalError RelationTupleSet

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+34−108

@@ -6,26 +6,7 @@

6{-# LANGUAGE UndecidableInstances #-}

7{-# LANGUAGE CPP #-}

8

9−module ProjectM36.Tupleable

9+module ProjectM36.Tupleable where

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

29

10

30import Data.Foldable

11import Data.Foldable

31import Data.List (partition)

12import Data.List (partition)

@@ -38,13 +19,16 @@ import qualified Data.Text as T

38import qualified Data.Vector as V

19import qualified Data.Vector as V

39import GHC.Generics

20import GHC.Generics

40import ProjectM36.Atomable

21import ProjectM36.Atomable

41−import ProjectM36.Attribute as A hiding (null, toList)

22+import ProjectM36.Attribute hiding (null)

42import ProjectM36.Base

23import ProjectM36.Base

43import ProjectM36.DataTypes.Primitive

24import ProjectM36.DataTypes.Primitive

44import ProjectM36.Error

25import ProjectM36.Error

45import ProjectM36.Tuple

26import ProjectM36.Tuple

46import ProjectM36.TupleSet

27import ProjectM36.TupleSet

47import qualified Data.Set as S

28import qualified Data.Set as S

29+#if __GLASGOW_HASKELL__ <= 802

30+import Data.Monoid

31+#endif

48

32

49{-import Data.Binary

33{-import Data.Binary

50import Control.DeepSeq

34import Control.DeepSeq

@@ -89,7 +73,7 @@ toInsertExpr vals rvName = do

89

73

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'.

74-- | 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'.

91toDefineExpr :: forall a proxy. Tupleable a => proxy a -> RelVarName -> DatabaseContextExpr

75toDefineExpr :: forall a proxy. Tupleable a => proxy a -> RelVarName -> DatabaseContextExpr

92−toDefineExpr _ rvName = Define rvName (map NakedAttributeExpr (V.toList (attributesVec attrs)))

76+toDefineExpr _ rvName = Define rvName (map NakedAttributeExpr (V.toList attrs))

93 where

77 where

94 attrs = toAttributes (Proxy :: Proxy a)

78 attrs = toAttributes (Proxy :: Proxy a)

95

79

@@ -140,110 +124,56 @@ validateAttributes actualAttrs expectedAttrs val

140 where

124 where

141 nonMatchingAttrs = attributeNamesNotContained actualAttrs expectedAttrs

125 nonMatchingAttrs = attributeNamesNotContained actualAttrs expectedAttrs

142

126

143−-- | Types that can be converted to and from 'RelationTuple'.

127+

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

164class Tupleable a where

128class Tupleable a where

165 toTuple :: a -> RelationTuple

129 toTuple :: a -> RelationTuple

166

130

167 fromTuple :: RelationTuple -> Either RelationalError a

131 fromTuple :: RelationTuple -> Either RelationalError a

168

132

169− toAttributes :: Proxy a -> Attributes

133+ toAttributes :: proxy a -> Attributes

170

134

171 default toTuple :: (Generic a, TupleableG (Rep a)) => a -> RelationTuple

135 default toTuple :: (Generic a, TupleableG (Rep a)) => a -> RelationTuple

172− toTuple = genericToTuple defaultTupleableOptions

136+ toTuple v = toTupleG (from v)

173

137

174 default fromTuple :: (Generic a, TupleableG (Rep a)) => RelationTuple -> Either RelationalError a

138 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

208−genericFromTuple opts tup = to <$> fromTupleG opts tup

139+ fromTuple tup = to <$> fromTupleG tup

209

140

210−genericToAttributes :: forall a. (Generic a, TupleableG (Rep a)) => TupleableOptions -> Proxy a -> Attributes

141+ default toAttributes :: (Generic a, TupleableG (Rep a)) => proxy a -> Attributes

211−genericToAttributes opts _ = toAttributesG opts (from (undefined :: a))

142+ toAttributes _ = toAttributesG (from (undefined :: a))

212

143

213class TupleableG g where

144class TupleableG g where

214− toTupleG :: TupleableOptions -> g a -> RelationTuple

145+ toTupleG :: g a -> RelationTuple

215− toAttributesG :: TupleableOptions -> g a -> Attributes

146+ toAttributesG :: g a -> Attributes

216− fromTupleG :: TupleableOptions -> RelationTuple -> Either RelationalError (g a)

147+ fromTupleG :: RelationTuple -> Either RelationalError (g a)

217 isRecordTypeG :: g a -> Bool

148 isRecordTypeG :: g a -> Bool

218

149

219--data type metadata

150--data type metadata

220instance (Datatype c, TupleableG a) => TupleableG (M1 D c a) where

151instance (Datatype c, TupleableG a) => TupleableG (M1 D c a) where

221− toTupleG opts (M1 v) = toTupleG opts v

152+ toTupleG (M1 v) = toTupleG v

222− toAttributesG opts (M1 v) = toAttributesG opts v

153+ toAttributesG (M1 v) = toAttributesG v

223− fromTupleG opts v = M1 <$> fromTupleG opts v

154+ fromTupleG v = M1 <$> fromTupleG v

224 isRecordTypeG (M1 v) = isRecordTypeG v

155 isRecordTypeG (M1 v) = isRecordTypeG v

225

156

226--constructor metadata

157--constructor metadata

227instance (Constructor c, TupleableG a, AtomableG a) => TupleableG (M1 C c a) where

158instance (Constructor c, TupleableG a, AtomableG a) => TupleableG (M1 C c a) where

228− toTupleG opts (M1 v) = RelationTuple attrs atoms

159+ toTupleG (M1 v) = RelationTuple attrs atoms

229 where

160 where

230− attrsToCheck = toAttributesG opts v

161+ attrsToCheck = toAttributesG v

231− counter = V.generate (arity attrsToCheck) id

162+ counter = V.generate (V.length attrsToCheck) id

232− attrs = attributesFromList (V.toList attrsV)

233− attrsV = V.zipWith (\num attr@(Attribute name typ) -> if T.null name then

163+ attrs = V.zipWith (\num attr@(Attribute name typ) -> if T.null name then

234 Attribute ("attr" <> T.pack (show (num + 1))) typ

164 Attribute ("attr" <> T.pack (show (num + 1))) typ

235 else

165 else

236− attr) counter (attributesVec attrsToCheck)

166+ attr) counter attrsToCheck

237 atoms = V.fromList (toAtomsG v)

167 atoms = V.fromList (toAtomsG v)

238− toAttributesG opts (M1 v) = toAttributesG opts v

168+ toAttributesG (M1 v) = toAttributesG v

239− fromTupleG opts tup = M1 <$> fromTupleG opts tup

169+ fromTupleG tup = M1 <$> fromTupleG tup

240 isRecordTypeG (M1 v) = isRecordTypeG v

170 isRecordTypeG (M1 v) = isRecordTypeG v

241

171

242-- product types

172-- product types

243instance (TupleableG a, TupleableG b) => TupleableG (a :*: b) where

173instance (TupleableG a, TupleableG b) => TupleableG (a :*: b) where

244 toTupleG = error "toTupleG"

174 toTupleG = error "toTupleG"

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

175+ 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

246− fromTupleG opts tup = (:*:) <$> fromTupleG opts tup <*> fromTupleG opts processedTuple

176+ fromTupleG tup = (:*:) <$> fromTupleG tup <*> fromTupleG processedTuple

247 where

177 where

248 processedTuple = if isRecordTypeG (undefined :: a x) then

178 processedTuple = if isRecordTypeG (undefined :: a x) then

249 tup

179 tup

@@ -254,22 +184,18 @@ instance (TupleableG a, TupleableG b) => TupleableG (a :*: b) where

254--selector/record

184--selector/record

255instance (Selector c, AtomableG a) => TupleableG (M1 S c a) where

185instance (Selector c, AtomableG a) => TupleableG (M1 S c a) where

256 toTupleG = error "toTupleG"

186 toTupleG = error "toTupleG"

257− toAttributesG opts m@(M1 v) = A.singleton (Attribute modifiedName aType)

187+ toAttributesG m@(M1 v) = V.singleton (Attribute name aType)

258 where

188 where

259 name = T.pack (selName m)

189 name = T.pack (selName m)

260− modifiedName = if T.null name then

261− name

262− else

263− fieldModifier opts name

264 aType = toAtomTypeG v

190 aType = toAtomTypeG v

265− fromTupleG opts tup = if null name then -- non-record type, just pull off the first tuple item

191+ fromTupleG tup = if null name then -- non-record type, just pull off the first tuple item

266 M1 <$> atomv (V.head (tupleAtoms tup))

192 M1 <$> atomv (V.head (tupleAtoms tup))

267 else do

193 else do

268− atom <- atomForAttributeName (fieldModifier opts (T.pack name)) tup

194+ atom <- atomForAttributeName (T.pack name) tup

269 val <- atomv atom

195 val <- atomv atom

270 pure (M1 val)

196 pure (M1 val)

271 where

197 where

272− expectedAtomType = atomType (V.head (attributesVec (toAttributesG opts (undefined :: M1 S c a x))))

198+ expectedAtomType = atomType (V.head (toAttributesG (undefined :: M1 S c a x)))

273 atomv atom = maybe (Left (AtomTypeMismatchError

199 atomv atom = maybe (Left (AtomTypeMismatchError

274 expectedAtomType

200 expectedAtomType

275 (atomTypeForAtom atom)

201 (atomTypeForAtom atom)

@@ -280,8 +206,8 @@ instance (Selector c, AtomableG a) => TupleableG (M1 S c a) where

280--constructors with no arguments

206--constructors with no arguments

281--basically useless but orthoganal to relationTrue

207--basically useless but orthoganal to relationTrue

282instance TupleableG U1 where

208instance TupleableG U1 where

283− toTupleG _ _ = emptyTuple

209+ toTupleG _= emptyTuple

284− toAttributesG _ _ = emptyAttributes

210+ toAttributesG _ = emptyAttributes

285− fromTupleG _ _ = pure U1

211+ fromTupleG _ = pure U1

286 isRecordTypeG _ = False

212 isRecordTypeG _ = False

287

213

src/lib/ProjectM36/Tupleable/Deriving.hsdeleted−229

@@ -1,229 +0,0 @@

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+3−5

@@ -17,7 +17,7 @@ substituteWithNameMacros macros e@(RelationVariable rvname tid) =

17 macroFilt (WithNameExpr macroName macroTid, _) = rvname == macroName && tid== macroTid in

18 case filter macroFilt macros of

19 [] -> e

20− [(_,replacement)] -> replacement

20+ (_,replacement):[] -> replacement

21 _ -> error "more than one macro matched!"

22substituteWithNameMacros macros (Project attrs expr) =

23 Project attrs (substituteWithNameMacros macros expr)

@@ -42,11 +42,9 @@ substituteWithNameMacros macros (NotEquals exprA exprB) =

42substituteWithNameMacros macros (Extend extendTup expr) =

43 Extend (substituteWitNameMacrosExtendTupleExpr macros extendTup) (substituteWithNameMacros macros expr)

44substituteWithNameMacros macros (With moreMacros expr) =

45− --collect and update nested with exprs

45+ --collect and override existing macros and recurse

46 let newMacros = foldr macroFolder macros moreMacros

47− macroFolder (wnexpr, mexpr) acc =

47+ macroFolder (wnexpr, mexpr) acc = filter (\(w,_) -> w /= wnexpr) acc ++ [(wnexpr, mexpr)] in

48− let subExpr = substituteWithNameMacros macros mexpr in

49− filter (\(w,_) -> w /= wnexpr) acc ++ [(wnexpr, subExpr)] in

50 --scan for a match- if it exists, replace it (representing a with clause at a lower level

48 --scan for a match- if it exists, replace it (representing a with clause at a lower level

51 substituteWithNameMacros newMacros expr

49 substituteWithNameMacros newMacros expr

52

50

stack.ghc8.0.yamlnew file+50

@@ -0,0 +1,50 @@

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.yamldeleted−19

@@ -1,19 +0,0 @@

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.yamlnew file+51

@@ -0,0 +1,51 @@

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.yamlnew file+48

@@ -0,0 +1,48 @@

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+16−25

@@ -2,36 +2,27 @@

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-14.27

5+resolver: lts-14.3

6

7# Local packages, usually specified by relative directory name

8packages:

9− - "."

9+- '.'

10# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)

11extra-deps:

12− - git: https://github.com/agentm/curryer.git

12+- git: https://github.com/haskell-distributed/distributed-process.git

13− commit: 74ecaac619ad1165a4517d5c0f4e530493bda130

13+ commit: 660d554f6acd2dba8b605c84e8fa69e45708bc14

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

20− - extended-reals-0.2.3.0

14+- extended-reals-0.2.3.0

21− - data-interval-2.0.1

15+- data-interval-2.0.1

22− - stm-containers-1.1.0.4

16+- stm-containers-1.1.0.4

17+- distributed-static-0.3.9

23− - stm-hamt-1.2.0.4

18+- 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

24− - rset-1.0.0

22+- rset-1.0.0

25− - hashable-time-0.2.0.2

23+- hashable-time-0.2.0.2

26− - network-transport-tcp-0.6.0

24+- network-transport-tcp-0.6.0

27− - megaparsec-7.0.5

25+- 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

35

26

36# Override default flag values for local packages and extra-deps

27# Override default flag values for local packages and extra-deps

37flags:

28flags:

stack.ghc8.8.yaml+17−25

@@ -2,36 +2,28 @@

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-16.4

5+resolver: lts-15.11

6

7# Local packages, usually specified by relative directory name

8packages:

9− - "."

9+- '.'

10# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)

11extra-deps:

12− - git: https://github.com/agentm/curryer.git

12+- git: https://github.com/agentm/distributed-process.git

13− commit: 74ecaac619ad1165a4517d5c0f4e530493bda130

13+ commit: 688a5b96d4b7b36d90c3db676230b2c943604288

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

20− - extended-reals-0.2.3.0

14+- extended-reals-0.2.3.0

21− - data-interval-2.0.1

15+- data-interval-2.0.1

22− - stm-containers-1.1.0.4

16+- stm-containers-1.1.0.4

17+- distributed-static-0.3.9

23− - stm-hamt-1.2.0.4

18+- 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

24− - rset-1.0.0

22+- rset-1.0.0

25− - hashable-time-0.2.0.2

23+- hashable-time-0.2.0.2

26− - network-transport-tcp-0.7.0

24+- network-transport-tcp-0.7.0

27− - megaparsec-7.0.5

25+- megaparsec-7.0.5

28− - network-2.8.0.1

26+- 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

35

27

36# Override default flag values for local packages and extra-deps

28# Override default flag values for local packages and extra-deps

37flags:

29flags:

test/Client/Simple.hs+2−1

@@ -9,6 +9,7 @@ import System.IO.Temp

9import System.FilePath

10import ProjectM36.TupleSet

11import ProjectM36.Attribute

12+import qualified Data.Vector as V

12import qualified Data.Map as M

13import qualified Data.Map as M

13

14

14main :: IO ()

15main :: IO ()

@@ -58,7 +59,7 @@ testSimpleCommitFailure = TestCase $ do

58 execute $ Assign "x" (ExistingRelation relationTrue)

59 execute $ Assign "x" (ExistingRelation relationTrue)

59 --cause error

60 --cause error

60 execute $ Assign "x" (MakeStaticRelation failAttrs emptyTupleSet)

61 execute $ Assign "x" (MakeStaticRelation failAttrs emptyTupleSet)

61− let expectedErr = Left (RelError (RelationTypeMismatchError mempty failAttrs))

62+ let expectedErr = Left (RelError (RelationTypeMismatchError V.empty failAttrs))

62 assertEqual "dbc error" expectedErr err

63 assertEqual "dbc error" expectedErr err

63

64

64-- #176 default merge couldn't handle Update

65-- #176 default merge couldn't handle Update

test/Relation/Atomable.hs+15−28

@@ -1,7 +1,8 @@

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, DerivingVia #-}

2+{-# LANGUAGE DeriveGeneric, DeriveAnyClass, OverloadedStrings, TypeApplications #-}

3import Test.HUnit

4import ProjectM36.Client

5+import Data.Binary

5import Control.DeepSeq

6import Control.DeepSeq

6import System.Exit

7import System.Exit

7import TutorialD.Interpreter.TestBase

8import TutorialD.Interpreter.TestBase

@@ -12,65 +13,52 @@ import Data.Time.Calendar (fromGregorian)

12import Data.Text

13import Data.Text

13import qualified Data.Map as M

14import qualified Data.Map as M

14import Data.Proxy

15import Data.Proxy

15−import Codec.Winery

16

17{-# ANN module ("Hlint: ignore Use newtype instead of data" :: String) #-}

18data Test1T = Test1C Integer

19− deriving (Generic, Show, Eq, NFData, Atomable)

19+ deriving (Generic, Show, Eq, Binary, NFData, Atomable)

20− deriving Serialise via WineryVariant Test1T

21

20

22data Test2T x = Test2C x

21data Test2T x = Test2C x

23− deriving (Show, Generic, Eq, NFData, Atomable)

22+ deriving (Show, Generic, Eq, Binary, NFData, Atomable)

24− deriving Serialise via WineryVariant (Test2T x)

25

23

26data Test3T = Test3C Integer Integer

24data Test3T = Test3C Integer Integer

27− deriving (Show, Generic, Eq, NFData, Atomable)

25+ deriving (Show, Generic, Eq, Binary, NFData, Atomable)

28− deriving Serialise via WineryVariant Test3T

29

26

30data Test4T = Test4Ca Integer |

27data Test4T = Test4Ca Integer |

31 Test4Cb Integer

28 Test4Cb Integer

32− deriving (Show, Generic, Eq, NFData, Atomable)

29+ deriving (Show, Generic, Eq, Binary, NFData, Atomable)

33− deriving Serialise via WineryVariant Test4T

34

30

35data TestListT = TestListC [Integer]

31data TestListT = TestListC [Integer]

36− deriving (Show, Generic, Eq, NFData, Atomable)

32+ deriving (Show, Generic, Eq, Binary, NFData, Atomable)

37− deriving Serialise via WineryVariant TestListT

38

33

39data TestNonEmptyT = TestNonEmptyC [Integer]

34data TestNonEmptyT = TestNonEmptyC [Integer]

40− deriving (Show, Generic, Eq, NFData, Atomable)

35+ deriving (Show, Generic, Eq, Binary, NFData, Atomable)

41− deriving Serialise via WineryVariant TestNonEmptyT

42

36

43data Test5T = Test5C {

37data Test5T = Test5C {

44 con1 :: Integer,

38 con1 :: Integer,

45 con2 :: Integer

39 con2 :: Integer

46− } deriving (Show, Generic, Eq, NFData, Atomable)

40+ } deriving (Show, Generic, Eq, Binary, NFData, Atomable)

47− deriving Serialise via WineryRecord Test5T

48

41

49data Test6T = Test6C (Maybe Integer)

42data Test6T = Test6C (Maybe Integer)

50− deriving (Show, Generic, Eq, NFData, Atomable)

43+ deriving (Show, Generic, Eq, Binary, NFData, Atomable)

51− deriving Serialise via WineryVariant Test6T

52

44

53data Test7T = Test7C (Either Integer Integer)

45data Test7T = Test7C (Either Integer Integer)

54− deriving (Show, Generic, Eq, NFData, Atomable)

46+ deriving (Show, Generic, Eq, Binary, NFData, Atomable)

55− deriving Serialise via WineryVariant Test7T

56

47

57data Test8T = Test8C Test1T

48data Test8T = Test8C Test1T

58− deriving (Show, Generic, Eq, NFData, Atomable)

49+ deriving (Show, Generic, Eq, Binary, NFData, Atomable)

59− deriving Serialise via WineryVariant Test8T

60

50

61data User = User

51data User = User

62 { userFirstName :: Text

52 { userFirstName :: Text

63 , userLastName :: Text

53 , userLastName :: Text

64− } deriving (Eq, Ord, Show, Generic, NFData, Atomable)

54+ } deriving (Eq, Ord, Show, Generic, NFData, Binary, Atomable)

65− deriving Serialise via WineryRecord User

66

55

67data Test9_4T = Test9_4C {

56data Test9_4T = Test9_4C {

68 f9_41 :: Int,

57 f9_41 :: Int,

69 f9_42 :: Int,

58 f9_42 :: Int,

70 f9_43 :: Int,

59 f9_43 :: Int,

71 f9_44 :: Int }

60 f9_44 :: Int }

72− deriving (Show, Generic, Eq, NFData, Atomable)

61+ deriving (Show, Generic, Eq, Binary, NFData, Atomable)

73− deriving Serialise via WineryRecord Test9_4T

74

62

75data Test9_5T = Test9_5C {

63data Test9_5T = Test9_5C {

76 f9_51 :: Int,

64 f9_51 :: Int,

@@ -79,8 +67,7 @@ data Test9_5T = Test9_5C {

79 f9_54 :: Int,

67 f9_54 :: Int,

80 f9_55 :: Int

68 f9_55 :: Int

81 }

69 }

82− deriving (Show, Generic, Eq, NFData, Atomable)

70+ deriving (Show, Generic, Eq, Binary, NFData, Atomable)

83− deriving Serialise via WineryRecord Test9_5T

84

71

85main :: IO ()

72main :: IO ()

86main = do

73main = do

test/Relation/Basic.hs+12−13

@@ -3,6 +3,8 @@ import ProjectM36.Base

3import ProjectM36.Relation

4import ProjectM36.Error

5import ProjectM36.DateExamples

6+import ProjectM36.TupleSet

7+import ProjectM36.Attribute hiding (null, attributeNames)

6import ProjectM36.DataTypes.Primitive

8import ProjectM36.DataTypes.Primitive

7import ProjectM36.RelationalExpression

9import ProjectM36.RelationalExpression

8import ProjectM36.TransactionGraph

10import ProjectM36.TransactionGraph

@@ -23,8 +25,8 @@ testList = TestList [testRelation "relationTrue" relationTrue, testRelation "rel

23 testRelation "products" productsRel,

25 testRelation "products" productsRel,

24 testRelation "supplierProducts" supplierProductsRel,

26 testRelation "supplierProducts" supplierProductsRel,

25 testMkRelationFromExprsBadAttrs,

27 testMkRelationFromExprsBadAttrs,

26− testExistingRelationType,

28+ testDuplicateAttributes,

27− testReorderTuple

29+ testExistingRelationType

28 ]

30 ]

29

31

30main :: IO ()

32main :: IO ()

@@ -63,7 +65,7 @@ validateAttrTypesMatchTupleAttrTypes rel@(Relation attrs tupSet) = foldr (\tuple

63 attrChecks tuple = V.map (\attr -> case atomForAttributeName (A.attributeName attr) tuple of

65 attrChecks tuple = V.map (\attr -> case atomForAttributeName (A.attributeName attr) tuple of

64 Left _ -> False

66 Left _ -> False

65 Right atom -> Right (atomTypeForAtom atom) ==

67 Right atom -> Right (atomTypeForAtom atom) ==

66− A.atomTypeForAttributeName (A.attributeName attr) attrs) (attributesVec (attributes rel))

68+ A.atomTypeForAttributeName (A.attributeName attr) attrs) (attributes rel)

67

69

68simpleRel :: Relation

70simpleRel :: Relation

69simpleRel = case mkRelation attrs tupleSet of

71simpleRel = case mkRelation attrs tupleSet of

@@ -101,19 +103,16 @@ testMkRelationFromExprsBadAttrs = TestCase $ do

101 Left err -> assertEqual "tuple type mismatch" (TupleAttributeTypeMismatchError (A.attributesFromList [Attribute "badAttr2" IntAtomType])) err

103 Left err -> assertEqual "tuple type mismatch" (TupleAttributeTypeMismatchError (A.attributesFromList [Attribute "badAttr2" IntAtomType])) err

102 Right _ -> assertFailure "expected tuple type mismatch"

104 Right _ -> assertFailure "expected tuple type mismatch"

103

105

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+

104testExistingRelationType :: Test

113testExistingRelationType :: Test

105testExistingRelationType = TestCase $ do

114testExistingRelationType = TestCase $ do

106 (graph, _) <- freshTransactionGraph dateExamples

115 (graph, _) <- freshTransactionGraph dateExamples

107 let typeResult = runRelationalExprM reenv (typeForRelationalExpr (ExistingRelation relationTrue))

116 let typeResult = runRelationalExprM reenv (typeForRelationalExpr (ExistingRelation relationTrue))

108 reenv = mkRelationalExprEnv dateExamples graph

117 reenv = mkRelationalExprEnv dateExamples graph

109 assertEqual "ExistingRelation with tuples type" (Right relationFalse) typeResult

118 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+9−187

@@ -1,29 +1,19 @@

1−{-# LANGUAGE

2− DeriveGeneric

3− , FlexibleInstances

1+{-# LANGUAGE DeriveGeneric, FlexibleInstances, FlexibleContexts, DeriveAnyClass #-}

4− , FlexibleContexts

5− , DeriveAnyClass

6− , ScopedTypeVariables

7− , TypeApplications

8− , DataKinds

9− , TypeOperators

10− , AllowAmbiguousTypes

11− , DerivingVia

12− #-}

13import Test.HUnit

2import Test.HUnit

14−import ProjectM36.Tupleable.Deriving

3+import ProjectM36.Tupleable

15import ProjectM36.Atomable

4import ProjectM36.Atomable

16−import ProjectM36.Attribute as A

5+import ProjectM36.Attribute

17import ProjectM36.Error

6import ProjectM36.Error

7+import Data.Binary

18import ProjectM36.Base

8import ProjectM36.Base

19import Control.DeepSeq (NFData)

9import Control.DeepSeq (NFData)

10+import GHC.Generics

20import qualified Data.Vector as V

11import qualified Data.Vector as V

21import qualified Data.Map as M

12import qualified Data.Map as M

22import qualified Data.Text as T

13import qualified Data.Text as T

23import qualified Data.Set as S

14import qualified Data.Set as S

24import System.Exit

15import System.Exit

25import Data.Proxy

16import Data.Proxy

26−import Codec.Winery

27

17

28{-# ANN module ("Hlint: ignore Use newtype instead of data" :: String) #-}

18{-# ANN module ("Hlint: ignore Use newtype instead of data" :: String) #-}

29

19

@@ -31,43 +21,35 @@ data Test1T = Test1C {

31 attrA :: Integer

21 attrA :: Integer

32 }

22 }

33 deriving (Generic, Eq, Show)

23 deriving (Generic, Eq, Show)

34− deriving Serialise via WineryRecord Test1T

35

24

36data Test2T = Test2C {

25data Test2T = Test2C {

37 attrB :: Integer,

26 attrB :: Integer,

38 attrC :: Integer

27 attrC :: Integer

39 }

28 }

40 deriving (Generic, Eq, Show)

29 deriving (Generic, Eq, Show)

41− deriving Serialise via WineryRecord Test2T

42

30

43data Test3T = Test3C Integer

31data Test3T = Test3C Integer

44 deriving (Generic, Eq, Show)

32 deriving (Generic, Eq, Show)

45− deriving Serialise via WineryVariant Test3T

46

33

47data Test4T = Test4C

34data Test4T = Test4C

48 deriving (Generic, Eq, Show)

35 deriving (Generic, Eq, Show)

49− deriving Serialise via WineryVariant Test4T

50

36

51data Test5T = Test5C1 Integer |

37data Test5T = Test5C1 Integer |

52 Test5C2 Integer

38 Test5C2 Integer

53 deriving (Generic, Eq, Show)

39 deriving (Generic, Eq, Show)

54− deriving Serialise via WineryVariant Test5T

55

40

56data Test6T = Test6C T.Text Integer Double

41data Test6T = Test6C T.Text Integer Double

57 deriving (Generic, Eq, Show)

42 deriving (Generic, Eq, Show)

58

43

59data Test7A = Test7AC Integer

44data Test7A = Test7AC Integer

60− deriving (Generic, Show, Eq, NFData, Atomable)

45+ deriving (Generic, Show, Eq, Binary, NFData, Atomable)

61− deriving Serialise via WineryVariant Test7A

62

46

63

47

64data Test7T = Test7C Test7A

48data Test7T = Test7C Test7A

65 deriving (Generic, Show, Eq)

49 deriving (Generic, Show, Eq)

66− deriving Serialise via WineryVariant Test7T

67

50

68data Test8T = Test8C

51data Test8T = Test8C

69 deriving (Generic, Show, Eq)

52 deriving (Generic, Show, Eq)

70− deriving Serialise via WineryVariant Test8T

71

53

72data Test9T = Test9C

54data Test9T = Test9C

73 {

55 {

@@ -76,15 +58,6 @@ data Test9T = Test9C

76 attr9C :: Double

58 attr9C :: Double

77 }

59 }

78 deriving (Generic, Show, Eq)

60 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

88

61

89instance Tupleable Test1T

62instance Tupleable Test1T

90

63

@@ -110,7 +83,7 @@ main = do

110 if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess

83 if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess

111

84

112testList :: Test

85testList :: Test

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]

86+testList = TestList [testADT1, testADT2, testADT3, testADT4, testADT6, testADT7, testADT8, testInsertExpr, testDefineExpr, testUpdateExpr, testUpdateExprEmptyAttrs, testDeleteExpr, testUpdateExprWrongAttr, testReorderedTuple]

114

87

115testADT1 :: Test

88testADT1 :: Test

116testADT1 = TestCase $ assertEqual "one record constructor" (Right example) (fromTuple (toTuple example))

89testADT1 = TestCase $ assertEqual "one record constructor" (Right example) (fromTuple (toTuple example))

@@ -148,7 +121,7 @@ testADT7 :: Test

148testADT7 = TestCase $ do

121testADT7 = TestCase $ do

149 let example = Test7C (Test7AC 3)

122 let example = Test7C (Test7AC 3)

150 assertEqual "atom type" (Right example) (fromTuple (toTuple example))

123 assertEqual "atom type" (Right example) (fromTuple (toTuple example))

151− let expectedAttrs = A.singleton (Attribute "" (ConstructedAtomType "Test7A" M.empty))

124+ let expectedAttrs = V.singleton (Attribute "" (ConstructedAtomType "Test7A" M.empty))

152 assertEqual "adt atomtype" expectedAttrs (toAttributes (Proxy :: Proxy Test7T))

125 assertEqual "adt atomtype" expectedAttrs (toAttributes (Proxy :: Proxy Test7T))

153

126

154testADT8 :: Test

127testADT8 :: Test

@@ -222,159 +195,8 @@ testDeleteExpr = TestCase $ do

222testReorderedTuple :: Test

195testReorderedTuple :: Test

223testReorderedTuple = TestCase $ do

196testReorderedTuple = TestCase $ do

224 let tupleRev :: RelationTuple -> RelationTuple

197 let tupleRev :: RelationTuple -> RelationTuple

225− tupleRev (RelationTuple v1 v2) = RelationTuple (revAttrs v1) (V.reverse v2)

198+ tupleRev (RelationTuple v1 v2) = RelationTuple (V.reverse v1) (V.reverse v2)

226− revAttrs attrs = A.attributesFromList (reverse (A.toList attrs))

227 expected = Test2C {attrB = 3,

199 expected = Test2C {attrB = 3,

228 attrC = 4}

200 attrC = 4}

229 actual = fromTuple . tupleRev . toTuple $ expected

201 actual = fromTuple . tupleRev . toTuple $ expected

230 assertEqual "reordered tuple" (Right expected) actual

202 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+20−19

@@ -5,6 +5,7 @@ test client/server interaction

5import Test.HUnit

6import ProjectM36.Client

7import qualified ProjectM36.Client as C

8+import ProjectM36.Server.EntryPoints

8import ProjectM36.Server

9import ProjectM36.Server

9import ProjectM36.Server.Config

10import ProjectM36.Server.Config

10import ProjectM36.Relation

11import ProjectM36.Relation

@@ -13,8 +14,16 @@ import ProjectM36.IsomorphicSchema

13import ProjectM36.Base

14import ProjectM36.Base

14

15

15import System.Exit

16import System.Exit

16−import Network.Socket (SockAddr(..))

17+

17import Control.Concurrent

18import 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+

18import Data.Either (isRight)

27import Data.Either (isRight)

19import Control.Exception

28import Control.Exception

20import System.IO.Temp

29import System.IO.Temp

@@ -23,8 +32,6 @@ import System.FilePath

23import System.Directory

32import System.Directory

24#endif

33#endif

25

34

26−type Timeout = Int

27−

28testList :: SessionId -> Connection -> MVar () -> Test

35testList :: SessionId -> Connection -> MVar () -> Test

29testList sessionId conn notificationTestMVar = TestList $ serverTests ++ sessionTests

36testList sessionId conn notificationTestMVar = TestList $ serverTests ++ sessionTests

30 where

37 where

@@ -42,7 +49,7 @@ testList sessionId conn notificationTestMVar = TestList $ serverTests ++ session

42 testRelationVariableSummary,

49 testRelationVariableSummary,

43 testNotification notificationTestMVar

50 testNotification notificationTestMVar

44 ]

51 ]

45− serverTests = [testRequestTimeout, testFileDescriptorCount, testClientConnectFail]

52+ serverTests = [testRequestTimeout, testFileDescriptorCount]

46

53

47main :: IO ()

54main :: IO ()

48main = do

55main = do

@@ -62,9 +69,11 @@ main = do

62testDatabaseName :: DatabaseName

69testDatabaseName :: DatabaseName

63testDatabaseName = "test"

70testDatabaseName = "test"

64

71

65−testConnection :: Port -> MVar () -> IO (Either ConnectionError (SessionId, Connection))

72+testConnection :: EndPointAddress -> MVar () -> IO (Either ConnectionError (SessionId, Connection))

66−testConnection serverPort mvar = do

73+testConnection serverAddress mvar = do

74+ let Just (host, service, _) = decodeEndPointAddress serverAddress

75+ serverAddress' = encodeEndPointAddress host service 1

67− let connInfo = RemoteConnectionInfo testDatabaseName "127.0.0.1" (show serverPort) (testNotificationCallback mvar)

76+ let connInfo = RemoteProcessConnectionInfo testDatabaseName (NodeId serverAddress') (testNotificationCallback mvar)

68 --putStrLn ("testConnection: " ++ show serverAddress)

77 --putStrLn ("testConnection: " ++ show serverAddress)

69 eConn <- connectProjectM36 connInfo

78 eConn <- connectProjectM36 connInfo

70 case eConn of

79 case eConn of

@@ -76,7 +85,7 @@ testConnection serverPort mvar = do

76 Right sessionId -> pure $ Right (sessionId, conn)

85 Right sessionId -> pure $ Right (sessionId, conn)

77

86

78-- | A version of 'launchServer' which returns the port on which the server is listening on a secondary thread

87-- | A version of 'launchServer' which returns the port on which the server is listening on a secondary thread

79−launchTestServer :: Timeout -> IO (Port, ThreadId)

88+launchTestServer :: Timeout -> IO (EndPointAddress, ThreadId)

80launchTestServer ti = do

89launchTestServer ti = do

81 addressMVar <- newEmptyMVar

90 addressMVar <- newEmptyMVar

82 tid <- forkIO $

91 tid <- forkIO $

@@ -90,9 +99,9 @@ launchTestServer ti = do

90 }

99 }

91

100

92 launchServer config (Just addressMVar) >> pure ()

101 launchServer config (Just addressMVar) >> pure ()

93− (SockAddrInet port _) <- takeMVar addressMVar

102+ endPointAddress <- takeMVar addressMVar

94 --liftIO $ putStrLn ("launched server on " ++ show endPointAddress)

103 --liftIO $ putStrLn ("launched server on " ++ show endPointAddress)

95− pure (fromIntegral port, tid)

104+ pure (endPointAddress, tid)

96

105

97testRelationalExpr :: SessionId -> Connection -> Test

106testRelationalExpr :: SessionId -> Connection -> Test

98testRelationalExpr sessionId conn = TestCase $ do

107testRelationalExpr sessionId conn = TestCase $ do

@@ -208,7 +217,7 @@ testRequestTimeout = TestCase $ do

208 Left err -> putStrLn ("failed to connect: " ++ show err) >> exitFailure

217 Left err -> putStrLn ("failed to connect: " ++ show err) >> exitFailure

209 Right (session, testConn) -> do

218 Right (session, testConn) -> do

210 res <- catchJust (\exc -> if exc == RequestTimeoutException then Just exc else Nothing) (callTestTimeout_ session testConn) (const (pure False))

219 res <- catchJust (\exc -> if exc == RequestTimeoutException then Just exc else Nothing) (callTestTimeout_ session testConn) (const (pure False))

211− assertBool "timeout exception was not thrown" (not res)

220+ assertBool "exception was not thrown" (not res)

212 killThread serverTid

221 killThread serverTid

213

222

214testFileDescriptorCount :: Test

223testFileDescriptorCount :: Test

@@ -238,11 +247,3 @@ fdCount = do

238--pass on non-linux platforms

247--pass on non-linux platforms

239testFileDescriptorCount = TestCase (pure ())

248testFileDescriptorCount = TestCase (pure ())

240#endif

249#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+9−3

@@ -18,6 +18,12 @@ import Data.Aeson

18import qualified Data.Map as M

19import qualified Data.ByteString.Lazy as BS

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+

21

27

22--start the websocket server

28--start the websocket server

23-- run some tutoriald against it

29-- run some tutoriald against it

@@ -31,12 +37,12 @@ launchTestServer = do

31 testDatabaseName = "test"

37 testDatabaseName = "test"

32 -- start normal server

38 -- start normal server

33 _ <- forkIO (launchServer config (Just addressMVar) >> pure ())

39 _ <- forkIO (launchServer config (Just addressMVar) >> pure ())

34− (SockAddrInet dbPort _) <- takeMVar addressMVar

40+ serverAddress <- takeMVar addressMVar

35 let wsServerHost = "127.0.0.1"

41 let wsServerHost = "127.0.0.1"

36 wsServerPort = 8889

42 wsServerPort = 8889

37− dbHost = "127.0.0.1"

43+ Just (dbHost, dbPort, _) = decodeEndPointAddress serverAddress

38 -- start websocket server proxy -- runServer doesn't support returning an arbitrary socket

44 -- start websocket server proxy -- runServer doesn't support returning an arbitrary socket

39− _ <- forkIO (WS.runServer wsServerHost wsServerPort (websocketProxyServer (fromIntegral dbPort) dbHost))

45+ _ <- forkIO (WS.runServer wsServerHost wsServerPort (websocketProxyServer (read dbPort) dbHost))

40 --wait for socket to be listening

46 --wait for socket to be listening

41 waitForListenSocket 5 (fromIntegral wsServerPort)

47 waitForListenSocket 5 (fromIntegral wsServerPort)

42 pure (fromIntegral wsServerPort, testDatabaseName)

48 pure (fromIntegral wsServerPort, testDatabaseName)

test/TransactionGraph/Merge.hs+15−25

@@ -4,7 +4,6 @@ import ProjectM36.Base

4import ProjectM36.Attribute

5import ProjectM36.Relation

6import ProjectM36.Transaction

7−import ProjectM36.TransactionInfo as TI

8import ProjectM36.TransactionGraph

7import ProjectM36.TransactionGraph

9import ProjectM36.Error

8import ProjectM36.Error

10import ProjectM36.Key

9import ProjectM36.Key

@@ -15,17 +14,6 @@ import ProjectM36.StaticOptimizer

15

14

16import qualified Data.ByteString.Lazy as BS

15import qualified Data.ByteString.Lazy as BS

17import System.Exit

16import System.Exit

18−

19−

20−

21−

22−

23−

24−

25−

26−

27−

28−

29import Data.Word

17import Data.Word

30import qualified Data.UUID as U

18import qualified Data.UUID as U

31import qualified Data.Set as S

19import qualified Data.Set as S

@@ -33,6 +21,7 @@ import qualified Data.Map as M

33import Data.Maybe

21import Data.Maybe

34import Data.Time.Clock

22import Data.Time.Clock

35import Data.Time.Calendar

23import Data.Time.Calendar

24+import qualified Data.List.NonEmpty as NE

36

25

37{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-}

26{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-}

38

27

@@ -72,9 +61,10 @@ basicTransactionGraph = do

72 uuidA = fakeUUID 10

61 uuidA = fakeUUID 10

73 uuidB = fakeUUID 11

62 uuidB = fakeUUID 11

74 uuidRoot = fakeUUID 1

63 uuidRoot = fakeUUID 1

64+ parents' = uuidRoot NE.:| []

75 rootContext = concreteDatabaseContext rootTrans

65 rootContext = concreteDatabaseContext rootTrans

76− (_, bsGraph') <- addTransaction "branchA" (createTrans uuidA (TI.singleParent uuidRoot testTime) rootContext) bsGraph

66+ (_, bsGraph') <- addTransaction "branchA" (createTrans uuidA (TransactionInfo parents' testTime) rootContext) bsGraph

77− (_, bsGraph'') <- addTransaction "branchB" (createTrans uuidB (TI.singleParent uuidRoot testTime) rootContext) bsGraph'

67+ (_, bsGraph'') <- addTransaction "branchB" (createTrans uuidB (TransactionInfo parents' testTime) rootContext) bsGraph'

78 pure bsGraph''

68 pure bsGraph''

79

69

80addTransaction :: HeadName -> Transaction -> TransactionGraph -> IO (Transaction, TransactionGraph)

70addTransaction :: HeadName -> Transaction -> TransactionGraph -> IO (Transaction, TransactionGraph)

@@ -118,7 +108,7 @@ testSubGraphToFirstAncestorSnipBranch = TestCase $ do

118 baseGraph <- basicTransactionGraph

108 baseGraph <- basicTransactionGraph

119 transA <- assertMaybe (transactionForHead "branchA" baseGraph) "failed to get branchA"

109 transA <- assertMaybe (transactionForHead "branchA" baseGraph) "failed to get branchA"

120 transB <- assertMaybe (transactionForHead "branchB" baseGraph) "failed to get branchB"

110 transB <- assertMaybe (transactionForHead "branchB" baseGraph) "failed to get branchB"

121− (_, graph) <- addTransaction "branchC" (createTrans (fakeUUID 12) (TI.singleParent (fakeUUID 1) testTime) (concreteDatabaseContext transA)) baseGraph

111+ (_, graph) <- addTransaction "branchC" (createTrans (fakeUUID 12) (TransactionInfo (fakeUUID 1 NE.:| []) testTime) (concreteDatabaseContext transA)) baseGraph

122 subgraph <- assertEither $ subGraphOfFirstCommonAncestor graph (transactionHeadsForGraph baseGraph) transA transB S.empty

112 subgraph <- assertEither $ subGraphOfFirstCommonAncestor graph (transactionHeadsForGraph baseGraph) transA transB S.empty

123 assertGraph subgraph

113 assertGraph subgraph

124 let graphEq graphArg = S.map transactionId (transactionsForGraph graphArg)

114 let graphEq graphArg = S.map transactionId (transactionsForGraph graphArg)

@@ -137,13 +127,13 @@ testSubGraphToFirstAncestorMoreTransactions = TestCase $ do

137 updatedBranchBContext <- case runDatabaseContextEvalMonad branchBContext env (optimizeAndEvalDatabaseContextExpr True (Assign "branchBOnlyRelvar" (ExistingRelation relationTrue))) of

127 updatedBranchBContext <- case runDatabaseContextEvalMonad branchBContext env (optimizeAndEvalDatabaseContextExpr True (Assign "branchBOnlyRelvar" (ExistingRelation relationTrue))) of

138 Left err -> assertFailure (show err) >> undefined

128 Left err -> assertFailure (show err) >> undefined

139 Right st -> pure $ dbc_context st

129 Right st -> pure $ dbc_context st

140− (_, graph') <- addTransaction "branchB" (createTrans (fakeUUID 3) (TI.singleParent (transactionId branchBTrans) testTime) updatedBranchBContext) graph

130+ (_, graph') <- addTransaction "branchB" (createTrans (fakeUUID 3) (TransactionInfo (transactionId branchBTrans NE.:| []) testTime) updatedBranchBContext) graph

141 branchBTrans' <- assertMaybe (transactionForHead "branchB" graph') "failed to get branchB head"

131 branchBTrans' <- assertMaybe (transactionForHead "branchB" graph') "failed to get branchB head"

142 assertEqual "branchB id 3" (fakeUUID 3) (transactionId branchBTrans')

132 assertEqual "branchB id 3" (fakeUUID 3) (transactionId branchBTrans')

143

133

144 -- add another transaction to branchA

134 -- add another transaction to branchA

145 branchATrans <- assertMaybe (transactionForHead "branchA" graph) "failed to get branchA head"

135 branchATrans <- assertMaybe (transactionForHead "branchA" graph) "failed to get branchA head"

146− (_, graph'') <- addTransaction "branchA" (createTrans (fakeUUID 4) (TI.singleParent (transactionId branchATrans) testTime) (concreteDatabaseContext branchATrans)) graph'

136+ (_, graph'') <- addTransaction "branchA" (createTrans (fakeUUID 4) (TransactionInfo (transactionId branchATrans NE.:| []) testTime) (concreteDatabaseContext branchATrans)) graph'

147 branchATrans' <- assertMaybe (transactionForHead "branchA" graph'') "failed to get branchA head"

137 branchATrans' <- assertMaybe (transactionForHead "branchA" graph'') "failed to get branchA head"

148 assertEqual "branchA id 4" (fakeUUID 4) (transactionId branchATrans')

138 assertEqual "branchA id 4" (fakeUUID 4) (transactionId branchATrans')

149

139

@@ -166,7 +156,7 @@ testSelectedBranchMerge = TestCase $ do

166 updatedBranchBContext <- case runDatabaseContextEvalMonad branchBContext env (optimizeAndEvalDatabaseContextExpr True (Assign "branchBOnlyRelvar" (ExistingRelation relationTrue))) of

156 updatedBranchBContext <- case runDatabaseContextEvalMonad branchBContext env (optimizeAndEvalDatabaseContextExpr True (Assign "branchBOnlyRelvar" (ExistingRelation relationTrue))) of

167 Left err -> assertFailure (show err) >> undefined

157 Left err -> assertFailure (show err) >> undefined

168 Right st -> pure (dbc_context st)

158 Right st -> pure (dbc_context st)

169− (_, graph') <- addTransaction "branchB" (createTrans (fakeUUID 3) (TI.singleParent (transactionId branchBTrans) testTime) updatedBranchBContext) graph

159+ (_, graph') <- addTransaction "branchB" (createTrans (fakeUUID 3) (TransactionInfo (transactionId branchBTrans NE.:| []) testTime) updatedBranchBContext) graph

170 --create the merge transaction in the graph

160 --create the merge transaction in the graph

171 let eGraph' = runGraphRefRelationalExprM gfEnv $ mergeTransactions testTime (fakeUUID 4) (fakeUUID 10) (SelectedBranchMergeStrategy "branchA") ("branchA", "branchB")

161 let eGraph' = runGraphRefRelationalExprM gfEnv $ mergeTransactions testTime (fakeUUID 4) (fakeUUID 10) (SelectedBranchMergeStrategy "branchA") ("branchA", "branchB")

172 gfEnv = freshGraphRefRelationalExprEnv Nothing graph'

162 gfEnv = freshGraphRefRelationalExprEnv Nothing graph'

@@ -195,8 +185,8 @@ testUnionPreferMergeStrategy = TestCase $ do

195 branchBContext = (concreteDatabaseContext branchBTrans) {relationVariables = M.insert conflictRelVarName (ExistingRelation branchBRelVar) (relationVariables (concreteDatabaseContext branchBTrans))}

185 branchBContext = (concreteDatabaseContext branchBTrans) {relationVariables = M.insert conflictRelVarName (ExistingRelation branchBRelVar) (relationVariables (concreteDatabaseContext branchBTrans))}

196 conflictRelVarName = "conflictRelVar"

186 conflictRelVarName = "conflictRelVar"

197

187

198− (_, graph') <- addTransaction "branchA" (createTrans (fakeUUID 3) (TI.singleParent (transactionId branchATrans) testTime) branchAContext) graph

188+ (_, graph') <- addTransaction "branchA" (createTrans (fakeUUID 3) (TransactionInfo (transactionId branchATrans NE.:| []) testTime) branchAContext) graph

199− (_, graph'') <- addTransaction "branchB" (createTrans (fakeUUID 4) (TI.singleParent (transactionId branchBTrans) testTime) branchBContext) graph'

189+ (_, graph'') <- addTransaction "branchB" (createTrans (fakeUUID 4) (TransactionInfo (transactionId branchBTrans NE.:| []) testTime) branchBContext) graph'

200 -- validate that the conflict is hidden because we preferred a branch

190 -- validate that the conflict is hidden because we preferred a branch

201 let merged = runGraphRefRelationalExprM env $ mergeTransactions testTime (fakeUUID 5) (fakeUUID 3) (UnionPreferMergeStrategy "branchB") ("branchA", "branchB")

191 let merged = runGraphRefRelationalExprM env $ mergeTransactions testTime (fakeUUID 5) (fakeUUID 3) (UnionPreferMergeStrategy "branchB") ("branchA", "branchB")

202 env = freshGraphRefRelationalExprEnv Nothing graph''

192 env = freshGraphRefRelationalExprEnv Nothing graph''

@@ -225,7 +215,7 @@ testUnionMergeStrategy = TestCase $ do

225 branchAOnlyIncDepName = "branchAOnlyIncDep"

215 branchAOnlyIncDepName = "branchAOnlyIncDep"

226 branchBOnlyRelVarName = "branchBOnlyRelVar"

216 branchBOnlyRelVarName = "branchBOnlyRelVar"

227 branchAOnlyIncDep = InclusionDependency (ExistingRelation relationTrue) (ExistingRelation relationTrue)

217 branchAOnlyIncDep = InclusionDependency (ExistingRelation relationTrue) (ExistingRelation relationTrue)

228− (_, graph') <- addTransaction "branchB" (createTrans (fakeUUID 3) (TI.singleParent (transactionId branchBTrans) testTime) updatedBranchBContext) graph

218+ (_, graph') <- addTransaction "branchB" (createTrans (fakeUUID 3) (TransactionInfo (transactionId branchBTrans NE.:| []) testTime) updatedBranchBContext) graph

229 let env = freshGraphRefRelationalExprEnv Nothing graph'

219 let env = freshGraphRefRelationalExprEnv Nothing graph'

230 (discon, _) <- assertEither $ runGraphRefRelationalExprM env $ mergeTransactions testTime (fakeUUID 5) (fakeUUID 10) UnionMergeStrategy ("branchA", "branchB")

220 (discon, _) <- assertEither $ runGraphRefRelationalExprM env $ mergeTransactions testTime (fakeUUID 5) (fakeUUID 10) UnionMergeStrategy ("branchA", "branchB")

231 let Just rvExpr = M.lookup branchBOnlyRelVarName (relationVariables (Discon.concreteDatabaseContext discon))

221 let Just rvExpr = M.lookup branchBOnlyRelVarName (relationVariables (Discon.concreteDatabaseContext discon))

@@ -233,7 +223,7 @@ testUnionMergeStrategy = TestCase $ do

233 reEnv = freshGraphRefRelationalExprEnv (Just (Discon.concreteDatabaseContext discon)) graph

223 reEnv = freshGraphRefRelationalExprEnv (Just (Discon.concreteDatabaseContext discon)) graph

234

224

235 assertEqual "branchBOnlyRelVar should appear in the merge" relationTrue rvRel

225 assertEqual "branchBOnlyRelVar should appear in the merge" relationTrue rvRel

236− (_, graph'') <- addTransaction "branchA" (createTrans (fakeUUID 4) (TI.singleParent (transactionId branchATrans) testTime) updatedBranchAContext) graph'

226+ (_, graph'') <- addTransaction "branchA" (createTrans (fakeUUID 4) (TransactionInfo (transactionId branchATrans NE.:| []) testTime) updatedBranchAContext) graph'

237 let eMergeGraph = runGraphRefRelationalExprM gfEnv $ mergeTransactions testTime (fakeUUID 5) (fakeUUID 3) UnionMergeStrategy ("branchA", "branchB")

227 let eMergeGraph = runGraphRefRelationalExprM gfEnv $ mergeTransactions testTime (fakeUUID 5) (fakeUUID 3) UnionMergeStrategy ("branchA", "branchB")

238 gfEnv = freshGraphRefRelationalExprEnv Nothing graph''

228 gfEnv = freshGraphRefRelationalExprEnv Nothing graph''

239 case eMergeGraph of

229 case eMergeGraph of

@@ -253,7 +243,7 @@ testUnionMergeStrategy = TestCase $ do

253 conflictRelVar <- assertEither $ mkRelationFromList (attributesFromList [Attribute "conflict" IntAtomType]) []

243 conflictRelVar <- assertEither $ mkRelationFromList (attributesFromList [Attribute "conflict" IntAtomType]) []

254 let conflictContextA = updatedBranchAContext {relationVariables = M.insert branchBOnlyRelVarName (ExistingRelation conflictRelVar) (relationVariables updatedBranchAContext) }

244 let conflictContextA = updatedBranchAContext {relationVariables = M.insert branchBOnlyRelVarName (ExistingRelation conflictRelVar) (relationVariables updatedBranchAContext) }

255 conflictBranchATrans <- assertMaybe (transactionForHead "branchA" graph'') "retrieving head transaction for expected conflict"

245 conflictBranchATrans <- assertMaybe (transactionForHead "branchA" graph'') "retrieving head transaction for expected conflict"

256− (_, graph''') <- addTransaction "branchA" (createTrans (fakeUUID 6) (TI.singleParent (transactionId conflictBranchATrans) testTime) conflictContextA) graph''

246+ (_, graph''') <- addTransaction "branchA" (createTrans (fakeUUID 6) (TransactionInfo (transactionId conflictBranchATrans NE.:| []) testTime) conflictContextA) graph''

257 let failingMerge = runGraphRefRelationalExprM gfEnv' $ mergeTransactions testTime (fakeUUID 5) (fakeUUID 3) UnionMergeStrategy ("branchA", "branchB")

247 let failingMerge = runGraphRefRelationalExprM gfEnv' $ mergeTransactions testTime (fakeUUID 5) (fakeUUID 3) UnionMergeStrategy ("branchA", "branchB")

258 gfEnv' = freshGraphRefRelationalExprEnv Nothing graph'''

248 gfEnv' = freshGraphRefRelationalExprEnv Nothing graph'''

259 case failingMerge of

249 case failingMerge of

@@ -282,9 +272,9 @@ testUnionMergeIncDepViolation = TestCase $ do

282

272

283

273

284 --add the rv in new commits to both branches

274 --add the rv in new commits to both branches

285− (_, graph') <- addTransaction "branchB" (createTrans (fakeUUID 3) (TI.singleParent (transactionId branchBTrans) testTime) branchBContext) graph

275+ (_, graph') <- addTransaction "branchB" (createTrans (fakeUUID 3) (TransactionInfo (transactionId branchBTrans NE.:| []) testTime) branchBContext) graph

286

276

287− (_, graph'') <- addTransaction "branchA" (createTrans (fakeUUID 4) (TI.singleParent (transactionId branchATrans) testTime) branchAContext) graph'

277+ (_, graph'') <- addTransaction "branchA" (createTrans (fakeUUID 4) (TransactionInfo (transactionId branchATrans NE.:| []) testTime) branchAContext) graph'

288

278

289 --check that the union merge fails due to a violated constraint

279 --check that the union merge fails due to a violated constraint

290 let eMerge = runGraphRefRelationalExprM env $ mergeTransactions testTime (fakeUUID 5) (fakeUUID 3) UnionMergeStrategy ("branchA", "branchB")

280 let eMerge = runGraphRefRelationalExprM env $ mergeTransactions testTime (fakeUUID 5) (fakeUUID 3) UnionMergeStrategy ("branchA", "branchB")

test/TransactionGraph/Persist.hs+7−64

@@ -3,12 +3,11 @@ import Test.HUnit

3import ProjectM36.Base

4import ProjectM36.Persist (DiskSync(NoDiskSync))

5import ProjectM36.TransactionGraph.Persist

6−import ProjectM36.TransactionGraph as TG

6+import ProjectM36.TransactionGraph

7import ProjectM36.Transaction

8import ProjectM36.DateExamples

9import System.IO.Temp

10import System.Exit

11−import System.Directory

12import Data.Either

11import Data.Either

13import Data.UUID.V4 (nextRandom)

12import Data.UUID.V4 (nextRandom)

14import System.FilePath

13import System.FilePath

@@ -17,9 +16,10 @@ import qualified Data.Map as M

17import qualified Data.Set as S

16import qualified Data.Set as S

18import Data.Time.Clock

17import Data.Time.Clock

19import Data.Time.Calendar

18import Data.Time.Calendar

19+#ifdef PM36_HASKELL_SCRIPTING

20−import ProjectM36.Client as C

20+import ProjectM36.Client

21import ProjectM36.Relation

22−import ProjectM36.Transaction.Persist

22+#endif

23

24main :: IO ()

25main = do

@@ -29,8 +29,7 @@ main = do

29testList :: Test

30testList = TestList [testBootstrapDB,

31 testDBSimplePersistence,

32− testFunctionPersistence,

32+ testFunctionPersistence]

33− testMerkleHashValidation]

34

33

35

34

36stamp' :: UTCTime

35stamp' :: UTCTime

@@ -75,62 +74,7 @@ testDBSimplePersistence = TestCase $ withSystemTempDirectory "m36testdb" $ \temp

75 case graphErr of

74 case graphErr of

76 Left err -> assertFailure (show err)

75 Left err -> assertFailure (show err)

77 Right graph'' -> assertBool "graph equality" (mapEq graph'' == mapEq graph')

76 Right graph'' -> assertBool "graph equality" (mapEq graph'' == mapEq graph')

78−

77+

79−testMerkleHashValidation :: Test

80−testMerkleHashValidation = TestCase $

81− -- add a commit and validate the hashes successfully

82− withSystemTempDirectory "m36testdb" $ \tempdir -> do

83− let dbdir = tempdir </> "dbdir"

84− connInfo = InProcessConnectionInfo (MinimalPersistence dbdir) emptyNotificationCallback []

85− conn <- assertIOEither $ connectProjectM36 connInfo

86− sess <- assertIOEither $ createSessionAtHead conn "master"

87− Right _ <- executeDatabaseContextExpr sess conn (Assign "x" (ExistingRelation relationTrue))

88− Right _ <- commit sess conn

89− val <- C.validateMerkleHashes sess conn

90− assertEqual "merkle success" (Right ()) val

91−

92− --read graph from disk

93− conn' <- assertIOEither $ connectProjectM36 connInfo

94− sess' <- assertIOEither $ createSessionAtHead conn' "master"

95−

96− val' <- C.validateMerkleHashes sess' conn'

97− assertEqual "merkle read again success" (Right ()) val'

98−

99− --alter the on-disk representation and check that the hash validation fails

100− eGraph <- transactionGraphLoad dbdir emptyTransactionGraph Nothing

101− case eGraph of

102− Left err -> assertFailure $ "failed to load graph" ++ show err

103− Right graph -> do

104− let trans = transactionHeadsForGraph graph M.! "master"

105− updatedTrans = Transaction (transactionId trans) (transactionInfo trans) updatedSchemas

106− transactionDir' = dbdir </> show (transactionId trans)

107− updatedSchemas =

108− case schemas trans of

109− Schemas ctx sschemas ->

110− let updatedContext = ctx {

111− relationVariables = M.insert "malicious" (ExistingRelation relationFalse) (relationVariables ctx)

112− } in

113− Schemas updatedContext sschemas

114− maliciousGraph = TransactionGraph malHeads malTransSet

115− malHeads = M.insert "master" updatedTrans (transactionHeadsForGraph graph)

116− malTransSet = S.insert updatedTrans (transactionsForGraph graph)

117− malMerkleHash = calculateMerkleHash updatedTrans maliciousGraph

118− regMerkleHash = merkleHash (transactionInfo trans)

119− --validate and fail

120− let val'' = TG.validateMerkleHashes maliciousGraph

121− assertEqual "loaded graph merkle hashes" (Left [MerkleValidationError (transactionId trans) regMerkleHash malMerkleHash]) val''

122− --delete existing transaction directory

123− removeDirectoryRecursive transactionDir'

124− writeTransaction NoDiskSync dbdir updatedTrans

125−

126− --read graph from disk

127− eConnFail <- connectProjectM36 connInfo

128− case eConnFail of

129− Left err ->

130− assertEqual "open connection merkle validation" (DatabaseValidationError [MerkleValidationError (transactionId trans) regMerkleHash malMerkleHash]) err

131− Right _ -> assertFailure "open connection validation"

132−

133−

134

78

135--only Haskell-scripted dbc and atom functions can be serialized

79--only Haskell-scripted dbc and atom functions can be serialized

136testFunctionPersistence :: Test

80testFunctionPersistence :: Test

@@ -159,11 +103,10 @@ testFunctionPersistence = TestCase $

159 let expectedRel = mkRelationFromList (attributesFromList [Attribute "a" IntAtomType]) [[IntAtom 3]]

103 let expectedRel = mkRelationFromList (attributesFromList [Attribute "a" IntAtomType]) [[IntAtom 3]]

160 assertEqual "testdisk dbc function run" expectedRel res

104 assertEqual "testdisk dbc function run" expectedRel res

161

105

162−#endif

163−

164assertIOEither :: (Show a) => IO (Either a b) -> IO b

106assertIOEither :: (Show a) => IO (Either a b) -> IO b

165assertIOEither x = do

107assertIOEither x = do

166 ret <- x

108 ret <- x

167 case ret of

109 case ret of

168 Left err -> assertFailure (show err) >> undefined

110 Left err -> assertFailure (show err) >> undefined

169 Right val -> pure val

111 Right val -> pure val

112+#endif

test/TutorialD/InterpreterTest.hs → test/TutorialD/Interpreter.hsrenamed+9−48

@@ -78,17 +78,13 @@ main = do

78 testAtomFunctionArgumentMismatch,

79 testInvalidDataConstructor,

80 testBasicList,

81− testRelationDeclarationMismatch,

81+ testRelationDeclarationMismatch

82− testInvalidTuples,

83− testSelfReferencingUncommittedContext,

84− testUnionAndIntersectionAttributeExprs

85 ]

82 ]

86

83

87simpleRelTests :: Test

84simpleRelTests :: Test

88simpleRelTests = TestCase $ do

85simpleRelTests = TestCase $ do

89 (graph, transId) <- freshTransactionGraph dateExamples

86 (graph, transId) <- freshTransactionGraph dateExamples

90− mapM_ (\(tutd, expected) ->

91− assertTutdEqual basicDatabaseContext transId graph expected tutd) testTups

87+ mapM_ (\(tutd, expected) -> assertTutdEqual basicDatabaseContext transId graph expected tutd) testTups

92 where

88 where

93 testTups = [("x:=true", Right relationTrue),

89 testTups = [("x:=true", Right relationTrue),

94 ("x:=false", Right relationFalse),

90 ("x:=false", Right relationFalse),

@@ -123,8 +119,7 @@ simpleRelTests = TestCase $ do

123 ("x:=relation{tuple{a 5}} : {b:=6}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 6])]),

119 ("x:=relation{tuple{a 5}} : {b:=6}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 6])]),

124 ("x:=relation{tuple{a 5}} : {b:=add(@a,5)}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 10])]),

120 ("x:=relation{tuple{a 5}} : {b:=add(@a,5)}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 10])]),

125 ("x:=relation{tuple{a 5}} : {b:=add(@a,\"spam\")}", Left (AtomFunctionTypeError "add" 2 IntegerAtomType TextAtomType)),

121 ("x:=relation{tuple{a 5}} : {b:=add(@a,\"spam\")}", Left (AtomFunctionTypeError "add" 2 IntegerAtomType TextAtomType)),

126− ("x:=relation{tuple{a 5}} : {b:=add(add(@a,2),5)}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 12])]),

122+ ("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 [])

128 ]

123 ]

129 simpleAAttributes = A.attributesFromList [Attribute "a" IntegerAtomType]

124 simpleAAttributes = A.attributesFromList [Attribute "a" IntegerAtomType]

130 simpleBAttributes = A.attributesFromList [Attribute "d" IntegerAtomType]

125 simpleBAttributes = A.attributesFromList [Attribute "d" IntegerAtomType]

@@ -136,8 +131,7 @@ simpleRelTests = TestCase $ do

136dateExampleRelTests :: Test

131dateExampleRelTests :: Test

137dateExampleRelTests = TestCase $ do

132dateExampleRelTests = TestCase $ do

138 (graph, transId) <- freshTransactionGraph dateExamples

133 (graph, transId) <- freshTransactionGraph dateExamples

139− mapM_ (\(tutd, expected) ->

140− assertTutdEqual dateExamples transId graph expected tutd) testTups

134+ mapM_ (\(tutd, expected) -> assertTutdEqual dateExamples transId graph expected tutd) testTups

141 where

135 where

142 simpleEitherIntTextAttributes = A.attributesFromList [Attribute "a" (eitherAtomType IntegerAtomType TextAtomType)]

136 simpleEitherIntTextAttributes = A.attributesFromList [Attribute "a" (eitherAtomType IntegerAtomType TextAtomType)]

143 maybeIntegerAtomType = ConstructedAtomType "Maybe" (M.singleton "a" IntegerAtomType)

137 maybeIntegerAtomType = ConstructedAtomType "Maybe" (M.singleton "a" IntegerAtomType)

@@ -155,7 +149,7 @@ dateExampleRelTests = TestCase $ do

155 else Right tuple) suppliersRel

149 else Right tuple) suppliersRel

156 extendTestAttributes = A.attributesFromList [Attribute "a" IntegerAtomType, Attribute "b" $ RelationAtomType (R.attributes suppliersRel)]

150 extendTestAttributes = A.attributesFromList [Attribute "a" IntegerAtomType, Attribute "b" $ RelationAtomType (R.attributes suppliersRel)]

157 testTups = [("x:=s where true", Right suppliersRel),

151 testTups = [("x:=s where true", Right suppliersRel),

158− ("x:=s where city = \"London\"", restrict (\tuple -> pure $ atomForAttributeName "city" tuple == Right (TextAtom "London")) suppliersRel),

152+ ("x:=s where city = \"London\"", restrict (\tuple -> pure $ atomForAttributeName "city" tuple == (Right $ TextAtom "London")) suppliersRel),

159 ("x:=s where false", Right $ Relation (R.attributes suppliersRel) emptyTupleSet),

153 ("x:=s where false", Right $ Relation (R.attributes suppliersRel) emptyTupleSet),

160 ("x:=p where color=\"Blue\" and city=\"Paris\"", mkRelationFromList (R.attributes productsRel) [[TextAtom "P5", TextAtom "Cam", TextAtom "Blue", IntegerAtom 12, TextAtom "Paris"]]),

154 ("x:=p where color=\"Blue\" and city=\"Paris\"", mkRelationFromList (R.attributes productsRel) [[TextAtom "P5", TextAtom "Cam", TextAtom "Blue", IntegerAtom 12, TextAtom "Paris"]]),

161 ("a:=s; update a (status:=50); x:=a{status}", mkRelation (A.attributesFromList [Attribute "status" IntegerAtomType]) (RelationTupleSet [mkRelationTuple (A.attributesFromList [Attribute "status" IntegerAtomType]) (V.fromList [IntegerAtom 50])])),

155 ("a:=s; update a (status:=50); x:=a{status}", mkRelation (A.attributesFromList [Attribute "status" IntegerAtomType]) (RelationTupleSet [mkRelationTuple (A.attributesFromList [Attribute "status" IntegerAtomType]) (V.fromList [IntegerAtom 50])])),

@@ -163,7 +157,7 @@ dateExampleRelTests = TestCase $ do

163 --atom function tests

157 --atom function tests

164 ("x:=((s : {status2 := add(10,@status)}) where status2=add(10,@status)){city,s#,sname,status}", Right suppliersRel),

158 ("x:=((s : {status2 := add(10,@status)}) where status2=add(10,@status)){city,s#,sname,status}", Right suppliersRel),

165 ("x:=relation{tuple{a 5}} : {b:=s}", mkRelation extendTestAttributes (RelationTupleSet [mkRelationTuple extendTestAttributes (V.fromList [IntegerAtom 5, RelationAtom suppliersRel])])),

159 ("x:=relation{tuple{a 5}} : {b:=s}", mkRelation extendTestAttributes (RelationTupleSet [mkRelationTuple extendTestAttributes (V.fromList [IntegerAtom 5, RelationAtom suppliersRel])])),

166− ("x:=s; update x where sname=\"Blake\" (city:=\"Boston\")", relMap (\tuple -> if atomForAttributeName "sname" tuple == Right (TextAtom "Blake") then Right $ updateTupleWithAtoms (M.singleton "city" (TextAtom "Boston")) tuple else Right tuple) suppliersRel),

160+ ("x:=s; update x where sname=\"Blake\" (city:=\"Boston\")", relMap (\tuple -> if atomForAttributeName "sname" tuple == (Right $ TextAtom "Blake") then Right $ updateTupleWithAtoms (M.singleton "city" (TextAtom "Boston")) tuple else Right tuple) suppliersRel),

167 ("x:=s; update x where city=\"Paris\" (status:=add(@status,10))", updateParisPlus10),

161 ("x:=s; update x where city=\"Paris\" (status:=add(@status,10))", updateParisPlus10),

168 --relatom function tests

162 --relatom function tests

169 ("x:=((s group ({city} as y)):{z:=count(@y)}){z}", mkRelation groupCountAttrs (RelationTupleSet [mkRelationTuple groupCountAttrs (V.singleton $ IntegerAtom 1)])),

163 ("x:=((s group ({city} as y)):{z:=count(@y)}){z}", mkRelation groupCountAttrs (RelationTupleSet [mkRelationTuple groupCountAttrs (V.singleton $ IntegerAtom 1)])),

@@ -235,7 +229,7 @@ transactionGraphAddCommitTest = TestCase $ do

235 commit sessionId dbconn >>= eitherFail

229 commit sessionId dbconn >>= eitherFail

236 discon <- disconnectedTransaction_ sessionId dbconn

230 discon <- disconnectedTransaction_ sessionId dbconn

237 let context = Discon.concreteDatabaseContext discon

231 let context = Discon.concreteDatabaseContext discon

238− assertEqual "ensure x was added" (M.lookup "x" (relationVariables context)) (Just (ExistingRelation suppliersRel))

232+ assertEqual "ensure x was added" (M.lookup "x" (relationVariables context)) (Just (RelationVariable "s" UncommittedContextMarker))

239

233

240transactionRollbackTest :: Test

234transactionRollbackTest :: Test

241transactionRollbackTest = TestCase $ do

235transactionRollbackTest = TestCase $ do

@@ -362,7 +356,7 @@ testComments :: Test

362testComments = TestCase $ do

356testComments = TestCase $ do

363 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback

357 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback

364 mapM_ (executeTutorialD sessionId dbconn) [

358 mapM_ (executeTutorialD sessionId dbconn) [

365− ":branch testbranch --test comment",

359+ ":branch testbranch --test comment\n",

366 ":jumphead {- test comment -} master"]

360 ":jumphead {- test comment -} master"]

367

361

368-- create a graph and query from two disparate contexts

362-- create a graph and query from two disparate contexts

@@ -545,7 +539,7 @@ testListConstructedAtom = TestCase $ do

545testTypeChecker :: Test

539testTypeChecker :: Test

546testTypeChecker = TestCase $ do

540testTypeChecker = TestCase $ do

547 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback

541 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback

548− let err1 = "AtomFunctionTypeError \"max\" 1"

542+ let err1 = "AtomFunctionTypeError \"max\" 1 (RelationAtomType [Attribute \"_\" IntegerAtomType]) IntegerAtomType"

549 expectTutorialDErr sessionId dbconn (T.isPrefixOf err1) "x:=relation{tuple{a 0}}:{b:=max(@a)}"

543 expectTutorialDErr sessionId dbconn (T.isPrefixOf err1) "x:=relation{tuple{a 0}}:{b:=max(@a)}"

550

544

551--exercise expression parser

545--exercise expression parser

@@ -665,10 +659,6 @@ testWithClause = TestCase $ do

665 executeTutorialD sessionId dbconn "x:=with (x as s) x"

659 executeTutorialD sessionId dbconn "x:=with (x as s) x"

666 eX <- executeRelationalExpr sessionId dbconn (RelationVariable "x" ())

660 eX <- executeRelationalExpr sessionId dbconn (RelationVariable "x" ())

667 assertEqual "with x as s" (Right suppliersRel) eX

661 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

672

662

673 let err1 = "RelVarAlreadyDefinedError"

663 let err1 = "RelVarAlreadyDefinedError"

674 expectTutorialDErr sessionId dbconn (T.isPrefixOf err1) "x:=with (s as s) s"

664 expectTutorialDErr sessionId dbconn (T.isPrefixOf err1) "x:=with (s as s) s"

@@ -701,32 +691,3 @@ testRelationDeclarationMismatch :: Test

701testRelationDeclarationMismatch = TestCase $ do

691testRelationDeclarationMismatch = TestCase $ do

702 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback

692 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback

703 expectTutorialDErr sessionId dbconn (T.isPrefixOf "AtomTypeMismatchError") "data A a = A a | B | C; a := relation{a A Integer}{tuple{a A \"1\"}}"

693 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/Interpreter/Import/ImportTest.hsdeleted−47

@@ -1,47 +0,0 @@

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.hsnew file+29

@@ -0,0 +1,29 @@

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.tutddeleted−2

@@ -1,2 +0,0 @@

1−x:=true;

2−y:=false;

test/TutorialD/PrinterTest.hsdeleted−47

@@ -1,47 +0,0 @@

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+2−5

@@ -4,8 +4,6 @@ import TutorialD.Interpreter.Import.TutorialD

4import System.Directory

5import Data.List (isSuffixOf)

6import System.Exit

7−import qualified Data.Text as T

8−import Text.URI

9

7

10testList :: IO Test

8testList :: IO Test

11testList = do

9testList = do

@@ -22,8 +20,7 @@ main = do

22

20

23testScript :: FilePath -> Test

21testScript :: FilePath -> Test

24testScript tutdFile = TestCase $ do

22testScript tutdFile = TestCase $ do

25− fileURI <- mkURI (T.pack ("file://" <> tutdFile))

23+ eImport <- importTutorialD tutdFile

26− eImport <- importTutorialDFromFile fileURI Nothing

27 case eImport of

24 case eImport of

28 Left err -> assertFailure ("tutd import failure in " ++ tutdFile ++ ": " ++ show err)

25 Left err -> assertFailure ("tutd import failure in " ++ tutdFile ++ ": " ++ show err)

29− Right _ -> pure ()

26+ Right _ -> pure ()