git.iko.soy/project-m36
on master help sign in
swap
44feeff559 ahead, 0 behind
184 files changed+11966−4003
since splitsnapshots
unifiedsplit
.appveyor.yml+39 .github/workflows/ci.yaml+69 .gitignore+3−1 .travis.yml−58 Changelog.markdown+65 README.markdown+19−8 cabal.project+9−2 cbits/DirectoryFsync.c+3 default.nix+1 docker.nix+18 docs/15_minute_tutorial.markdown+65−68 docs/atomfunctions.markdown+31−2 docs/basic_benchmarks.html+1230 docs/commits_in_constant_time.markdown+134 docs/data_independence.markdown+109 docs/database_context_functions.markdown+51−1 docs/dataframes.markdown+53 docs/filesystem-persistence.markdown+1−1 docs/import_export_csv.markdown+65 docs/introduction_to_projectm36.markdown+35−14 docs/introduction_to_the_relational_algebra.markdown+2−2 docs/merkle_transaction_graph.markdown+33 docs/new_datatypes.markdown+1−1 docs/reaching_out_of_the_tarpit.markdown+1−1 docs/server_mode.markdown+1−1 docs/transaction_graph_operators.markdown+8−18 docs/tupleable.markdown+23 docs/tutd_cheatsheet.markdown+99 docs/tutd_tutorial.markdown+268−186 docs/websocket_server.markdown+3−3 examples/CustomTupleable.hs+67 examples/DerivingCustomTupleable.hs+54 examples/DynamicAtomFunctions.hs+12 examples/DynamicDatabaseContextFunctions.hs+26 examples/Plantfarm.hs+446 examples/SimpleClient.hs+3−2 examples/blog.hs+11−8 examples/hair.hs+9−6 examples/out_of_the_tarpit.hs+11−7 examples/out_of_the_tarpit.tutd+4−4 jupyter/TutorialD Notebook Walkthrough.ipynb+1−1 nix/sources.json+50 nix/sources.nix+171 project-m36.cabal+198−216 release.nix+36 runghcid.sh+1−1 scripts/DateExamples.tutd+2−2 scripts/multiline.tutd+2 shell.nix+1 src/bin/ProjectM36/Client/Json.hs+4−1 src/bin/ProjectM36/Server/RemoteCallTypes/Json.hs+51−21 src/bin/ProjectM36/Server/WebSocket.hs+41−22 src/bin/ProjectM36/Server/WebSocket/project-m36.js+45−6 src/bin/ProjectM36/Server/WebSocket/websocket-client.html+1−1 src/bin/ProjectM36/Server/WebSocket/websocket-client.js+7−1 src/bin/ProjectM36/Server/WebSocket/websocket-server.hs+49−12 src/bin/TutorialD/Interpreter.hs+34−32 src/bin/TutorialD/Interpreter/Base.hs+115−40 src/bin/TutorialD/Interpreter/DatabaseContextExpr.hs+31−34 src/bin/TutorialD/Interpreter/DatabaseContextIOOperator.hs+27−8 src/bin/TutorialD/Interpreter/Export/Base.hs+3 src/bin/TutorialD/Interpreter/Export/CSV.hs+1−2 src/bin/TutorialD/Interpreter/Import/Base.hs+11−3 src/bin/TutorialD/Interpreter/Import/BasicExamples.hs+6−2 src/bin/TutorialD/Interpreter/Import/CSV.hs+5−5 src/bin/TutorialD/Interpreter/Import/TutorialD.hs+70−15 src/bin/TutorialD/Interpreter/InformationOperator.hs+5−1 src/bin/TutorialD/Interpreter/RODatabaseContextOperator.hs+94−25 src/bin/TutorialD/Interpreter/RelationalExpr.hs+94−71 src/bin/TutorialD/Interpreter/SchemaOperator.hs+3−5 src/bin/TutorialD/Interpreter/TransGraphRelationalOperator.hs+5−9 src/bin/TutorialD/Interpreter/TransactionGraphOperator.hs+18−19 src/bin/TutorialD/Interpreter/Types.hs+32−21 src/bin/TutorialD/Printer.hs+165 src/bin/TutorialD/tutd.hs+24−17 src/bin/benchmark/Basic.hs+106 src/bin/benchmark/Handles.hs+27−38 src/bin/benchmark/bigrel.hs+42−19 src/lib/ProjectM36/Arbitrary.hs+127 src/lib/ProjectM36/Atom.hs+15−10 src/lib/ProjectM36/AtomFunction.hs+35−1 src/lib/ProjectM36/AtomFunctionError.hs+2−2 src/lib/ProjectM36/AtomFunctions/Basic.hs+2 src/lib/ProjectM36/AtomFunctions/Primitive.hs+9−1 src/lib/ProjectM36/AtomType.hs+210−64 src/lib/ProjectM36/Atomable.hs+68−56 src/lib/ProjectM36/Attribute.hs+155−29 src/lib/ProjectM36/AttributeExpr.hs+7 src/lib/ProjectM36/AttributeNames.hs+3−2 src/lib/ProjectM36/Base.hs+235−116 src/lib/ProjectM36/Client.hs+381−370 src/lib/ProjectM36/Client/Simple.hs+3−2 src/lib/ProjectM36/DataConstructorDef.hs+2−3 src/lib/ProjectM36/DataFrame.hs+183 src/lib/ProjectM36/DataTypes/Basic.hs+4−2 src/lib/ProjectM36/DataTypes/Day.hs+2−5 src/lib/ProjectM36/DataTypes/Interval.hs+57−19 src/lib/ProjectM36/DataTypes/List.hs+2−3 src/lib/ProjectM36/DataTypes/NonEmptyList.hs+53 src/lib/ProjectM36/DataTypes/Primitive.hs+7−2 src/lib/ProjectM36/DataTypes/Sorting.hs+31 src/lib/ProjectM36/DatabaseContext.hs+24−5 src/lib/ProjectM36/DatabaseContextFunction.hs+36−1 src/lib/ProjectM36/DatabaseContextFunctionError.hs+1−2 src/lib/ProjectM36/DatabaseContextFunctionUtils.hs+15−8 src/lib/ProjectM36/DateExamples.hs+3−3 src/lib/ProjectM36/DisconnectedTransaction.hs+7−1 src/lib/ProjectM36/Error.hs+28−15 src/lib/ProjectM36/FSType.hs+4 src/lib/ProjectM36/FileLock.hs+5−15 src/lib/ProjectM36/GraphRefRelationalExpr.hs+45 src/lib/ProjectM36/InclusionDependency.hs+5−6 src/lib/ProjectM36/IsomorphicSchema.hs+30−33 src/lib/ProjectM36/Key.hs+2 src/lib/ProjectM36/MerkleHash.hs+9 src/lib/ProjectM36/NormalizeExpr.hs+132 src/lib/ProjectM36/Notifications.hs+12−7 src/lib/ProjectM36/Persist.hs+61−13 src/lib/ProjectM36/Relation.hs+31−49 src/lib/ProjectM36/Relation/Parse/CSV.hs+47−39 src/lib/ProjectM36/Relation/Show/CSV.hs+6−6 src/lib/ProjectM36/Relation/Show/HTML.hs+5−2 src/lib/ProjectM36/Relation/Show/Term.hs+22−12 src/lib/ProjectM36/RelationalExpression.hs+1079−618 src/lib/ProjectM36/ScriptSession.hs+132−31 src/lib/ProjectM36/Serialise/AtomFunctionError.hs+7 src/lib/ProjectM36/Serialise/Base.hs+85 src/lib/ProjectM36/Serialise/DataFrame.hs+13 src/lib/ProjectM36/Serialise/DatabaseContextFunctionError.hs+7 src/lib/ProjectM36/Serialise/Error.hs+15 src/lib/ProjectM36/Serialise/IsomorphicSchema.hs+7 src/lib/ProjectM36/Serialise/MergeError.hs+1 src/lib/ProjectM36/Server.hs+166−82 src/lib/ProjectM36/Server/Config.hs+6 src/lib/ProjectM36/Server/EntryPoints.hs+127−138 src/lib/ProjectM36/Server/ParseArgs.hs+60−25 src/lib/ProjectM36/Server/RemoteCallTypes.hs+71−32 src/lib/ProjectM36/Session.hs+3−2 src/lib/ProjectM36/Sessions.hs+29−7 src/lib/ProjectM36/Shortcuts.hs+247 src/lib/ProjectM36/StaticOptimizer.hs+373−248 src/lib/ProjectM36/TransGraphRelationalExpression.hs+141−136 src/lib/ProjectM36/Transaction.hs+24−16 src/lib/ProjectM36/Transaction/Persist.hs+66−59 src/lib/ProjectM36/Transaction/Type.hs+8 src/lib/ProjectM36/TransactionDiffs.hs+12 src/lib/ProjectM36/TransactionGraph.hs+240−151 src/lib/ProjectM36/TransactionGraph/Merge.hs+16−12 src/lib/ProjectM36/TransactionGraph/Persist.hs+26−15 src/lib/ProjectM36/TransactionGraph/Show.hs+3−4 src/lib/ProjectM36/TransactionGraph/Types.hs+12 src/lib/ProjectM36/TransactionInfo.hs+12 src/lib/ProjectM36/Tuple.hs+49−43 src/lib/ProjectM36/TupleSet.hs+7 src/lib/ProjectM36/Tupleable.hs+139−37 src/lib/ProjectM36/Tupleable/Deriving.hs+229 src/lib/ProjectM36/TypeConstructor.hs+4−6 src/lib/ProjectM36/WCWidth.hs+425 src/lib/ProjectM36/Win32Handle.hs+4−1 src/lib/ProjectM36/WithNameExpr.hs+86 stack.ghc8.10.yaml+19 stack.ghc8.6.yaml+62 stack.yaml → stack.ghc8.8.yaml+28−14 test/Client/Simple.hs+15−10 test/DataFrame.hs+61 test/IsomorphicSchema.hs+43−33 test/Relation/Atomable.hs+89−14 test/Relation/Basic.hs+27−14 test/Relation/Export/CSV.hs+25−20 test/Relation/StaticOptimizer.hs+84−60 test/Relation/Tupleable.hs+210−30 test/Server/Main.hs+46−29 test/Server/WebSocket.hs+9−7 test/TransactionGraph/Merge.hs+70−39 test/TransactionGraph/Persist.hs+83−18 test/TutorialD/Interpreter/AtomFunctionScript.hs+25−17 test/TutorialD/Interpreter/DatabaseContextFunctionScript.hs+16−17 test/TutorialD/Interpreter/Import/ImportTest.hs+47 test/TutorialD/Interpreter/Import/TutorialD.hs−21 test/TutorialD/Interpreter/Import/httpimporttest.tutd+2 test/TutorialD/Interpreter/TestBase.hs+7−8 test/TutorialD/Interpreter.hs → test/TutorialD/InterpreterTest.hs+232−39 test/TutorialD/PrinterTest.hs+47 test/scripts.hs+5−2
.appveyor.ymlnew file+39
@@ -0,0 +1,39 @@
1+build: off
2+
3+version: 1.0.{build}-{branch}
4+
5+image: Visual Studio 2017
6+
7+before_test:
8+# http://help.appveyor.com/discussions/problems/6312-curl-command-not-found
9+- set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
10+
11+- curl -sS -ostack.zip -L --insecure http://www.stackage.org/stack/windows-x86_64
12+- 7z x stack.zip stack.exe
13+
14+clone_folder: "c:\\project-m36"
15+clone_depth: 2
16+environment:
17+ global:
18+ STACK_ROOT: "c:\\sr"
19+ matrix:
20+ - YAML: "stack.ghc8.6.yaml"
21+
22+platform:
23+ - x64
24+
25+cache:
26+ - "c:\\sr"
27+ - "%LocalAppData%\\Programs\\stack"
28+# - ".stack-work" # send us over the 1 GB limit
29+
30+test_script:
31+ - stack setup > nul
32+# The ugly echo "" hack is to avoid complaints about 0 being an invalid file
33+# descriptor
34+ - echo "" | stack --stack-yaml %YAML% --no-terminal test
35+# - 7z.exe a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on project-m36.7z .stack-work\install\*\bin\project-m36-server.exe .stack-work\install\*\bin\project-m36-websocket-server.exe .stack-work\install\*\bin\tutd.exe .stack-work\install\*\bin\project-m36-server.exe
36+
37+#artifacts:
38+# - path: project-m36.7z
39+# name: project-m36.7z
.github/workflows/ci.yamlnew file+69
@@ -0,0 +1,69 @@
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+3−1
@@ -18,4 +18,6 @@ persistence-notes
1818jupyter/itutd.egg-info
1919jupyter/build
2020juyter/dist
21−.ipynb_checkpoints
21+.ipynb_checkpoints
22+project-m36.nix
23+stack.yaml
.travis.ymldeleted−58
@@ -1,58 +0,0 @@
1−# For more information, see https://github.com/hvr/multi-ghc-travis
2−language: c
3−sudo: false
4−
5−git:
6− submodules: false # whether to recursively clone submodules
7−
8−cache:
9− directories:
10− - $HOME/.cabal/packages
11− - $HOME/.cabal/store
12−
13−before_cache:
14− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
15− # remove files that are regenerated by 'cabal update'
16− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
17− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
18− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
19− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
20− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
21−
22−matrix:
23− include:
24− #- compiler: "ghc-7.8.4"
25− # env: TEST=--disable-tests BENCH=--disable-benchmarks
26− # addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
27− - compiler: "ghc-7.10.3"
28− # env: TEST=--disable-tests BENCH=--disable-benchmarks
29− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
30− - compiler: "ghc-8.0.2"
31− # env: TEST=--disable-tests BENCH=--disable-benchmarks
32− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
33− #- compiler: "ghc-8.2.1"
34− # env: TEST=--disable-tests BENCH=--disable-benchmarks
35− # addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}
36−
37−before_install:
38− - HC=${CC}
39− - unset CC
40− - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH
41−
42−install:
43− - cabal --version
44− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
45− - travis_retry cabal update -v
46− - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
47−
48− - cabal new-build -w ${HC} --enable-tests --dep -j2 all
49−
50−# Here starts the actual work to be performed for the package under test;
51−# any command which exits with a non-zero exit code causes the build to fail.
52−script:
53− - cabal sdist
54− - cabal new-build -w ${HC} -j1
55− - cabal new-test -w ${HC}
56− - curl -sL https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh | sh -s lint src test examples --cpp-define VERSION_project_m36=HLINT
57− - cabal new-haddock
58−# EOF
Changelog.markdown+65
@@ -1,3 +1,68 @@
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)
27+
28+* fix case sensitivity issue with relation variables in tutd
29+* fix multibyte escaping in data frames
30+* fix broken instances of `Atomable [a]`
31+* fix `TypeConstructor` validation of argument count
32+* add help option to executables
33+
34+# 2019-01-08 (v0.6)
35+
36+* fix atom type parsing to support more complex data types
37+* add [data frames](docs/dataframes.markdown) to support server-side sort ordering, limits, and offsets
38+
39+# 2018-10-03 (v0.5.1)
40+
41+* fix atom function type validation
42+* add support for GHC 8.4 (now we support GHC 8.0, 8.2, and 8.4)
43+
44+# 2018-08-10 (v0.5)
45+
46+* fix critical type bug which allowed unresolved types to be used
47+* add full support for GHC 8.2 with stack or cabal (delayed for a long time by dependency version boundaries)
48+* drop support for GHC 7.10
49+* add support for `with (relexpr as name,...)` syntax for use as tutd macros
50+* add `NonEmptyList` list data type
51+
52+# 2018-06-04 (v0.4)
53+
54+* add contributed feature to allow users to [create arbitrary relations](https://github.com/agentm/project-m36/blob/master/docs/tutd_tutorial.markdown#arbitrary-relation-variables)
55+* fix type validation bug allowing concrete type with type variables in relations
56+* improve usability of `Interval a` data type
57+* allow `Integer` to be parsed as negative in `tutd` console
58+* support precompiled (Haskell) [`AtomFunction`s](https://github.com/agentm/project-m36/blob/master/docs/atomfunctions.markdown#pre-compiled-atom-functions) and [`DatabaseContextFunction`s](https://github.com/agentm/project-m36/blob/master/docs/database_context_functions.markdown#loading-precompiled-modules)
59+* make TutorialD scripts read from the filesystem unconditionally read as UTF-8
60+* improve support for display of multibyte characters in `tutd` console, especially Chinese
61+* fix file descriptor leak in file sychronization
62+* improve reliability by allowing fast-forward commits when using `autoMergeToHead`
63+* add [`semijoin` and `anitjoin`](https://github.com/agentm/project-m36/blob/master/docs/tutd_tutorial.markdown#join) support to `tutd`
64+* added various new static optimizations
65+
166# 2017-11-14
267
368* alter websocket server API to allow for multiple representations (JSON, text, or HTML) to be selected and returned simultaneously
README.markdown+19−8
@@ -4,7 +4,9 @@
44[![Public Domain](https://img.shields.io/badge/license-Public%20Domain-brightgreen.svg)](http://unlicense.org)
55[![Hackage](https://img.shields.io/hackage/v/project-m36.svg)](http://hackage.haskell.org/package/project-m36)
66[![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+[![Github Workflow status](https://github.com/agentm/project-m36/workflows/CI/badge.svg)](https://github.com/agentm/project-m36/actions?query=workflow%3ACI)
9+
810
911*Software can always be made faster, but rarely can it be made more correct.*
1012
@@ -12,6 +14,12 @@
1214
1315Project:M36 implements a relational algebra engine as inspired by the writings of Chris Date.
1416
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+
1523## Description
1624
1725Unlike 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.
@@ -24,10 +32,6 @@ Project:M36 is written entirely in the [Haskell programming language](https://ww
2432
2533[![asciicast](https://asciinema.org/a/3syu35c8cydm403292a74l1n5.png)](https://asciinema.org/a/3syu35c8cydm403292a74l1n5)
2634
27−## Try It!
28−
29−You can experiment instantly with Project:M36 straight from your browser at [try.project-m36.io](https://try.project-m36.io)!
30−
3135## Use-Cases
3236
3337Project:M36 supports multiple frontends which target different audiences.
@@ -40,7 +44,7 @@ Project:M36 supports multiple frontends which target different audiences.
4044
4145* [Developer's Blog](https://agentm.github.io/project-m36/)
4246* [Mailing List/Discussion Group](https://groups.google.com/d/forum/project-m36)
43−* IRC Channel: chat.freenode.net #project-m36
47+* IRC Channel: irc.libera.chat #project-m36 -- [Chat via Web Client](http://kiwiirc.com/nextclient/irc.libera.chat:+6697/#project-m36)
4448* [Hackage](https://hackage.haskell.org/package/project-m36)
4549* [Diogo Biazus' Project:M36 Video Tutorial](https://www.youtube.com/watch?v=_GC_lxlVEnE)
4650
@@ -50,22 +54,26 @@ Project:M36 supports multiple frontends which target different audiences.
5054
51551. [Installation and Introduction to Project:M36](docs/introduction_to_projectm36.markdown)
52561. [Introduction to the Relational Algebra](docs/introduction_to_the_relational_algebra.markdown)
57+1. [TutorialD Cheatsheet](docs/tutd_cheatsheet.markdown)
53581. [TutorialD via Jupyter Notebook Walkthrough](jupyter/TutorialD%20Notebook%20Walkthrough.ipynb)
54591. [TutorialD Tutorial](docs/tutd_tutorial.markdown)
55601. [15 Minute Tutorial](docs/15_minute_tutorial.markdown)
56611. [Developer's Change Log](Changelog.markdown)
57621. [Simple Client API](docs/simple_api.markdown)
63+1. [CSV Import/Export](docs/import_export_csv.markdown)
5864
5965### Database Comparisons
6066
61671. [ACID Database Properties](docs/acid_assessment.markdown)
62681. [On NULL (in SQL)](docs/on_null.markdown)
63691. [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)
6471
6572### Advanced Features
6673
67741. [Transaction Graph Operators](docs/transaction_graph_operators.markdown)
68751. [ProjectM36.Client Library](docs/projectm36_client_library.markdown)
76+1. [Data Frames for Sorting](docs/dataframes.markdown)
69771. [Adding New Data Types](docs/new_datatypes.markdown)
70781. [Database-Manipulating Functions](docs/database_context_functions.markdown)
71791. [Serving Remote ProjectM36 Databases](docs/server_mode.markdown)
@@ -75,15 +83,18 @@ Project:M36 supports multiple frontends which target different audiences.
75831. [Trans-Graph Relational Expressions](docs/transgraphrelationalexpr.markdown)
76841. [Isomorphic Schemas](docs/isomorphic_schemas.markdown)
77851. [Replication](docs/replication.markdown)
86+1. [Basic Operator Benchmarks](https://rawgit.com/agentm/project-m36/master/docs/basic_benchmarks.html)
87+1. [Merkle Transaction Hashes](docs/merkle_transaction_graph.markdown)
7888
7989### Integrations
8090
81911. [WebSocket Server](docs/websocket_server.markdown)
82−1. [Jupyter Notebook Kernel](docs/jupypter_kernel.markdown)
92+1. [Jupyter Notebook Kernel](docs/jupyter_kernel.markdown)
93+1. [Persistent Driver](https://github.com/YuMingLiao/persistent-project-m36)
8394
8495## Development
8596
86−Project:M36 is developed in Haskell and compiled with GHC 7.10 or GHC 8.0.2 or later.
97+Project:M36 is developed in Haskell and compiled with GHC 8.6 or later.
8798
8899## Related Projects
89100
cabal.project+9−2
@@ -1,3 +1,10 @@
1−-- this is needed for GHC8 until distributed-process-extras is updated on Hackage with increased upper bounds
21packages: 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
2+
3+package *
4+ split-sections: True
5+
6+--high-performance streaming library
7+source-repository-package
8+ type: git
9+ location: https://github.com/composewell/streamly.git
10+ tag: ac3af8749194f1788704dda8667d0b3807075cc2
cbits/DirectoryFsync.c+3
@@ -24,11 +24,13 @@ int cDirectoryFsync(char *path)
2424 ret = fstat(fd,&fdstat);
2525 if(ret < 0)
2626 {
27+ close(fd);
2728 return errno;
2829 }
2930
3031 if(!S_ISDIR(fdstat.st_mode))
3132 {
33+ close(fd);
3234 return ENOTDIR;
3335 }
3436
@@ -39,6 +41,7 @@ int cDirectoryFsync(char *path)
3941#else
4042 ret = fsync(fd);
4143#endif
44+ close(fd);
4245 if(ret < 0)
4346 {
4447 return errno;
default.nixnew file+1
@@ -0,0 +1 @@
1+(import ./release.nix { }).project
docker.nixnew file+18
@@ -0,0 +1,18 @@
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+65−68
@@ -4,40 +4,34 @@ Thank you for evaluating Project:M36, a new relational algebra engine written in
44
55## Prerequisites
66
7−* any Linux
8−* GHC 7.10 or later version (Haskell compiler)
9−* cabal (package downloader) installed
7+* any Linux, MacOS, or Windows computer with Docker installed
108
119## Download and Install
1210
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+
1317```bash
1418git clone https://github.com/agentm/project-m36.git
15−cabal sandbox init
16−cabal install --dependencies-only
17−cabal run tutd
19+cabal new-run tutd
1820```
1921
2022## Some Basic TutorialD
2123
22−When you run the ```tutd``` interpreter, you are interacting with an in-memory database using a dialect of the TutorialD language which is described in numerous book by Chris J. Date. It is a language specifically designed for human interaction with the relational algebra.
24+When you run the ```tutd``` interpreter, you are interacting with an in-memory database using a dialect of the TutorialD language which is described in numerous books by Chris J. Date. It is a language specifically designed for human interaction with the relational algebra.
2325
2426Note that TutorialD is strongly-typed- no type coercions take place automatically. For example, an integer will never be interpreted as a string or vice versa.
2527
2628### Load the Canonical Chris Date Example
2729
2830```
29−TutorialD (master/main): :importexample date
30−```
31−
32−or
33−
34−```
35−TutorialD (master/main): :importtud "scripts/DateExamples.tutd"
31+TutorialD (master/main): :importexample cjdate
3632```
3733
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.
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.
4135
4236### Execute Relational Expressions
4337
@@ -164,7 +158,7 @@ Database context expressions change the state of the database, much like "CREATE
164158#### Create a Relation Variable
165159
166160```
167−TutorialD (master/main): x:=relation{name Text, age Int}{tuple{name "Steve", age 40},tuple{name "Mike", age 31}}
161+TutorialD (master/main): x:=relation{name Text, age Integer}{tuple{name "Steve", age 40},tuple{name "Mike", age 31}}
168162TutorialD (master/main): :showexpr x
169163┌────────┬──────────┐
170164│age::Int│name::Text│
@@ -179,23 +173,25 @@ This is similar to SQL's "CREATE TABLE" operator.
179173#### Insert Additional Tuples
180174
181175```
182−TutorialD (master/main): x:=relation{name Text, age Int}{tuple{name "Steve", age 40},tuple{name "Mike", age 31}}
176+TutorialD (master/main): x:=relation{name Text, age Integer}{tuple{name "Steve", age 40},tuple{name "Mike", age 31}}
183177TutorialD (master/main): :showexpr x
184−┌────────┬──────────┐
185−│age::Int│name::Text│
186−├────────┼──────────┤
187−│40 │"Steve" │
188−│31 │"Mike" │
189−└────────┴──────────┘
178+┌────────────┬──────────┐
179+│age::Integer│name::Text│
180+├────────────┼──────────┤
181+│31 │"Mike" │
182+│40 │"Steve" │
183+└────────────┴──────────┘
184+
190185TutorialD (master/main): insert x relation{tuple{name "Bob", age 24}}
191186TutorialD (master/main): :showexpr x
192−┌────────┬──────────┐
193−│age::Int│name::Text│
194−├────────┼──────────┤
195−│40 │"Steve" │
196−│24 │"Bob" │
197−│31 │"Mike" │
198−└────────┴──────────┘
187+┌────────────┬──────────┐
188+│age::Integer│name::Text│
189+├────────────┼──────────┤
190+│31 │"Mike" │
191+│40 │"Steve" │
192+│24 │"Bob" │
193+└────────────┴──────────┘
194+
199195```
200196
201197Note that the relational insertion is identical to "x:=x union relation{...}".
@@ -204,50 +200,51 @@ Note that the relational insertion is identical to "x:=x union relation{...}".
204200
205201```
206202TutorialD (master/main): :showexpr s
207−┌──────────┬────────┬───────────┬───────────┐
208−│city::Text│s#::Text│sname::Text│status::Int│
209−├──────────┼────────┼───────────┼───────────┤
210−│"Paris" │"S2" │"Jones" │10 │
211−│"Paris" │"S3" │"Blake" │30 │
212−│"London" │"S1" │"Smith" │20 │
213−│"London" │"S4" │"Clark" │20 │
214−│"Athens" │"S5" │"Adams" │30 │
215−└──────────┴────────┴───────────┴───────────┘
203+┌──────────┬────────┬───────────┬───────────────┐
204+│city::Text│s#::Text│sname::Text│status::Integer│
205+├──────────┼────────┼───────────┼───────────────┤
206+│"London" │"S1" │"Smith" │20 │
207+│"Athens" │"S5" │"Adams" │30 │
208+│"Paris" │"S3" │"Blake" │30 │
209+│"London" │"S4" │"Clark" │20 │
210+│"Paris" │"S2" │"Jones" │10 │
211+└──────────┴────────┴───────────┴───────────────┘
216212TutorialD (master/main): update s where city="London" (status:=35)
217213TutorialD (master/main): :showexpr s
218−┌──────────┬────────┬───────────┬───────────┐
219−│city::Text│s#::Text│sname::Text│status::Int│
220−├──────────┼────────┼───────────┼───────────┤
221−│"London" │"S4" │"Clark" │35 │
222−│"London" │"S1" │"Smith" │35 │
223−│"Paris" │"S2" │"Jones" │10 │
224−│"Paris" │"S3" │"Blake" │30 │
225−│"Athens" │"S5" │"Adams" │30 │
226−└──────────┴────────┴───────────┴───────────┘
214+┌──────────┬────────┬───────────┬───────────────┐
215+│city::Text│s#::Text│sname::Text│status::Integer│
216+├──────────┼────────┼───────────┼───────────────┤
217+│"Athens" │"S5" │"Adams" │30 │
218+│"London" │"S1" │"Smith" │35 │
219+│"London" │"S4" │"Clark" │35 │
220+│"Paris" │"S3" │"Blake" │30 │
221+│"Paris" │"S2" │"Jones" │10 │
222+└──────────┴────────┴───────────┴───────────────┘
223+
227224```
228225#### Deleting Tuples from a Relation Variable
229226
230227```
231228TutorialD (master/main): :showexpr s
232−┌──────────┬────────┬───────────┬───────────┐
233−│city::Text│s#::Text│sname::Text│status::Int│
234−├──────────┼────────┼───────────┼───────────┤
235−│"Paris" │"S2" │"Jones" │10 │
236−│"Paris" │"S3" │"Blake" │30 │
237−│"London" │"S1" │"Smith" │20 │
238−│"London" │"S4" │"Clark" │20 │
239−│"Athens" │"S5" │"Adams" │30 │
240−└──────────┴────────┴───────────┴───────────┘
229+┌──────────┬────────┬───────────┬───────────────┐
230+│city::Text│s#::Text│sname::Text│status::Integer│
231+├──────────┼────────┼───────────┼───────────────┤
232+│"Paris" │"S2" │"Jones" │10 │
233+│"Paris" │"S3" │"Blake" │30 │
234+│"London" │"S1" │"Smith" │20 │
235+│"Athens" │"S5" │"Adams" │30 │
236+│"London" │"S4" │"Clark" │20 │
237+└──────────┴────────┴───────────┴───────────────┘
241238TutorialD (master/main): delete s where sname="Adams"
242239TutorialD (master/main): :showexpr s
243−┌──────────┬────────┬───────────┬───────────┐
244−│city::Text│s#::Text│sname::Text│status::Int│
245−├──────────┼────────┼───────────┼───────────┤
246−│"Paris" │"S2" │"Jones" │10 │
247−│"Paris" │"S3" │"Blake" │30 │
248−│"London" │"S1" │"Smith" │20 │
249−│"London" │"S4" │"Clark" │20 │
250−└──────────┴────────┴───────────┴───────────┘
240+┌──────────┬────────┬───────────┬───────────────┐
241+│city::Text│s#::Text│sname::Text│status::Integer│
242+├──────────┼────────┼───────────┼───────────────┤
243+│"Paris" │"S2" │"Jones" │10 │
244+│"London" │"S4" │"Clark" │20 │
245+│"Paris" │"S3" │"Blake" │30 │
246+│"London" │"S1" │"Smith" │20 │
247+└──────────┴────────┴───────────┴───────────────┘
251248```
252249
253250### Execute Transaction Graph Expressions
@@ -270,7 +267,7 @@ TutorialD (master/main): :rollback
270267
271268```
272269TutorialD (master/main): :branch experimental
273−TutorialD (experimental): employee:=relation{name Text, salary Int}
270+TutorialD (experimental): employee:=relation{name Text, salary Integer}
274271TutorialD (experimental): :commit
275272```
276273
docs/atomfunctions.markdown+31−2
@@ -6,7 +6,7 @@ While Project:M36 includes a set of basic function which operate on relational v
66
77Other DBMSes also include this feature by way of stored functions such as with PL/pgsql, T-SQL, or PL/SQL.
88
9−Project:M36 allows users to implement strongly-typed and pure atom functions in the Haskell language at runtime. This facility makes use of GHC, the Haskell compiler, as a runtime service.
9+Project:M36 allows users to implement strongly-typed and pure atom functions in the Haskell language at runtime. This facility makes use of GHC, the Haskell compiler, as a runtime service. Alternatively, Haskell-based atom functions can be pre-compiled and loaded at runtime.
1010
1111## Atom Function Example
1212
@@ -15,7 +15,7 @@ In this example, we install an atom function to convert between Fahrenheit and C
1515We write the function giving it the name "celsiusToFahrenheit" with type ```Int -> Int``` which indicates to the compiler that the function take one ```Int``` argument value and returns one ```Int``` value. Finally, the body of the function is implemented in quotes or triple-quotes. Note that the function makes use of the "[ProjectM36.Base](/src/lib/ProjectM36/Base.hs)" module to handle the Atom type. The function must take a list of Atoms as arguments and return an Atom. The standard GHC Prelude is available in this AtomFunctionBody context.
1616
1717```
18−TutorialD (master/main): addatomfunction "celsiusToFahrenheit" Int -> Either AtomFunctionError Int """(\\((IntAtom c):_) -> pure $ IntAtom ( (c * 9 `div` 5) + 32)) :: [Atom] -> Either AtomFunctionError Atom"""
18+TutorialD (master/main): addatomfunction "celsiusToFahrenheit" Int -> Either AtomFunctionError Int """(\((IntAtom c):_) -> pure $ IntAtom ( (c * 9 `div` 5) + 32)) :: [Atom] -> Either AtomFunctionError Atom"""
1919```
2020
2121Using triple-quotes allows quotes to be used inside the string without backslash escaping, which can become tedious. The sum type using ```Either``` allows the function to return an error, if necessary.
@@ -41,6 +41,35 @@ Project:M36 also supports polymorphic types when used with atom functions. Here
4141addatomfunction "idTest" a -> Either AtomFunctionError a "(\(x:_) -> pure x) :: [Atom] -> Either AtomFunctionError Atom"
4242```
4343
44+## Pre-compiled Atom Functions
45+
46+Compiling atom functions at runtime can incur a performance cost. To mitigate this, atom functions can be compiled by GHC to object files and then loaded into the Project:M36 server. Let's look at an [example](https://github.com/agentm/project-m36/):
47+
48+```haskell
49+module DynamicAtomFunctions where
50+import ProjectM36.Base
51+
52+someAtomFunctions :: [AtomFunction]
53+someAtomFunctions = [AtomFunction{
54+ atomFuncName = "constTrue",
55+ atomFuncType = [TypeVariableType "a", BoolAtomType],
56+ atomFuncBody = AtomFunctionBody Nothing (\(x:_) -> pure (BoolAtom True))}]
57+```
58+
59+Any function inside any module which returns a list of `AtomFunction`s can be used to load more atom functions. First, create the Haskell object file:
60+
61+`cabal exec ghc -- examples/DynamicAtomFunctions.hs -package project-m36`
62+
63+Use cabal or stack to invoke ghc so that the project-m36 installed package will be found.
64+
65+Finally, connect to your Project:M36 database using the `tutd` client and run:
66+
67+`TutorialD (master/main): loadatomfunctions "DynamicAtomFunctions" "someFunctions" "examples/DynamicAtomFunctions.o"`
68+
69+If you see an error such as "unknown symbol", the version of the "project-m36" library installed in your sandbox is different from that with which you linked the object file. Make sure that the same versions are used in linking the server and object file.
70+
71+The atom function is now loaded and ready-to-use. Note, however, that the function must be added every time the project-m36-server starts. This will probably be improved in a future release.
72+
4473## Differences when compared to other DBMSes
4574
4675Project:M36 enforces strongly-typed atom functions. Specifically, atom functions must be pure (free of any side effects) and cannot operate on any variables other than the atoms passed in. This certainly sets stricter limits on what can be accomplished in an atom function when compared to stored functions in other DBMS products. For example, an atom function in Project:M36 would never be able to retrieve stock information from an external website because such a function cannot be pure and thus would be rejected by the atom function compiler. This restriction maintains the mathematical cohesiveness of the database and allows the DBMS to make performance-enhancing inferences it would not otherwise be able to make.
docs/basic_benchmarks.htmlnew file+1230
@@ -0,0 +1,1230 @@
1+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2+<html>
3+ <head>
4+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
5+ <title>criterion report</title>
6+ <script language="javascript" type="text/javascript">
7+ /*! jQuery v3.2.1 | (c) JS Foundation and other contributors | jquery.org/license */
8+!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.2.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=Array.isArray(d)))?(e?(e=!1,f=c&&Array.isArray(c)?c:[]):f=c&&r.isPlainObject(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){return a.replace(t,"ms-").replace(u,v)},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},guid:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return a.apply(b||this,d.concat(f.call(arguments)))},e.guid=a.guid=a.guid||r.guid++,e},now:Date.now,support:o}),"function"==typeof Symbol&&(r.fn[Symbol.iterator]=c[Symbol.iterator]),r.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){j["[object "+b+"]"]=b.toLowerCase()});function w(a){var b=!!a&&"length"in a&&a.length,c=r.type(a);return"function"!==c&&!r.isWindow(a)&&("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+K+"*("+L+")(?:"+K+"*([*^$|!~]?=)"+K+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+L+"))|)"+K+"*\\]",N=":("+L+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",O=new RegExp(K+"+","g"),P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0&&("form"in a||"label"in a)},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"form"in b?b.parentNode&&b.disabled===!1?"label"in b?"label"in b.parentNode?b.parentNode.disabled===a:b.disabled===a:b.isDisabled===a||b.isDisabled!==!a&&ea(b)===a:b.disabled===a:"label"in b&&b.disabled===a}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}}):(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c,d,e,f=b.getElementById(a);if(f){if(c=f.getAttributeNode("id"),c&&c.value===a)return[f];e=b.getElementsByName(a),d=0;while(f=e[d++])if(c=f.getAttributeNode("id"),c&&c.value===a)return[f]}return[]}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c<b;c+=2)a.push(c);return a}),odd:pa(function(a,b){for(var c=1;c<b;c+=2)a.push(c);return a}),lt:pa(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function ra(){}ra.prototype=d.filters=d.pseudos,d.setFilters=new ra,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=Q.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function sa(a){for(var b=0,c=a.length,d="";b<c;b++)d+=a[b].value;return d}function ta(a,b,c){var d=b.dir,e=b.next,f=e||d,g=c&&"parentNode"===f,h=x++;return b.first?function(b,c,e){while(b=b[d])if(1===b.nodeType||g)return a(b,c,e);return!1}:function(b,c,i){var j,k,l,m=[w,h];if(i){while(b=b[d])if((1===b.nodeType||g)&&a(b,c,i))return!0}else while(b=b[d])if(1===b.nodeType||g)if(l=b[u]||(b[u]={}),k=l[b.uniqueID]||(l[b.uniqueID]={}),e&&e===b.nodeName.toLowerCase())b=b[d]||b;else{if((j=k[f])&&j[0]===w&&j[1]===h)return m[2]=j[2];if(k[f]=m,m[2]=a(b,c,i))return!0}return!1}}function ua(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d<e;d++)ga(a,b[d],c);return c}function wa(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;h<i;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function xa(a,b,c,d,e,f){return d&&!d[u]&&(d=xa(d)),e&&!e[u]&&(e=xa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||va(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:wa(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=wa(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i<f;i++)if(c=d.relative[a[i].type])m=[ta(ua(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;e<f;e++)if(d.relative[a[e].type])break;return xa(i>1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i<e&&ya(a.slice(i,e)),e<f&&ya(a=a.slice(e)),e<f&&sa(a))}m.push(c)}return ua(m)}function za(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,c,e){var f,i,j,k,l,m="function"==typeof a&&a,n=!e&&g(a=m.selector||a);if(c=c||[],1===n.length){if(i=n[0]=n[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&9===b.nodeType&&p&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(_,aa),b)||[])[0],!b)return c;m&&(b=b.parentNode),a=a.slice(i.shift().value.length)}f=V.needsContext.test(a)?0:i.length;while(f--){if(j=i[f],d.relative[k=j.type])break;if((l=d.find[k])&&(e=l(j.matches[0].replace(_,aa),$.test(i[0].type)&&qa(b.parentNode)||b))){if(i.splice(f,1),a=e.length&&sa(i),!a)return G.apply(c,e),c;break}}}return(m||h(a,n))(e,b,!p,c,!b||$.test(a)&&qa(b.parentNode)||b),c},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext;function B(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()}var C=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,D=/^.[^:#\[\.,]*$/;function E(a,b,c){return r.isFunction(b)?r.grep(a,function(a,d){return!!b.call(a,d,a)!==c}):b.nodeType?r.grep(a,function(a){return a===b!==c}):"string"!=typeof b?r.grep(a,function(a){return i.call(b,a)>-1!==c}):D.test(b)?r.filter(b,a,c):(b=r.filter(b,a),r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType}))}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b<d;b++)if(r.contains(e[b],this))return!0}));for(c=this.pushStack([]),b=0;b<d;b++)r.find(a,e[b],c);return d>1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(E(this,a||[],!1))},not:function(a){return this.pushStack(E(this,a||[],!0))},is:function(a){return!!E(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var F,G=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,H=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||F,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:G.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),C.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};H.prototype=r.fn,F=r(d);var I=/^(?:parents|prev(?:Until|All))/,J={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a<c;a++)if(r.contains(this,b[a]))return!0})},closest:function(a,b){var c,d=0,e=this.length,f=[],g="string"!=typeof a&&r(a);if(!A.test(a))for(;d<e;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function K(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return K(a,"nextSibling")},prev:function(a){return K(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return B(a,"iframe")?a.contentDocument:(B(a,"template")&&(a=a.content||a),r.merge([],a.childNodes))}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(J[a]||r.uniqueSort(e),I.test(a)&&e.reverse()),this.pushStack(e)}});var L=/[^\x20\t\r\n\f]+/g;function M(a){var b={};return r.each(a.match(L)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?M(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=e||a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){r.each(b,function(b,c){r.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==r.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return r.each(arguments,function(a,b){var c;while((c=r.inArray(b,f,c))>-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function N(a){return a}function O(a){throw a}function P(a,b,c,d){var e;try{a&&r.isFunction(e=a.promise)?e.call(a).done(b).fail(c):a&&r.isFunction(e=a.then)?e.call(a,b,c):b.apply(void 0,[a].slice(d))}catch(a){c.apply(void 0,[a])}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b<f)){if(a=d.apply(h,i),a===c.promise())throw new TypeError("Thenable self-resolution");j=a&&("object"==typeof a||"function"==typeof a)&&a.then,r.isFunction(j)?e?j.call(a,g(f,c,N,e),g(f,c,O,e)):(f++,j.call(a,g(f,c,N,e),g(f,c,O,e),g(f,c,N,c.notifyWith))):(d!==N&&(h=void 0,i=[a]),(e||c.resolveWith)(h,i))}},k=e?j:function(){try{j()}catch(a){r.Deferred.exceptionHook&&r.Deferred.exceptionHook(a,k.stackTrace),b+1>=f&&(d!==O&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:N,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:N)),c[2][3].add(g(0,a,r.isFunction(d)?d:O))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(P(a,g.done(h(c)).resolve,g.reject,!b),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)P(e[c],h(c),g.reject);return g.promise()}});var Q=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&Q.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var R=r.Deferred();r.fn.ready=function(a){return R.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||R.resolveWith(d,[r]))}}),r.ready.then=R.then;function S(){d.removeEventListener("DOMContentLoaded",S),
9+a.removeEventListener("load",S),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",S),a.addEventListener("load",S));var T=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)T(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},U=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function V(){this.expando=r.expando+V.uid++}V.uid=1,V.prototype={cache:function(a){var b=a[this.expando];return b||(b={},U(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[r.camelCase(b)]=c;else for(d in b)e[r.camelCase(d)]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][r.camelCase(b)]},access:function(a,b,c){return void 0===b||b&&"string"==typeof b&&void 0===c?this.get(a,b):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d=a[this.expando];if(void 0!==d){if(void 0!==b){Array.isArray(b)?b=b.map(r.camelCase):(b=r.camelCase(b),b=b in d?[b]:b.match(L)||[]),c=b.length;while(c--)delete d[b[c]]}(void 0===b||r.isEmptyObject(d))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!r.isEmptyObject(b)}};var W=new V,X=new V,Y=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function $(a){return"true"===a||"false"!==a&&("null"===a?null:a===+a+""?+a:Y.test(a)?JSON.parse(a):a)}function _(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Z,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c=$(c)}catch(e){}X.set(a,b,c)}else c=void 0;return c}r.extend({hasData:function(a){return X.hasData(a)||W.hasData(a)},data:function(a,b,c){return X.access(a,b,c)},removeData:function(a,b){X.remove(a,b)},_data:function(a,b,c){return W.access(a,b,c)},_removeData:function(a,b){W.remove(a,b)}}),r.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=X.get(f),1===f.nodeType&&!W.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=r.camelCase(d.slice(5)),_(f,d,e[d])));W.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){X.set(this,a)}):T(this,function(b){var c;if(f&&void 0===b){if(c=X.get(f,a),void 0!==c)return c;if(c=_(f,a),void 0!==c)return c}else this.each(function(){X.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){X.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=W.get(a,b),c&&(!d||Array.isArray(c)?d=W.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return W.get(a,c)||W.access(a,c,{empty:r.Callbacks("once memory").add(function(){W.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?r.queue(this[0],a):void 0===b?this:this.each(function(){var c=r.queue(this,a,b);r._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&r.dequeue(this,a)})},dequeue:function(a){return this.each(function(){r.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=r.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=W.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var aa=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ba=new RegExp("^(?:([+-])=|)("+aa+")([a-z%]*)$","i"),ca=["Top","Right","Bottom","Left"],da=function(a,b){return a=b||a,"none"===a.style.display||""===a.style.display&&r.contains(a.ownerDocument,a)&&"none"===r.css(a,"display")},ea=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};function fa(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return r.css(a,b,"")},i=h(),j=c&&c[3]||(r.cssNumber[b]?"":"px"),k=(r.cssNumber[b]||"px"!==j&&+i)&&ba.exec(r.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,r.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var ga={};function ha(a){var b,c=a.ownerDocument,d=a.nodeName,e=ga[d];return e?e:(b=c.body.appendChild(c.createElement(d)),e=r.css(b,"display"),b.parentNode.removeChild(b),"none"===e&&(e="block"),ga[d]=e,e)}function ia(a,b){for(var c,d,e=[],f=0,g=a.length;f<g;f++)d=a[f],d.style&&(c=d.style.display,b?("none"===c&&(e[f]=W.get(d,"display")||null,e[f]||(d.style.display="")),""===d.style.display&&da(d)&&(e[f]=ha(d))):"none"!==c&&(e[f]="none",W.set(d,"display",c)));for(f=0;f<g;f++)null!=e[f]&&(a[f].style.display=e[f]);return a}r.fn.extend({show:function(){return ia(this,!0)},hide:function(){return ia(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){da(this)?r(this).show():r(this).hide()})}});var ja=/^(?:checkbox|radio)$/i,ka=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,la=/^$|\/(?:java|ecma)script/i,ma={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ma.optgroup=ma.option,ma.tbody=ma.tfoot=ma.colgroup=ma.caption=ma.thead,ma.th=ma.td;function na(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&B(a,b)?r.merge([a],c):c}function oa(a,b){for(var c=0,d=a.length;c<d;c++)W.set(a[c],"globalEval",!b||W.get(b[c],"globalEval"))}var pa=/<|&#?\w+;/;function qa(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],n=0,o=a.length;n<o;n++)if(f=a[n],f||0===f)if("object"===r.type(f))r.merge(m,f.nodeType?[f]:f);else if(pa.test(f)){g=g||l.appendChild(b.createElement("div")),h=(ka.exec(f)||["",""])[1].toLowerCase(),i=ma[h]||ma._default,g.innerHTML=i[1]+r.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;r.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",n=0;while(f=m[n++])if(d&&r.inArray(f,d)>-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=na(l.appendChild(f),"script"),j&&oa(g),c){k=0;while(f=g[k++])la.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var ra=d.documentElement,sa=/^key/,ta=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ua=/^([^.]*)(?:\.(.+)|)/;function va(){return!0}function wa(){return!1}function xa(){try{return d.activeElement}catch(a){}}function ya(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ya(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=wa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(ra,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(L)||[""],j=b.length;while(j--)h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.hasData(a)&&W.get(a);if(q&&(i=q.events)){b=(b||"").match(L)||[""],j=b.length;while(j--)if(h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&W.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(W.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c<arguments.length;c++)i[c]=arguments[c];if(b.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,b)!==!1){h=r.event.handlers.call(this,b,j),c=0;while((f=h[c++])&&!b.isPropagationStopped()){b.currentTarget=f.elem,d=0;while((g=f.handlers[d++])&&!b.isImmediatePropagationStopped())b.rnamespace&&!b.rnamespace.test(g.namespace)||(b.handleObj=g,b.data=g.data,e=((r.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(b.result=e)===!1&&(b.preventDefault(),b.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,b),b.result}},handlers:function(a,b){var c,d,e,f,g,h=[],i=b.delegateCount,j=a.target;if(i&&j.nodeType&&!("click"===a.type&&a.button>=1))for(;j!==this;j=j.parentNode||this)if(1===j.nodeType&&("click"!==a.type||j.disabled!==!0)){for(f=[],g={},c=0;c<i;c++)d=b[c],e=d.selector+" ",void 0===g[e]&&(g[e]=d.needsContext?r(e,this).index(j)>-1:r.find(e,this,null,[j]).length),g[e]&&f.push(d);f.length&&h.push({elem:j,handlers:f})}return j=this,i<b.length&&h.push({elem:j,handlers:b.slice(i)}),h},addProp:function(a,b){Object.defineProperty(r.Event.prototype,a,{enumerable:!0,configurable:!0,get:r.isFunction(b)?function(){if(this.originalEvent)return b(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[a]},set:function(b){Object.defineProperty(this,a,{enumerable:!0,configurable:!0,writable:!0,value:b})}})},fix:function(a){return a[r.expando]?a:new r.Event(a)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==xa()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===xa()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&B(this,"input"))return this.click(),!1},_default:function(a){return B(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},r.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},r.Event=function(a,b){return this instanceof r.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?va:wa,this.target=a.target&&3===a.target.nodeType?a.target.parentNode:a.target,this.currentTarget=a.currentTarget,this.relatedTarget=a.relatedTarget):this.type=a,b&&r.extend(this,b),this.timeStamp=a&&a.timeStamp||r.now(),void(this[r.expando]=!0)):new r.Event(a,b)},r.Event.prototype={constructor:r.Event,isDefaultPrevented:wa,isPropagationStopped:wa,isImmediatePropagationStopped:wa,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=va,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=va,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=va,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},r.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(a){var b=a.button;return null==a.which&&sa.test(a.type)?null!=a.charCode?a.charCode:a.keyCode:!a.which&&void 0!==b&&ta.test(a.type)?1&b?1:2&b?3:4&b?2:0:a.which}},r.event.addProp),r.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){r.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||r.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),r.fn.extend({on:function(a,b,c,d){return ya(this,a,b,c,d)},one:function(a,b,c,d){return ya(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,r(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=wa),this.each(function(){r.event.remove(this,a,c,b)})}});var za=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,Aa=/<script|<style|<link/i,Ba=/checked\s*(?:[^=]|=\s*.checked.)/i,Ca=/^true\/(.*)/,Da=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Ea(a,b){return B(a,"table")&&B(11!==b.nodeType?b:b.firstChild,"tr")?r(">tbody",a)[0]||a:a}function Fa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Ga(a){var b=Ca.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ha(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(W.hasData(a)&&(f=W.access(a),g=W.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c<d;c++)r.event.add(b,e,j[e][c])}X.hasData(a)&&(h=X.access(a),i=r.extend({},h),X.set(b,i))}}function Ia(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ja.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function Ja(a,b,c,d){b=g.apply([],b);var e,f,h,i,j,k,l=0,m=a.length,n=m-1,q=b[0],s=r.isFunction(q);if(s||m>1&&"string"==typeof q&&!o.checkClone&&Ba.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ja(f,b,c,d)});if(m&&(e=qa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(na(e,"script"),Fa),i=h.length;l<m;l++)j=e,l!==n&&(j=r.clone(j,!0,!0),i&&r.merge(h,na(j,"script"))),c.call(a[l],j,l);if(i)for(k=h[h.length-1].ownerDocument,r.map(h,Ga),l=0;l<i;l++)j=h[l],la.test(j.type||"")&&!W.access(j,"globalEval")&&r.contains(k,j)&&(j.src?r._evalUrl&&r._evalUrl(j.src):p(j.textContent.replace(Da,""),k))}return a}function Ka(a,b,c){for(var d,e=b?r.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||r.cleanData(na(d)),d.parentNode&&(c&&r.contains(d.ownerDocument,d)&&oa(na(d,"script")),d.parentNode.removeChild(d));return a}r.extend({htmlPrefilter:function(a){return a.replace(za,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=na(h),f=na(a),d=0,e=f.length;d<e;d++)Ia(f[d],g[d]);if(b)if(c)for(f=f||na(a),g=g||na(h),d=0,e=f.length;d<e;d++)Ha(f[d],g[d]);else Ha(a,h);return g=na(h,"script"),g.length>0&&oa(g,!i&&na(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(U(c)){if(b=c[W.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[W.expando]=void 0}c[X.expando]&&(c[X.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ka(this,a,!0)},remove:function(a){return Ka(this,a)},text:function(a){return T(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.appendChild(a)}})},prepend:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(na(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return T(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!Aa.test(a)&&!ma[(ka.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c<d;c++)b=this[c]||{},1===b.nodeType&&(r.cleanData(na(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ja(this,arguments,function(b){var c=this.parentNode;r.inArray(this,a)<0&&(r.cleanData(na(this)),c&&c.replaceChild(b,this))},a)}}),r.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){r.fn[a]=function(a){for(var c,d=[],e=r(a),f=e.length-1,g=0;g<=f;g++)c=g===f?this:this.clone(!0),r(e[g])[b](c),h.apply(d,c.get());return this.pushStack(d)}});var La=/^margin/,Ma=new RegExp("^("+aa+")(?!px)[a-z%]+$","i"),Na=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)};!function(){function b(){if(i){i.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",i.innerHTML="",ra.appendChild(h);var b=a.getComputedStyle(i);c="1%"!==b.top,g="2px"===b.marginLeft,e="4px"===b.width,i.style.marginRight="50%",f="4px"===b.marginRight,ra.removeChild(h),i=null}}var c,e,f,g,h=d.createElement("div"),i=d.createElement("div");i.style&&(i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",o.clearCloneStyle="content-box"===i.style.backgroundClip,h.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",h.appendChild(i),r.extend(o,{pixelPosition:function(){return b(),c},boxSizingReliable:function(){return b(),e},pixelMarginRight:function(){return b(),f},reliableMarginLeft:function(){return b(),g}}))}();function Oa(a,b,c){var d,e,f,g,h=a.style;return c=c||Na(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||r.contains(a.ownerDocument,a)||(g=r.style(a,b)),!o.pixelMarginRight()&&Ma.test(g)&&La.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function Pa(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Qa=/^(none|table(?!-c[ea]).+)/,Ra=/^--/,Sa={position:"absolute",visibility:"hidden",display:"block"},Ta={letterSpacing:"0",fontWeight:"400"},Ua=["Webkit","Moz","ms"],Va=d.createElement("div").style;function Wa(a){if(a in Va)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ua.length;while(c--)if(a=Ua[c]+b,a in Va)return a}function Xa(a){var b=r.cssProps[a];return b||(b=r.cssProps[a]=Wa(a)||a),b}function Ya(a,b,c){var d=ba.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Za(a,b,c,d,e){var f,g=0;for(f=c===(d?"border":"content")?4:"width"===b?1:0;f<4;f+=2)"margin"===c&&(g+=r.css(a,c+ca[f],!0,e)),d?("content"===c&&(g-=r.css(a,"padding"+ca[f],!0,e)),"margin"!==c&&(g-=r.css(a,"border"+ca[f]+"Width",!0,e))):(g+=r.css(a,"padding"+ca[f],!0,e),"padding"!==c&&(g+=r.css(a,"border"+ca[f]+"Width",!0,e)));return g}function $a(a,b,c){var d,e=Na(a),f=Oa(a,b,e),g="border-box"===r.css(a,"boxSizing",!1,e);return Ma.test(f)?f:(d=g&&(o.boxSizingReliable()||f===a.style[b]),"auto"===f&&(f=a["offset"+b[0].toUpperCase()+b.slice(1)]),f=parseFloat(f)||0,f+Za(a,b,c||(g?"border":"content"),d,e)+"px")}r.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Oa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=r.camelCase(b),i=Ra.test(b),j=a.style;return i||(b=Xa(h)),g=r.cssHooks[b]||r.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:j[b]:(f=typeof c,"string"===f&&(e=ba.exec(c))&&e[1]&&(c=fa(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(r.cssNumber[h]?"":"px")),o.clearCloneStyle||""!==c||0!==b.indexOf("background")||(j[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i?j.setProperty(b,c):j[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=r.camelCase(b),i=Ra.test(b);return i||(b=Xa(h)),g=r.cssHooks[b]||r.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Oa(a,b,d)),"normal"===e&&b in Ta&&(e=Ta[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),r.each(["height","width"],function(a,b){r.cssHooks[b]={get:function(a,c,d){if(c)return!Qa.test(r.css(a,"display"))||a.getClientRects().length&&a.getBoundingClientRect().width?$a(a,b,d):ea(a,Sa,function(){return $a(a,b,d)})},set:function(a,c,d){var e,f=d&&Na(a),g=d&&Za(a,b,d,"border-box"===r.css(a,"boxSizing",!1,f),f);return g&&(e=ba.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=r.css(a,b)),Ya(a,c,g)}}}),r.cssHooks.marginLeft=Pa(o.reliableMarginLeft,function(a,b){if(b)return(parseFloat(Oa(a,"marginLeft"))||a.getBoundingClientRect().left-ea(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px"}),r.each({margin:"",padding:"",border:"Width"},function(a,b){r.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];d<4;d++)e[a+ca[d]+b]=f[d]||f[d-2]||f[0];return e}},La.test(a)||(r.cssHooks[a+b].set=Ya)}),r.fn.extend({css:function(a,b){return T(this,function(a,b,c){var d,e,f={},g=0;if(Array.isArray(b)){for(d=Na(a),e=b.length;g<e;g++)f[b[g]]=r.css(a,b[g],!1,d);return f}return void 0!==c?r.style(a,b,c):r.css(a,b)},a,b,arguments.length>1)}});function _a(a,b,c,d,e){return new _a.prototype.init(a,b,c,d,e)}r.Tween=_a,_a.prototype={constructor:_a,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=_a.propHooks[this.prop];return a&&a.get?a.get(this):_a.propHooks._default.get(this)},run:function(a){var b,c=_a.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):_a.propHooks._default.set(this),this}},_a.prototype.init.prototype=_a.prototype,_a.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},_a.propHooks.scrollTop=_a.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=_a.prototype.init,r.fx.step={};var ab,bb,cb=/^(?:toggle|show|hide)$/,db=/queueHooks$/;function eb(){bb&&(d.hidden===!1&&a.requestAnimationFrame?a.requestAnimationFrame(eb):a.setTimeout(eb,r.fx.interval),r.fx.tick())}function fb(){return a.setTimeout(function(){ab=void 0}),ab=r.now()}function gb(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=ca[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function hb(a,b,c){for(var d,e=(kb.tweeners[b]||[]).concat(kb.tweeners["*"]),f=0,g=e.length;f<g;f++)if(d=e[f].call(c,b,a))return d}function ib(a,b,c){var d,e,f,g,h,i,j,k,l="width"in b||"height"in b,m=this,n={},o=a.style,p=a.nodeType&&da(a),q=W.get(a,"fxshow");c.queue||(g=r._queueHooks(a,"fx"),null==g.unqueued&&(g.unqueued=0,h=g.empty.fire,g.empty.fire=function(){g.unqueued||h()}),g.unqueued++,m.always(function(){m.always(function(){g.unqueued--,r.queue(a,"fx").length||g.empty.fire()})}));for(d in b)if(e=b[d],cb.test(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}n[d]=q&&q[d]||r.style(a,d)}if(i=!r.isEmptyObject(b),i||!r.isEmptyObject(n)){l&&1===a.nodeType&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=q&&q.display,null==j&&(j=W.get(a,"display")),k=r.css(a,"display"),"none"===k&&(j?k=j:(ia([a],!0),j=a.style.display||j,k=r.css(a,"display"),ia([a]))),("inline"===k||"inline-block"===k&&null!=j)&&"none"===r.css(a,"float")&&(i||(m.done(function(){o.display=j}),null==j&&(k=o.display,j="none"===k?"":k)),o.display="inline-block")),c.overflow&&(o.overflow="hidden",m.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]})),i=!1;for(d in n)i||(q?"hidden"in q&&(p=q.hidden):q=W.access(a,"fxshow",{display:j}),f&&(q.hidden=!p),p&&ia([a],!0),m.done(function(){p||ia([a]),W.remove(a,"fxshow");for(d in n)r.style(a,d,n[d])})),i=hb(p?q[d]:0,d,m),d in q||(q[d]=i.start,p&&(i.end=i.start,i.start=0))}}function jb(a,b){var c,d,e,f,g;for(c in a)if(d=r.camelCase(c),e=b[d],f=a[c],Array.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=r.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kb(a,b,c){var d,e,f=0,g=kb.prefilters.length,h=r.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=ab||fb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;g<i;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),f<1&&i?c:(i||h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:r.extend({},b),opts:r.extend(!0,{specialEasing:{},easing:r.easing._default},c),originalProperties:b,originalOptions:c,startTime:ab||fb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=r.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;c<d;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jb(k,j.opts.specialEasing);f<g;f++)if(d=kb.prefilters[f].call(j,a,k,j.opts))return r.isFunction(d.stop)&&(r._queueHooks(j.elem,j.opts.queue).stop=r.proxy(d.stop,d)),d;return r.map(k,hb,j),r.isFunction(j.opts.start)&&j.opts.start.call(a,j),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always),r.fx.timer(r.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j}r.Animation=r.extend(kb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return fa(c.elem,a,ba.exec(b),c),c}]},tweener:function(a,b){r.isFunction(a)?(b=a,a=["*"]):a=a.match(L);for(var c,d=0,e=a.length;d<e;d++)c=a[d],kb.tweeners[c]=kb.tweeners[c]||[],kb.tweeners[c].unshift(b)},prefilters:[ib],prefilter:function(a,b){b?kb.prefilters.unshift(a):kb.prefilters.push(a)}}),r.speed=function(a,b,c){var d=a&&"object"==typeof a?r.extend({},a):{complete:c||!c&&b||r.isFunction(a)&&a,duration:a,easing:c&&b||b&&!r.isFunction(b)&&b};return r.fx.off?d.duration=0:"number"!=typeof d.duration&&(d.duration in r.fx.speeds?d.duration=r.fx.speeds[d.duration]:d.duration=r.fx.speeds._default),null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){r.isFunction(d.old)&&d.old.call(this),d.queue&&r.dequeue(this,d.queue)},d},r.fn.extend({fadeTo:function(a,b,c,d){return this.filter(da).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=r.isEmptyObject(a),f=r.speed(b,c,d),g=function(){var b=kb(this,r.extend({},a),f);(e||W.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=r.timers,g=W.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&db.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||r.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=W.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=r.timers,g=d?d.length:0;for(c.finish=!0,r.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;b<g;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),r.each(["toggle","show","hide"],function(a,b){var c=r.fn[b];r.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gb(b,!0),a,d,e)}}),r.each({slideDown:gb("show"),slideUp:gb("hide"),slideToggle:gb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){r.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),r.timers=[],r.fx.tick=function(){var a,b=0,c=r.timers;for(ab=r.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||r.fx.stop(),ab=void 0},r.fx.timer=function(a){r.timers.push(a),r.fx.start()},r.fx.interval=13,r.fx.start=function(){bb||(bb=!0,eb())},r.fx.stop=function(){bb=null},r.fx.speeds={slow:600,fast:200,_default:400},r.fn.delay=function(b,c){return b=r.fx?r.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",o.checkOn=""!==a.value,o.optSelected=c.selected,a=d.createElement("input"),a.value="t",a.type="radio",o.radioValue="t"===a.value}();var lb,mb=r.expr.attrHandle;r.fn.extend({attr:function(a,b){return T(this,r.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?lb:void 0)),void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),
10+null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&B(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(L);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),lb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=mb[b]||r.find.attr;mb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=mb[g],mb[g]=e,e=null!=c(a,b,d)?g:null,mb[g]=f),e}});var nb=/^(?:input|select|textarea|button)$/i,ob=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return T(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):nb.test(a.nodeName)||ob.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function pb(a){var b=a.match(L)||[];return b.join(" ")}function qb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,qb(this)))});if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,qb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,qb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(L)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=qb(this),b&&W.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":W.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+pb(qb(c))+" ").indexOf(b)>-1)return!0;return!1}});var rb=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":Array.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:pb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d<i;d++)if(c=e[d],(c.selected||d===f)&&!c.disabled&&(!c.parentNode.disabled||!B(c.parentNode,"optgroup"))){if(b=r(c).val(),g)return b;h.push(b)}return h},set:function(a,b){var c,d,e=a.options,f=r.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=r.inArray(r.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(Array.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var sb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!sb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,sb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(W.get(h,"events")||{})[b.type]&&W.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&U(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!U(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=W.access(d,b);e||d.addEventListener(a,c,!0),W.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=W.access(d,b)-1;e?W.access(d,b,e):(d.removeEventListener(a,c,!0),W.remove(d,b))}}});var tb=a.location,ub=r.now(),vb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(Array.isArray(b))r.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)Ab(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(Array.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)Ab(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&zb.test(this.nodeName)&&!yb.test(a)&&(this.checked||!ja.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:Array.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}});var Bb=/%20/g,Cb=/#.*$/,Db=/([?&])_=[^&]*/,Eb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Fb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Gb=/^(?:GET|HEAD)$/,Hb=/^\/\//,Ib={},Jb={},Kb="*/".concat("*"),Lb=d.createElement("a");Lb.href=tb.href;function Mb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(L)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nb(a,b,c,d){var e={},f=a===Jb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Ob(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Pb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Qb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:tb.href,type:"GET",isLocal:Fb.test(tb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Ob(Ob(a,r.ajaxSettings),b):Ob(r.ajaxSettings,a)},ajaxPrefilter:Mb(Ib),ajaxTransport:Mb(Jb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Eb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||tb.href)+"").replace(Hb,tb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(L)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Lb.protocol+"//"+Lb.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Nb(Ib,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Gb.test(o.type),f=o.url.replace(Cb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(Bb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(vb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Db,"$1"),n=(vb.test(f)?"&":"?")+"_="+ub++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Kb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Nb(Jb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Pb(o,y,d)),v=Qb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Rb={0:200,1223:204},Sb=r.ajaxSettings.xhr();o.cors=!!Sb&&"withCredentials"in Sb,o.ajax=Sb=!!Sb,r.ajaxTransport(function(b){var c,d;if(o.cors||Sb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Rb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Tb=[],Ub=/(=)\?(?=&|$)|\?\?/;r.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Tb.pop()||r.expando+"_"+ub++;return this[a]=!0,a}}),r.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Ub.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ub.test(b.data)&&"data");if(h||"jsonp"===b.dataTypes[0])return e=b.jsonpCallback=r.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Ub,"$1"+e):b.jsonp!==!1&&(b.url+=(vb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||r.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?r(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Tb.push(e)),g&&r.isFunction(f)&&f(g[0]),g=f=void 0}),"script"}),o.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),r.parseHTML=function(a,b,c){if("string"!=typeof a)return[];"boolean"==typeof b&&(c=b,b=!1);var e,f,g;return b||(o.createHTMLDocument?(b=d.implementation.createHTMLDocument(""),e=b.createElement("base"),e.href=d.location.href,b.head.appendChild(e)):b=d),f=C.exec(a),g=!c&&[],f?[b.createElement(f[1])]:(f=qa([a],b,g),g&&g.length&&r(g).remove(),r.merge([],f.childNodes))},r.fn.load=function(a,b,c){var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=pb(a.slice(h)),a=a.slice(0,h)),r.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&r.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?r("<div>").append(r.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},r.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){r.fn[b]=function(a){return this.on(b,a)}}),r.expr.pseudos.animated=function(a){return r.grep(r.timers,function(b){return a===b.elem}).length},r.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=r.css(a,"position"),l=r(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=r.css(a,"top"),i=r.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),r.isFunction(b)&&(b=b.call(a,c,r.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},r.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){r.offset.setOffset(this,a,b)});var b,c,d,e,f=this[0];if(f)return f.getClientRects().length?(d=f.getBoundingClientRect(),b=f.ownerDocument,c=b.documentElement,e=b.defaultView,{top:d.top+e.pageYOffset-c.clientTop,left:d.left+e.pageXOffset-c.clientLeft}):{top:0,left:0}},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===r.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),B(a[0],"html")||(d=a.offset()),d={top:d.top+r.css(a[0],"borderTopWidth",!0),left:d.left+r.css(a[0],"borderLeftWidth",!0)}),{top:b.top-d.top-r.css(c,"marginTop",!0),left:b.left-d.left-r.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===r.css(a,"position"))a=a.offsetParent;return a||ra})}}),r.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;r.fn[a]=function(d){return T(this,function(a,d,e){var f;return r.isWindow(a)?f=a:9===a.nodeType&&(f=a.defaultView),void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),r.each(["top","left"],function(a,b){r.cssHooks[b]=Pa(o.pixelPosition,function(a,c){if(c)return c=Oa(a,b),Ma.test(c)?r(a).position()[b]+"px":c})}),r.each({Height:"height",Width:"width"},function(a,b){r.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){r.fn[d]=function(e,f){var g=arguments.length&&(c||"boolean"!=typeof e),h=c||(e===!0||f===!0?"margin":"border");return T(this,function(b,c,e){var f;return r.isWindow(b)?0===d.indexOf("outer")?b["inner"+a]:b.document.documentElement["client"+a]:9===b.nodeType?(f=b.documentElement,Math.max(b.body["scroll"+a],f["scroll"+a],b.body["offset"+a],f["offset"+a],f["client"+a])):void 0===e?r.css(b,c,h):r.style(b,c,e,h)},b,g?e:void 0,g)}})}),r.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),r.holdReady=function(a){a?r.readyWait++:r.ready(!0)},r.isArray=Array.isArray,r.parseJSON=JSON.parse,r.nodeName=B,"function"==typeof define&&define.amd&&define("jquery",[],function(){return r});var Vb=a.jQuery,Wb=a.$;return r.noConflict=function(b){return a.$===r&&(a.$=Wb),b&&a.jQuery===r&&(a.jQuery=Vb),r},b||(a.jQuery=a.$=r),r});
11+
12+ </script>
13+ <script language="javascript" type="text/javascript">
14+ /* Javascript plotting library for jQuery, version 0.8.3.
15+
16+Copyright (c) 2007-2014 IOLA and Ole Laursen.
17+Licensed under the MIT license.
18+
19+*/
20+(function($){$.color={};$.color.make=function(r,g,b,a){var o={};o.r=r||0;o.g=g||0;o.b=b||0;o.a=a!=null?a:1;o.add=function(c,d){for(var i=0;i<c.length;++i)o[c.charAt(i)]+=d;return o.normalize()};o.scale=function(c,f){for(var i=0;i<c.length;++i)o[c.charAt(i)]*=f;return o.normalize()};o.toString=function(){if(o.a>=1){return"rgb("+[o.r,o.g,o.b].join(",")+")"}else{return"rgba("+[o.r,o.g,o.b,o.a].join(",")+")"}};o.normalize=function(){function clamp(min,value,max){return value<min?min:value>max?max:value}o.r=clamp(0,parseInt(o.r),255);o.g=clamp(0,parseInt(o.g),255);o.b=clamp(0,parseInt(o.b),255);o.a=clamp(0,o.a,1);return o};o.clone=function(){return $.color.make(o.r,o.b,o.g,o.a)};return o.normalize()};$.color.extract=function(elem,css){var c;do{c=elem.css(css).toLowerCase();if(c!=""&&c!="transparent")break;elem=elem.parent()}while(elem.length&&!$.nodeName(elem.get(0),"body"));if(c=="rgba(0, 0, 0, 0)")c="transparent";return $.color.parse(c)};$.color.parse=function(str){var res,m=$.color.make;if(res=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10));if(res=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10),parseFloat(res[4]));if(res=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55);if(res=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55,parseFloat(res[4]));if(res=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))return m(parseInt(res[1],16),parseInt(res[2],16),parseInt(res[3],16));if(res=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str))return m(parseInt(res[1]+res[1],16),parseInt(res[2]+res[2],16),parseInt(res[3]+res[3],16));var name=$.trim(str).toLowerCase();if(name=="transparent")return m(255,255,255,0);else{res=lookupColors[name]||[0,0,0];return m(res[0],res[1],res[2])}};var lookupColors={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);(function($){var hasOwnProperty=Object.prototype.hasOwnProperty;if(!$.fn.detach){$.fn.detach=function(){return this.each(function(){if(this.parentNode){this.parentNode.removeChild(this)}})}}function Canvas(cls,container){var element=container.children("."+cls)[0];if(element==null){element=document.createElement("canvas");element.className=cls;$(element).css({direction:"ltr",position:"absolute",left:0,top:0}).appendTo(container);if(!element.getContext){if(window.G_vmlCanvasManager){element=window.G_vmlCanvasManager.initElement(element)}else{throw new Error("Canvas is not available. If you're using IE with a fall-back such as Excanvas, then there's either a mistake in your conditional include, or the page has no DOCTYPE and is rendering in Quirks Mode.")}}}this.element=element;var context=this.context=element.getContext("2d");var devicePixelRatio=window.devicePixelRatio||1,backingStoreRatio=context.webkitBackingStorePixelRatio||context.mozBackingStorePixelRatio||context.msBackingStorePixelRatio||context.oBackingStorePixelRatio||context.backingStorePixelRatio||1;this.pixelRatio=devicePixelRatio/backingStoreRatio;this.resize(container.width(),container.height());this.textContainer=null;this.text={};this._textCache={}}Canvas.prototype.resize=function(width,height){if(width<=0||height<=0){throw new Error("Invalid dimensions for plot, width = "+width+", height = "+height)}var element=this.element,context=this.context,pixelRatio=this.pixelRatio;if(this.width!=width){element.width=width*pixelRatio;element.style.width=width+"px";this.width=width}if(this.height!=height){element.height=height*pixelRatio;element.style.height=height+"px";this.height=height}context.restore();context.save();context.scale(pixelRatio,pixelRatio)};Canvas.prototype.clear=function(){this.context.clearRect(0,0,this.width,this.height)};Canvas.prototype.render=function(){var cache=this._textCache;for(var layerKey in cache){if(hasOwnProperty.call(cache,layerKey)){var layer=this.getTextLayer(layerKey),layerCache=cache[layerKey];layer.hide();for(var styleKey in layerCache){if(hasOwnProperty.call(layerCache,styleKey)){var styleCache=layerCache[styleKey];for(var key in styleCache){if(hasOwnProperty.call(styleCache,key)){var positions=styleCache[key].positions;for(var i=0,position;position=positions[i];i++){if(position.active){if(!position.rendered){layer.append(position.element);position.rendered=true}}else{positions.splice(i--,1);if(position.rendered){position.element.detach()}}}if(positions.length==0){delete styleCache[key]}}}}}layer.show()}}};Canvas.prototype.getTextLayer=function(classes){var layer=this.text[classes];if(layer==null){if(this.textContainer==null){this.textContainer=$("<div class='flot-text'></div>").css({position:"absolute",top:0,left:0,bottom:0,right:0,"font-size":"smaller",color:"#545454"}).insertAfter(this.element)}layer=this.text[classes]=$("<div></div>").addClass(classes).css({position:"absolute",top:0,left:0,bottom:0,right:0}).appendTo(this.textContainer)}return layer};Canvas.prototype.getTextInfo=function(layer,text,font,angle,width){var textStyle,layerCache,styleCache,info;text=""+text;if(typeof font==="object"){textStyle=font.style+" "+font.variant+" "+font.weight+" "+font.size+"px/"+font.lineHeight+"px "+font.family}else{textStyle=font}layerCache=this._textCache[layer];if(layerCache==null){layerCache=this._textCache[layer]={}}styleCache=layerCache[textStyle];if(styleCache==null){styleCache=layerCache[textStyle]={}}info=styleCache[text];if(info==null){var element=$("<div></div>").html(text).css({position:"absolute","max-width":width,top:-9999}).appendTo(this.getTextLayer(layer));if(typeof font==="object"){element.css({font:textStyle,color:font.color})}else if(typeof font==="string"){element.addClass(font)}info=styleCache[text]={width:element.outerWidth(true),height:element.outerHeight(true),element:element,positions:[]};element.detach()}return info};Canvas.prototype.addText=function(layer,x,y,text,font,angle,width,halign,valign){var info=this.getTextInfo(layer,text,font,angle,width),positions=info.positions;if(halign=="center"){x-=info.width/2}else if(halign=="right"){x-=info.width}if(valign=="middle"){y-=info.height/2}else if(valign=="bottom"){y-=info.height}for(var i=0,position;position=positions[i];i++){if(position.x==x&&position.y==y){position.active=true;return}}position={active:true,rendered:false,element:positions.length?info.element.clone():info.element,x:x,y:y};positions.push(position);position.element.css({top:Math.round(y),left:Math.round(x),"text-align":halign})};Canvas.prototype.removeText=function(layer,x,y,text,font,angle){if(text==null){var layerCache=this._textCache[layer];if(layerCache!=null){for(var styleKey in layerCache){if(hasOwnProperty.call(layerCache,styleKey)){var styleCache=layerCache[styleKey];for(var key in styleCache){if(hasOwnProperty.call(styleCache,key)){var positions=styleCache[key].positions;for(var i=0,position;position=positions[i];i++){position.active=false}}}}}}}else{var positions=this.getTextInfo(layer,text,font,angle).positions;for(var i=0,position;position=positions[i];i++){if(position.x==x&&position.y==y){position.active=false}}}};function Plot(placeholder,data_,options_,plugins){var series=[],options={colors:["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"],legend:{show:true,noColumns:1,labelFormatter:null,labelBoxBorderColor:"#ccc",container:null,position:"ne",margin:5,backgroundColor:null,backgroundOpacity:.85,sorted:null},xaxis:{show:null,position:"bottom",mode:null,font:null,color:null,tickColor:null,transform:null,inverseTransform:null,min:null,max:null,autoscaleMargin:null,ticks:null,tickFormatter:null,labelWidth:null,labelHeight:null,reserveSpace:null,tickLength:null,alignTicksWithAxis:null,tickDecimals:null,tickSize:null,minTickSize:null},yaxis:{autoscaleMargin:.02,position:"left"},xaxes:[],yaxes:[],series:{points:{show:false,radius:3,lineWidth:2,fill:true,fillColor:"#ffffff",symbol:"circle"},lines:{lineWidth:2,fill:false,fillColor:null,steps:false},bars:{show:false,lineWidth:2,barWidth:1,fill:true,fillColor:null,align:"left",horizontal:false,zero:true},shadowSize:3,highlightColor:null},grid:{show:true,aboveData:false,color:"#545454",backgroundColor:null,borderColor:null,tickColor:null,margin:0,labelMargin:5,axisMargin:8,borderWidth:2,minBorderMargin:null,markings:null,markingsColor:"#f4f4f4",markingsLineWidth:2,clickable:false,hoverable:false,autoHighlight:true,mouseActiveRadius:10},interaction:{redrawOverlayInterval:1e3/60},hooks:{}},surface=null,overlay=null,eventHolder=null,ctx=null,octx=null,xaxes=[],yaxes=[],plotOffset={left:0,right:0,top:0,bottom:0},plotWidth=0,plotHeight=0,hooks={processOptions:[],processRawData:[],processDatapoints:[],processOffset:[],drawBackground:[],drawSeries:[],draw:[],bindEvents:[],drawOverlay:[],shutdown:[]},plot=this;plot.setData=setData;plot.setupGrid=setupGrid;plot.draw=draw;plot.getPlaceholder=function(){return placeholder};plot.getCanvas=function(){return surface.element};plot.getPlotOffset=function(){return plotOffset};plot.width=function(){return plotWidth};plot.height=function(){return plotHeight};plot.offset=function(){var o=eventHolder.offset();o.left+=plotOffset.left;o.top+=plotOffset.top;return o};plot.getData=function(){return series};plot.getAxes=function(){var res={},i;$.each(xaxes.concat(yaxes),function(_,axis){if(axis)res[axis.direction+(axis.n!=1?axis.n:"")+"axis"]=axis});return res};plot.getXAxes=function(){return xaxes};plot.getYAxes=function(){return yaxes};plot.c2p=canvasToAxisCoords;plot.p2c=axisToCanvasCoords;plot.getOptions=function(){return options};plot.highlight=highlight;plot.unhighlight=unhighlight;plot.triggerRedrawOverlay=triggerRedrawOverlay;plot.pointOffset=function(point){return{left:parseInt(xaxes[axisNumber(point,"x")-1].p2c(+point.x)+plotOffset.left,10),top:parseInt(yaxes[axisNumber(point,"y")-1].p2c(+point.y)+plotOffset.top,10)}};plot.shutdown=shutdown;plot.destroy=function(){shutdown();placeholder.removeData("plot").empty();series=[];options=null;surface=null;overlay=null;eventHolder=null;ctx=null;octx=null;xaxes=[];yaxes=[];hooks=null;highlights=[];plot=null};plot.resize=function(){var width=placeholder.width(),height=placeholder.height();surface.resize(width,height);overlay.resize(width,height)};plot.hooks=hooks;initPlugins(plot);parseOptions(options_);setupCanvases();setData(data_);setupGrid();draw();bindEvents();function executeHooks(hook,args){args=[plot].concat(args);for(var i=0;i<hook.length;++i)hook[i].apply(this,args)}function initPlugins(){var classes={Canvas:Canvas};for(var i=0;i<plugins.length;++i){var p=plugins[i];p.init(plot,classes);if(p.options)$.extend(true,options,p.options)}}function parseOptions(opts){$.extend(true,options,opts);if(opts&&opts.colors){options.colors=opts.colors}if(options.xaxis.color==null)options.xaxis.color=$.color.parse(options.grid.color).scale("a",.22).toString();if(options.yaxis.color==null)options.yaxis.color=$.color.parse(options.grid.color).scale("a",.22).toString();if(options.xaxis.tickColor==null)options.xaxis.tickColor=options.grid.tickColor||options.xaxis.color;if(options.yaxis.tickColor==null)options.yaxis.tickColor=options.grid.tickColor||options.yaxis.color;if(options.grid.borderColor==null)options.grid.borderColor=options.grid.color;if(options.grid.tickColor==null)options.grid.tickColor=$.color.parse(options.grid.color).scale("a",.22).toString();var i,axisOptions,axisCount,fontSize=placeholder.css("font-size"),fontSizeDefault=fontSize?+fontSize.replace("px",""):13,fontDefaults={style:placeholder.css("font-style"),size:Math.round(.8*fontSizeDefault),variant:placeholder.css("font-variant"),weight:placeholder.css("font-weight"),family:placeholder.css("font-family")};axisCount=options.xaxes.length||1;for(i=0;i<axisCount;++i){axisOptions=options.xaxes[i];if(axisOptions&&!axisOptions.tickColor){axisOptions.tickColor=axisOptions.color}axisOptions=$.extend(true,{},options.xaxis,axisOptions);options.xaxes[i]=axisOptions;if(axisOptions.font){axisOptions.font=$.extend({},fontDefaults,axisOptions.font);if(!axisOptions.font.color){axisOptions.font.color=axisOptions.color}if(!axisOptions.font.lineHeight){axisOptions.font.lineHeight=Math.round(axisOptions.font.size*1.15)}}}axisCount=options.yaxes.length||1;for(i=0;i<axisCount;++i){axisOptions=options.yaxes[i];if(axisOptions&&!axisOptions.tickColor){axisOptions.tickColor=axisOptions.color}axisOptions=$.extend(true,{},options.yaxis,axisOptions);options.yaxes[i]=axisOptions;if(axisOptions.font){axisOptions.font=$.extend({},fontDefaults,axisOptions.font);if(!axisOptions.font.color){axisOptions.font.color=axisOptions.color}if(!axisOptions.font.lineHeight){axisOptions.font.lineHeight=Math.round(axisOptions.font.size*1.15)}}}if(options.xaxis.noTicks&&options.xaxis.ticks==null)options.xaxis.ticks=options.xaxis.noTicks;if(options.yaxis.noTicks&&options.yaxis.ticks==null)options.yaxis.ticks=options.yaxis.noTicks;if(options.x2axis){options.xaxes[1]=$.extend(true,{},options.xaxis,options.x2axis);options.xaxes[1].position="top";if(options.x2axis.min==null){options.xaxes[1].min=null}if(options.x2axis.max==null){options.xaxes[1].max=null}}if(options.y2axis){options.yaxes[1]=$.extend(true,{},options.yaxis,options.y2axis);options.yaxes[1].position="right";if(options.y2axis.min==null){options.yaxes[1].min=null}if(options.y2axis.max==null){options.yaxes[1].max=null}}if(options.grid.coloredAreas)options.grid.markings=options.grid.coloredAreas;if(options.grid.coloredAreasColor)options.grid.markingsColor=options.grid.coloredAreasColor;if(options.lines)$.extend(true,options.series.lines,options.lines);if(options.points)$.extend(true,options.series.points,options.points);if(options.bars)$.extend(true,options.series.bars,options.bars);if(options.shadowSize!=null)options.series.shadowSize=options.shadowSize;if(options.highlightColor!=null)options.series.highlightColor=options.highlightColor;for(i=0;i<options.xaxes.length;++i)getOrCreateAxis(xaxes,i+1).options=options.xaxes[i];for(i=0;i<options.yaxes.length;++i)getOrCreateAxis(yaxes,i+1).options=options.yaxes[i];for(var n in hooks)if(options.hooks[n]&&options.hooks[n].length)hooks[n]=hooks[n].concat(options.hooks[n]);executeHooks(hooks.processOptions,[options])}function setData(d){series=parseData(d);fillInSeriesOptions();processData()}function parseData(d){var res=[];for(var i=0;i<d.length;++i){var s=$.extend(true,{},options.series);if(d[i].data!=null){s.data=d[i].data;delete d[i].data;$.extend(true,s,d[i]);d[i].data=s.data}else s.data=d[i];res.push(s)}return res}function axisNumber(obj,coord){var a=obj[coord+"axis"];if(typeof a=="object")a=a.n;if(typeof a!="number")a=1;return a}function allAxes(){return $.grep(xaxes.concat(yaxes),function(a){return a})}function canvasToAxisCoords(pos){var res={},i,axis;for(i=0;i<xaxes.length;++i){axis=xaxes[i];if(axis&&axis.used)res["x"+axis.n]=axis.c2p(pos.left)}for(i=0;i<yaxes.length;++i){axis=yaxes[i];if(axis&&axis.used)res["y"+axis.n]=axis.c2p(pos.top)}if(res.x1!==undefined)res.x=res.x1;if(res.y1!==undefined)res.y=res.y1;return res}function axisToCanvasCoords(pos){var res={},i,axis,key;for(i=0;i<xaxes.length;++i){axis=xaxes[i];if(axis&&axis.used){key="x"+axis.n;if(pos[key]==null&&axis.n==1)key="x";if(pos[key]!=null){res.left=axis.p2c(pos[key]);break}}}for(i=0;i<yaxes.length;++i){axis=yaxes[i];if(axis&&axis.used){key="y"+axis.n;if(pos[key]==null&&axis.n==1)key="y";if(pos[key]!=null){res.top=axis.p2c(pos[key]);break}}}return res}function getOrCreateAxis(axes,number){if(!axes[number-1])axes[number-1]={n:number,direction:axes==xaxes?"x":"y",options:$.extend(true,{},axes==xaxes?options.xaxis:options.yaxis)};return axes[number-1]}function fillInSeriesOptions(){var neededColors=series.length,maxIndex=-1,i;for(i=0;i<series.length;++i){var sc=series[i].color;if(sc!=null){neededColors--;if(typeof sc=="number"&&sc>maxIndex){maxIndex=sc}}}if(neededColors<=maxIndex){neededColors=maxIndex+1}var c,colors=[],colorPool=options.colors,colorPoolSize=colorPool.length,variation=0;for(i=0;i<neededColors;i++){c=$.color.parse(colorPool[i%colorPoolSize]||"#666");if(i%colorPoolSize==0&&i){if(variation>=0){if(variation<.5){variation=-variation-.2}else variation=0}else variation=-variation}colors[i]=c.scale("rgb",1+variation)}var colori=0,s;for(i=0;i<series.length;++i){s=series[i];if(s.color==null){s.color=colors[colori].toString();++colori}else if(typeof s.color=="number")s.color=colors[s.color].toString();if(s.lines.show==null){var v,show=true;for(v in s)if(s[v]&&s[v].show){show=false;break}if(show)s.lines.show=true}if(s.lines.zero==null){s.lines.zero=!!s.lines.fill}s.xaxis=getOrCreateAxis(xaxes,axisNumber(s,"x"));s.yaxis=getOrCreateAxis(yaxes,axisNumber(s,"y"))}}function processData(){var topSentry=Number.POSITIVE_INFINITY,bottomSentry=Number.NEGATIVE_INFINITY,fakeInfinity=Number.MAX_VALUE,i,j,k,m,length,s,points,ps,x,y,axis,val,f,p,data,format;function updateAxis(axis,min,max){if(min<axis.datamin&&min!=-fakeInfinity)axis.datamin=min;if(max>axis.datamax&&max!=fakeInfinity)axis.datamax=max}$.each(allAxes(),function(_,axis){axis.datamin=topSentry;axis.datamax=bottomSentry;axis.used=false});for(i=0;i<series.length;++i){s=series[i];s.datapoints={points:[]};executeHooks(hooks.processRawData,[s,s.data,s.datapoints])}for(i=0;i<series.length;++i){s=series[i];data=s.data;format=s.datapoints.format;if(!format){format=[];format.push({x:true,number:true,required:true});format.push({y:true,number:true,required:true});if(s.bars.show||s.lines.show&&s.lines.fill){var autoscale=!!(s.bars.show&&s.bars.zero||s.lines.show&&s.lines.zero);format.push({y:true,number:true,required:false,defaultValue:0,autoscale:autoscale});if(s.bars.horizontal){delete format[format.length-1].y;format[format.length-1].x=true}}s.datapoints.format=format}if(s.datapoints.pointsize!=null)continue;s.datapoints.pointsize=format.length;ps=s.datapoints.pointsize;points=s.datapoints.points;var insertSteps=s.lines.show&&s.lines.steps;s.xaxis.used=s.yaxis.used=true;for(j=k=0;j<data.length;++j,k+=ps){p=data[j];var nullify=p==null;if(!nullify){for(m=0;m<ps;++m){val=p[m];f=format[m];if(f){if(f.number&&val!=null){val=+val;if(isNaN(val))val=null;else if(val==Infinity)val=fakeInfinity;else if(val==-Infinity)val=-fakeInfinity}if(val==null){if(f.required)nullify=true;if(f.defaultValue!=null)val=f.defaultValue}}points[k+m]=val}}if(nullify){for(m=0;m<ps;++m){val=points[k+m];if(val!=null){f=format[m];if(f.autoscale!==false){if(f.x){updateAxis(s.xaxis,val,val)}if(f.y){updateAxis(s.yaxis,val,val)}}}points[k+m]=null}}else{if(insertSteps&&k>0&&points[k-ps]!=null&&points[k-ps]!=points[k]&&points[k-ps+1]!=points[k+1]){for(m=0;m<ps;++m)points[k+ps+m]=points[k+m];points[k+1]=points[k-ps+1];k+=ps}}}}for(i=0;i<series.length;++i){s=series[i];executeHooks(hooks.processDatapoints,[s,s.datapoints])}for(i=0;i<series.length;++i){s=series[i];points=s.datapoints.points;ps=s.datapoints.pointsize;format=s.datapoints.format;var xmin=topSentry,ymin=topSentry,xmax=bottomSentry,ymax=bottomSentry;for(j=0;j<points.length;j+=ps){if(points[j]==null)continue;for(m=0;m<ps;++m){val=points[j+m];f=format[m];if(!f||f.autoscale===false||val==fakeInfinity||val==-fakeInfinity)continue;if(f.x){if(val<xmin)xmin=val;if(val>xmax)xmax=val}if(f.y){if(val<ymin)ymin=val;if(val>ymax)ymax=val}}}if(s.bars.show){var delta;switch(s.bars.align){case"left":delta=0;break;case"right":delta=-s.bars.barWidth;break;default:delta=-s.bars.barWidth/2}if(s.bars.horizontal){ymin+=delta;ymax+=delta+s.bars.barWidth}else{xmin+=delta;xmax+=delta+s.bars.barWidth}}updateAxis(s.xaxis,xmin,xmax);updateAxis(s.yaxis,ymin,ymax)}$.each(allAxes(),function(_,axis){if(axis.datamin==topSentry)axis.datamin=null;if(axis.datamax==bottomSentry)axis.datamax=null})}function setupCanvases(){placeholder.css("padding",0).children().filter(function(){return!$(this).hasClass("flot-overlay")&&!$(this).hasClass("flot-base")}).remove();if(placeholder.css("position")=="static")placeholder.css("position","relative");surface=new Canvas("flot-base",placeholder);overlay=new Canvas("flot-overlay",placeholder);ctx=surface.context;octx=overlay.context;eventHolder=$(overlay.element).unbind();var existing=placeholder.data("plot");if(existing){existing.shutdown();overlay.clear()}placeholder.data("plot",plot)}function bindEvents(){if(options.grid.hoverable){eventHolder.mousemove(onMouseMove);eventHolder.bind("mouseleave",onMouseLeave)}if(options.grid.clickable)eventHolder.click(onClick);executeHooks(hooks.bindEvents,[eventHolder])}function shutdown(){if(redrawTimeout)clearTimeout(redrawTimeout);eventHolder.unbind("mousemove",onMouseMove);eventHolder.unbind("mouseleave",onMouseLeave);eventHolder.unbind("click",onClick);executeHooks(hooks.shutdown,[eventHolder])}function setTransformationHelpers(axis){function identity(x){return x}var s,m,t=axis.options.transform||identity,it=axis.options.inverseTransform;if(axis.direction=="x"){s=axis.scale=plotWidth/Math.abs(t(axis.max)-t(axis.min));m=Math.min(t(axis.max),t(axis.min))}else{s=axis.scale=plotHeight/Math.abs(t(axis.max)-t(axis.min));s=-s;m=Math.max(t(axis.max),t(axis.min))}if(t==identity)axis.p2c=function(p){return(p-m)*s};else axis.p2c=function(p){return(t(p)-m)*s};if(!it)axis.c2p=function(c){return m+c/s};else axis.c2p=function(c){return it(m+c/s)}}function measureTickLabels(axis){var opts=axis.options,ticks=axis.ticks||[],labelWidth=opts.labelWidth||0,labelHeight=opts.labelHeight||0,maxWidth=labelWidth||(axis.direction=="x"?Math.floor(surface.width/(ticks.length||1)):null),legacyStyles=axis.direction+"Axis "+axis.direction+axis.n+"Axis",layer="flot-"+axis.direction+"-axis flot-"+axis.direction+axis.n+"-axis "+legacyStyles,font=opts.font||"flot-tick-label tickLabel";for(var i=0;i<ticks.length;++i){var t=ticks[i];if(!t.label)continue;var info=surface.getTextInfo(layer,t.label,font,null,maxWidth);labelWidth=Math.max(labelWidth,info.width);labelHeight=Math.max(labelHeight,info.height)}axis.labelWidth=opts.labelWidth||labelWidth;axis.labelHeight=opts.labelHeight||labelHeight}function allocateAxisBoxFirstPhase(axis){var lw=axis.labelWidth,lh=axis.labelHeight,pos=axis.options.position,isXAxis=axis.direction==="x",tickLength=axis.options.tickLength,axisMargin=options.grid.axisMargin,padding=options.grid.labelMargin,innermost=true,outermost=true,first=true,found=false;$.each(isXAxis?xaxes:yaxes,function(i,a){if(a&&(a.show||a.reserveSpace)){if(a===axis){found=true}else if(a.options.position===pos){if(found){outermost=false}else{innermost=false}}if(!found){first=false}}});if(outermost){axisMargin=0}if(tickLength==null){tickLength=first?"full":5}if(!isNaN(+tickLength))padding+=+tickLength;if(isXAxis){lh+=padding;if(pos=="bottom"){plotOffset.bottom+=lh+axisMargin;axis.box={top:surface.height-plotOffset.bottom,height:lh}}else{axis.box={top:plotOffset.top+axisMargin,height:lh};plotOffset.top+=lh+axisMargin}}else{lw+=padding;if(pos=="left"){axis.box={left:plotOffset.left+axisMargin,width:lw};plotOffset.left+=lw+axisMargin}else{plotOffset.right+=lw+axisMargin;axis.box={left:surface.width-plotOffset.right,width:lw}}}axis.position=pos;axis.tickLength=tickLength;axis.box.padding=padding;axis.innermost=innermost}function allocateAxisBoxSecondPhase(axis){if(axis.direction=="x"){axis.box.left=plotOffset.left-axis.labelWidth/2;axis.box.width=surface.width-plotOffset.left-plotOffset.right+axis.labelWidth}else{axis.box.top=plotOffset.top-axis.labelHeight/2;axis.box.height=surface.height-plotOffset.bottom-plotOffset.top+axis.labelHeight}}function adjustLayoutForThingsStickingOut(){var minMargin=options.grid.minBorderMargin,axis,i;if(minMargin==null){minMargin=0;for(i=0;i<series.length;++i)minMargin=Math.max(minMargin,2*(series[i].points.radius+series[i].points.lineWidth/2))}var margins={left:minMargin,right:minMargin,top:minMargin,bottom:minMargin};$.each(allAxes(),function(_,axis){if(axis.reserveSpace&&axis.ticks&&axis.ticks.length){if(axis.direction==="x"){margins.left=Math.max(margins.left,axis.labelWidth/2);margins.right=Math.max(margins.right,axis.labelWidth/2)}else{margins.bottom=Math.max(margins.bottom,axis.labelHeight/2);margins.top=Math.max(margins.top,axis.labelHeight/2)}}});plotOffset.left=Math.ceil(Math.max(margins.left,plotOffset.left));plotOffset.right=Math.ceil(Math.max(margins.right,plotOffset.right));plotOffset.top=Math.ceil(Math.max(margins.top,plotOffset.top));plotOffset.bottom=Math.ceil(Math.max(margins.bottom,plotOffset.bottom))}function setupGrid(){var i,axes=allAxes(),showGrid=options.grid.show;for(var a in plotOffset){var margin=options.grid.margin||0;plotOffset[a]=typeof margin=="number"?margin:margin[a]||0}executeHooks(hooks.processOffset,[plotOffset]);for(var a in plotOffset){if(typeof options.grid.borderWidth=="object"){plotOffset[a]+=showGrid?options.grid.borderWidth[a]:0}else{plotOffset[a]+=showGrid?options.grid.borderWidth:0}}$.each(axes,function(_,axis){var axisOpts=axis.options;axis.show=axisOpts.show==null?axis.used:axisOpts.show;axis.reserveSpace=axisOpts.reserveSpace==null?axis.show:axisOpts.reserveSpace;setRange(axis)});if(showGrid){var allocatedAxes=$.grep(axes,function(axis){return axis.show||axis.reserveSpace});$.each(allocatedAxes,function(_,axis){setupTickGeneration(axis);setTicks(axis);snapRangeToTicks(axis,axis.ticks);measureTickLabels(axis)});for(i=allocatedAxes.length-1;i>=0;--i)allocateAxisBoxFirstPhase(allocatedAxes[i]);adjustLayoutForThingsStickingOut();$.each(allocatedAxes,function(_,axis){allocateAxisBoxSecondPhase(axis)})}plotWidth=surface.width-plotOffset.left-plotOffset.right;plotHeight=surface.height-plotOffset.bottom-plotOffset.top;$.each(axes,function(_,axis){setTransformationHelpers(axis)});if(showGrid){drawAxisLabels()}insertLegend()}function setRange(axis){var opts=axis.options,min=+(opts.min!=null?opts.min:axis.datamin),max=+(opts.max!=null?opts.max:axis.datamax),delta=max-min;if(delta==0){var widen=max==0?1:.01;if(opts.min==null)min-=widen;if(opts.max==null||opts.min!=null)max+=widen}else{var margin=opts.autoscaleMargin;if(margin!=null){if(opts.min==null){min-=delta*margin;if(min<0&&axis.datamin!=null&&axis.datamin>=0)min=0}if(opts.max==null){max+=delta*margin;if(max>0&&axis.datamax!=null&&axis.datamax<=0)max=0}}}axis.min=min;axis.max=max}function setupTickGeneration(axis){var opts=axis.options;var noTicks;if(typeof opts.ticks=="number"&&opts.ticks>0)noTicks=opts.ticks;else noTicks=.3*Math.sqrt(axis.direction=="x"?surface.width:surface.height);var delta=(axis.max-axis.min)/noTicks,dec=-Math.floor(Math.log(delta)/Math.LN10),maxDec=opts.tickDecimals;if(maxDec!=null&&dec>maxDec){dec=maxDec}var magn=Math.pow(10,-dec),norm=delta/magn,size;if(norm<1.5){size=1}else if(norm<3){size=2;if(norm>2.25&&(maxDec==null||dec+1<=maxDec)){size=2.5;++dec}}else if(norm<7.5){size=5}else{size=10}size*=magn;if(opts.minTickSize!=null&&size<opts.minTickSize){size=opts.minTickSize}axis.delta=delta;axis.tickDecimals=Math.max(0,maxDec!=null?maxDec:dec);axis.tickSize=opts.tickSize||size;if(opts.mode=="time"&&!axis.tickGenerator){throw new Error("Time mode requires the flot.time plugin.")}if(!axis.tickGenerator){axis.tickGenerator=function(axis){var ticks=[],start=floorInBase(axis.min,axis.tickSize),i=0,v=Number.NaN,prev;do{prev=v;v=start+i*axis.tickSize;ticks.push(v);++i}while(v<axis.max&&v!=prev);return ticks};axis.tickFormatter=function(value,axis){var factor=axis.tickDecimals?Math.pow(10,axis.tickDecimals):1;var formatted=""+Math.round(value*factor)/factor;if(axis.tickDecimals!=null){var decimal=formatted.indexOf(".");var precision=decimal==-1?0:formatted.length-decimal-1;if(precision<axis.tickDecimals){return(precision?formatted:formatted+".")+(""+factor).substr(1,axis.tickDecimals-precision)}}return formatted}}if($.isFunction(opts.tickFormatter))axis.tickFormatter=function(v,axis){return""+opts.tickFormatter(v,axis)};if(opts.alignTicksWithAxis!=null){var otherAxis=(axis.direction=="x"?xaxes:yaxes)[opts.alignTicksWithAxis-1];if(otherAxis&&otherAxis.used&&otherAxis!=axis){var niceTicks=axis.tickGenerator(axis);if(niceTicks.length>0){if(opts.min==null)axis.min=Math.min(axis.min,niceTicks[0]);if(opts.max==null&&niceTicks.length>1)axis.max=Math.max(axis.max,niceTicks[niceTicks.length-1])}axis.tickGenerator=function(axis){var ticks=[],v,i;for(i=0;i<otherAxis.ticks.length;++i){v=(otherAxis.ticks[i].v-otherAxis.min)/(otherAxis.max-otherAxis.min);v=axis.min+v*(axis.max-axis.min);ticks.push(v)}return ticks};if(!axis.mode&&opts.tickDecimals==null){var extraDec=Math.max(0,-Math.floor(Math.log(axis.delta)/Math.LN10)+1),ts=axis.tickGenerator(axis);if(!(ts.length>1&&/\..*0$/.test((ts[1]-ts[0]).toFixed(extraDec))))axis.tickDecimals=extraDec}}}}function setTicks(axis){var oticks=axis.options.ticks,ticks=[];if(oticks==null||typeof oticks=="number"&&oticks>0)ticks=axis.tickGenerator(axis);else if(oticks){if($.isFunction(oticks))ticks=oticks(axis);else ticks=oticks}var i,v;axis.ticks=[];for(i=0;i<ticks.length;++i){var label=null;var t=ticks[i];if(typeof t=="object"){v=+t[0];if(t.length>1)label=t[1]}else v=+t;if(label==null)label=axis.tickFormatter(v,axis);if(!isNaN(v))axis.ticks.push({v:v,label:label})}}function snapRangeToTicks(axis,ticks){if(axis.options.autoscaleMargin&&ticks.length>0){if(axis.options.min==null)axis.min=Math.min(axis.min,ticks[0].v);if(axis.options.max==null&&ticks.length>1)axis.max=Math.max(axis.max,ticks[ticks.length-1].v)}}function draw(){surface.clear();executeHooks(hooks.drawBackground,[ctx]);var grid=options.grid;if(grid.show&&grid.backgroundColor)drawBackground();if(grid.show&&!grid.aboveData){drawGrid()}for(var i=0;i<series.length;++i){executeHooks(hooks.drawSeries,[ctx,series[i]]);drawSeries(series[i])}executeHooks(hooks.draw,[ctx]);if(grid.show&&grid.aboveData){drawGrid()}surface.render();triggerRedrawOverlay()}function extractRange(ranges,coord){var axis,from,to,key,axes=allAxes();for(var i=0;i<axes.length;++i){axis=axes[i];if(axis.direction==coord){key=coord+axis.n+"axis";if(!ranges[key]&&axis.n==1)key=coord+"axis";if(ranges[key]){from=ranges[key].from;to=ranges[key].to;break}}}if(!ranges[key]){axis=coord=="x"?xaxes[0]:yaxes[0];from=ranges[coord+"1"];to=ranges[coord+"2"]}if(from!=null&&to!=null&&from>to){var tmp=from;from=to;to=tmp}return{from:from,to:to,axis:axis}}function drawBackground(){ctx.save();ctx.translate(plotOffset.left,plotOffset.top);ctx.fillStyle=getColorOrGradient(options.grid.backgroundColor,plotHeight,0,"rgba(255, 255, 255, 0)");ctx.fillRect(0,0,plotWidth,plotHeight);ctx.restore()}function drawGrid(){var i,axes,bw,bc;ctx.save();ctx.translate(plotOffset.left,plotOffset.top);var markings=options.grid.markings;if(markings){if($.isFunction(markings)){axes=plot.getAxes();axes.xmin=axes.xaxis.min;axes.xmax=axes.xaxis.max;axes.ymin=axes.yaxis.min;axes.ymax=axes.yaxis.max;markings=markings(axes)}for(i=0;i<markings.length;++i){var m=markings[i],xrange=extractRange(m,"x"),yrange=extractRange(m,"y");if(xrange.from==null)xrange.from=xrange.axis.min;if(xrange.to==null)xrange.to=xrange.axis.max;
21+if(yrange.from==null)yrange.from=yrange.axis.min;if(yrange.to==null)yrange.to=yrange.axis.max;if(xrange.to<xrange.axis.min||xrange.from>xrange.axis.max||yrange.to<yrange.axis.min||yrange.from>yrange.axis.max)continue;xrange.from=Math.max(xrange.from,xrange.axis.min);xrange.to=Math.min(xrange.to,xrange.axis.max);yrange.from=Math.max(yrange.from,yrange.axis.min);yrange.to=Math.min(yrange.to,yrange.axis.max);var xequal=xrange.from===xrange.to,yequal=yrange.from===yrange.to;if(xequal&&yequal){continue}xrange.from=Math.floor(xrange.axis.p2c(xrange.from));xrange.to=Math.floor(xrange.axis.p2c(xrange.to));yrange.from=Math.floor(yrange.axis.p2c(yrange.from));yrange.to=Math.floor(yrange.axis.p2c(yrange.to));if(xequal||yequal){var lineWidth=m.lineWidth||options.grid.markingsLineWidth,subPixel=lineWidth%2?.5:0;ctx.beginPath();ctx.strokeStyle=m.color||options.grid.markingsColor;ctx.lineWidth=lineWidth;if(xequal){ctx.moveTo(xrange.to+subPixel,yrange.from);ctx.lineTo(xrange.to+subPixel,yrange.to)}else{ctx.moveTo(xrange.from,yrange.to+subPixel);ctx.lineTo(xrange.to,yrange.to+subPixel)}ctx.stroke()}else{ctx.fillStyle=m.color||options.grid.markingsColor;ctx.fillRect(xrange.from,yrange.to,xrange.to-xrange.from,yrange.from-yrange.to)}}}axes=allAxes();bw=options.grid.borderWidth;for(var j=0;j<axes.length;++j){var axis=axes[j],box=axis.box,t=axis.tickLength,x,y,xoff,yoff;if(!axis.show||axis.ticks.length==0)continue;ctx.lineWidth=1;if(axis.direction=="x"){x=0;if(t=="full")y=axis.position=="top"?0:plotHeight;else y=box.top-plotOffset.top+(axis.position=="top"?box.height:0)}else{y=0;if(t=="full")x=axis.position=="left"?0:plotWidth;else x=box.left-plotOffset.left+(axis.position=="left"?box.width:0)}if(!axis.innermost){ctx.strokeStyle=axis.options.color;ctx.beginPath();xoff=yoff=0;if(axis.direction=="x")xoff=plotWidth+1;else yoff=plotHeight+1;if(ctx.lineWidth==1){if(axis.direction=="x"){y=Math.floor(y)+.5}else{x=Math.floor(x)+.5}}ctx.moveTo(x,y);ctx.lineTo(x+xoff,y+yoff);ctx.stroke()}ctx.strokeStyle=axis.options.tickColor;ctx.beginPath();for(i=0;i<axis.ticks.length;++i){var v=axis.ticks[i].v;xoff=yoff=0;if(isNaN(v)||v<axis.min||v>axis.max||t=="full"&&(typeof bw=="object"&&bw[axis.position]>0||bw>0)&&(v==axis.min||v==axis.max))continue;if(axis.direction=="x"){x=axis.p2c(v);yoff=t=="full"?-plotHeight:t;if(axis.position=="top")yoff=-yoff}else{y=axis.p2c(v);xoff=t=="full"?-plotWidth:t;if(axis.position=="left")xoff=-xoff}if(ctx.lineWidth==1){if(axis.direction=="x")x=Math.floor(x)+.5;else y=Math.floor(y)+.5}ctx.moveTo(x,y);ctx.lineTo(x+xoff,y+yoff)}ctx.stroke()}if(bw){bc=options.grid.borderColor;if(typeof bw=="object"||typeof bc=="object"){if(typeof bw!=="object"){bw={top:bw,right:bw,bottom:bw,left:bw}}if(typeof bc!=="object"){bc={top:bc,right:bc,bottom:bc,left:bc}}if(bw.top>0){ctx.strokeStyle=bc.top;ctx.lineWidth=bw.top;ctx.beginPath();ctx.moveTo(0-bw.left,0-bw.top/2);ctx.lineTo(plotWidth,0-bw.top/2);ctx.stroke()}if(bw.right>0){ctx.strokeStyle=bc.right;ctx.lineWidth=bw.right;ctx.beginPath();ctx.moveTo(plotWidth+bw.right/2,0-bw.top);ctx.lineTo(plotWidth+bw.right/2,plotHeight);ctx.stroke()}if(bw.bottom>0){ctx.strokeStyle=bc.bottom;ctx.lineWidth=bw.bottom;ctx.beginPath();ctx.moveTo(plotWidth+bw.right,plotHeight+bw.bottom/2);ctx.lineTo(0,plotHeight+bw.bottom/2);ctx.stroke()}if(bw.left>0){ctx.strokeStyle=bc.left;ctx.lineWidth=bw.left;ctx.beginPath();ctx.moveTo(0-bw.left/2,plotHeight+bw.bottom);ctx.lineTo(0-bw.left/2,0);ctx.stroke()}}else{ctx.lineWidth=bw;ctx.strokeStyle=options.grid.borderColor;ctx.strokeRect(-bw/2,-bw/2,plotWidth+bw,plotHeight+bw)}}ctx.restore()}function drawAxisLabels(){$.each(allAxes(),function(_,axis){var box=axis.box,legacyStyles=axis.direction+"Axis "+axis.direction+axis.n+"Axis",layer="flot-"+axis.direction+"-axis flot-"+axis.direction+axis.n+"-axis "+legacyStyles,font=axis.options.font||"flot-tick-label tickLabel",tick,x,y,halign,valign;surface.removeText(layer);if(!axis.show||axis.ticks.length==0)return;for(var i=0;i<axis.ticks.length;++i){tick=axis.ticks[i];if(!tick.label||tick.v<axis.min||tick.v>axis.max)continue;if(axis.direction=="x"){halign="center";x=plotOffset.left+axis.p2c(tick.v);if(axis.position=="bottom"){y=box.top+box.padding}else{y=box.top+box.height-box.padding;valign="bottom"}}else{valign="middle";y=plotOffset.top+axis.p2c(tick.v);if(axis.position=="left"){x=box.left+box.width-box.padding;halign="right"}else{x=box.left+box.padding}}surface.addText(layer,x,y,tick.label,font,null,null,halign,valign)}})}function drawSeries(series){if(series.lines.show)drawSeriesLines(series);if(series.bars.show)drawSeriesBars(series);if(series.points.show)drawSeriesPoints(series)}function drawSeriesLines(series){function plotLine(datapoints,xoffset,yoffset,axisx,axisy){var points=datapoints.points,ps=datapoints.pointsize,prevx=null,prevy=null;ctx.beginPath();for(var i=ps;i<points.length;i+=ps){var x1=points[i-ps],y1=points[i-ps+1],x2=points[i],y2=points[i+1];if(x1==null||x2==null)continue;if(y1<=y2&&y1<axisy.min){if(y2<axisy.min)continue;x1=(axisy.min-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.min}else if(y2<=y1&&y2<axisy.min){if(y1<axisy.min)continue;x2=(axisy.min-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.min}if(y1>=y2&&y1>axisy.max){if(y2>axisy.max)continue;x1=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.max}else if(y2>=y1&&y2>axisy.max){if(y1>axisy.max)continue;x2=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.max}if(x1<=x2&&x1<axisx.min){if(x2<axisx.min)continue;y1=(axisx.min-x1)/(x2-x1)*(y2-y1)+y1;x1=axisx.min}else if(x2<=x1&&x2<axisx.min){if(x1<axisx.min)continue;y2=(axisx.min-x1)/(x2-x1)*(y2-y1)+y1;x2=axisx.min}if(x1>=x2&&x1>axisx.max){if(x2>axisx.max)continue;y1=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x1=axisx.max}else if(x2>=x1&&x2>axisx.max){if(x1>axisx.max)continue;y2=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x2=axisx.max}if(x1!=prevx||y1!=prevy)ctx.moveTo(axisx.p2c(x1)+xoffset,axisy.p2c(y1)+yoffset);prevx=x2;prevy=y2;ctx.lineTo(axisx.p2c(x2)+xoffset,axisy.p2c(y2)+yoffset)}ctx.stroke()}function plotLineArea(datapoints,axisx,axisy){var points=datapoints.points,ps=datapoints.pointsize,bottom=Math.min(Math.max(0,axisy.min),axisy.max),i=0,top,areaOpen=false,ypos=1,segmentStart=0,segmentEnd=0;while(true){if(ps>0&&i>points.length+ps)break;i+=ps;var x1=points[i-ps],y1=points[i-ps+ypos],x2=points[i],y2=points[i+ypos];if(areaOpen){if(ps>0&&x1!=null&&x2==null){segmentEnd=i;ps=-ps;ypos=2;continue}if(ps<0&&i==segmentStart+ps){ctx.fill();areaOpen=false;ps=-ps;ypos=1;i=segmentStart=segmentEnd+ps;continue}}if(x1==null||x2==null)continue;if(x1<=x2&&x1<axisx.min){if(x2<axisx.min)continue;y1=(axisx.min-x1)/(x2-x1)*(y2-y1)+y1;x1=axisx.min}else if(x2<=x1&&x2<axisx.min){if(x1<axisx.min)continue;y2=(axisx.min-x1)/(x2-x1)*(y2-y1)+y1;x2=axisx.min}if(x1>=x2&&x1>axisx.max){if(x2>axisx.max)continue;y1=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x1=axisx.max}else if(x2>=x1&&x2>axisx.max){if(x1>axisx.max)continue;y2=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x2=axisx.max}if(!areaOpen){ctx.beginPath();ctx.moveTo(axisx.p2c(x1),axisy.p2c(bottom));areaOpen=true}if(y1>=axisy.max&&y2>=axisy.max){ctx.lineTo(axisx.p2c(x1),axisy.p2c(axisy.max));ctx.lineTo(axisx.p2c(x2),axisy.p2c(axisy.max));continue}else if(y1<=axisy.min&&y2<=axisy.min){ctx.lineTo(axisx.p2c(x1),axisy.p2c(axisy.min));ctx.lineTo(axisx.p2c(x2),axisy.p2c(axisy.min));continue}var x1old=x1,x2old=x2;if(y1<=y2&&y1<axisy.min&&y2>=axisy.min){x1=(axisy.min-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.min}else if(y2<=y1&&y2<axisy.min&&y1>=axisy.min){x2=(axisy.min-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.min}if(y1>=y2&&y1>axisy.max&&y2<=axisy.max){x1=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.max}else if(y2>=y1&&y2>axisy.max&&y1<=axisy.max){x2=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.max}if(x1!=x1old){ctx.lineTo(axisx.p2c(x1old),axisy.p2c(y1))}ctx.lineTo(axisx.p2c(x1),axisy.p2c(y1));ctx.lineTo(axisx.p2c(x2),axisy.p2c(y2));if(x2!=x2old){ctx.lineTo(axisx.p2c(x2),axisy.p2c(y2));ctx.lineTo(axisx.p2c(x2old),axisy.p2c(y2))}}}ctx.save();ctx.translate(plotOffset.left,plotOffset.top);ctx.lineJoin="round";var lw=series.lines.lineWidth,sw=series.shadowSize;if(lw>0&&sw>0){ctx.lineWidth=sw;ctx.strokeStyle="rgba(0,0,0,0.1)";var angle=Math.PI/18;plotLine(series.datapoints,Math.sin(angle)*(lw/2+sw/2),Math.cos(angle)*(lw/2+sw/2),series.xaxis,series.yaxis);ctx.lineWidth=sw/2;plotLine(series.datapoints,Math.sin(angle)*(lw/2+sw/4),Math.cos(angle)*(lw/2+sw/4),series.xaxis,series.yaxis)}ctx.lineWidth=lw;ctx.strokeStyle=series.color;var fillStyle=getFillStyle(series.lines,series.color,0,plotHeight);if(fillStyle){ctx.fillStyle=fillStyle;plotLineArea(series.datapoints,series.xaxis,series.yaxis)}if(lw>0)plotLine(series.datapoints,0,0,series.xaxis,series.yaxis);ctx.restore()}function drawSeriesPoints(series){function plotPoints(datapoints,radius,fillStyle,offset,shadow,axisx,axisy,symbol){var points=datapoints.points,ps=datapoints.pointsize;for(var i=0;i<points.length;i+=ps){var x=points[i],y=points[i+1];if(x==null||x<axisx.min||x>axisx.max||y<axisy.min||y>axisy.max)continue;ctx.beginPath();x=axisx.p2c(x);y=axisy.p2c(y)+offset;if(symbol=="circle")ctx.arc(x,y,radius,0,shadow?Math.PI:Math.PI*2,false);else symbol(ctx,x,y,radius,shadow);ctx.closePath();if(fillStyle){ctx.fillStyle=fillStyle;ctx.fill()}ctx.stroke()}}ctx.save();ctx.translate(plotOffset.left,plotOffset.top);var lw=series.points.lineWidth,sw=series.shadowSize,radius=series.points.radius,symbol=series.points.symbol;if(lw==0)lw=1e-4;if(lw>0&&sw>0){var w=sw/2;ctx.lineWidth=w;ctx.strokeStyle="rgba(0,0,0,0.1)";plotPoints(series.datapoints,radius,null,w+w/2,true,series.xaxis,series.yaxis,symbol);ctx.strokeStyle="rgba(0,0,0,0.2)";plotPoints(series.datapoints,radius,null,w/2,true,series.xaxis,series.yaxis,symbol)}ctx.lineWidth=lw;ctx.strokeStyle=series.color;plotPoints(series.datapoints,radius,getFillStyle(series.points,series.color),0,false,series.xaxis,series.yaxis,symbol);ctx.restore()}function drawBar(x,y,b,barLeft,barRight,fillStyleCallback,axisx,axisy,c,horizontal,lineWidth){var left,right,bottom,top,drawLeft,drawRight,drawTop,drawBottom,tmp;if(horizontal){drawBottom=drawRight=drawTop=true;drawLeft=false;left=b;right=x;top=y+barLeft;bottom=y+barRight;if(right<left){tmp=right;right=left;left=tmp;drawLeft=true;drawRight=false}}else{drawLeft=drawRight=drawTop=true;drawBottom=false;left=x+barLeft;right=x+barRight;bottom=b;top=y;if(top<bottom){tmp=top;top=bottom;bottom=tmp;drawBottom=true;drawTop=false}}if(right<axisx.min||left>axisx.max||top<axisy.min||bottom>axisy.max)return;if(left<axisx.min){left=axisx.min;drawLeft=false}if(right>axisx.max){right=axisx.max;drawRight=false}if(bottom<axisy.min){bottom=axisy.min;drawBottom=false}if(top>axisy.max){top=axisy.max;drawTop=false}left=axisx.p2c(left);bottom=axisy.p2c(bottom);right=axisx.p2c(right);top=axisy.p2c(top);if(fillStyleCallback){c.fillStyle=fillStyleCallback(bottom,top);c.fillRect(left,top,right-left,bottom-top)}if(lineWidth>0&&(drawLeft||drawRight||drawTop||drawBottom)){c.beginPath();c.moveTo(left,bottom);if(drawLeft)c.lineTo(left,top);else c.moveTo(left,top);if(drawTop)c.lineTo(right,top);else c.moveTo(right,top);if(drawRight)c.lineTo(right,bottom);else c.moveTo(right,bottom);if(drawBottom)c.lineTo(left,bottom);else c.moveTo(left,bottom);c.stroke()}}function drawSeriesBars(series){function plotBars(datapoints,barLeft,barRight,fillStyleCallback,axisx,axisy){var points=datapoints.points,ps=datapoints.pointsize;for(var i=0;i<points.length;i+=ps){if(points[i]==null)continue;drawBar(points[i],points[i+1],points[i+2],barLeft,barRight,fillStyleCallback,axisx,axisy,ctx,series.bars.horizontal,series.bars.lineWidth)}}ctx.save();ctx.translate(plotOffset.left,plotOffset.top);ctx.lineWidth=series.bars.lineWidth;ctx.strokeStyle=series.color;var barLeft;switch(series.bars.align){case"left":barLeft=0;break;case"right":barLeft=-series.bars.barWidth;break;default:barLeft=-series.bars.barWidth/2}var fillStyleCallback=series.bars.fill?function(bottom,top){return getFillStyle(series.bars,series.color,bottom,top)}:null;plotBars(series.datapoints,barLeft,barLeft+series.bars.barWidth,fillStyleCallback,series.xaxis,series.yaxis);ctx.restore()}function getFillStyle(filloptions,seriesColor,bottom,top){var fill=filloptions.fill;if(!fill)return null;if(filloptions.fillColor)return getColorOrGradient(filloptions.fillColor,bottom,top,seriesColor);var c=$.color.parse(seriesColor);c.a=typeof fill=="number"?fill:.4;c.normalize();return c.toString()}function insertLegend(){if(options.legend.container!=null){$(options.legend.container).html("")}else{placeholder.find(".legend").remove()}if(!options.legend.show){return}var fragments=[],entries=[],rowStarted=false,lf=options.legend.labelFormatter,s,label;for(var i=0;i<series.length;++i){s=series[i];if(s.label){label=lf?lf(s.label,s):s.label;if(label){entries.push({label:label,color:s.color})}}}if(options.legend.sorted){if($.isFunction(options.legend.sorted)){entries.sort(options.legend.sorted)}else if(options.legend.sorted=="reverse"){entries.reverse()}else{var ascending=options.legend.sorted!="descending";entries.sort(function(a,b){return a.label==b.label?0:a.label<b.label!=ascending?1:-1})}}for(var i=0;i<entries.length;++i){var entry=entries[i];if(i%options.legend.noColumns==0){if(rowStarted)fragments.push("</tr>");fragments.push("<tr>");rowStarted=true}fragments.push('<td class="legendColorBox"><div style="border:1px solid '+options.legend.labelBoxBorderColor+';padding:1px"><div style="width:4px;height:0;border:5px solid '+entry.color+';overflow:hidden"></div></div></td>'+'<td class="legendLabel">'+entry.label+"</td>")}if(rowStarted)fragments.push("</tr>");if(fragments.length==0)return;var table='<table style="font-size:smaller;color:'+options.grid.color+'">'+fragments.join("")+"</table>";if(options.legend.container!=null)$(options.legend.container).html(table);else{var pos="",p=options.legend.position,m=options.legend.margin;if(m[0]==null)m=[m,m];if(p.charAt(0)=="n")pos+="top:"+(m[1]+plotOffset.top)+"px;";else if(p.charAt(0)=="s")pos+="bottom:"+(m[1]+plotOffset.bottom)+"px;";if(p.charAt(1)=="e")pos+="right:"+(m[0]+plotOffset.right)+"px;";else if(p.charAt(1)=="w")pos+="left:"+(m[0]+plotOffset.left)+"px;";var legend=$('<div class="legend">'+table.replace('style="','style="position:absolute;'+pos+";")+"</div>").appendTo(placeholder);if(options.legend.backgroundOpacity!=0){var c=options.legend.backgroundColor;if(c==null){c=options.grid.backgroundColor;if(c&&typeof c=="string")c=$.color.parse(c);else c=$.color.extract(legend,"background-color");c.a=1;c=c.toString()}var div=legend.children();$('<div style="position:absolute;width:'+div.width()+"px;height:"+div.height()+"px;"+pos+"background-color:"+c+';"> </div>').prependTo(legend).css("opacity",options.legend.backgroundOpacity)}}}var highlights=[],redrawTimeout=null;function findNearbyItem(mouseX,mouseY,seriesFilter){var maxDistance=options.grid.mouseActiveRadius,smallestDistance=maxDistance*maxDistance+1,item=null,foundPoint=false,i,j,ps;for(i=series.length-1;i>=0;--i){if(!seriesFilter(series[i]))continue;var s=series[i],axisx=s.xaxis,axisy=s.yaxis,points=s.datapoints.points,mx=axisx.c2p(mouseX),my=axisy.c2p(mouseY),maxx=maxDistance/axisx.scale,maxy=maxDistance/axisy.scale;ps=s.datapoints.pointsize;if(axisx.options.inverseTransform)maxx=Number.MAX_VALUE;if(axisy.options.inverseTransform)maxy=Number.MAX_VALUE;if(s.lines.show||s.points.show){for(j=0;j<points.length;j+=ps){var x=points[j],y=points[j+1];if(x==null)continue;if(x-mx>maxx||x-mx<-maxx||y-my>maxy||y-my<-maxy)continue;var dx=Math.abs(axisx.p2c(x)-mouseX),dy=Math.abs(axisy.p2c(y)-mouseY),dist=dx*dx+dy*dy;if(dist<smallestDistance){smallestDistance=dist;item=[i,j/ps]}}}if(s.bars.show&&!item){var barLeft,barRight;switch(s.bars.align){case"left":barLeft=0;break;case"right":barLeft=-s.bars.barWidth;break;default:barLeft=-s.bars.barWidth/2}barRight=barLeft+s.bars.barWidth;for(j=0;j<points.length;j+=ps){var x=points[j],y=points[j+1],b=points[j+2];if(x==null)continue;if(series[i].bars.horizontal?mx<=Math.max(b,x)&&mx>=Math.min(b,x)&&my>=y+barLeft&&my<=y+barRight:mx>=x+barLeft&&mx<=x+barRight&&my>=Math.min(b,y)&&my<=Math.max(b,y))item=[i,j/ps]}}}if(item){i=item[0];j=item[1];ps=series[i].datapoints.pointsize;return{datapoint:series[i].datapoints.points.slice(j*ps,(j+1)*ps),dataIndex:j,series:series[i],seriesIndex:i}}return null}function onMouseMove(e){if(options.grid.hoverable)triggerClickHoverEvent("plothover",e,function(s){return s["hoverable"]!=false})}function onMouseLeave(e){if(options.grid.hoverable)triggerClickHoverEvent("plothover",e,function(s){return false})}function onClick(e){triggerClickHoverEvent("plotclick",e,function(s){return s["clickable"]!=false})}function triggerClickHoverEvent(eventname,event,seriesFilter){var offset=eventHolder.offset(),canvasX=event.pageX-offset.left-plotOffset.left,canvasY=event.pageY-offset.top-plotOffset.top,pos=canvasToAxisCoords({left:canvasX,top:canvasY});pos.pageX=event.pageX;pos.pageY=event.pageY;var item=findNearbyItem(canvasX,canvasY,seriesFilter);if(item){item.pageX=parseInt(item.series.xaxis.p2c(item.datapoint[0])+offset.left+plotOffset.left,10);item.pageY=parseInt(item.series.yaxis.p2c(item.datapoint[1])+offset.top+plotOffset.top,10)}if(options.grid.autoHighlight){for(var i=0;i<highlights.length;++i){var h=highlights[i];if(h.auto==eventname&&!(item&&h.series==item.series&&h.point[0]==item.datapoint[0]&&h.point[1]==item.datapoint[1]))unhighlight(h.series,h.point)}if(item)highlight(item.series,item.datapoint,eventname)}placeholder.trigger(eventname,[pos,item])}function triggerRedrawOverlay(){var t=options.interaction.redrawOverlayInterval;if(t==-1){drawOverlay();return}if(!redrawTimeout)redrawTimeout=setTimeout(drawOverlay,t)}function drawOverlay(){redrawTimeout=null;octx.save();overlay.clear();octx.translate(plotOffset.left,plotOffset.top);var i,hi;for(i=0;i<highlights.length;++i){hi=highlights[i];if(hi.series.bars.show)drawBarHighlight(hi.series,hi.point);else drawPointHighlight(hi.series,hi.point)}octx.restore();executeHooks(hooks.drawOverlay,[octx])}function highlight(s,point,auto){if(typeof s=="number")s=series[s];if(typeof point=="number"){var ps=s.datapoints.pointsize;point=s.datapoints.points.slice(ps*point,ps*(point+1))}var i=indexOfHighlight(s,point);if(i==-1){highlights.push({series:s,point:point,auto:auto});triggerRedrawOverlay()}else if(!auto)highlights[i].auto=false}function unhighlight(s,point){if(s==null&&point==null){highlights=[];triggerRedrawOverlay();return}if(typeof s=="number")s=series[s];if(typeof point=="number"){var ps=s.datapoints.pointsize;point=s.datapoints.points.slice(ps*point,ps*(point+1))}var i=indexOfHighlight(s,point);if(i!=-1){highlights.splice(i,1);triggerRedrawOverlay()}}function indexOfHighlight(s,p){for(var i=0;i<highlights.length;++i){var h=highlights[i];if(h.series==s&&h.point[0]==p[0]&&h.point[1]==p[1])return i}return-1}function drawPointHighlight(series,point){var x=point[0],y=point[1],axisx=series.xaxis,axisy=series.yaxis,highlightColor=typeof series.highlightColor==="string"?series.highlightColor:$.color.parse(series.color).scale("a",.5).toString();if(x<axisx.min||x>axisx.max||y<axisy.min||y>axisy.max)return;var pointRadius=series.points.radius+series.points.lineWidth/2;octx.lineWidth=pointRadius;octx.strokeStyle=highlightColor;var radius=1.5*pointRadius;x=axisx.p2c(x);y=axisy.p2c(y);octx.beginPath();if(series.points.symbol=="circle")octx.arc(x,y,radius,0,2*Math.PI,false);else series.points.symbol(octx,x,y,radius,false);octx.closePath();octx.stroke()}function drawBarHighlight(series,point){var highlightColor=typeof series.highlightColor==="string"?series.highlightColor:$.color.parse(series.color).scale("a",.5).toString(),fillStyle=highlightColor,barLeft;switch(series.bars.align){case"left":barLeft=0;break;case"right":barLeft=-series.bars.barWidth;break;default:barLeft=-series.bars.barWidth/2}octx.lineWidth=series.bars.lineWidth;octx.strokeStyle=highlightColor;drawBar(point[0],point[1],point[2]||0,barLeft,barLeft+series.bars.barWidth,function(){return fillStyle},series.xaxis,series.yaxis,octx,series.bars.horizontal,series.bars.lineWidth)}function getColorOrGradient(spec,bottom,top,defaultColor){if(typeof spec=="string")return spec;else{var gradient=ctx.createLinearGradient(0,top,0,bottom);for(var i=0,l=spec.colors.length;i<l;++i){var c=spec.colors[i];if(typeof c!="string"){var co=$.color.parse(defaultColor);if(c.brightness!=null)co=co.scale("rgb",c.brightness);if(c.opacity!=null)co.a*=c.opacity;c=co.toString()}gradient.addColorStop(i/(l-1),c)}return gradient}}}$.plot=function(placeholder,data,options){var plot=new Plot($(placeholder),data,options,$.plot.plugins);return plot};$.plot.version="0.8.3";$.plot.plugins=[];$.fn.plot=function(data,options){return this.each(function(){$.plot(this,data,options)})};function floorInBase(n,base){return base*Math.floor(n/base)}})(jQuery);
22+ </script>
23+ <script language="javascript" type="text/javascript">
24+ /* Javascript plotting library for jQuery, version 0.8.3.
25+
26+Copyright (c) 2007-2014 IOLA and Ole Laursen.
27+Licensed under the MIT license.
28+
29+*/
30+(function($){var options={series:{points:{errorbars:null,xerr:{err:"x",show:null,asymmetric:null,upperCap:null,lowerCap:null,color:null,radius:null},yerr:{err:"y",show:null,asymmetric:null,upperCap:null,lowerCap:null,color:null,radius:null}}}};function processRawData(plot,series,data,datapoints){if(!series.points.errorbars)return;var format=[{x:true,number:true,required:true},{y:true,number:true,required:true}];var errors=series.points.errorbars;if(errors=="x"||errors=="xy"){if(series.points.xerr.asymmetric){format.push({x:true,number:true,required:true});format.push({x:true,number:true,required:true})}else format.push({x:true,number:true,required:true})}if(errors=="y"||errors=="xy"){if(series.points.yerr.asymmetric){format.push({y:true,number:true,required:true});format.push({y:true,number:true,required:true})}else format.push({y:true,number:true,required:true})}datapoints.format=format}function parseErrors(series,i){var points=series.datapoints.points;var exl=null,exu=null,eyl=null,eyu=null;var xerr=series.points.xerr,yerr=series.points.yerr;var eb=series.points.errorbars;if(eb=="x"||eb=="xy"){if(xerr.asymmetric){exl=points[i+2];exu=points[i+3];if(eb=="xy")if(yerr.asymmetric){eyl=points[i+4];eyu=points[i+5]}else eyl=points[i+4]}else{exl=points[i+2];if(eb=="xy")if(yerr.asymmetric){eyl=points[i+3];eyu=points[i+4]}else eyl=points[i+3]}}else if(eb=="y")if(yerr.asymmetric){eyl=points[i+2];eyu=points[i+3]}else eyl=points[i+2];if(exu==null)exu=exl;if(eyu==null)eyu=eyl;var errRanges=[exl,exu,eyl,eyu];if(!xerr.show){errRanges[0]=null;errRanges[1]=null}if(!yerr.show){errRanges[2]=null;errRanges[3]=null}return errRanges}function drawSeriesErrors(plot,ctx,s){var points=s.datapoints.points,ps=s.datapoints.pointsize,ax=[s.xaxis,s.yaxis],radius=s.points.radius,err=[s.points.xerr,s.points.yerr];var invertX=false;if(ax[0].p2c(ax[0].max)<ax[0].p2c(ax[0].min)){invertX=true;var tmp=err[0].lowerCap;err[0].lowerCap=err[0].upperCap;err[0].upperCap=tmp}var invertY=false;if(ax[1].p2c(ax[1].min)<ax[1].p2c(ax[1].max)){invertY=true;var tmp=err[1].lowerCap;err[1].lowerCap=err[1].upperCap;err[1].upperCap=tmp}for(var i=0;i<s.datapoints.points.length;i+=ps){var errRanges=parseErrors(s,i);for(var e=0;e<err.length;e++){var minmax=[ax[e].min,ax[e].max];if(errRanges[e*err.length]){var x=points[i],y=points[i+1];var upper=[x,y][e]+errRanges[e*err.length+1],lower=[x,y][e]-errRanges[e*err.length];if(err[e].err=="x")if(y>ax[1].max||y<ax[1].min||upper<ax[0].min||lower>ax[0].max)continue;if(err[e].err=="y")if(x>ax[0].max||x<ax[0].min||upper<ax[1].min||lower>ax[1].max)continue;var drawUpper=true,drawLower=true;if(upper>minmax[1]){drawUpper=false;upper=minmax[1]}if(lower<minmax[0]){drawLower=false;lower=minmax[0]}if(err[e].err=="x"&&invertX||err[e].err=="y"&&invertY){var tmp=lower;lower=upper;upper=tmp;tmp=drawLower;drawLower=drawUpper;drawUpper=tmp;tmp=minmax[0];minmax[0]=minmax[1];minmax[1]=tmp}x=ax[0].p2c(x),y=ax[1].p2c(y),upper=ax[e].p2c(upper);lower=ax[e].p2c(lower);minmax[0]=ax[e].p2c(minmax[0]);minmax[1]=ax[e].p2c(minmax[1]);var lw=err[e].lineWidth?err[e].lineWidth:s.points.lineWidth,sw=s.points.shadowSize!=null?s.points.shadowSize:s.shadowSize;if(lw>0&&sw>0){var w=sw/2;ctx.lineWidth=w;ctx.strokeStyle="rgba(0,0,0,0.1)";drawError(ctx,err[e],x,y,upper,lower,drawUpper,drawLower,radius,w+w/2,minmax);ctx.strokeStyle="rgba(0,0,0,0.2)";drawError(ctx,err[e],x,y,upper,lower,drawUpper,drawLower,radius,w/2,minmax)}ctx.strokeStyle=err[e].color?err[e].color:s.color;ctx.lineWidth=lw;drawError(ctx,err[e],x,y,upper,lower,drawUpper,drawLower,radius,0,minmax)}}}}function drawError(ctx,err,x,y,upper,lower,drawUpper,drawLower,radius,offset,minmax){y+=offset;upper+=offset;lower+=offset;if(err.err=="x"){if(upper>x+radius)drawPath(ctx,[[upper,y],[Math.max(x+radius,minmax[0]),y]]);else drawUpper=false;if(lower<x-radius)drawPath(ctx,[[Math.min(x-radius,minmax[1]),y],[lower,y]]);else drawLower=false}else{if(upper<y-radius)drawPath(ctx,[[x,upper],[x,Math.min(y-radius,minmax[0])]]);else drawUpper=false;if(lower>y+radius)drawPath(ctx,[[x,Math.max(y+radius,minmax[1])],[x,lower]]);else drawLower=false}radius=err.radius!=null?err.radius:radius;if(drawUpper){if(err.upperCap=="-"){if(err.err=="x")drawPath(ctx,[[upper,y-radius],[upper,y+radius]]);else drawPath(ctx,[[x-radius,upper],[x+radius,upper]])}else if($.isFunction(err.upperCap)){if(err.err=="x")err.upperCap(ctx,upper,y,radius);else err.upperCap(ctx,x,upper,radius)}}if(drawLower){if(err.lowerCap=="-"){if(err.err=="x")drawPath(ctx,[[lower,y-radius],[lower,y+radius]]);else drawPath(ctx,[[x-radius,lower],[x+radius,lower]])}else if($.isFunction(err.lowerCap)){if(err.err=="x")err.lowerCap(ctx,lower,y,radius);else err.lowerCap(ctx,x,lower,radius)}}}function drawPath(ctx,pts){ctx.beginPath();ctx.moveTo(pts[0][0],pts[0][1]);for(var p=1;p<pts.length;p++)ctx.lineTo(pts[p][0],pts[p][1]);ctx.stroke()}function draw(plot,ctx){var plotOffset=plot.getPlotOffset();ctx.save();ctx.translate(plotOffset.left,plotOffset.top);$.each(plot.getData(),function(i,s){if(s.points.errorbars&&(s.points.xerr.show||s.points.yerr.show))drawSeriesErrors(plot,ctx,s)});ctx.restore()}function init(plot){plot.hooks.processRawData.push(processRawData);plot.hooks.draw.push(draw)}$.plot.plugins.push({init:init,options:options,name:"errorbars",version:"1.0"})})(jQuery);
31+ </script>
32+ <script language="javascript" type="text/javascript">
33+ /* Javascript plotting library for jQuery, version 0.8.3.
34+
35+Copyright (c) 2007-2014 IOLA and Ole Laursen.
36+Licensed under the MIT license.
37+
38+*/
39+(function(a){function e(h){var k,j=this,l=h.data||{};if(l.elem)j=h.dragTarget=l.elem,h.dragProxy=d.proxy||j,h.cursorOffsetX=l.pageX-l.left,h.cursorOffsetY=l.pageY-l.top,h.offsetX=h.pageX-h.cursorOffsetX,h.offsetY=h.pageY-h.cursorOffsetY;else if(d.dragging||l.which>0&&h.which!=l.which||a(h.target).is(l.not))return;switch(h.type){case"mousedown":return a.extend(l,a(j).offset(),{elem:j,target:h.target,pageX:h.pageX,pageY:h.pageY}),b.add(document,"mousemove mouseup",e,l),i(j,!1),d.dragging=null,!1;case!d.dragging&&"mousemove":if(g(h.pageX-l.pageX)+g(h.pageY-l.pageY)<l.distance)break;h.target=l.target,k=f(h,"dragstart",j),k!==!1&&(d.dragging=j,d.proxy=h.dragProxy=a(k||j)[0]);case"mousemove":if(d.dragging){if(k=f(h,"drag",j),c.drop&&(c.drop.allowed=k!==!1,c.drop.handler(h)),k!==!1)break;h.type="mouseup"}case"mouseup":b.remove(document,"mousemove mouseup",e),d.dragging&&(c.drop&&c.drop.handler(h),f(h,"dragend",j)),i(j,!0),d.dragging=d.proxy=l.elem=!1}return!0}function f(b,c,d){b.type=c;var e=a.event.dispatch.call(d,b);return e===!1?!1:e||b.result}function g(a){return Math.pow(a,2)}function h(){return d.dragging===!1}function i(a,b){a&&(a.unselectable=b?"off":"on",a.onselectstart=function(){return b},a.style&&(a.style.MozUserSelect=b?"":"none"))}a.fn.drag=function(a,b,c){return b&&this.bind("dragstart",a),c&&this.bind("dragend",c),a?this.bind("drag",b?b:a):this.trigger("drag")};var b=a.event,c=b.special,d=c.drag={not:":input",distance:0,which:1,dragging:!1,setup:function(c){c=a.extend({distance:d.distance,which:d.which,not:d.not},c||{}),c.distance=g(c.distance),b.add(this,"mousedown",e,c),this.attachEvent&&this.attachEvent("ondragstart",h)},teardown:function(){b.remove(this,"mousedown",e),this===d.dragging&&(d.dragging=d.proxy=!1),i(this,!0),this.detachEvent&&this.detachEvent("ondragstart",h)}};c.dragstart=c.dragend={setup:function(){},teardown:function(){}}})(jQuery);(function(d){function e(a){var b=a||window.event,c=[].slice.call(arguments,1),f=0,e=0,g=0,a=d.event.fix(b);a.type="mousewheel";b.wheelDelta&&(f=b.wheelDelta/120);b.detail&&(f=-b.detail/3);g=f;void 0!==b.axis&&b.axis===b.HORIZONTAL_AXIS&&(g=0,e=-1*f);void 0!==b.wheelDeltaY&&(g=b.wheelDeltaY/120);void 0!==b.wheelDeltaX&&(e=-1*b.wheelDeltaX/120);c.unshift(a,f,e,g);return(d.event.dispatch||d.event.handle).apply(this,c)}var c=["DOMMouseScroll","mousewheel"];if(d.event.fixHooks)for(var h=c.length;h;)d.event.fixHooks[c[--h]]=d.event.mouseHooks;d.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=c.length;a;)this.addEventListener(c[--a],e,!1);else this.onmousewheel=e},teardown:function(){if(this.removeEventListener)for(var a=c.length;a;)this.removeEventListener(c[--a],e,!1);else this.onmousewheel=null}};d.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery);(function($){var options={xaxis:{zoomRange:null,panRange:null},zoom:{interactive:false,trigger:"dblclick",amount:1.5},pan:{interactive:false,cursor:"move",frameRate:20}};function init(plot){function onZoomClick(e,zoomOut){var c=plot.offset();c.left=e.pageX-c.left;c.top=e.pageY-c.top;if(zoomOut)plot.zoomOut({center:c});else plot.zoom({center:c})}function onMouseWheel(e,delta){e.preventDefault();onZoomClick(e,delta<0);return false}var prevCursor="default",prevPageX=0,prevPageY=0,panTimeout=null;function onDragStart(e){if(e.which!=1)return false;var c=plot.getPlaceholder().css("cursor");if(c)prevCursor=c;plot.getPlaceholder().css("cursor",plot.getOptions().pan.cursor);prevPageX=e.pageX;prevPageY=e.pageY}function onDrag(e){var frameRate=plot.getOptions().pan.frameRate;if(panTimeout||!frameRate)return;panTimeout=setTimeout(function(){plot.pan({left:prevPageX-e.pageX,top:prevPageY-e.pageY});prevPageX=e.pageX;prevPageY=e.pageY;panTimeout=null},1/frameRate*1e3)}function onDragEnd(e){if(panTimeout){clearTimeout(panTimeout);panTimeout=null}plot.getPlaceholder().css("cursor",prevCursor);plot.pan({left:prevPageX-e.pageX,top:prevPageY-e.pageY})}function bindEvents(plot,eventHolder){var o=plot.getOptions();if(o.zoom.interactive){eventHolder[o.zoom.trigger](onZoomClick);eventHolder.mousewheel(onMouseWheel)}if(o.pan.interactive){eventHolder.bind("dragstart",{distance:10},onDragStart);eventHolder.bind("drag",onDrag);eventHolder.bind("dragend",onDragEnd)}}plot.zoomOut=function(args){if(!args)args={};if(!args.amount)args.amount=plot.getOptions().zoom.amount;args.amount=1/args.amount;plot.zoom(args)};plot.zoom=function(args){if(!args)args={};var c=args.center,amount=args.amount||plot.getOptions().zoom.amount,w=plot.width(),h=plot.height();if(!c)c={left:w/2,top:h/2};var xf=c.left/w,yf=c.top/h,minmax={x:{min:c.left-xf*w/amount,max:c.left+(1-xf)*w/amount},y:{min:c.top-yf*h/amount,max:c.top+(1-yf)*h/amount}};$.each(plot.getAxes(),function(_,axis){var opts=axis.options,min=minmax[axis.direction].min,max=minmax[axis.direction].max,zr=opts.zoomRange,pr=opts.panRange;if(zr===false)return;min=axis.c2p(min);max=axis.c2p(max);if(min>max){var tmp=min;min=max;max=tmp}if(pr){if(pr[0]!=null&&min<pr[0]){min=pr[0]}if(pr[1]!=null&&max>pr[1]){max=pr[1]}}var range=max-min;if(zr&&(zr[0]!=null&&range<zr[0]&&amount>1||zr[1]!=null&&range>zr[1]&&amount<1))return;opts.min=min;opts.max=max});plot.setupGrid();plot.draw();if(!args.preventEvent)plot.getPlaceholder().trigger("plotzoom",[plot,args])};plot.pan=function(args){var delta={x:+args.left,y:+args.top};if(isNaN(delta.x))delta.x=0;if(isNaN(delta.y))delta.y=0;$.each(plot.getAxes(),function(_,axis){var opts=axis.options,min,max,d=delta[axis.direction];min=axis.c2p(axis.p2c(axis.min)+d),max=axis.c2p(axis.p2c(axis.max)+d);var pr=opts.panRange;if(pr===false)return;if(pr){if(pr[0]!=null&&pr[0]>min){d=pr[0]-min;min+=d;max+=d}if(pr[1]!=null&&pr[1]<max){d=pr[1]-max;min+=d;max+=d}}opts.min=min;opts.max=max});plot.setupGrid();plot.draw();if(!args.preventEvent)plot.getPlaceholder().trigger("plotpan",[plot,args])};function shutdown(plot,eventHolder){eventHolder.unbind(plot.getOptions().zoom.trigger,onZoomClick);eventHolder.unbind("mousewheel",onMouseWheel);eventHolder.unbind("dragstart",onDragStart);eventHolder.unbind("drag",onDrag);eventHolder.unbind("dragend",onDragEnd);if(panTimeout)clearTimeout(panTimeout)}plot.hooks.bindEvents.push(bindEvents);plot.hooks.shutdown.push(shutdown)}$.plot.plugins.push({init:init,options:options,name:"navigate",version:"1.3"})})(jQuery);
40+ </script>
41+ <script language="javascript" type="text/javascript">
42+ (function ($) {
43+ $.zip = function(a,b) {
44+ var x = Math.min(a.length,b.length);
45+ var c = new Array(x);
46+ for (var i = 0; i < x; i++)
47+ c[i] = [a[i],b[i]];
48+ return c;
49+ };
50+
51+ $.mean = function(ary) {
52+ var m = 0, i = 0;
53+
54+ while (i < ary.length) {
55+ var j = i++;
56+ m += (ary[j] - m) / i;
57+ }
58+
59+ return m;
60+ };
61+
62+ $.timeUnits = function(secs) {
63+ if (secs < 0) return $.timeUnits(-secs);
64+ else if (secs >= 1e9) return [1e-9, "Gs"];
65+ else if (secs >= 1e6) return [1e-6, "Ms"];
66+ else if (secs >= 1) return [1, "s"];
67+ else if (secs >= 1e-3) return [1e3, "ms"];
68+ else if (secs >= 1e-6) return [1e6, "\u03bcs"];
69+ else if (secs >= 1e-9) return [1e9, "ns"];
70+ else if (secs >= 1e-12) return [1e12, "ps"];
71+ return [1, "s"];
72+ };
73+
74+ $.scaleTimes = function(ary) {
75+ var s = $.timeUnits($.mean(ary));
76+ return [$.scaleBy(s[0], ary), s[0]];
77+ };
78+
79+ $.prepareTime = function(secs) {
80+ var units = $.timeUnits(secs);
81+ var scaled = secs * units[0];
82+ var s = scaled.toPrecision(3);
83+ var t = scaled.toString();
84+ return [t.length < s.length ? t : s, units[1]];
85+ };
86+
87+ $.scaleBy = function(x, ary) {
88+ var nary = new Array(ary.length);
89+ for (var i = 0; i < ary.length; i++)
90+ nary[i] = ary[i] * x;
91+ return nary;
92+ };
93+
94+ $.renderTime = function(secs) {
95+ var x = $.prepareTime(secs);
96+ return x[0] + ' ' + x[1];
97+ };
98+
99+ $.unitFormatter = function(scale) {
100+ var labelname;
101+ return function(secs,axis) {
102+ var x = $.prepareTime(secs / scale);
103+ if (labelname === x[1])
104+ return x[0];
105+ else {
106+ labelname = x[1];
107+ return x[0] + ' ' + x[1];
108+ }
109+ };
110+ };
111+
112+ $.addTooltip = function(name, renderText) {
113+ function showTooltip(x, y, contents) {
114+ $('<div id="tooltip">' + contents + '</div>').css( {
115+ position: 'absolute',
116+ display: 'none',
117+ top: y + 5,
118+ left: x + 5,
119+ border: '1px solid #fdd',
120+ padding: '2px',
121+ 'background-color': '#fee',
122+ opacity: 0.80
123+ }).appendTo("body").fadeIn(200);
124+ };
125+ var pp = null;
126+ $(name).bind("plothover", function (event, pos, item) {
127+ $("#x").text(pos.x.toFixed(2));
128+ $("#y").text(pos.y.toFixed(2));
129+
130+ if (item) {
131+ if (pp != item.dataIndex) {
132+ pp = item.dataIndex;
133+
134+ $("#tooltip").remove();
135+ var x = item.datapoint[0],
136+ y = item.datapoint[1];
137+
138+ showTooltip(item.pageX, item.pageY, renderText(x,y));
139+ }
140+ }
141+ else {
142+ $("#tooltip").remove();
143+ pp = null;
144+ }
145+ });
146+ };
147+})(jQuery);
148+
149+ </script>
150+ <style type="text/css">
151+ html, body {
152+ height: 100%;
153+ margin: 0;
154+}
155+
156+#wrap {
157+ min-height: 100%;
158+}
159+
160+#main {
161+ overflow: auto;
162+ padding-bottom: 180px; /* must be same height as the footer */
163+}
164+
165+#footer {
166+ position: relative;
167+ margin-top: -180px; /* negative value of footer height */
168+ height: 180px;
169+ clear: both;
170+ background: #888;
171+ margin: 40px 0 0;
172+ color: white;
173+ font-size: larger;
174+ font-weight: 300;
175+}
176+
177+body:before {
178+ /* Opera fix */
179+ content: "";
180+ height: 100%;
181+ float: left;
182+ width: 0;
183+ margin-top: -32767px;
184+}
185+
186+body {
187+ font: 14px Helvetica Neue;
188+ text-rendering: optimizeLegibility;
189+ margin-top: 1em;
190+}
191+
192+a:link {
193+ color: steelblue;
194+ text-decoration: none;
195+}
196+
197+a:visited {
198+ color: #4a743b;
199+ text-decoration: none;
200+}
201+
202+#footer a {
203+ color: white;
204+ text-decoration: underline;
205+}
206+
207+.hover {
208+ color: steelblue;
209+ text-decoration: none;
210+}
211+
212+.body {
213+ width: 960px;
214+ margin: auto;
215+}
216+
217+.footfirst {
218+ position: relative;
219+ top: 30px;
220+}
221+
222+th {
223+ font-weight: 500;
224+ opacity: 0.8;
225+}
226+
227+th.cibound {
228+ opacity: 0.4;
229+}
230+
231+.confinterval {
232+ opacity: 0.5;
233+}
234+
235+h1 {
236+ font-size: 36px;
237+ font-weight: 300;
238+ margin-bottom: .3em;
239+}
240+
241+h2 {
242+ font-size: 30px;
243+ font-weight: 300;
244+ margin-bottom: .3em;
245+}
246+
247+.meanlegend {
248+ color: #404040;
249+ background-color: #ffffff;
250+ opacity: 0.6;
251+ font-size: smaller;
252+}
253+
254+ </style>
255+ <!--[if !IE 7]>
256+ <style type="text/css">
257+ #wrap {display:table;height:100%}
258+ </style>
259+ <![endif]-->
260+ </head>
261+ <body>
262+ <div id="wrap">
263+ <div id="main" class="body">
264+ <h1>criterion performance measurements</h1>
265+
266+<h2>overview</h2>
267+
268+<p><a href="#grokularation">want to understand this report?</a></p>
269+
270+<p>Environment: AMD Opteron 6168 on Ubuntu 12.04 with GHC 8.0.2</p>
271+
272+<div id="overview" class="ovchart" style="width:900px;height:100px;"></div>
273+
274+<h2><a name="b0">create/relation 10x100</a></h2>
275+ <table width="100%">
276+ <tbody>
277+ <tr>
278+ <td><div id="kde0" class="kdechart"
279+ style="width:450px;height:278px;"></div></td>
280+ <td><div id="time0" class="timechart"
281+ style="width:450px;height:278px;"></div></td>
282+<!--
283+ <td><div id="cycle0" class="cyclechart"
284+ style="width:300px;height:278px;"></div></td>
285+-->
286+ </tr>
287+ </tbody>
288+ </table>
289+
290+ <table>
291+ <thead class="analysis">
292+ <th></th>
293+ <th class="cibound"
294+ title="0.95 confidence level">lower bound</th>
295+ <th>estimate</th>
296+ <th class="cibound"
297+ title="0.95 confidence level">upper bound</th>
298+ </thead>
299+ <tbody>
300+ <tr>
301+ <td>OLS regression</td>
302+ <td><span class="confinterval olstimelb0">xxx</span></td>
303+ <td><span class="olstimept0">xxx</span></td>
304+ <td><span class="confinterval olstimeub0">xxx</span></td>
305+ </tr>
306+ <tr>
307+ <td>R&#xb2; goodness-of-fit</td>
308+ <td><span class="confinterval olsr2lb0">xxx</span></td>
309+ <td><span class="olsr2pt0">xxx</span></td>
310+ <td><span class="confinterval olsr2ub0">xxx</span></td>
311+ </tr>
312+ <tr>
313+ <td>Mean execution time</td>
314+ <td><span class="confinterval citime">5.891481267739451e-4</span></td>
315+ <td><span class="time">5.906283388143756e-4</span></td>
316+ <td><span class="confinterval citime">5.919056866982677e-4</span></td>
317+ </tr>
318+ <tr>
319+ <td>Standard deviation</td>
320+ <td><span class="confinterval citime">3.7867077713250133e-6</span></td>
321+ <td><span class="time">4.502571301832575e-6</span></td>
322+ <td><span class="confinterval citime">5.8062391798041006e-6</span></td>
323+ </tr>
324+ </tbody>
325+ </table>
326+
327+ <span class="outliers">
328+ <p>Outlying measurements have slight
329+ (<span class="percent">1.2343749999999981e-2</span>%)
330+ effect on estimated standard deviation.</p>
331+ </span>
332+<h2><a name="b1">create/relation 10x1000</a></h2>
333+ <table width="100%">
334+ <tbody>
335+ <tr>
336+ <td><div id="kde1" class="kdechart"
337+ style="width:450px;height:278px;"></div></td>
338+ <td><div id="time1" class="timechart"
339+ style="width:450px;height:278px;"></div></td>
340+<!--
341+ <td><div id="cycle1" class="cyclechart"
342+ style="width:300px;height:278px;"></div></td>
343+-->
344+ </tr>
345+ </tbody>
346+ </table>
347+
348+ <table>
349+ <thead class="analysis">
350+ <th></th>
351+ <th class="cibound"
352+ title="0.95 confidence level">lower bound</th>
353+ <th>estimate</th>
354+ <th class="cibound"
355+ title="0.95 confidence level">upper bound</th>
356+ </thead>
357+ <tbody>
358+ <tr>
359+ <td>OLS regression</td>
360+ <td><span class="confinterval olstimelb1">xxx</span></td>
361+ <td><span class="olstimept1">xxx</span></td>
362+ <td><span class="confinterval olstimeub1">xxx</span></td>
363+ </tr>
364+ <tr>
365+ <td>R&#xb2; goodness-of-fit</td>
366+ <td><span class="confinterval olsr2lb1">xxx</span></td>
367+ <td><span class="olsr2pt1">xxx</span></td>
368+ <td><span class="confinterval olsr2ub1">xxx</span></td>
369+ </tr>
370+ <tr>
371+ <td>Mean execution time</td>
372+ <td><span class="confinterval citime">5.760191573102873e-3</span></td>
373+ <td><span class="time">5.770838309782314e-3</span></td>
374+ <td><span class="confinterval citime">5.779948952798578e-3</span></td>
375+ </tr>
376+ <tr>
377+ <td>Standard deviation</td>
378+ <td><span class="confinterval citime">2.2935863601065537e-5</span></td>
379+ <td><span class="time">2.8815215559732134e-5</span></td>
380+ <td><span class="confinterval citime">3.914144050420156e-5</span></td>
381+ </tr>
382+ </tbody>
383+ </table>
384+
385+ <span class="outliers">
386+ <p>Outlying measurements have slight
387+ (<span class="percent">2.5623268698060614e-2</span>%)
388+ effect on estimated standard deviation.</p>
389+ </span>
390+<h2><a name="b2">create/relation 10x10000</a></h2>
391+ <table width="100%">
392+ <tbody>
393+ <tr>
394+ <td><div id="kde2" class="kdechart"
395+ style="width:450px;height:278px;"></div></td>
396+ <td><div id="time2" class="timechart"
397+ style="width:450px;height:278px;"></div></td>
398+<!--
399+ <td><div id="cycle2" class="cyclechart"
400+ style="width:300px;height:278px;"></div></td>
401+-->
402+ </tr>
403+ </tbody>
404+ </table>
405+
406+ <table>
407+ <thead class="analysis">
408+ <th></th>
409+ <th class="cibound"
410+ title="0.95 confidence level">lower bound</th>
411+ <th>estimate</th>
412+ <th class="cibound"
413+ title="0.95 confidence level">upper bound</th>
414+ </thead>
415+ <tbody>
416+ <tr>
417+ <td>OLS regression</td>
418+ <td><span class="confinterval olstimelb2">xxx</span></td>
419+ <td><span class="olstimept2">xxx</span></td>
420+ <td><span class="confinterval olstimeub2">xxx</span></td>
421+ </tr>
422+ <tr>
423+ <td>R&#xb2; goodness-of-fit</td>
424+ <td><span class="confinterval olsr2lb2">xxx</span></td>
425+ <td><span class="olsr2pt2">xxx</span></td>
426+ <td><span class="confinterval olsr2ub2">xxx</span></td>
427+ </tr>
428+ <tr>
429+ <td>Mean execution time</td>
430+ <td><span class="confinterval citime">5.772489494946795e-2</span></td>
431+ <td><span class="time">5.784195729887314e-2</span></td>
432+ <td><span class="confinterval citime">5.792298187695035e-2</span></td>
433+ </tr>
434+ <tr>
435+ <td>Standard deviation</td>
436+ <td><span class="confinterval citime">1.0422507194091924e-4</span></td>
437+ <td><span class="time">1.7121491767487851e-4</span></td>
438+ <td><span class="confinterval citime">2.73724491538287e-4</span></td>
439+ </tr>
440+ </tbody>
441+ </table>
442+
443+ <span class="outliers">
444+ <p>Outlying measurements have slight
445+ (<span class="percent">7.638888888888888e-2</span>%)
446+ effect on estimated standard deviation.</p>
447+ </span>
448+<h2><a name="b3">restrict/restrict relation 10x10000 to 10x1</a></h2>
449+ <table width="100%">
450+ <tbody>
451+ <tr>
452+ <td><div id="kde3" class="kdechart"
453+ style="width:450px;height:278px;"></div></td>
454+ <td><div id="time3" class="timechart"
455+ style="width:450px;height:278px;"></div></td>
456+<!--
457+ <td><div id="cycle3" class="cyclechart"
458+ style="width:300px;height:278px;"></div></td>
459+-->
460+ </tr>
461+ </tbody>
462+ </table>
463+
464+ <table>
465+ <thead class="analysis">
466+ <th></th>
467+ <th class="cibound"
468+ title="0.95 confidence level">lower bound</th>
469+ <th>estimate</th>
470+ <th class="cibound"
471+ title="0.95 confidence level">upper bound</th>
472+ </thead>
473+ <tbody>
474+ <tr>
475+ <td>OLS regression</td>
476+ <td><span class="confinterval olstimelb3">xxx</span></td>
477+ <td><span class="olstimept3">xxx</span></td>
478+ <td><span class="confinterval olstimeub3">xxx</span></td>
479+ </tr>
480+ <tr>
481+ <td>R&#xb2; goodness-of-fit</td>
482+ <td><span class="confinterval olsr2lb3">xxx</span></td>
483+ <td><span class="olsr2pt3">xxx</span></td>
484+ <td><span class="confinterval olsr2ub3">xxx</span></td>
485+ </tr>
486+ <tr>
487+ <td>Mean execution time</td>
488+ <td><span class="confinterval citime">1.4337830338577313e-2</span></td>
489+ <td><span class="time">1.448797309139284e-2</span></td>
490+ <td><span class="confinterval citime">1.4763601823824296e-2</span></td>
491+ </tr>
492+ <tr>
493+ <td>Standard deviation</td>
494+ <td><span class="confinterval citime">2.772536754203617e-4</span></td>
495+ <td><span class="time">4.774249175945004e-4</span></td>
496+ <td><span class="confinterval citime">8.291091461013828e-4</span></td>
497+ </tr>
498+ </tbody>
499+ </table>
500+
501+ <span class="outliers">
502+ <p>Outlying measurements have moderate
503+ (<span class="percent">0.11563227985262721</span>%)
504+ effect on estimated standard deviation.</p>
505+ </span>
506+<h2><a name="b4">restrict/restrict relation 10x10000 to 10x5000</a></h2>
507+ <table width="100%">
508+ <tbody>
509+ <tr>
510+ <td><div id="kde4" class="kdechart"
511+ style="width:450px;height:278px;"></div></td>
512+ <td><div id="time4" class="timechart"
513+ style="width:450px;height:278px;"></div></td>
514+<!--
515+ <td><div id="cycle4" class="cyclechart"
516+ style="width:300px;height:278px;"></div></td>
517+-->
518+ </tr>
519+ </tbody>
520+ </table>
521+
522+ <table>
523+ <thead class="analysis">
524+ <th></th>
525+ <th class="cibound"
526+ title="0.95 confidence level">lower bound</th>
527+ <th>estimate</th>
528+ <th class="cibound"
529+ title="0.95 confidence level">upper bound</th>
530+ </thead>
531+ <tbody>
532+ <tr>
533+ <td>OLS regression</td>
534+ <td><span class="confinterval olstimelb4">xxx</span></td>
535+ <td><span class="olstimept4">xxx</span></td>
536+ <td><span class="confinterval olstimeub4">xxx</span></td>
537+ </tr>
538+ <tr>
539+ <td>R&#xb2; goodness-of-fit</td>
540+ <td><span class="confinterval olsr2lb4">xxx</span></td>
541+ <td><span class="olsr2pt4">xxx</span></td>
542+ <td><span class="confinterval olsr2ub4">xxx</span></td>
543+ </tr>
544+ <tr>
545+ <td>Mean execution time</td>
546+ <td><span class="confinterval citime">8.322941573263729e-2</span></td>
547+ <td><span class="time">8.447258684075218e-2</span></td>
548+ <td><span class="confinterval citime">8.511386931168204e-2</span></td>
549+ </tr>
550+ <tr>
551+ <td>Standard deviation</td>
552+ <td><span class="confinterval citime">6.118316959029327e-4</span></td>
553+ <td><span class="time">1.4013810341920257e-3</span></td>
554+ <td><span class="confinterval citime">2.3016514403696887e-3</span></td>
555+ </tr>
556+ </tbody>
557+ </table>
558+
559+ <span class="outliers">
560+ <p>Outlying measurements have slight
561+ (<span class="percent">9.0e-2</span>%)
562+ effect on estimated standard deviation.</p>
563+ </span>
564+<h2><a name="b5">project/project 10x1000 to 1x1000</a></h2>
565+ <table width="100%">
566+ <tbody>
567+ <tr>
568+ <td><div id="kde5" class="kdechart"
569+ style="width:450px;height:278px;"></div></td>
570+ <td><div id="time5" class="timechart"
571+ style="width:450px;height:278px;"></div></td>
572+<!--
573+ <td><div id="cycle5" class="cyclechart"
574+ style="width:300px;height:278px;"></div></td>
575+-->
576+ </tr>
577+ </tbody>
578+ </table>
579+
580+ <table>
581+ <thead class="analysis">
582+ <th></th>
583+ <th class="cibound"
584+ title="0.95 confidence level">lower bound</th>
585+ <th>estimate</th>
586+ <th class="cibound"
587+ title="0.95 confidence level">upper bound</th>
588+ </thead>
589+ <tbody>
590+ <tr>
591+ <td>OLS regression</td>
592+ <td><span class="confinterval olstimelb5">xxx</span></td>
593+ <td><span class="olstimept5">xxx</span></td>
594+ <td><span class="confinterval olstimeub5">xxx</span></td>
595+ </tr>
596+ <tr>
597+ <td>R&#xb2; goodness-of-fit</td>
598+ <td><span class="confinterval olsr2lb5">xxx</span></td>
599+ <td><span class="olsr2pt5">xxx</span></td>
600+ <td><span class="confinterval olsr2ub5">xxx</span></td>
601+ </tr>
602+ <tr>
603+ <td>Mean execution time</td>
604+ <td><span class="confinterval citime">1.2211661066456561e-2</span></td>
605+ <td><span class="time">1.243577405705988e-2</span></td>
606+ <td><span class="confinterval citime">1.2583044006972743e-2</span></td>
607+ </tr>
608+ <tr>
609+ <td>Standard deviation</td>
610+ <td><span class="confinterval citime">3.0211460384957275e-4</span></td>
611+ <td><span class="time">4.600204612133745e-4</span></td>
612+ <td><span class="confinterval citime">5.956804020691042e-4</span></td>
613+ </tr>
614+ </tbody>
615+ </table>
616+
617+ <span class="outliers">
618+ <p>Outlying measurements have moderate
619+ (<span class="percent">0.14345146934193906</span>%)
620+ effect on estimated standard deviation.</p>
621+ </span>
622+<h2><a name="b6">project/project 10x1000 to 5x1000</a></h2>
623+ <table width="100%">
624+ <tbody>
625+ <tr>
626+ <td><div id="kde6" class="kdechart"
627+ style="width:450px;height:278px;"></div></td>
628+ <td><div id="time6" class="timechart"
629+ style="width:450px;height:278px;"></div></td>
630+<!--
631+ <td><div id="cycle6" class="cyclechart"
632+ style="width:300px;height:278px;"></div></td>
633+-->
634+ </tr>
635+ </tbody>
636+ </table>
637+
638+ <table>
639+ <thead class="analysis">
640+ <th></th>
641+ <th class="cibound"
642+ title="0.95 confidence level">lower bound</th>
643+ <th>estimate</th>
644+ <th class="cibound"
645+ title="0.95 confidence level">upper bound</th>
646+ </thead>
647+ <tbody>
648+ <tr>
649+ <td>OLS regression</td>
650+ <td><span class="confinterval olstimelb6">xxx</span></td>
651+ <td><span class="olstimept6">xxx</span></td>
652+ <td><span class="confinterval olstimeub6">xxx</span></td>
653+ </tr>
654+ <tr>
655+ <td>R&#xb2; goodness-of-fit</td>
656+ <td><span class="confinterval olsr2lb6">xxx</span></td>
657+ <td><span class="olsr2pt6">xxx</span></td>
658+ <td><span class="confinterval olsr2ub6">xxx</span></td>
659+ </tr>
660+ <tr>
661+ <td>Mean execution time</td>
662+ <td><span class="confinterval citime">1.5271674270594341e-2</span></td>
663+ <td><span class="time">1.547382196820991e-2</span></td>
664+ <td><span class="confinterval citime">1.5622307025724294e-2</span></td>
665+ </tr>
666+ <tr>
667+ <td>Standard deviation</td>
668+ <td><span class="confinterval citime">2.873217405621163e-4</span></td>
669+ <td><span class="time">3.978143402171812e-4</span></td>
670+ <td><span class="confinterval citime">5.247713511789067e-4</span></td>
671+ </tr>
672+ </tbody>
673+ </table>
674+
675+ <span class="outliers">
676+ <p>Outlying measurements have slight
677+ (<span class="percent">4.1587901701323225e-2</span>%)
678+ effect on estimated standard deviation.</p>
679+ </span>
680+<h2><a name="b7">union/union identical 10x1000</a></h2>
681+ <table width="100%">
682+ <tbody>
683+ <tr>
684+ <td><div id="kde7" class="kdechart"
685+ style="width:450px;height:278px;"></div></td>
686+ <td><div id="time7" class="timechart"
687+ style="width:450px;height:278px;"></div></td>
688+<!--
689+ <td><div id="cycle7" class="cyclechart"
690+ style="width:300px;height:278px;"></div></td>
691+-->
692+ </tr>
693+ </tbody>
694+ </table>
695+
696+ <table>
697+ <thead class="analysis">
698+ <th></th>
699+ <th class="cibound"
700+ title="0.95 confidence level">lower bound</th>
701+ <th>estimate</th>
702+ <th class="cibound"
703+ title="0.95 confidence level">upper bound</th>
704+ </thead>
705+ <tbody>
706+ <tr>
707+ <td>OLS regression</td>
708+ <td><span class="confinterval olstimelb7">xxx</span></td>
709+ <td><span class="olstimept7">xxx</span></td>
710+ <td><span class="confinterval olstimeub7">xxx</span></td>
711+ </tr>
712+ <tr>
713+ <td>R&#xb2; goodness-of-fit</td>
714+ <td><span class="confinterval olsr2lb7">xxx</span></td>
715+ <td><span class="olsr2pt7">xxx</span></td>
716+ <td><span class="confinterval olsr2ub7">xxx</span></td>
717+ </tr>
718+ <tr>
719+ <td>Mean execution time</td>
720+ <td><span class="confinterval citime">4.908323998442862e-2</span></td>
721+ <td><span class="time">4.923173514046889e-2</span></td>
722+ <td><span class="confinterval citime">4.94547578201357e-2</span></td>
723+ </tr>
724+ <tr>
725+ <td>Standard deviation</td>
726+ <td><span class="confinterval citime">2.09615306506087e-4</span></td>
727+ <td><span class="time">3.275115670368287e-4</span></td>
728+ <td><span class="confinterval citime">4.977889379852797e-4</span></td>
729+ </tr>
730+ </tbody>
731+ </table>
732+
733+ <span class="outliers">
734+ <p>Outlying measurements have slight
735+ (<span class="percent">7.100591715976319e-2</span>%)
736+ effect on estimated standard deviation.</p>
737+ </span>
738+<h2><a name="b8">union/union identical 10x10000</a></h2>
739+ <table width="100%">
740+ <tbody>
741+ <tr>
742+ <td><div id="kde8" class="kdechart"
743+ style="width:450px;height:278px;"></div></td>
744+ <td><div id="time8" class="timechart"
745+ style="width:450px;height:278px;"></div></td>
746+<!--
747+ <td><div id="cycle8" class="cyclechart"
748+ style="width:300px;height:278px;"></div></td>
749+-->
750+ </tr>
751+ </tbody>
752+ </table>
753+
754+ <table>
755+ <thead class="analysis">
756+ <th></th>
757+ <th class="cibound"
758+ title="0.95 confidence level">lower bound</th>
759+ <th>estimate</th>
760+ <th class="cibound"
761+ title="0.95 confidence level">upper bound</th>
762+ </thead>
763+ <tbody>
764+ <tr>
765+ <td>OLS regression</td>
766+ <td><span class="confinterval olstimelb8">xxx</span></td>
767+ <td><span class="olstimept8">xxx</span></td>
768+ <td><span class="confinterval olstimeub8">xxx</span></td>
769+ </tr>
770+ <tr>
771+ <td>R&#xb2; goodness-of-fit</td>
772+ <td><span class="confinterval olsr2lb8">xxx</span></td>
773+ <td><span class="olsr2pt8">xxx</span></td>
774+ <td><span class="confinterval olsr2ub8">xxx</span></td>
775+ </tr>
776+ <tr>
777+ <td>Mean execution time</td>
778+ <td><span class="confinterval citime">0.5144192261126985</span></td>
779+ <td><span class="time">0.5157808375258943</span></td>
780+ <td><span class="confinterval citime">0.5164000385072457</span></td>
781+ </tr>
782+ <tr>
783+ <td>Standard deviation</td>
784+ <td><span class="confinterval citime">0</span></td>
785+ <td><span class="time">1.1935851498586624e-3</span></td>
786+ <td><span class="confinterval citime">1.285892588023751e-3</span></td>
787+ </tr>
788+ </tbody>
789+ </table>
790+
791+ <span class="outliers">
792+ <p>Outlying measurements have moderate
793+ (<span class="percent">0.18749999999999997</span>%)
794+ effect on estimated standard deviation.</p>
795+ </span>
796+<h2><a name="b9">join/join identical 10x100</a></h2>
797+ <table width="100%">
798+ <tbody>
799+ <tr>
800+ <td><div id="kde9" class="kdechart"
801+ style="width:450px;height:278px;"></div></td>
802+ <td><div id="time9" class="timechart"
803+ style="width:450px;height:278px;"></div></td>
804+<!--
805+ <td><div id="cycle9" class="cyclechart"
806+ style="width:300px;height:278px;"></div></td>
807+-->
808+ </tr>
809+ </tbody>
810+ </table>
811+
812+ <table>
813+ <thead class="analysis">
814+ <th></th>
815+ <th class="cibound"
816+ title="0.95 confidence level">lower bound</th>
817+ <th>estimate</th>
818+ <th class="cibound"
819+ title="0.95 confidence level">upper bound</th>
820+ </thead>
821+ <tbody>
822+ <tr>
823+ <td>OLS regression</td>
824+ <td><span class="confinterval olstimelb9">xxx</span></td>
825+ <td><span class="olstimept9">xxx</span></td>
826+ <td><span class="confinterval olstimeub9">xxx</span></td>
827+ </tr>
828+ <tr>
829+ <td>R&#xb2; goodness-of-fit</td>
830+ <td><span class="confinterval olsr2lb9">xxx</span></td>
831+ <td><span class="olsr2pt9">xxx</span></td>
832+ <td><span class="confinterval olsr2ub9">xxx</span></td>
833+ </tr>
834+ <tr>
835+ <td>Mean execution time</td>
836+ <td><span class="confinterval citime">0.3355841931137941</span></td>
837+ <td><span class="time">0.3374978199984254</span></td>
838+ <td><span class="confinterval citime">0.3385756312293291</span></td>
839+ </tr>
840+ <tr>
841+ <td>Standard deviation</td>
842+ <td><span class="confinterval citime">0</span></td>
843+ <td><span class="time">1.6965376723717264e-3</span></td>
844+ <td><span class="confinterval citime">1.8668238128934738e-3</span></td>
845+ </tr>
846+ </tbody>
847+ </table>
848+
849+ <span class="outliers">
850+ <p>Outlying measurements have moderate
851+ (<span class="percent">0.1875</span>%)
852+ effect on estimated standard deviation.</p>
853+ </span>
854+<h2><a name="b10">group/group 10x100</a></h2>
855+ <table width="100%">
856+ <tbody>
857+ <tr>
858+ <td><div id="kde10" class="kdechart"
859+ style="width:450px;height:278px;"></div></td>
860+ <td><div id="time10" class="timechart"
861+ style="width:450px;height:278px;"></div></td>
862+<!--
863+ <td><div id="cycle10" class="cyclechart"
864+ style="width:300px;height:278px;"></div></td>
865+-->
866+ </tr>
867+ </tbody>
868+ </table>
869+
870+ <table>
871+ <thead class="analysis">
872+ <th></th>
873+ <th class="cibound"
874+ title="0.95 confidence level">lower bound</th>
875+ <th>estimate</th>
876+ <th class="cibound"
877+ title="0.95 confidence level">upper bound</th>
878+ </thead>
879+ <tbody>
880+ <tr>
881+ <td>OLS regression</td>
882+ <td><span class="confinterval olstimelb10">xxx</span></td>
883+ <td><span class="olstimept10">xxx</span></td>
884+ <td><span class="confinterval olstimeub10">xxx</span></td>
885+ </tr>
886+ <tr>
887+ <td>R&#xb2; goodness-of-fit</td>
888+ <td><span class="confinterval olsr2lb10">xxx</span></td>
889+ <td><span class="olsr2pt10">xxx</span></td>
890+ <td><span class="confinterval olsr2ub10">xxx</span></td>
891+ </tr>
892+ <tr>
893+ <td>Mean execution time</td>
894+ <td><span class="confinterval citime">4.666001885635249e-2</span></td>
895+ <td><span class="time">4.70336206675725e-2</span></td>
896+ <td><span class="confinterval citime">4.7476184359486216e-2</span></td>
897+ </tr>
898+ <tr>
899+ <td>Standard deviation</td>
900+ <td><span class="confinterval citime">5.178696454087703e-4</span></td>
901+ <td><span class="time">7.389605929837668e-4</span></td>
902+ <td><span class="confinterval citime">1.1404867684675546e-3</span></td>
903+ </tr>
904+ </tbody>
905+ </table>
906+
907+ <span class="outliers">
908+ <p>Outlying measurements have slight
909+ (<span class="percent">7.100591715976322e-2</span>%)
910+ effect on estimated standard deviation.</p>
911+ </span>
912+<h2><a name="b11">write/write 10x1000</a></h2>
913+ <table width="100%">
914+ <tbody>
915+ <tr>
916+ <td><div id="kde11" class="kdechart"
917+ style="width:450px;height:278px;"></div></td>
918+ <td><div id="time11" class="timechart"
919+ style="width:450px;height:278px;"></div></td>
920+<!--
921+ <td><div id="cycle11" class="cyclechart"
922+ style="width:300px;height:278px;"></div></td>
923+-->
924+ </tr>
925+ </tbody>
926+ </table>
927+
928+ <table>
929+ <thead class="analysis">
930+ <th></th>
931+ <th class="cibound"
932+ title="0.95 confidence level">lower bound</th>
933+ <th>estimate</th>
934+ <th class="cibound"
935+ title="0.95 confidence level">upper bound</th>
936+ </thead>
937+ <tbody>
938+ <tr>
939+ <td>OLS regression</td>
940+ <td><span class="confinterval olstimelb11">xxx</span></td>
941+ <td><span class="olstimept11">xxx</span></td>
942+ <td><span class="confinterval olstimeub11">xxx</span></td>
943+ </tr>
944+ <tr>
945+ <td>R&#xb2; goodness-of-fit</td>
946+ <td><span class="confinterval olsr2lb11">xxx</span></td>
947+ <td><span class="olsr2pt11">xxx</span></td>
948+ <td><span class="confinterval olsr2ub11">xxx</span></td>
949+ </tr>
950+ <tr>
951+ <td>Mean execution time</td>
952+ <td><span class="confinterval citime">1.5472953190097016e-3</span></td>
953+ <td><span class="time">1.5673276303702817e-3</span></td>
954+ <td><span class="confinterval citime">1.5890440248897237e-3</span></td>
955+ </tr>
956+ <tr>
957+ <td>Standard deviation</td>
958+ <td><span class="confinterval citime">6.110376965683773e-5</span></td>
959+ <td><span class="time">6.970009193368111e-5</span></td>
960+ <td><span class="confinterval citime">7.954403273020534e-5</span></td>
961+ </tr>
962+ </tbody>
963+ </table>
964+
965+ <span class="outliers">
966+ <p>Outlying measurements have moderate
967+ (<span class="percent">0.30346203307926556</span>%)
968+ effect on estimated standard deviation.</p>
969+ </span>
970+
971+ <h2><a name="grokularation">understanding this report</a></h2>
972+
973+ <p>In this report, each function benchmarked by criterion is assigned
974+ a section of its own. The charts in each section are active; if
975+ you hover your mouse over data points and annotations, you will see
976+ more details.</p>
977+
978+ <ul>
979+ <li>The chart on the left is a
980+ <a href="http://en.wikipedia.org/wiki/Kernel_density_estimation">kernel
981+ density estimate</a> (also known as a KDE) of time
982+ measurements. This graphs the probability of any given time
983+ measurement occurring. A spike indicates that a measurement of a
984+ particular time occurred; its height indicates how often that
985+ measurement was repeated.</li>
986+
987+ <li>The chart on the right is the raw data from which the kernel
988+ density estimate is built. The <i>x</i> axis indicates the
989+ number of loop iterations, while the <i>y</i> axis shows measured
990+ execution time for the given number of loop iterations. The
991+ line behind the values is the linear regression prediction of
992+ execution time for a given number of iterations. Ideally, all
993+ measurements will be on (or very near) this line.</li>
994+ </ul>
995+
996+ <p>Under the charts is a small table.
997+ The first two rows are the results of a linear regression run
998+ on the measurements displayed in the right-hand chart.</p>
999+
1000+ <ul>
1001+ <li><i>OLS regression</i> indicates the
1002+ time estimated for a single loop iteration using an ordinary
1003+ least-squares regression model. This number is more accurate
1004+ than the <i>mean</i> estimate below it, as it more effectively
1005+ eliminates measurement overhead and other constant factors.</li>
1006+ <li><i>R&#xb2; goodness-of-fit</i> is a measure of how
1007+ accurately the linear regression model fits the observed
1008+ measurements. If the measurements are not too noisy, R&#xb2;
1009+ should lie between 0.99 and 1, indicating an excellent fit. If
1010+ the number is below 0.99, something is confounding the accuracy
1011+ of the linear model.</li>
1012+ <li><i>Mean execution time</i> and <i>standard deviation</i> are
1013+ statistics calculated from execution time
1014+ divided by number of iterations.</li>
1015+ </ul>
1016+
1017+ <p>We use a statistical technique called
1018+ the <a href="http://en.wikipedia.org/wiki/Bootstrapping_(statistics)">bootstrap</a>
1019+ to provide confidence intervals on our estimates. The
1020+ bootstrap-derived upper and lower bounds on estimates let you see
1021+ how accurate we believe those estimates to be. (Hover the mouse
1022+ over the table headers to see the confidence levels.)</p>
1023+
1024+ <p>A noisy benchmarking environment can cause some or many
1025+ measurements to fall far from the mean. These outlying
1026+ measurements can have a significant inflationary effect on the
1027+ estimate of the standard deviation. We calculate and display an
1028+ estimate of the extent to which the standard deviation has been
1029+ inflated by outliers.</p>
1030+
1031+<script type="text/javascript">
1032+$(function () {
1033+ function mangulate(rpt) {
1034+ var measured = function(key) {
1035+ var idx = rpt.reportKeys.indexOf(key);
1036+ return rpt.reportMeasured.map(function(r) { return r[idx]; });
1037+ };
1038+ var lowerBound = function(est) {
1039+ return est.estPoint - est.estError.confIntLDX;
1040+ };
1041+ var upperBound = function(est) {
1042+ return est.estPoint + est.estError.confIntUDX;
1043+ };
1044+ var number = rpt.reportNumber;
1045+ var name = rpt.reportName;
1046+ var mean = rpt.reportAnalysis.anMean.estPoint;
1047+ var iters = measured("iters");
1048+ var times = measured("time");
1049+ var kdetimes = rpt.reportKDEs[0].kdeValues;
1050+ var kdepdf = rpt.reportKDEs[0].kdePDF;
1051+
1052+ var meanSecs = mean;
1053+ var units = $.timeUnits(mean);
1054+ var rgrs = rpt.reportAnalysis.anRegress[0];
1055+ var scale = units[0];
1056+ var olsTime = rgrs.regCoeffs.iters;
1057+ $(".olstimept" + number).text(function() {
1058+ return $.renderTime(olsTime.estPoint);
1059+ });
1060+ $(".olstimelb" + number).text(function() {
1061+ return $.renderTime(lowerBound(olsTime));
1062+ });
1063+ $(".olstimeub" + number).text(function() {
1064+ return $.renderTime(upperBound(olsTime));
1065+ });
1066+ $(".olsr2pt" + number).text(function() {
1067+ return rgrs.regRSquare.estPoint.toFixed(3);
1068+ });
1069+ $(".olsr2lb" + number).text(function() {
1070+ return lowerBound(rgrs.regRSquare).toFixed(3);
1071+ });
1072+ $(".olsr2ub" + number).text(function() {
1073+ return upperBound(rgrs.regRSquare).toFixed(3);
1074+ });
1075+ mean *= scale;
1076+ kdetimes = $.scaleBy(scale, kdetimes);
1077+ var kq = $("#kde" + number);
1078+ var k = $.plot(kq,
1079+ [{ label: name + " time densities",
1080+ data: $.zip(kdetimes, kdepdf),
1081+ }],
1082+ { xaxis: { tickFormatter: $.unitFormatter(scale) },
1083+ yaxis: { ticks: false },
1084+ grid: { borderColor: "#777",
1085+ hoverable: true, markings: [ { color: '#6fd3fb',
1086+ lineWidth: 1.5, xaxis: { from: mean, to: mean } } ] },
1087+ });
1088+ var o = k.pointOffset({ x: mean, y: 0});
1089+ kq.append('<div class="meanlegend" title="' + $.renderTime(meanSecs) +
1090+ '" style="position:absolute;left:' + (o.left + 4) +
1091+ 'px;bottom:139px;">mean</div>');
1092+ $.addTooltip("#kde" + number,
1093+ function(secs) { return $.renderTime(secs / scale); });
1094+ var timepairs = new Array(times.length);
1095+ var lastiter = iters[iters.length-1];
1096+ var olspairs = [[0,0], [lastiter, lastiter * scale * olsTime.estPoint]];
1097+ for (var i = 0; i < times.length; i++)
1098+ timepairs[i] = [iters[i],times[i]*scale];
1099+ iterFormatter = function() {
1100+ var denom = 0;
1101+ return function(iters) {
1102+ if (iters == 0)
1103+ return '';
1104+ if (denom > 0)
1105+ return (iters / denom).toFixed();
1106+ var power;
1107+ if (iters >= 1e9) {
1108+ denom = '1e9'; power = '&#x2079;';
1109+ }
1110+ if (iters >= 1e6) {
1111+ denom = '1e6'; power = '&#x2076;';
1112+ }
1113+ else if (iters >= 1e3) {
1114+ denom = '1e3'; power = '&#xb3;';
1115+ }
1116+ else denom = 1;
1117+ if (denom > 1) {
1118+ iters = (iters / denom).toFixed();
1119+ iters += '&times;10' + power + ' iters';
1120+ } else {
1121+ iters += ' iters';
1122+ }
1123+ return iters;
1124+ };
1125+ };
1126+ $.plot($("#time" + number),
1127+ [{ label: "regression", data: olspairs,
1128+ lines: { show: true } },
1129+ { label: name + " times", data: timepairs,
1130+ points: { show: true } }],
1131+ { grid: { borderColor: "#777", hoverable: true },
1132+ xaxis: { tickFormatter: iterFormatter() },
1133+ yaxis: { tickFormatter: $.unitFormatter(scale) } });
1134+ $.addTooltip("#time" + number,
1135+ function(iters,secs) {
1136+ return ($.renderTime(secs / scale) + ' / ' +
1137+ iters.toLocaleString() + ' iters');
1138+ });
1139+ if (0) {
1140+ var cyclepairs = new Array(cycles.length);
1141+ for (var i = 0; i < cycles.length; i++)
1142+ cyclepairs[i] = [cycles[i],i];
1143+ $.plot($("#cycle" + number),
1144+ [{ label: name + " cycles",
1145+ data: cyclepairs }],
1146+ { points: { show: true },
1147+ grid: { borderColor: "#777", hoverable: true },
1148+ xaxis: { tickFormatter:
1149+ function(cycles,axis) { return cycles + ' cycles'; }},
1150+ yaxis: { ticks: false },
1151+ });
1152+ $.addTooltip("#cycles" + number, function(x,y) { return x + ' cycles'; });
1153+ }
1154+ };
1155+ var reports = [{"reportAnalysis":{"anMean":{"estError":{"confIntLDX":1.480212040430454e-6,"confIntUDX":1.2773478838920983e-6,"confIntCL":5.0e-2},"estPoint":5.906283388143756e-4},"anRegress":[{"regRSquare":{"estError":{"confIntLDX":3.555021666379332e-6,"confIntUDX":3.2835390818553023e-6,"confIntCL":5.0e-2},"estPoint":0.999994210390811},"regResponder":"time","regCoeffs":{"y":{"estError":{"confIntLDX":3.992840580325896e-5,"confIntUDX":3.5096033885701615e-5,"confIntCL":5.0e-2},"estPoint":4.5018032731655834e-5},"iters":{"estError":{"confIntLDX":4.916701435576497e-7,"confIntUDX":6.481819002255793e-7,"confIntCL":5.0e-2},"estPoint":5.990242120138069e-4}}}],"anStdDev":{"estError":{"confIntLDX":7.158635305075615e-7,"confIntUDX":1.3036678779715258e-6,"confIntCL":5.0e-2},"estPoint":4.502571301832575e-6},"anOutlierVar":{"ovFraction":1.2343749999999981e-2,"ovDesc":"slight","ovEffect":"Slight"},"anOverhead":2.1820495514718956e-3},"reportKDEs":[{"kdeValues":[5.767309127295322e-4,5.769143047848586e-4,5.770976968401851e-4,5.772810888955115e-4,5.77464480950838e-4,5.776478730061645e-4,5.77831265061491e-4,5.780146571168174e-4,5.781980491721439e-4,5.783814412274703e-4,5.785648332827969e-4,5.787482253381233e-4,5.789316173934497e-4,5.791150094487762e-4,5.792984015041027e-4,5.794817935594292e-4,5.796651856147556e-4,5.798485776700821e-4,5.800319697254085e-4,5.802153617807351e-4,5.803987538360615e-4,5.80582145891388e-4,5.807655379467144e-4,5.80948930002041e-4,5.811323220573674e-4,5.813157141126938e-4,5.814991061680203e-4,5.816824982233467e-4,5.818658902786733e-4,5.820492823339997e-4,5.822326743893262e-4,5.824160664446526e-4,5.825994584999791e-4,5.827828505553056e-4,5.829662426106321e-4,5.831496346659585e-4,5.833330267212849e-4,5.835164187766114e-4,5.836998108319379e-4,5.838832028872644e-4,5.840665949425908e-4,5.842499869979173e-4,5.844333790532437e-4,5.846167711085703e-4,5.848001631638967e-4,5.849835552192232e-4,5.851669472745496e-4,5.85350339329876e-4,5.855337313852026e-4,5.85717123440529e-4,5.859005154958555e-4,5.860839075511819e-4,5.862672996065085e-4,5.864506916618349e-4,5.866340837171614e-4,5.868174757724878e-4,5.870008678278143e-4,5.871842598831408e-4,5.873676519384673e-4,5.875510439937937e-4,5.877344360491201e-4,5.879178281044466e-4,5.881012201597731e-4,5.882846122150996e-4,5.88468004270426e-4,5.886513963257525e-4,5.88834788381079e-4,5.890181804364055e-4,5.892015724917319e-4,5.893849645470584e-4,5.895683566023848e-4,5.897517486577112e-4,5.899351407130378e-4,5.901185327683642e-4,5.903019248236907e-4,5.904853168790171e-4,5.906687089343437e-4,5.908521009896701e-4,5.910354930449966e-4,5.91218885100323e-4,5.914022771556495e-4,5.91585669210976e-4,5.917690612663024e-4,5.919524533216289e-4,5.921358453769553e-4,5.923192374322818e-4,5.925026294876083e-4,5.926860215429348e-4,5.928694135982612e-4,5.930528056535877e-4,5.932361977089142e-4,5.934195897642407e-4,5.936029818195671e-4,5.937863738748935e-4,5.9396976593022e-4,5.941531579855465e-4,5.94336550040873e-4,5.945199420961994e-4,5.947033341515259e-4,5.948867262068523e-4,5.950701182621789e-4,5.952535103175053e-4,5.954369023728318e-4,5.956202944281582e-4,5.958036864834846e-4,5.959870785388112e-4,5.961704705941376e-4,5.963538626494641e-4,5.965372547047905e-4,5.96720646760117e-4,5.969040388154435e-4,5.9708743087077e-4,5.972708229260964e-4,5.974542149814229e-4,5.976376070367494e-4,5.978209990920759e-4,5.980043911474023e-4,5.981877832027287e-4,5.983711752580552e-4,5.985545673133817e-4,5.987379593687082e-4,5.989213514240346e-4,5.991047434793611e-4,5.992881355346875e-4,5.994715275900141e-4,5.996549196453405e-4,5.99838311700667e-4,6.000217037559934e-4],"kdeType":"time","kdePDF":[7439.606200664009,7463.860772581996,7512.519471367643,7585.879034733249,7684.378650480464,7808.59288896541,7959.222344451404,8137.082052941013,8343.087784506373,8578.240345240563,8843.608066987465,9140.307710396293,9469.484056270247,9832.288508711508,10229.85707790064,10663.288147018666,11133.620453497775,11641.811726519703,12188.718418185661,12775.076943623719,13401.48680508669,14068.395917549335,14776.088380313859,15524.674853637032,16314.085605322467,17144.066194245657,18014.17566107358,18923.787006368777,19872.089658085122,20858.093568968376,21880.63454363045,22938.38037810305,24029.837403295212,25153.35705838,26307.1421796571,27489.252772337637,28697.611133056118,29930.00630457071,31184.097964923378,32457.419974418754,33747.38391792052,35051.283079886554,36366.2973683962,37689.499755989564,39017.864824376906,40348.27998326451,41677.55987863412,43002.46441251096,44319.720666231085,45626.048855992674,46918.19225848234,48192.9508326456,49447.218039767664,50678.02013753379,51882.55700504304,53058.24335548316,54202.74902189472,55314.036869023075,56390.396799555885,57430.47429337121,58433.29194928923,59398.26259347494,60325.19267798467,61214.27491525301,62066.069375311075,62881.472605315255,63661.67470632853,64408.10470879936,65122.36501266323,65806.15608584625,66461.19303076026,67089.1160163213,67691.39691757591,68269.24479142003,68823.51303185195,69354.61118031963,69862.42440713938,70346.24362265936,70804.70901910632,71235.76958662862,71636.66079434061,72003.90218716432,72333.31613345034,72620.06838137904,72858.73046143548,73043.3633274288,73167.62098077408,73224.87219401666,73208.33786178584,73111.2409815332,72926.96582184076,72649.22248949985,72272.2128714332,71790.79381341882,71200.63340969513,70498.35641645365,69681.67506379938,68749.50191620484,67702.04190771938,66540.86123835878,65268.93144221416,63890.64760364616,62411.82038186993,60839.642182361524,59182.628462524866,57450.535757302285,55654.25853871905,53805.707465851454,51917.67192636734,50003.67000988945,48077.78918372171,46154.520964229625,44248.59279791539,42374.80019444325,40547.841902338376,38782.160602275166,37091.79123010303,35490.21865040699,33990.24599998552,32603.874627041063,31342.19618255019,30215.2970895606,29232.17533570354,28400.669312593527,27727.39826820856,27217.713846527327,26875.662160911106,26703.955878966048]}],"reportKeys":["time","cpuTime","cycles","iters","allocated","numGcs","bytesCopied","mutatorWallSeconds","mutatorCpuSeconds","gcWallSeconds","gcCpuSeconds"],"reportNumber":0,"reportName":"create/relation 10x100","reportOutliers":{"highSevere":0,"highMild":0,"lowMild":0,"samplesSeen":42,"lowSevere":0},"reportMeasured":[[6.813240033807233e-4,6.795370000000009e-4,1291970,1,null,null,null,null,null,null,null],[1.2316010033828206e-3,1.2288760000000003e-3,2337568,2,null,null,null,null,null,null,null],[1.8350910031585954e-3,1.8311770000000033e-3,3484055,3,null,null,null,null,null,null,null],[2.427155995974317e-3,2.4221040000000013e-3,4608527,4,null,null,null,null,null,null,null],[3.0626340012531728e-3,3.052128000000001e-3,5816367,5,null,null,null,null,null,null,null],[3.638373003923334e-3,3.6385010000000023e-3,6911175,6,null,null,null,null,null,null,null],[4.216387998894788e-3,4.203885999999997e-3,8007897,7,null,null,null,null,null,null,null],[4.8334379971493036e-3,4.838462000000002e-3,9181602,8,null,null,null,null,null,null,null],[5.428168005892076e-3,5.415576000000005e-3,10312089,9,null,null,null,null,null,null,null],[6.012180994730443e-3,6.00813e-3,11421128,10,null,null,null,null,null,null,null],[6.5902550049941055e-3,6.592010999999995e-3,12518912,11,null,null,null,null,null,null,null],[7.23675199697027e-3,7.229662999999997e-3,13747464,12,null,null,null,null,null,null,null],[7.84011700307019e-3,7.831859999999996e-3,14893518,13,null,null,null,null,null,null,null],[8.434026000031736e-3,8.425254999999993e-3,16022852,14,null,null,null,null,null,null,null],[9.01525300287176e-3,9.005011000000007e-3,17125378,15,null,null,null,null,null,null,null],[9.62481100577861e-3,9.613589000000006e-3,18284524,16,null,null,null,null,null,null,null],[1.0174692004511598e-2,1.0159233000000017e-2,19330158,17,null,null,null,null,null,null,null],[1.0838796995813027e-2,1.0825276000000023e-2,20590579,18,null,null,null,null,null,null,null],[1.1404266006138641e-2,1.1396694000000013e-2,21666369,19,null,null,null,null,null,null,null],[1.2019466004858259e-2,1.200773400000002e-2,22835526,20,null,null,null,null,null,null,null],[1.2612122001883108e-2,1.2602988999999981e-2,23960806,21,null,null,null,null,null,null,null],[1.3185921001422685e-2,1.3175439999999983e-2,25039019,22,null,null,null,null,null,null,null],[1.380999500543112e-2,1.3800904000000003e-2,26235900,23,null,null,null,null,null,null,null],[1.5010613002232276e-2,1.5004187000000002e-2,28517754,25,null,null,null,null,null,null,null],[1.5596878998621833e-2,1.5588999999999964e-2,29631118,26,null,null,null,null,null,null,null],[1.619237400154816e-2,1.6183787000000005e-2,30763246,27,null,null,null,null,null,null,null],[1.6726298003050033e-2,1.6716809e-2,31778366,28,null,null,null,null,null,null,null],[1.7975681999814697e-2,1.7950438999999985e-2,34152290,30,null,null,null,null,null,null,null],[1.8578729999717325e-2,1.856606700000002e-2,35298278,31,null,null,null,null,null,null,null],[1.9729389998246916e-2,1.972127800000001e-2,37482481,33,null,null,null,null,null,null,null],[2.0979664994229097e-2,2.0962800000000004e-2,39859087,35,null,null,null,null,null,null,null],[2.1577223000349477e-2,2.1558966000000013e-2,40993942,36,null,null,null,null,null,null,null],[2.283525199891301e-2,2.282013599999999e-2,43384199,38,null,null,null,null,null,null,null],[2.397813599964138e-2,2.3962815000000026e-2,45555911,40,null,null,null,null,null,null,null],[2.510333999816794e-2,2.5077219999999956e-2,47676154,42,null,null,null,null,null,null,null],[2.6329069005441852e-2,2.6309212000000026e-2,50021602,44,null,null,null,null,null,null,null],[2.815628200187348e-2,2.8133567000000026e-2,53494575,47,null,null,null,null,null,null,null],[2.939282599982107e-2,2.937685499999998e-2,55844069,49,null,null,null,null,null,null,null],[3.1181958998786286e-2,3.1156967000000035e-2,59243868,52,null,null,null,null,null,null,null],[3.252649400383234e-2,3.249802700000004e-2,61797251,54,null,null,null,null,null,null,null],[3.4448503000021446e-2,3.442938200000001e-2,65450278,57,null,null,null,null,null,null,null],[3.607152900076471e-2,3.6039925000000084e-2,68534608,60,null,null,null,null,null,null,null],[3.795692800485995e-2,3.7922617999999964e-2,72115683,63,null,null,null,null,null,null,null],[3.981165000004694e-2,3.978681899999992e-2,75640494,66,null,null,null,null,null,null,null],[4.13812839979073e-2,4.134547600000005e-2,78620459,69,null,null,null,null,null,null,null],[4.381340800318867e-2,4.3773587e-2,83243475,73,null,null,null,null,null,null,null],[4.59521769953426e-2,4.591688100000002e-2,87305971,76,null,null,null,null,null,null,null],[4.8131951996765565e-2,4.807948400000006e-2,91447845,80,null,null,null,null,null,null,null],[5.042989100184059e-2,5.0378136000000184e-2,95814508,84,null,null,null,null,null,null,null],[5.349220000061905e-2,5.3437803000000006e-2,101632803,89,null,null,null,null,null,null,null],[5.570261099637719e-2,5.566170800000014e-2,105832608,93,null,null,null,null,null,null,null],[5.8637883004848845e-2,5.8586950000000027e-2,111410682,98,null,null,null,null,null,null,null],[6.1715287003607955e-2,6.1675520000000095e-2,117257562,103,null,null,null,null,null,null,null],[6.46549410012085e-2,6.460622500000013e-2,122841390,108,null,null,null,null,null,null,null],[6.766005199460778e-2,6.762474500000004e-2,128551690,113,null,null,null,null,null,null,null],[7.115251399955014e-2,7.110800200000011e-2,135187173,119,null,null,null,null,null,null,null],[7.494805199530674e-2,7.490005500000008e-2,142399851,125,null,null,null,null,null,null,null],[7.836887799930992e-2,7.830414600000002e-2,148897308,131,null,null,null,null,null,null,null],[8.264995200443082e-2,8.25901229999999e-2,157032133,138,null,null,null,null,null,null,null],[8.62455440001213e-2,8.619491499999987e-2,163865596,144,null,null,null,null,null,null,null],[9.091036900645122e-2,9.084664899999995e-2,172727386,152,null,null,null,null,null,null,null],[9.528734099876601e-2,9.521602299999987e-2,181043100,159,null,null,null,null,null,null,null],[0.10003491100360407,9.9945022e-2,190062923,167,null,null,null,null,null,null,null],[0.10540352200041525,0.1053145390000001,200264351,176,null,null,null,null,null,null,null],[0.1109114220016636,0.11082174499999997,210729214,185,null,null,null,null,null,null,null],[0.11628856800234644,0.11619333099999984,220946401,194,null,null,null,null,null,null,null],[0.12236196899903007,0.12219322300000002,232485189,204,null,null,null,null,null,null,null],[0.1280951240041759,0.12801656100000036,243377425,214,null,null,null,null,null,null,null],[0.13404688699665712,0.13395500699999996,254686351,224,null,null,null,null,null,null,null],[0.14159004599787295,0.14147092299999997,269018879,236,null,null,null,null,null,null,null],[0.14789382999879308,0.14779020099999984,280995516,247,null,null,null,null,null,null,null],[0.15566811999451602,0.1555507089999999,295767514,260,null,null,null,null,null,null,null],[0.16341256899613654,0.1632890299999996,310480881,273,null,null,null,null,null,null,null],[0.17193876200326486,0.17182209000000004,326682249,287,null,null,null,null,null,null,null],[0.18065470200235723,0.18048433699999977,343241359,301,null,null,null,null,null,null,null],[0.19008455899893306,0.18990984600000038,361158953,316,null,null,null,null,null,null,null],[0.19925997099926462,0.19908731799999924,378591096,332,null,null,null,null,null,null,null],[0.20827979499881621,0.2080981780000002,395729002,348,null,null,null,null,null,null,null],[0.21893202800129075,0.21876482700000022,415967666,366,null,null,null,null,null,null,null],[0.22986117999971611,0.2297205800000004,436734977,384,null,null,null,null,null,null,null]]},{"reportAnalysis":{"anMean":{"estError":{"confIntLDX":1.064673667944098e-5,"confIntUDX":9.11064301626404e-6,"confIntCL":5.0e-2},"estPoint":5.770838309782314e-3},"anRegress":[{"regRSquare":{"estError":{"confIntLDX":5.15058316596928e-6,"confIntUDX":3.7708817312021026e-6,"confIntCL":5.0e-2},"estPoint":0.9999926782872085},"regResponder":"time","regCoeffs":{"y":{"estError":{"confIntLDX":1.2175205858588846e-4,"confIntUDX":1.1025796245932467e-4,"confIntCL":5.0e-2},"estPoint":1.2610346963985624e-4},"iters":{"estError":{"confIntLDX":5.124258960720503e-6,"confIntUDX":5.297958354179462e-6,"confIntCL":5.0e-2},"estPoint":5.823855877516418e-3}}}],"anStdDev":{"estError":{"confIntLDX":5.879351958666597e-6,"confIntUDX":1.0326224944469426e-5,"confIntCL":5.0e-2},"estPoint":2.8815215559732134e-5},"anOutlierVar":{"ovFraction":2.5623268698060614e-2,"ovDesc":"slight","ovEffect":"Slight"},"anOverhead":2.1820495514718956e-3},"reportKDEs":[{"kdeValues":[5.671752972753566e-3,5.672973797666535e-3,5.674194622579503e-3,5.675415447492472e-3,5.676636272405441e-3,5.67785709731841e-3,5.679077922231379e-3,5.6802987471443476e-3,5.681519572057317e-3,5.682740396970285e-3,5.683961221883254e-3,5.685182046796224e-3,5.686402871709192e-3,5.687623696622161e-3,5.6888445215351295e-3,5.690065346448099e-3,5.691286171361068e-3,5.692506996274036e-3,5.6937278211870055e-3,5.694948646099974e-3,5.696169471012943e-3,5.697390295925912e-3,5.698611120838881e-3,5.69983194575185e-3,5.701052770664818e-3,5.7022735955777875e-3,5.703494420490757e-3,5.704715245403725e-3,5.705936070316694e-3,5.707156895229663e-3,5.708377720142632e-3,5.709598545055601e-3,5.7108193699685695e-3,5.712040194881539e-3,5.713261019794507e-3,5.714481844707476e-3,5.7157026696204455e-3,5.716923494533414e-3,5.718144319446383e-3,5.719365144359351e-3,5.720585969272321e-3,5.72180679418529e-3,5.723027619098258e-3,5.7242484440112274e-3,5.725469268924196e-3,5.726690093837165e-3,5.727910918750134e-3,5.729131743663103e-3,5.730352568576072e-3,5.73157339348904e-3,5.732794218402009e-3,5.734015043314979e-3,5.735235868227947e-3,5.736456693140916e-3,5.737677518053885e-3,5.738898342966854e-3,5.740119167879823e-3,5.741339992792791e-3,5.742560817705761e-3,5.743781642618729e-3,5.745002467531698e-3,5.746223292444667e-3,5.747444117357636e-3,5.748664942270605e-3,5.749885767183573e-3,5.7511065920965426e-3,5.752327417009512e-3,5.75354824192248e-3,5.754769066835449e-3,5.755989891748418e-3,5.757210716661387e-3,5.758431541574355e-3,5.7596523664873245e-3,5.760873191400294e-3,5.762094016313262e-3,5.763314841226231e-3,5.7645356661392e-3,5.765756491052169e-3,5.766977315965138e-3,5.7681981408781065e-3,5.769418965791076e-3,5.770639790704044e-3,5.771860615617013e-3,5.7730814405299825e-3,5.774302265442951e-3,5.77552309035592e-3,5.7767439152688884e-3,5.777964740181858e-3,5.779185565094827e-3,5.780406390007795e-3,5.7816272149207645e-3,5.782848039833733e-3,5.784068864746702e-3,5.785289689659671e-3,5.78651051457264e-3,5.787731339485609e-3,5.788952164398577e-3,5.790172989311546e-3,5.791393814224516e-3,5.792614639137484e-3,5.793835464050453e-3,5.795056288963422e-3,5.796277113876391e-3,5.79749793878936e-3,5.798718763702328e-3,5.799939588615298e-3,5.801160413528266e-3,5.802381238441235e-3,5.803602063354204e-3,5.804822888267173e-3,5.806043713180142e-3,5.80726453809311e-3,5.80848536300608e-3,5.809706187919049e-3,5.810927012832017e-3,5.812147837744986e-3,5.813368662657955e-3,5.814589487570924e-3,5.815810312483893e-3,5.8170311373968615e-3,5.818251962309831e-3,5.819472787222799e-3,5.820693612135768e-3,5.8219144370487376e-3,5.823135261961706e-3,5.824356086874675e-3,5.8255769117876435e-3,5.826797736700613e-3],"kdeType":"time","kdePDF":[1019.5373084237668,1019.7637421621965,1020.2533075587864,1021.0792144186191,1022.3508072300559,1024.2129867878552,1026.8454162718053,1030.4614937957865,1035.3070707871354,1041.6588940448357,1049.8227491047244,1060.1312837170783,1072.941492877457,1088.6318509576324,1107.5990820219793,1130.2545662959658,1157.0203888375997,1188.325045561594,1224.5988316461085,1266.268947740355,1313.7543699811238,1367.4605402846023,1427.7739433567695,1495.0566460032612,1569.6408822636686,1651.8237743055083,1741.8622835752412,1839.9684891405898,1946.3052902416885,2060.9826276280264,2184.0543131922036,2315.515549693471,2455.3012120490203,2603.284948897687,2759.2791481342897,2923.0357931793324,3094.248218274285,3272.553751529788,3457.537214316371,3648.7352254287057,3845.6412388599433,4047.7112255820925,4254.369893024689,4465.017321523728,4679.035885376282,4895.797317705572,5114.669773457488,5335.024743740762,5556.2436775111355,5777.72417327335,5998.885613905776,6219.1741316372745,6438.066807253191,6655.07502728686,6869.746944694798,7081.6690116630525,7290.466577058243,7495.80356489116,7697.381273290746,7894.936355194286,8088.238061616294,8277.084845397681,8461.30043730499,8640.729516891945,8815.233107438498,8984.683827447849,9148.961130658738,9307.94666247959,9461.519853464551,9609.553860308291,9751.911952311124,9888.444426880076,10018.986121954547,10143.354576845091,10261.348876416434,10372.749197347559,10477.317059833256,10574.796273936703,10664.914557169564,10747.385788965996,10821.912858643147,10888.191056211128,10945.911949936743,10994.767690718814,11034.455680884012,11064.683543693101,11085.17432937169,11095.671893546707,11095.946384299015,11085.799774378575,11065.071375267627,11033.643269570874,10991.445597583166,10938.46163282784,10874.732579941767,10800.36202664313,10715.51997985466,10620.446414617943,10515.454263509158,10400.93177415873,10277.34416349412,10145.234499758115,10005.22374746179,9858.009916420577,9704.366264036635,9545.13851010128,9381.241035581452,9213.652051023826,9043.407736167,8871.595369822204,8699.345487711116,8527.823125314791,8358.218222412313,8191.735285356814,8029.582421708993,7872.959879083788,7723.0482354335945,7580.996400997628,7447.909602344188,7324.837525942117,7212.76280221673,7112.590010864868,7025.135384208468,6951.117377548318,6891.148263932293,6845.726895675284,6815.232756655521,6799.921408252735]}],"reportKeys":["time","cpuTime","cycles","iters","allocated","numGcs","bytesCopied","mutatorWallSeconds","mutatorCpuSeconds","gcWallSeconds","gcCpuSeconds"],"reportNumber":1,"reportName":"create/relation 10x1000","reportOutliers":{"highSevere":0,"highMild":0,"lowMild":1,"samplesSeen":33,"lowSevere":0},"reportMeasured":[[5.887054001505021e-3,5.879581999999495e-3,11182234,1,null,null,null,null,null,null,null],[1.1682764001307078e-2,1.1675040000000081e-2,22194893,2,null,null,null,null,null,null,null],[1.7509942001197487e-2,1.74909379999999e-2,33265063,3,null,null,null,null,null,null,null],[2.3410166999383364e-2,2.3395288999999764e-2,44477630,4,null,null,null,null,null,null,null],[2.9472086003806908e-2,2.9430035999999937e-2,55992906,5,null,null,null,null,null,null,null],[3.5199064994230866e-2,3.516572100000026e-2,66874109,6,null,null,null,null,null,null,null],[4.122917899803724e-2,4.1192778000000096e-2,78332155,7,null,null,null,null,null,null,null],[4.701189199840883e-2,4.6936478000000115e-2,89320165,8,null,null,null,null,null,null,null],[5.271683200408006e-2,5.2686497999999915e-2,100160078,9,null,null,null,null,null,null,null],[5.865615299990168e-2,5.859188300000007e-2,111442987,10,null,null,null,null,null,null,null],[6.451627500064205e-2,6.446151800000077e-2,122578882,11,null,null,null,null,null,null,null],[6.994964399927994e-2,6.990481299999995e-2,132901645,12,null,null,null,null,null,null,null],[7.564991200342774e-2,7.560714800000046e-2,143731876,13,null,null,null,null,null,null,null],[8.150492400454823e-2,8.145551299999987e-2,154856276,14,null,null,null,null,null,null,null],[8.717107799748192e-2,8.711902599999988e-2,165622826,15,null,null,null,null,null,null,null],[9.312852899893187e-2,9.307294599999949e-2,176940830,16,null,null,null,null,null,null,null],[9.896839800057933e-2,9.890558900000013e-2,188037060,17,null,null,null,null,null,null,null],[0.10488027700193925,0.10481192300000064,199268869,18,null,null,null,null,null,null,null],[0.11073017199669266,0.11065237000000039,210383777,19,null,null,null,null,null,null,null],[0.1164985559953493,0.11641449700000006,221345187,20,null,null,null,null,null,null,null],[0.12229861300147604,0.12221939399999915,232363084,21,null,null,null,null,null,null,null],[0.12807984399842098,0.12799171500000028,243349421,22,null,null,null,null,null,null,null],[0.13390199199784547,0.1338048280000006,254410896,23,null,null,null,null,null,null,null],[0.14545249000366312,0.1453479619999989,276355041,25,null,null,null,null,null,null,null],[0.15155094099463895,0.15144441099999995,287943394,26,null,null,null,null,null,null,null],[0.15711575300520053,0.1570216500000008,298516821,27,null,null,null,null,null,null,null],[0.1631851429992821,0.16307090699999982,310048392,28,null,null,null,null,null,null,null],[0.1747862139964127,0.1746803400000001,332090436,30,null,null,null,null,null,null,null],[0.18045503400207963,0.1803195800000008,342861401,31,null,null,null,null,null,null,null],[0.19231173899606802,0.1921958280000009,365388724,33,null,null,null,null,null,null,null],[0.2039038500006427,0.20378220699999972,387412480,35,null,null,null,null,null,null,null],[0.21039060900511686,0.21022488999999922,399739724,36,null,null,null,null,null,null,null],[0.22193210600380553,0.22176617799999931,421666776,38,null,null,null,null,null,null,null],[0.2330857230044785,0.23292181699999936,442860210,40,null,null,null,null,null,null,null],[0.24479770500329323,0.24462668700000023,465112860,42,null,null,null,null,null,null,null],[0.25617124199925456,0.25600337800000084,486722943,44,null,null,null,null,null,null,null],[0.27382572499482194,0.2736053199999997,520266634,47,null,null,null,null,null,null,null],[0.28562600299483165,0.28540836500000033,542685866,49,null,null,null,null,null,null,null]]},{"reportAnalysis":{"anMean":{"estError":{"confIntLDX":1.1706234940519339e-4,"confIntUDX":8.102457807721009e-5,"confIntCL":5.0e-2},"estPoint":5.784195729887314e-2},"anRegress":[{"regRSquare":{"estError":{"confIntLDX":1.0044644099260758e-5,"confIntUDX":5.5926182669363556e-6,"confIntCL":5.0e-2},"estPoint":0.9999927443132401},"regResponder":"time","regCoeffs":{"y":{"estError":{"confIntLDX":4.549259207879345e-4,"confIntUDX":5.647312782263292e-4,"confIntCL":5.0e-2},"estPoint":-1.3937853123716963e-4},"iters":{"estError":{"confIntLDX":1.1138027169087239e-4,"confIntUDX":8.933946864835007e-5,"confIntCL":5.0e-2},"estPoint":5.807704609456791e-2}}}],"anStdDev":{"estError":{"confIntLDX":6.698984573395927e-5,"confIntUDX":1.0250957386340848e-4,"confIntCL":5.0e-2},"estPoint":1.7121491767487851e-4},"anOutlierVar":{"ovFraction":7.638888888888888e-2,"ovDesc":"slight","ovEffect":"Slight"},"anOverhead":2.1820495514718956e-3},"reportKDEs":[{"kdeValues":[5.741071695578914e-2,5.741628100214218e-2,5.742184504849522e-2,5.742740909484826e-2,5.74329731412013e-2,5.743853718755434e-2,5.744410123390738e-2,5.7449665280260416e-2,5.7455229326613455e-2,5.7460793372966494e-2,5.746635741931953e-2,5.747192146567257e-2,5.747748551202561e-2,5.748304955837865e-2,5.748861360473169e-2,5.749417765108473e-2,5.749974169743777e-2,5.7505305743790806e-2,5.7510869790143845e-2,5.7516433836496884e-2,5.752199788284992e-2,5.752756192920296e-2,5.7533125975556e-2,5.753869002190904e-2,5.754425406826208e-2,5.754981811461512e-2,5.755538216096816e-2,5.75609462073212e-2,5.7566510253674236e-2,5.7572074300027275e-2,5.7577638346380314e-2,5.758320239273335e-2,5.758876643908639e-2,5.759433048543943e-2,5.759989453179247e-2,5.760545857814551e-2,5.761102262449855e-2,5.761658667085159e-2,5.7622150717204626e-2,5.7627714763557665e-2,5.7633278809910704e-2,5.763884285626374e-2,5.764440690261678e-2,5.764997094896982e-2,5.765553499532286e-2,5.76610990416759e-2,5.766666308802894e-2,5.767222713438198e-2,5.7677791180735016e-2,5.7683355227088055e-2,5.7688919273441094e-2,5.769448331979413e-2,5.770004736614717e-2,5.770561141250021e-2,5.771117545885325e-2,5.771673950520629e-2,5.772230355155933e-2,5.772786759791237e-2,5.773343164426541e-2,5.7738995690618446e-2,5.7744559736971485e-2,5.7750123783324524e-2,5.775568782967756e-2,5.77612518760306e-2,5.776681592238364e-2,5.777237996873668e-2,5.777794401508972e-2,5.778350806144276e-2,5.77890721077958e-2,5.7794636154148836e-2,5.7800200200501875e-2,5.7805764246854914e-2,5.781132829320795e-2,5.781689233956099e-2,5.782245638591403e-2,5.782802043226707e-2,5.783358447862011e-2,5.783914852497315e-2,5.784471257132619e-2,5.7850276617679226e-2,5.7855840664032265e-2,5.7861404710385304e-2,5.786696875673834e-2,5.787253280309138e-2,5.787809684944442e-2,5.788366089579746e-2,5.78892249421505e-2,5.789478898850354e-2,5.790035303485658e-2,5.790591708120962e-2,5.7911481127562656e-2,5.7917045173915695e-2,5.7922609220268734e-2,5.792817326662177e-2,5.793373731297481e-2,5.793930135932785e-2,5.794486540568089e-2,5.795042945203393e-2,5.795599349838697e-2,5.796155754474001e-2,5.7967121591093046e-2,5.7972685637446085e-2,5.7978249683799124e-2,5.798381373015216e-2,5.79893777765052e-2,5.799494182285824e-2,5.800050586921128e-2,5.800606991556432e-2,5.801163396191736e-2,5.80171980082704e-2,5.8022762054623436e-2,5.8028326100976475e-2,5.8033890147329514e-2,5.803945419368255e-2,5.804501824003559e-2,5.805058228638863e-2,5.805614633274167e-2,5.806171037909471e-2,5.806727442544775e-2,5.807283847180079e-2,5.807840251815383e-2,5.8083966564506866e-2,5.8089530610859905e-2,5.8095094657212944e-2,5.810065870356598e-2,5.810622274991902e-2,5.811178679627206e-2,5.81173508426251e-2],"kdeType":"time","kdePDF":[864.337780567609,864.7149663440533,865.4691143773614,866.5997771575265,868.1062822472436,869.9877308886195,872.2429961678006,874.8707207565141,877.869314254025,881.23695015743,884.9715624924057,889.0708421405709,893.5322329034202,898.3529273463608,903.5298624696674,909.0597152562005,914.9388981484232,921.1635545096367,927.729554126396,934.632488810753,941.8676681622743,949.4301155507385,957.3145643809444,965.5154547012332,974.0269302170491,982.8428357702603,991.9567153438611,1001.3618106502569,1011.0510603594689,1021.0171000213678,1031.252262733412,1041.7485806023867,1052.4977870452958,1063.491319970846,1074.7203258789777,1086.1756649115468,1097.8479168826773,1109.7273883124024,1121.8041204821538,1134.0678985252673,1146.5082615602405,1159.1145138687505,1171.8757371147092,1184.7808035946825,1197.8183905041446,1210.97699519794,1224.2449514174898,1237.6104464512014,1251.0615391888011,1264.5861790244194,1278.17222555776,1291.8074690370927,1305.4796514826935,1319.176488424201,1332.8856911807407,1346.594989608087,1360.2921552331238,1373.9650246919678,1387.6015233848482,1401.189689257703,1414.7176966180257,1428.173879890213,1441.5467572141677,1454.8250537895403,1467.9977248674795,1481.0539782913854,1493.9832964886293,1506.7754578158913,1519.4205571622201,1531.909025715667,1544.2316498018174,1556.3795887053034,1568.34439138886,1580.1180120282238,1591.6928242856093,1603.0616342491494,1614.2176919710232,1625.1547015424637,1635.8668296499902,1646.3487125634085,1656.5954615129635,1666.6026664198482,1676.3663979516655,1685.8832078817686,1695.15012773918,1704.1646657434887,1712.9248020271448,1721.428982155464,1729.6761089627587,1737.6655327309381,1745.397039744956,1752.87083926725,1760.0875489811233,1767.0481789604837,1773.7541142307196,1780.2070959925284,1786.4092015872814,1792.3628232889182,1798.0706460134295,1803.5356240426133,1808.7609568640078,1813.7500642336247,1818.5065605723607,1823.034228810673,1827.3369937992732,1831.418895406227,1835.2840614228421,1838.9366804022002,1842.3809745549881,1845.6211728275348,1848.661484286526,1851.506071933908,1854.1590270738127,1856.6243443511423,1858.9058975785972,1861.0074164655264,1862.9324643579657,1864.684417094723,1866.2664430792536,1867.6814846615316,1868.9322409180254,1870.0211519114143,1870.9503845047345,1871.7218197973543,1872.337042242516,1872.7973304982488,1873.1036500552098,1873.2566476765892]}],"reportKeys":["time","cpuTime","cycles","iters","allocated","numGcs","bytesCopied","mutatorWallSeconds","mutatorCpuSeconds","gcWallSeconds","gcCpuSeconds"],"reportNumber":2,"reportName":"create/relation 10x10000","reportOutliers":{"highSevere":0,"highMild":0,"lowMild":1,"samplesSeen":11,"lowSevere":0},"reportMeasured":[[5.802666299859993e-2,5.799217000000034e-2,110247192,1,null,null,null,null,null,null,null],[0.11603023100178689,0.11595200700000063,220455093,2,null,null,null,null,null,null,null],[0.1739662089967169,0.1738531520000013,330532285,3,null,null,null,null,null,null,null],[0.23227401099575218,0.2321224449999999,441317043,4,null,null,null,null,null,null,null],[0.2908108289993834,0.2905827829999996,552537826,5,null,null,null,null,null,null,null],[0.34785422600543825,0.34761730600000007,660920579,6,null,null,null,null,null,null,null],[0.40712012400035746,0.40688040700000094,773525905,7,null,null,null,null,null,null,null],[0.4638553500044509,0.46359462299999876,881324905,8,null,null,null,null,null,null,null],[0.5220888359981473,0.5217654560000007,991965021,9,null,null,null,null,null,null,null],[0.5797449680030695,0.5794075549999995,1101513012,10,null,null,null,null,null,null,null],[0.638773004997347,0.6383390959999993,1213664465,11,null,null,null,null,null,null,null],[0.6977926010004012,0.6972165320000006,1325803613,12,null,null,null,null,null,null,null]]},{"reportAnalysis":{"anMean":{"estError":{"confIntLDX":1.501427528155276e-4,"confIntUDX":2.7562873243145575e-4,"confIntCL":5.0e-2},"estPoint":1.448797309139284e-2},"anRegress":[{"regRSquare":{"estError":{"confIntLDX":7.047959918693447e-4,"confIntUDX":5.488466394070191e-4,"confIntCL":5.0e-2},"estPoint":0.9988610048876899},"regResponder":"time","regCoeffs":{"y":{"estError":{"confIntLDX":2.8646289933435686e-3,"confIntUDX":3.244918023182094e-3,"confIntCL":5.0e-2},"estPoint":5.033271389983918e-4},"iters":{"estError":{"confIntLDX":2.0722653404042432e-4,"confIntUDX":2.1460011194947975e-4,"confIntCL":5.0e-2},"estPoint":1.4458875553677806e-2}}}],"anStdDev":{"estError":{"confIntLDX":2.0017124217413867e-4,"confIntUDX":3.516842285068824e-4,"confIntCL":5.0e-2},"estPoint":4.774249175945004e-4},"anOutlierVar":{"ovFraction":0.11563227985262721,"ovDesc":"moderate","ovEffect":"Moderate"},"anOverhead":2.1820495514718956e-3},"reportKDEs":[{"kdeValues":[1.3629004076506593e-2,1.3650202404333968e-2,1.367140073216134e-2,1.3692599059988715e-2,1.3713797387816088e-2,1.3734995715643463e-2,1.3756194043470836e-2,1.377739237129821e-2,1.3798590699125585e-2,1.3819789026952958e-2,1.3840987354780333e-2,1.3862185682607706e-2,1.388338401043508e-2,1.3904582338262453e-2,1.3925780666089828e-2,1.39469789939172e-2,1.3968177321744575e-2,1.398937564957195e-2,1.4010573977399323e-2,1.4031772305226698e-2,1.405297063305407e-2,1.4074168960881445e-2,1.4095367288708818e-2,1.4116565616536193e-2,1.4137763944363568e-2,1.415896227219094e-2,1.4180160600018315e-2,1.4201358927845688e-2,1.4222557255673063e-2,1.4243755583500436e-2,1.426495391132781e-2,1.4286152239155185e-2,1.4307350566982558e-2,1.4328548894809933e-2,1.4349747222637306e-2,1.437094555046468e-2,1.4392143878292053e-2,1.4413342206119428e-2,1.4434540533946803e-2,1.4455738861774176e-2,1.447693718960155e-2,1.4498135517428923e-2,1.4519333845256298e-2,1.454053217308367e-2,1.4561730500911045e-2,1.458292882873842e-2,1.4604127156565793e-2,1.4625325484393168e-2,1.464652381222054e-2,1.4667722140047915e-2,1.4688920467875288e-2,1.4710118795702663e-2,1.4731317123530038e-2,1.475251545135741e-2,1.4773713779184785e-2,1.4794912107012158e-2,1.4816110434839533e-2,1.4837308762666906e-2,1.485850709049428e-2,1.4879705418321653e-2,1.4900903746149028e-2,1.4922102073976401e-2,1.4943300401803776e-2,1.496449872963115e-2,1.4985697057458523e-2,1.5006895385285898e-2,1.5028093713113271e-2,1.5049292040940646e-2,1.5070490368768018e-2,1.5091688696595393e-2,1.5112887024422768e-2,1.513408535225014e-2,1.5155283680077515e-2,1.5176482007904888e-2,1.5197680335732263e-2,1.5218878663559636e-2,1.524007699138701e-2,1.5261275319214385e-2,1.5282473647041758e-2,1.5303671974869133e-2,1.5324870302696506e-2,1.534606863052388e-2,1.5367266958351253e-2,1.5388465286178628e-2,1.5409663614006003e-2,1.5430861941833376e-2,1.545206026966075e-2,1.5473258597488123e-2,1.5494456925315498e-2,1.5515655253142871e-2,1.5536853580970246e-2,1.555805190879762e-2,1.5579250236624993e-2,1.5600448564452368e-2,1.562164689227974e-2,1.5642845220107116e-2,1.566404354793449e-2,1.568524187576186e-2,1.5706440203589238e-2,1.572763853141661e-2,1.5748836859243984e-2,1.577003518707136e-2,1.5791233514898733e-2,1.5812431842726106e-2,1.5833630170553482e-2,1.5854828498380855e-2,1.5876026826208228e-2,1.58972251540356e-2,1.5918423481862978e-2,1.593962180969035e-2,1.5960820137517723e-2,1.5982018465345096e-2,1.6003216793172473e-2,1.6024415120999846e-2,1.604561344882722e-2,1.6066811776654595e-2,1.6088010104481968e-2,1.610920843230934e-2,1.6130406760136714e-2,1.615160508796409e-2,1.6172803415791463e-2,1.6194001743618836e-2,1.621520007144621e-2,1.6236398399273586e-2,1.625759672710096e-2,1.627879505492833e-2,1.6299993382755708e-2,1.632119171058308e-2],"kdeType":"time","kdePDF":[236.1468506342645,238.42315975933295,242.96912858425986,249.77198675890781,258.8138142621554,270.07279242351245,283.52451076567814,299.1430674014351,316.90168943873925,336.77261765772505,358.72604613157625,382.72797946098194,408.7369625833353,436.69974353713724,466.5460396403535,498.1826831747923,531.4875148321455,566.3034636291537,602.4332939206391,639.6355086652782,677.6218707076326,716.0569405724475,754.5599327746658,792.7090680628882,830.0484536556194,866.0973664698996,900.3616558446292,932.3468331312696,961.5722863992992,987.5859591179271,1009.978770149166,1028.3980345754383,1042.5591738408243,1052.255079284244,1057.3626119132182,1057.8458764597917,1053.7560896840748,1045.228059505023,1032.4734892826261,1015.7715063844435,995.4569725890917,971.9072541984668,945.5282030112918,916.7401202180627,885.9644426127243,853.6118073895211,820.0720254013871,785.7063337796247,750.8421204799047,715.7701302205685,680.7439880684003,645.9817270145621,611.6688902672513,577.9627053380816,544.9967990765202,512.8859402702265,481.73035503504656,451.6192523818604,422.6333129877053,394.8460217808541,368.32385260089035,343.1254297925042,319.29988770945994,296.88471774821517,275.9034295927156,256.36335778327094,238.25391840349252,221.5455680459126,206.18964467993428,192.11918528566417,179.25072631553067,167.48700813895317,156.72043063320865,146.83704957553374,137.7208662156558,129.2581471128136,121.34151775755043,113.87359959872839,106.77000229107666,99.96153662365278,93.39557344526342,87.03653463389456,80.86555879591435,74.87943272728975,69.08891658802744,63.516614347273304,58.19455077189301,53.161612727553226,48.46099759342363,44.13778775416025,40.236740558202534,36.80035116808556,33.86721462261318,31.4706860431445,29.637816491489335,28.388527993554806,27.734985289792334,27.681123706087906,28.222301108778947,29.345055507877436,31.02696632313282,33.23663419562585,35.93380906597205,39.069706823689295,42.58755937487617,46.42344031070433,50.507398070112885,54.76491097350307,59.118654965810116,63.49054728078228,67.80400003385625,71.9862898417851,75.97092592957311,79.6998826143421,83.12555488150204,86.21229959990345,88.93744044624657,91.29164146592449,93.278590954289,94.91398156497118,96.22382098041126,97.24215629121531,98.00834036880944,98.56400605518164,98.94994050786177,99.20306493132794,99.35372269439145,99.42346123269024]}],"reportKeys":["time","cpuTime","cycles","iters","allocated","numGcs","bytesCopied","mutatorWallSeconds","mutatorCpuSeconds","gcWallSeconds","gcCpuSeconds"],"reportNumber":3,"reportName":"restrict/restrict relation 10x10000 to 10x1","reportOutliers":{"highSevere":1,"highMild":0,"lowMild":0,"samplesSeen":22,"lowSevere":0},"reportMeasured":[[1.254821499605896e-2,1.253168299999885e-2,23833172,1,null,null,null,null,null,null,null],[2.469259400095325e-2,2.4657473000001318e-2,46908325,2,null,null,null,null,null,null,null],[4.938155299896607e-2,4.931847499999975e-2,93819295,3,null,null,null,null,null,null,null],[5.7797679997747764e-2,5.77268619999991e-2,109805686,4,null,null,null,null,null,null,null],[7.035779000580078e-2,7.0287411999999e-2,133671460,5,null,null,null,null,null,null,null],[9.253486299712677e-2,9.243146399999702e-2,175809034,6,null,null,null,null,null,null,null],[0.10170249599468661,0.10158981499999697,193225303,7,null,null,null,null,null,null,null],[0.11512309200043092,0.11497926600000241,218724826,8,null,null,null,null,null,null,null],[0.12616992999392096,0.1260058870000016,239715692,9,null,null,null,null,null,null,null],[0.14971562999562593,0.14953576899999987,284452564,10,null,null,null,null,null,null,null],[0.1593516780048958,0.15915635500000036,302758476,11,null,null,null,null,null,null,null],[0.16994197700114455,0.16973221199999955,322882229,12,null,null,null,null,null,null,null],[0.19297148700570688,0.19272797600000047,366638785,13,null,null,null,null,null,null,null],[0.20395877199916868,0.20370798700000137,387512061,14,null,null,null,null,null,null,null],[0.21702719799941406,0.21678522699999903,412342135,15,null,null,null,null,null,null,null],[0.2289532409995445,0.22868242799999905,435003398,16,null,null,null,null,null,null,null],[0.25124789999972563,0.2509605150000027,477365114,17,null,null,null,null,null,null,null],[0.2602841040061321,0.25986185000000006,494530761,18,null,null,null,null,null,null,null],[0.27312203800102,0.2727749569999993,518923833,19,null,null,null,null,null,null,null],[0.2951591550008743,0.29479497700000223,560790800,20,null,null,null,null,null,null,null],[0.30637529699743027,0.3059842109999984,582103272,21,null,null,null,null,null,null,null],[0.3175946830015164,0.31720702700000203,603421740,22,null,null,null,null,null,null,null],[0.3274035539943725,0.32700220600000307,622057602,23,null,null,null,null,null,null,null],[0.36078646600071806,0.36023960700000046,685484566,25,null,null,null,null,null,null,null]]},{"reportAnalysis":{"anMean":{"estError":{"confIntLDX":1.2431711081148933e-3,"confIntUDX":6.412824709298576e-4,"confIntCL":5.0e-2},"estPoint":8.447258684075218e-2},"anRegress":[{"regRSquare":{"estError":{"confIntLDX":3.1814620502657043e-4,"confIntUDX":1.8060952075904524e-4,"confIntCL":5.0e-2},"estPoint":0.9997530519626538},"regResponder":"time","regCoeffs":{"y":{"estError":{"confIntLDX":5.320556288099867e-3,"confIntUDX":6.507065883152455e-3,"confIntCL":5.0e-2},"estPoint":-1.3701538662041516e-3},"iters":{"estError":{"confIntLDX":9.266209026589783e-4,"confIntUDX":1.1153229224582645e-3,"confIntCL":5.0e-2},"estPoint":8.504563215758416e-2}}}],"anStdDev":{"estError":{"confIntLDX":7.89549338289093e-4,"confIntUDX":9.00270406177663e-4,"confIntCL":5.0e-2},"estPoint":1.4013810341920257e-3},"anOutlierVar":{"ovFraction":9.0e-2,"ovDesc":"slight","ovEffect":"Slight"},"anOverhead":2.1820495514718956e-3},"reportKDEs":[{"kdeValues":[8.070310981625707e-2,8.075036357653102e-2,8.079761733680496e-2,8.084487109707891e-2,8.089212485735285e-2,8.09393786176268e-2,8.098663237790076e-2,8.10338861381747e-2,8.108113989844865e-2,8.112839365872258e-2,8.117564741899654e-2,8.122290117927049e-2,8.127015493954443e-2,8.131740869981838e-2,8.136466246009232e-2,8.141191622036627e-2,8.145916998064022e-2,8.150642374091416e-2,8.155367750118811e-2,8.160093126146205e-2,8.1648185021736e-2,8.169543878200995e-2,8.174269254228389e-2,8.178994630255784e-2,8.183720006283178e-2,8.188445382310573e-2,8.193170758337968e-2,8.197896134365362e-2,8.202621510392757e-2,8.207346886420151e-2,8.212072262447546e-2,8.216797638474942e-2,8.221523014502335e-2,8.22624839052973e-2,8.230973766557124e-2,8.23569914258452e-2,8.240424518611915e-2,8.245149894639309e-2,8.249875270666704e-2,8.254600646694098e-2,8.259326022721493e-2,8.264051398748888e-2,8.268776774776282e-2,8.273502150803677e-2,8.278227526831071e-2,8.282952902858466e-2,8.287678278885861e-2,8.292403654913255e-2,8.29712903094065e-2,8.301854406968044e-2,8.30657978299544e-2,8.311305159022835e-2,8.316030535050228e-2,8.320755911077624e-2,8.325481287105017e-2,8.330206663132413e-2,8.334932039159808e-2,8.339657415187202e-2,8.344382791214597e-2,8.34910816724199e-2,8.353833543269386e-2,8.358558919296781e-2,8.363284295324175e-2,8.36800967135157e-2,8.372735047378964e-2,8.377460423406359e-2,8.382185799433753e-2,8.386911175461148e-2,8.391636551488543e-2,8.396361927515937e-2,8.401087303543332e-2,8.405812679570726e-2,8.410538055598121e-2,8.415263431625516e-2,8.41998880765291e-2,8.424714183680306e-2,8.4294395597077e-2,8.434164935735095e-2,8.43889031176249e-2,8.443615687789884e-2,8.448341063817279e-2,8.453066439844673e-2,8.457791815872068e-2,8.462517191899463e-2,8.467242567926857e-2,8.471967943954252e-2,8.476693319981646e-2,8.481418696009041e-2,8.486144072036436e-2,8.49086944806383e-2,8.495594824091225e-2,8.500320200118619e-2,8.505045576146014e-2,8.50977095217341e-2,8.514496328200803e-2,8.519221704228198e-2,8.523947080255592e-2,8.528672456282987e-2,8.533397832310383e-2,8.538123208337776e-2,8.542848584365172e-2,8.547573960392565e-2,8.55229933641996e-2,8.557024712447356e-2,8.56175008847475e-2,8.566475464502145e-2,8.571200840529539e-2,8.575926216556934e-2,8.580651592584329e-2,8.585376968611723e-2,8.590102344639118e-2,8.594827720666512e-2,8.599553096693907e-2,8.604278472721302e-2,8.609003848748696e-2,8.613729224776091e-2,8.618454600803485e-2,8.62317997683088e-2,8.627905352858276e-2,8.63263072888567e-2,8.637356104913065e-2,8.642081480940458e-2,8.646806856967854e-2,8.651532232995249e-2,8.656257609022643e-2,8.660982985050038e-2,8.665708361077432e-2,8.670433737104827e-2],"kdeType":"time","kdePDF":[92.3086773908225,92.357761886428,92.45590651832431,92.60306248601609,92.79915638482603,93.04408996321756,93.33773980261624,93.67995692261259,94.07056631511186,94.50936641166705,94.99612848886476,95.53059601724885,96.11248395983819,96.7414780268368,97.4172338936303,98.13937638961931,98.90749866584518,99.72116134972482,100.57989169551458,101.4831827393787,102.430492468132,103.42124301086862,104.4548198627676,105.53057115039063,106.64780694774748,107.8057986523098,109.00377842999379,110.2409387379196,111.51643193347834,112.82936997790614,114.17882424217945,115.5638254226023,116.98336357296606,118.43638825961767,119.92180884518928,121.43849490610339,122.98527678830536,124.5609463049578,126.16425757910008,127.79392803349742,129.4486395291201,131.1270396528686,132.82774315434182,134.54933353059192,136.2903647569761,138.0493631613498,139.82482943801733,141.61524079699913,143.41905324336705,145.23470398057296,147.06061393092673,148.89519036560333,150.7368296358464,152.58391999632633,154.43484451097473,156.28798403098938,158.14172023415975,159.99443871413416,161.84453210781078,163.6904032486151,165.5304683331085,167.3631600880728,169.1869309250239,171.00025606894118,172.80163664793898,174.58960273057647,176.36271629758048,178.1195741348641,179.85881063494068,181.5791004940798,183.2791612929059,184.95775594852157,186.61369502672306,188.24583890338815,189.85309976472294,191.4344434366877,192.98889103464302,194.51552042499648,196.01346749145253,197.48192719930077,198.9201544520853,200.32746473590544,201.7032345475745,203.0469016038301,204.357964829811,205.63598412602408,206.88057991407305,208.09143246244727,209.2682809947231,210.41092258355513,211.51921083487218,212.5930543676943,213.63241509598726,214.63730631992814,215.60779063489645,216.5439776673988,217.44602164799662,218.3141188321171,219.14850478039233,219.9494515108795,220.71726453617,221.45227979898345,222.15486052037198,222.8253939751184,223.46428820930262,224.0719687153282,224.64887507994445,225.19545762097002,225.71217402851266,226.19948602649902,226.6578560702619,227.08774409579618,227.489604336074,227.86388221952174,228.21101136538908,228.53141069030488,228.8254816397991,229.09360555799407,229.3361412080195,229.55342245500205,229.74575612270667,229.9134200340936,230.0566612451716,230.1756944806159,230.27070077864968,230.34182635169338,230.38918166824777,230.4128407604204]}],"reportKeys":["time","cpuTime","cycles","iters","allocated","numGcs","bytesCopied","mutatorWallSeconds","mutatorCpuSeconds","gcWallSeconds","gcCpuSeconds"],"reportNumber":4,"reportName":"restrict/restrict relation 10x10000 to 10x5000","reportOutliers":{"highSevere":0,"highMild":0,"lowMild":0,"samplesSeen":9,"lowSevere":1},"reportMeasured":[[8.242733500082977e-2,8.23534549999998e-2,156602833,1,null,null,null,null,null,null,null],[0.16349744900071528,0.16337303199999909,310634560,2,null,null,null,null,null,null,null],[0.259703730000183,0.2595030559999998,493428789,3,null,null,null,null,null,null,null],[0.34040561800065916,0.340130073000001,646761164,4,null,null,null,null,null,null,null],[0.4212543219982763,0.4209288019999988,800374404,5,null,null,null,null,null,null,null],[0.5070945240004221,0.5067263110000013,963471707,6,null,null,null,null,null,null,null],[0.5995631650002906,0.599115004999998,1139160942,7,null,null,null,null,null,null,null],[0.6832402630025172,0.6827478420000013,1298146922,8,null,null,null,null,null,null,null],[0.7608672300048056,0.7602914290000022,1445639167,9,null,null,null,null,null,null,null],[0.8457545939963893,0.8451073460000025,1606924694,10,null,null,null,null,null,null,null]]},{"reportAnalysis":{"anMean":{"estError":{"confIntLDX":2.241129906033184e-4,"confIntUDX":1.4726994991286387e-4,"confIntCL":5.0e-2},"estPoint":1.243577405705988e-2},"anRegress":[{"regRSquare":{"estError":{"confIntLDX":4.874527268268203e-4,"confIntUDX":3.9628034480598817e-4,"confIntCL":5.0e-2},"estPoint":0.999248061855069},"regResponder":"time","regCoeffs":{"y":{"estError":{"confIntLDX":2.138261771143397e-3,"confIntUDX":1.7479280365314538e-3,"confIntCL":5.0e-2},"estPoint":-4.138930822500715e-3},"iters":{"estError":{"confIntLDX":1.521867184636535e-4,"confIntUDX":1.4879101356986973e-4,"confIntCL":5.0e-2},"estPoint":1.2976132037824937e-2}}}],"anStdDev":{"estError":{"confIntLDX":1.5790585736380177e-4,"confIntUDX":1.3565994085572964e-4,"confIntCL":5.0e-2},"estPoint":4.600204612133745e-4},"anOutlierVar":{"ovFraction":0.14345146934193906,"ovDesc":"moderate","ovEffect":"Moderate"},"anOverhead":2.1820495514718956e-3},"reportKDEs":[{"kdeValues":[1.1216415464752303e-2,1.1231742709670032e-2,1.1247069954587761e-2,1.1262397199505492e-2,1.1277724444423222e-2,1.129305168934095e-2,1.130837893425868e-2,1.132370617917641e-2,1.1339033424094138e-2,1.135436066901187e-2,1.1369687913929599e-2,1.1385015158847328e-2,1.1400342403765057e-2,1.1415669648682786e-2,1.1430996893600515e-2,1.1446324138518246e-2,1.1461651383435975e-2,1.1476978628353705e-2,1.1492305873271434e-2,1.1507633118189163e-2,1.1522960363106892e-2,1.1538287608024623e-2,1.1553614852942352e-2,1.1568942097860082e-2,1.158426934277781e-2,1.159959658769554e-2,1.1614923832613271e-2,1.1630251077531e-2,1.164557832244873e-2,1.1660905567366459e-2,1.1676232812284188e-2,1.1691560057201917e-2,1.1706887302119648e-2,1.1722214547037377e-2,1.1737541791955106e-2,1.1752869036872836e-2,1.1768196281790565e-2,1.1783523526708294e-2,1.1798850771626025e-2,1.1814178016543754e-2,1.1829505261461483e-2,1.1844832506379212e-2,1.1860159751296942e-2,1.187548699621467e-2,1.1890814241132402e-2,1.1906141486050131e-2,1.192146873096786e-2,1.193679597588559e-2,1.1952123220803319e-2,1.196745046572105e-2,1.1982777710638779e-2,1.1998104955556508e-2,1.2013432200474237e-2,1.2028759445391966e-2,1.2044086690309696e-2,1.2059413935227426e-2,1.2074741180145156e-2,1.2090068425062885e-2,1.2105395669980614e-2,1.2120722914898343e-2,1.2136050159816072e-2,1.2151377404733803e-2,1.2166704649651533e-2,1.2182031894569262e-2,1.2197359139486991e-2,1.221268638440472e-2,1.2228013629322451e-2,1.224334087424018e-2,1.225866811915791e-2,1.2273995364075639e-2,1.2289322608993368e-2,1.2304649853911097e-2,1.2319977098828826e-2,1.2335304343746557e-2,1.2350631588664287e-2,1.2365958833582016e-2,1.2381286078499745e-2,1.2396613323417474e-2,1.2411940568335205e-2,1.2427267813252934e-2,1.2442595058170663e-2,1.2457922303088393e-2,1.2473249548006122e-2,1.2488576792923851e-2,1.2503904037841582e-2,1.2519231282759311e-2,1.253455852767704e-2,1.254988577259477e-2,1.2565213017512499e-2,1.2580540262430228e-2,1.2595867507347959e-2,1.2611194752265688e-2,1.2626521997183417e-2,1.2641849242101147e-2,1.2657176487018876e-2,1.2672503731936607e-2,1.2687830976854336e-2,1.2703158221772065e-2,1.2718485466689794e-2,1.2733812711607524e-2,1.2749139956525253e-2,1.2764467201442982e-2,1.2779794446360713e-2,1.2795121691278442e-2,1.2810448936196171e-2,1.28257761811139e-2,1.284110342603163e-2,1.285643067094936e-2,1.287175791586709e-2,1.2887085160784819e-2,1.2902412405702548e-2,1.2917739650620277e-2,1.2933066895538008e-2,1.2948394140455738e-2,1.2963721385373467e-2,1.2979048630291196e-2,1.2994375875208925e-2,1.3009703120126654e-2,1.3025030365044384e-2,1.3040357609962114e-2,1.3055684854879844e-2,1.3071012099797573e-2,1.3086339344715302e-2,1.3101666589633031e-2,1.3116993834550762e-2,1.3132321079468491e-2,1.314764832438622e-2,1.316297556930395e-2],"kdeType":"time","kdePDF":[226.39213579040626,227.74737208286672,230.4240209777485,234.35520446525166,239.44251189763614,245.55824020542485,252.54830281977044,260.23574239210177,268.42476856524763,276.90522970074903,285.4574168248726,293.857089327339,301.88060533640714,309.3100354147814,315.9381364991158,321.5730640786122,326.04270470946744,329.1985183000614,330.91879032668004,331.11120830482804,329.7146943643358,326.70044640392877,322.07216358193614,315.8654571759498,308.1464742561771,299.0097881330211,288.5756350012319,276.9865993921043,264.4038707584309,251.00320864962754,236.9707635617167,222.4989039966407,207.78219717561993,193.01368120718084,178.38155065714358,164.06635609851597,150.23879233903116,137.05812089351653,124.67124133043687,113.21239491946292,102.80345409486672,93.55472411010112,85.56616022287774,78.92888592916546,73.72688599788663,70.03874287314144,67.93928660130277,67.50103665813326,68.79532841542114,71.89303670435095,76.86483293611263,83.78093923284351,92.71037154239649,103.71969220152411,116.87131930550787,132.22146404469964,149.8177865562957,169.69687474606908,191.8816582336357,216.3788707422337,243.17666901250362,272.2425052447056,303.52133417118614,336.9342164993303,372.37735927907704,409.721612502002,448.8124216740795,489.4702197772223,531.4912301625712,574.6486452440753,618.6941445652857,663.3597194720666,708.3597792379582,753.3935235600917,798.1475770274628,842.2988904557856,885.5179199440715,927.4720954846134,967.8295857961837,1006.2633542572273,1042.4554826658525,1076.1017161094705,1106.9161552836308,1134.6359945388488,1159.0261775156848,1179.8838203249143,1197.0422375434712,1210.374401077014,1219.7956677387433,1225.2656288821559,1226.7889642908985,1224.4152214676953,1218.237488266476,1208.3899785330054,1195.044603621632,1178.4066536929734,1158.709758016505,1136.2103299323414,1111.181727129456,1083.9083697562796,1054.6800568134404,1023.7867054776729,991.5137095872026,958.1380744126301,923.9254376202575,889.1280340279541,853.9836076027433,818.715221407658,783.5318679329476,748.629741137533,714.1939997715211,680.4008307382902,647.4196123111446,615.4149801841269,584.5486141706749,554.9805887901812,526.8701653502904,500.3759443079053,475.65534216819646,452.86340421171957,432.151010083949,413.6625709617908,397.53335207497497,383.88658063512054,372.8305150623065,364.4556557868969,358.8322705486918,356.00838847365]}],"reportKeys":["time","cpuTime","cycles","iters","allocated","numGcs","bytesCopied","mutatorWallSeconds","mutatorCpuSeconds","gcWallSeconds","gcCpuSeconds"],"reportNumber":5,"reportName":"project/project 10x1000 to 1x1000","reportOutliers":{"highSevere":0,"highMild":0,"lowMild":4,"samplesSeen":24,"lowSevere":0},"reportMeasured":[[1.1805506001110189e-2,1.1793334000000044e-2,22422097,1,null,null,null,null,null,null,null],[2.3688543995376676e-2,2.3665619999999166e-2,44998973,2,null,null,null,null,null,null,null],[3.559850100282347e-2,3.5557807e-2,67629392,3,null,null,null,null,null,null,null],[4.660554000292905e-2,4.656808600000062e-2,88522841,4,null,null,null,null,null,null,null],[5.880757200066e-2,5.875392799999801e-2,111725134,5,null,null,null,null,null,null,null],[7.08814989993698e-2,7.08285650000029e-2,134666505,6,null,null,null,null,null,null,null],[8.951854199403897e-2,8.944563700000074e-2,170086558,7,null,null,null,null,null,null,null],[0.10135353299847338,0.10126066199999784,192564595,8,null,null,null,null,null,null,null],[0.11417685800552135,0.1140760279999995,216925949,9,null,null,null,null,null,null,null],[0.1255695689978893,0.1254597309999994,238572908,10,null,null,null,null,null,null,null],[0.13713935700070579,0.13703011200000148,260557082,11,null,null,null,null,null,null,null],[0.14897361699695466,0.1488434130000016,283042615,12,null,null,null,null,null,null,null],[0.16108048299793154,0.16094834200000108,306044257,13,null,null,null,null,null,null,null],[0.1797490840035607,0.17961487999999903,341513638,14,null,null,null,null,null,null,null],[0.19128122000256553,0.19112937800000296,363427079,15,null,null,null,null,null,null,null],[0.2028727059951052,0.20270760100000018,385452590,16,null,null,null,null,null,null,null],[0.21521219300484518,0.2150410849999993,408892984,17,null,null,null,null,null,null,null],[0.22753583099984098,0.22735460599999868,432309224,18,null,null,null,null,null,null,null],[0.23789910299819894,0.23770649300000102,452001413,19,null,null,null,null,null,null,null],[0.25045923499419587,0.2502648369999996,475864654,20,null,null,null,null,null,null,null],[0.26928186200530035,0.2690656770000004,511629312,21,null,null,null,null,null,null,null],[0.2863831520007807,0.28614335399999646,544120390,22,null,null,null,null,null,null,null],[0.3001085560026695,0.2998305869999953,570198325,23,null,null,null,null,null,null,null],[0.31689061599900015,0.3166167309999963,602084550,25,null,null,null,null,null,null,null],[0.33565128299960634,0.335338225000001,637727896,26,null,null,null,null,null,null,null],[0.3474145780055551,0.3470547940000017,660078787,27,null,null,null,null,null,null,null]]},{"reportAnalysis":{"anMean":{"estError":{"confIntLDX":2.0214769761556922e-4,"confIntUDX":1.4848505751438416e-4,"confIntCL":5.0e-2},"estPoint":1.547382196820991e-2},"anRegress":[{"regRSquare":{"estError":{"confIntLDX":3.8860730800849286e-4,"confIntUDX":3.083141884447915e-4,"confIntCL":5.0e-2},"estPoint":0.9994214827754374},"regResponder":"time","regCoeffs":{"y":{"estError":{"confIntLDX":2.459566718063007e-3,"confIntUDX":1.8356311328678744e-3,"confIntCL":5.0e-2},"estPoint":-3.352632585310556e-3},"iters":{"estError":{"confIntLDX":1.8636327388533297e-4,"confIntUDX":1.8116858527507038e-4,"confIntCL":5.0e-2},"estPoint":1.596884111763632e-2}}}],"anStdDev":{"estError":{"confIntLDX":1.1049259965506493e-4,"confIntUDX":1.2695701096172553e-4,"confIntCL":5.0e-2},"estPoint":3.978143402171812e-4},"anOutlierVar":{"ovFraction":4.1587901701323225e-2,"ovDesc":"slight","ovEffect":"Slight"},"anOverhead":2.1820495514718956e-3},"reportKDEs":[{"kdeValues":[1.449190814844687e-2,1.450530902167609e-2,1.451870989490531e-2,1.453211076813453e-2,1.454551164136375e-2,1.4558912514592971e-2,1.4572313387822191e-2,1.4585714261051411e-2,1.4599115134280631e-2,1.4612516007509851e-2,1.4625916880739071e-2,1.4639317753968291e-2,1.4652718627197511e-2,1.4666119500426731e-2,1.4679520373655951e-2,1.4692921246885171e-2,1.4706322120114391e-2,1.4719722993343612e-2,1.4733123866572832e-2,1.4746524739802052e-2,1.4759925613031272e-2,1.4773326486260492e-2,1.4786727359489712e-2,1.4800128232718932e-2,1.4813529105948152e-2,1.4826929979177372e-2,1.4840330852406592e-2,1.4853731725635812e-2,1.4867132598865032e-2,1.4880533472094252e-2,1.4893934345323472e-2,1.4907335218552692e-2,1.4920736091781912e-2,1.4934136965011132e-2,1.4947537838240352e-2,1.4960938711469573e-2,1.4974339584698793e-2,1.4987740457928013e-2,1.5001141331157233e-2,1.5014542204386453e-2,1.5027943077615673e-2,1.5041343950844893e-2,1.5054744824074113e-2,1.5068145697303333e-2,1.5081546570532553e-2,1.5094947443761773e-2,1.5108348316990993e-2,1.5121749190220213e-2,1.5135150063449433e-2,1.5148550936678653e-2,1.5161951809907873e-2,1.5175352683137093e-2,1.5188753556366313e-2,1.5202154429595533e-2,1.5215555302824754e-2,1.5228956176053974e-2,1.5242357049283194e-2,1.5255757922512414e-2,1.5269158795741634e-2,1.5282559668970854e-2,1.5295960542200074e-2,1.5309361415429296e-2,1.5322762288658514e-2,1.5336163161887736e-2,1.5349564035116954e-2,1.5362964908346176e-2,1.5376365781575394e-2,1.5389766654804616e-2,1.5403167528033834e-2,1.5416568401263056e-2,1.5429969274492276e-2,1.5443370147721496e-2,1.5456771020950716e-2,1.5470171894179936e-2,1.5483572767409156e-2,1.5496973640638376e-2,1.5510374513867596e-2,1.5523775387096816e-2,1.5537176260326037e-2,1.5550577133555257e-2,1.5563978006784477e-2,1.5577378880013697e-2,1.5590779753242917e-2,1.5604180626472137e-2,1.5617581499701357e-2,1.5630982372930577e-2,1.5644383246159795e-2,1.5657784119389017e-2,1.5671184992618235e-2,1.5684585865847457e-2,1.5697986739076675e-2,1.5711387612305897e-2,1.5724788485535116e-2,1.5738189358764337e-2,1.5751590231993556e-2,1.5764991105222777e-2,1.5778391978451996e-2,1.5791792851681218e-2,1.5805193724910436e-2,1.5818594598139658e-2,1.5831995471368876e-2,1.5845396344598098e-2,1.5858797217827316e-2,1.5872198091056538e-2,1.5885598964285756e-2,1.5898999837514978e-2,1.5912400710744196e-2,1.5925801583973418e-2,1.5939202457202636e-2,1.5952603330431858e-2,1.5966004203661077e-2,1.59794050768903e-2,1.5992805950119517e-2,1.600620682334874e-2,1.6019607696577957e-2,1.603300856980718e-2,1.6046409443036397e-2,1.605981031626562e-2,1.6073211189494837e-2,1.608661206272406e-2,1.6100012935953277e-2,1.61134138091825e-2,1.612681468241172e-2,1.614021555564094e-2,1.6153616428870157e-2,1.616701730209938e-2,1.61804181753286e-2,1.619381904855782e-2],"kdeType":"time","kdePDF":[339.3394652798866,339.3398040126309,339.3376431288003,339.32739669237077,339.3009102922482,339.247723764681,339.1554106367999,339.00998549878693,338.79636892038155,338.49889829347273,338.1018721352799,337.5901149363349,336.94954957576823,336.16776462767433,335.2345645060762,334.14249128978645,332.8873081718342,331.4684357265141,329.8893335161033,328.15782090850354,326.28633229362185,324.29210312771494,322.19728437090976,320.02898389675147,317.8192343401486,315.60488762010215,313.42743704500253,311.3327685078397,309.3708428377909,307.5953119260009,306.063071817416,304.83375658235536,303.9691774679016,303.5327125867404,303.58865322460764,304.2015137198996,305.4353127616136,307.35283482599084,310.0148812816948,313.47952138699367,317.80135392797513,323.03079055437377,329.2133719156,336.3891274498759,344.59198911288667,353.84926844237333,364.18120515195346,375.600593957622,388.11249460737326,401.7140281656252,416.39426057011894,432.1341724082433,448.9067118368043,466.67692567837355,485.4021620501326,505.0323364901117,525.5102525026635,546.771966795203,568.7471892504013,591.3597078800761,614.5278296281449,638.1648288983123,662.1793970288159,686.4760875553643,710.9557539166747,735.5159781763992,760.0514912686873,784.4545871277792,808.6155347452408,832.4229936279593,855.7644392343634,878.5266056863712,900.595953348804,921.8591687111609,942.2037033933608,961.518358039165,979.6939153894958,996.6238249891242,1012.2049398364882,1026.338302911342,1038.929978992983,1049.8919246034288,1059.1428863703215,1066.6093156988043,1072.2262854638248,1075.9383925720354,1077.7006287758888,1077.4792011204433,1075.2522829217874,1071.0106762550165,1064.7583675925548,1056.5129594848056,1046.3059629998363,1034.1829380025176,1020.2034712023833,1004.4409851613746,986.9823750386817,967.9274736572588,947.3883493909525,925.4884452710058,902.361571470757,878.1507668237224,853.0070481445114,827.0880687462661,800.5567095891997,773.5796278778657,746.3257885974294,718.965004413615,691.6665085553291,664.5975837782671,637.9222683231118,611.8001570089538,586.3853123385799,561.8252968530317,538.260334087611,515.8226014887058,494.6356546921212,474.81397877906545,456.46265864814916,439.67715759127947,424.5431906418146,411.13667735818353,399.523757475057,389.7608523315806,381.89475517986835,375.9627343682566,371.9926349382536,370.00296630346537]}],"reportKeys":["time","cpuTime","cycles","iters","allocated","numGcs","bytesCopied","mutatorWallSeconds","mutatorCpuSeconds","gcWallSeconds","gcCpuSeconds"],"reportNumber":6,"reportName":"project/project 10x1000 to 5x1000","reportOutliers":{"highSevere":0,"highMild":0,"lowMild":0,"samplesSeen":21,"lowSevere":0},"reportMeasured":[[1.507493200188037e-2,1.506444999999701e-2,28631577,1,null,null,null,null,null,null,null],[3.0044839993934147e-2,3.0011522999998874e-2,57076332,2,null,null,null,null,null,null,null],[4.602774199884152e-2,4.5973276000005114e-2,87445137,3,null,null,null,null,null,null,null],[5.9625961002893746e-2,5.957763600000021e-2,113280994,4,null,null,null,null,null,null,null],[7.525645900022937e-2,7.519037400000173e-2,142976086,5,null,null,null,null,null,null,null],[8.905667799990624e-2,8.897487000000126e-2,169198952,6,null,null,null,null,null,null,null],[0.11078702899976633,0.11069898400000255,210485926,7,null,null,null,null,null,null,null],[0.12581275300181005,0.12570637000000318,239036957,8,null,null,null,null,null,null,null],[0.14042515800247202,0.14030637199999774,266800371,9,null,null,null,null,null,null,null],[0.15486334200249985,0.15474121999999824,294230327,10,null,null,null,null,null,null,null],[0.16949182599637425,0.16934615400000297,322026203,11,null,null,null,null,null,null,null],[0.18458782800007612,0.1844472820000007,350709797,12,null,null,null,null,null,null,null],[0.2069304859978729,0.20675212399999765,393162950,13,null,null,null,null,null,null,null],[0.22282338000513846,0.22255065099999882,423354484,14,null,null,null,null,null,null,null],[0.237528261000989,0.23732342799999628,451294459,15,null,null,null,null,null,null,null],[0.25102039399644127,0.2507945950000021,476930577,16,null,null,null,null,null,null,null],[0.26663147199724335,0.2664183879999982,506590187,17,null,null,null,null,null,null,null],[0.28122573099972215,0.280993083999995,534320598,18,null,null,null,null,null,null,null],[0.295340610005951,0.2950916140000004,561138070,19,null,null,null,null,null,null,null],[0.31776399700174807,0.3175341020000033,603742588,20,null,null,null,null,null,null,null],[0.3324330129980808,0.3321678370000001,631612507,21,null,null,null,null,null,null,null],[0.34725084000092465,0.3469759039999971,659767266,22,null,null,null,null,null,null,null],[0.37028686700068647,0.3699242579999975,703537082,23,null,null,null,null,null,null,null]]},{"reportAnalysis":{"anMean":{"estError":{"confIntLDX":1.4849515604026947e-4,"confIntUDX":2.2302267966680528e-4,"confIntCL":5.0e-2},"estPoint":4.923173514046889e-2},"anRegress":[{"regRSquare":{"estError":{"confIntLDX":1.0446290147780868e-4,"confIntUDX":9.674844257745452e-5,"confIntCL":5.0e-2},"estPoint":0.9998833768007424},"regResponder":"time","regCoeffs":{"y":{"estError":{"confIntLDX":2.259559006627959e-3,"confIntUDX":1.93476793690426e-3,"confIntCL":5.0e-2},"estPoint":8.529011135507786e-4},"iters":{"estError":{"confIntLDX":3.400703549832976e-4,"confIntUDX":3.762902771172333e-4,"confIntCL":5.0e-2},"estPoint":4.922073172017738e-2}}}],"anStdDev":{"estError":{"confIntLDX":1.1789626053074169e-4,"confIntUDX":1.7027737094845103e-4,"confIntCL":5.0e-2},"estPoint":3.275115670368287e-4},"anOutlierVar":{"ovFraction":7.100591715976319e-2,"ovDesc":"slight","ovEffect":"Slight"},"anOverhead":2.1820495514718956e-3},"reportKDEs":[{"kdeValues":[4.8763763595693385e-2,4.877421973183179e-2,4.8784675867970195e-2,4.87951320041086e-2,4.8805588140247005e-2,4.881604427638541e-2,4.8826500412523816e-2,4.883695654866222e-2,4.884741268480062e-2,4.8857868820939024e-2,4.886832495707743e-2,4.8878781093215834e-2,4.888923722935424e-2,4.8899693365492644e-2,4.891014950163105e-2,4.8920605637769454e-2,4.893106177390786e-2,4.8941517910046264e-2,4.895197404618467e-2,4.8962430182323075e-2,4.897288631846148e-2,4.8983342454599885e-2,4.899379859073828e-2,4.900425472687669e-2,4.901471086301509e-2,4.90251669991535e-2,4.90356231352919e-2,4.904607927143031e-2,4.905653540756871e-2,4.906699154370712e-2,4.907744767984552e-2,4.908790381598393e-2,4.9098359952122334e-2,4.910881608826074e-2,4.9119272224399144e-2,4.912972836053755e-2,4.914018449667595e-2,4.915064063281435e-2,4.916109676895276e-2,4.917155290509116e-2,4.918200904122957e-2,4.919246517736797e-2,4.920292131350638e-2,4.921337744964478e-2,4.922383358578319e-2,4.923428972192159e-2,4.924474585806e-2,4.92552019941984e-2,4.926565813033681e-2,4.927611426647521e-2,4.928657040261361e-2,4.9297026538752016e-2,4.930748267489042e-2,4.9317938811028826e-2,4.932839494716723e-2,4.9338851083305636e-2,4.934930721944404e-2,4.9359763355582446e-2,4.937021949172085e-2,4.9380675627859257e-2,4.939113176399766e-2,4.940158790013607e-2,4.941204403627447e-2,4.942250017241288e-2,4.9432956308551275e-2,4.944341244468968e-2,4.9453868580828085e-2,4.946432471696649e-2,4.9474780853104895e-2,4.94852369892433e-2,4.9495693125381705e-2,4.950614926152011e-2,4.9516605397658515e-2,4.952706153379692e-2,4.9537517669935326e-2,4.954797380607373e-2,4.9558429942212136e-2,4.956888607835054e-2,4.957934221448894e-2,4.9589798350627344e-2,4.960025448676575e-2,4.9610710622904154e-2,4.962116675904256e-2,4.9631622895180964e-2,4.964207903131937e-2,4.9652535167457774e-2,4.966299130359618e-2,4.9673447439734585e-2,4.968390357587299e-2,4.9694359712011395e-2,4.97048158481498e-2,4.9715271984288205e-2,4.97257281204266e-2,4.973618425656501e-2,4.974664039270341e-2,4.975709652884182e-2,4.976755266498022e-2,4.977800880111863e-2,4.978846493725703e-2,4.979892107339544e-2,4.9809377209533844e-2,4.981983334567225e-2,4.9830289481810654e-2,4.984074561794906e-2,4.9851201754087464e-2,4.986165789022587e-2,4.987211402636427e-2,4.988257016250267e-2,4.989302629864108e-2,4.990348243477948e-2,4.991393857091789e-2,4.992439470705629e-2,4.99348508431947e-2,4.99453069793331e-2,4.995576311547151e-2,4.996621925160991e-2,4.997667538774832e-2,4.998713152388672e-2,4.999758766002513e-2,5.000804379616353e-2,5.001849993230194e-2,5.0028956068440336e-2,5.003941220457874e-2,5.0049868340717146e-2,5.006032447685555e-2,5.0070780612993956e-2,5.008123674913236e-2,5.009169288527077e-2],"kdeType":"time","kdePDF":[1098.1507885487008,1097.9619233817857,1097.5842312136772,1097.0177886927365,1096.2627115819625,1095.3191557024065,1094.1873181825406,1092.867439006317,1091.3598028509393,1089.6647412036432,1087.7826347451623,1085.7139159859626,1083.459072139828,1081.018648217944,1078.3932503252845,1075.5835491398614,1072.590283554232,1069.4142644576223,1066.0563786360883,1062.5175927672994,1058.7989574858525,1054.9016114944125,1050.8267856955515,1046.5758073188047,1042.150104017285,1037.551207908116,1032.780759531016,1027.8405116995527,1022.732333219919,1017.4582124525269,1012.0202606922909,1006.4207153441816,1000.6619428714358,994.746441494759,988.6768436218823,982.4559179880054,976.0865714888894,969.5718506897206,962.9149429942818,956.1191774604987,949.1880252499767,942.1250997008403,934.9341560148293,927.6190905514208,920.1839397234736,912.6328784907797,904.9702184496759,897.2004055188036,889.3280172228839,881.3577595783024,873.2944635860681,865.1430813395881,856.9086817564133,848.596445944922,840.2116622185147,831.7597207716074,823.2461080331823,814.6764007152273,806.0562595747128,797.3914229091496,788.687699806899,779.9509631746153,771.1871425650936,762.4022168298012,753.6022066210252,744.7931667693202,735.9811785623662,727.1723419518214,718.3727677149313,709.5885695978602,700.8258564676222,692.0907244994243,683.38924942587,674.7274788741564,666.1114248167496,657.5470561604609,649.0402914979433,640.5969920448158,632.2229547844832,623.9239058416803,615.7054941044108,607.5732851127132,599.5327552311303,591.5892861203489,583.7481595217655,576.0145523671652,568.3935322238881,560.8900530841606,553.5089515053812,546.254943106383,539.1326194227606,532.1464451225471,525.3007555816087,518.5997548163084,512.0475137691359,505.6479689412247,499.4049213639129,493.32203589982515,487.4028408623033,481.6507279404777,476.0689524157841,470.6606336543614,465.42875585847673,460.3761690589644,455.50559032959774,450.8196052033888,446.3206692699979,442.01110993275995,437.89312830330215,433.96880121131943,430.2400833068271,426.7088092320881,423.37669584045085,420.245344439502,417.31624303626484,414.59076856262493,412.07018905977213,409.75566580116725,407.6482553344219,405.74891142344734,404.0584868733492,402.5777352217515,401.30731228155986,400.2477775215805,399.3995952729278,398.7631357507153,398.33867588218374,398.1263999341119]}],"reportKeys":["time","cpuTime","cycles","iters","allocated","numGcs","bytesCopied","mutatorWallSeconds","mutatorCpuSeconds","gcWallSeconds","gcCpuSeconds"],"reportNumber":7,"reportName":"union/union identical 10x1000","reportOutliers":{"highSevere":0,"highMild":0,"lowMild":0,"samplesSeen":12,"lowSevere":0},"reportMeasured":[[5.00213889972656e-2,4.998460699999896e-2,95031185,1,null,null,null,null,null,null,null],[0.10105308899801457,0.10095891699999981,191990889,2,null,null,null,null,null,null,null],[0.14932909200433642,0.1491997110000014,283717109,3,null,null,null,null,null,null,null],[0.19788539900036994,0.19771486700000196,375970752,4,null,null,null,null,null,null,null],[0.245552549000422,0.24537460400000555,466539415,5,null,null,null,null,null,null,null],[0.29433757099468494,0.2941104770000038,559233974,6,null,null,null,null,null,null,null],[0.3468570469995029,0.34655869999999567,659019788,7,null,null,null,null,null,null,null],[0.39563732800161233,0.3953240969999996,751698269,8,null,null,null,null,null,null,null],[0.4421533890053979,0.4418359009999975,840083885,9,null,null,null,null,null,null,null],[0.4914517830038676,0.49105002900000017,933750741,10,null,null,null,null,null,null,null],[0.5395605520025128,0.5391937190000036,1025155452,11,null,null,null,null,null,null,null],[0.5905701550000231,0.590161234,1122074516,12,null,null,null,null,null,null,null],[0.6457649580042926,0.645225259,1226945092,13,null,null,null,null,null,null,null]]},{"reportAnalysis":{"anMean":{"estError":{"confIntLDX":1.3616114131957957e-3,"confIntUDX":6.192009813513755e-4,"confIntCL":5.0e-2},"estPoint":0.5157808375258943},"anRegress":[{"regRSquare":{"estError":{"confIntLDX":5.2562411323342495e-5,"confIntUDX":2.078751864043049e-5,"confIntCL":5.0e-2},"estPoint":0.9999792124813596},"regResponder":"time","regCoeffs":{"y":{"estError":{"confIntLDX":1.5438998001626996e-2,"confIntUDX":9.506022004642714e-3,"confIntCL":5.0e-2},"estPoint":3.1666350041647164e-3},"iters":{"estError":{"confIntLDX":6.950864203099427e-3,"confIntUDX":5.521645800035779e-3,"confIntCL":5.0e-2},"estPoint":0.5155792741992622}}}],"anStdDev":{"estError":{"confIntLDX":1.1935851498586624e-3,"confIntUDX":9.230743816508865e-5,"confIntCL":5.0e-2},"estPoint":1.1935851498586624e-3},"anOutlierVar":{"ovFraction":0.18749999999999997,"ovDesc":"moderate","ovEffect":"Moderate"},"anOverhead":2.1820495514718956e-3},"reportKDEs":[{"kdeValues":[0.5141965029831452,0.5142175476882999,0.5142385923934545,0.5142596370986091,0.5142806818037639,0.5143017265089185,0.5143227712140731,0.5143438159192277,0.5143648606243824,0.514385905329537,0.5144069500346917,0.5144279947398464,0.514449039445001,0.5144700841501556,0.5144911288553102,0.5145121735604649,0.5145332182656196,0.5145542629707742,0.5145753076759289,0.5145963523810835,0.5146173970862381,0.5146384417913927,0.5146594864965475,0.5146805312017021,0.5147015759068567,0.5147226206120114,0.514743665317166,0.5147647100223206,0.5147857547274753,0.51480679943263,0.5148278441377846,0.5148488888429392,0.5148699335480938,0.5148909782532485,0.5149120229584032,0.5149330676635578,0.5149541123687125,0.5149751570738671,0.5149962017790217,0.5150172464841763,0.5150382911893311,0.5150593358944857,0.5150803805996403,0.515101425304795,0.5151224700099496,0.5151435147151042,0.515164559420259,0.5151856041254136,0.5152066488305682,0.5152276935357228,0.5152487382408775,0.5152697829460321,0.5152908276511868,0.5153118723563415,0.5153329170614961,0.5153539617666507,0.5153750064718053,0.51539605117696,0.5154170958821147,0.5154381405872693,0.515459185292424,0.5154802299975786,0.5155012747027332,0.5155223194078878,0.5155433641130426,0.5155644088181972,0.5155854535233518,0.5156064982285065,0.5156275429336611,0.5156485876388157,0.5156696323439705,0.5156906770491251,0.5157117217542797,0.5157327664594343,0.515753811164589,0.5157748558697436,0.5157959005748983,0.515816945280053,0.5158379899852076,0.5158590346903622,0.5158800793955168,0.5159011241006715,0.5159221688058262,0.5159432135109808,0.5159642582161355,0.5159853029212901,0.5160063476264447,0.5160273923315993,0.5160484370367541,0.5160694817419087,0.5160905264470633,0.516111571152218,0.5161326158573726,0.5161536605625272,0.5161747052676819,0.5161957499728366,0.5162167946779912,0.5162378393831458,0.5162588840883005,0.5162799287934551,0.5163009734986098,0.5163220182037644,0.5163430629089191,0.5163641076140737,0.5163851523192283,0.516406197024383,0.5164272417295377,0.5164482864346923,0.5164693311398469,0.5164903758450016,0.5165114205501562,0.5165324652553108,0.5165535099604656,0.5165745546656202,0.5165955993707748,0.5166166440759294,0.5166376887810841,0.5166587334862387,0.5166797781913934,0.5167008228965481,0.5167218676017027,0.5167429123068573,0.5167639570120119,0.5167850017171666,0.5168060464223213,0.5168270911274759,0.5168481358326306,0.5168691805377852],"kdeType":"time","kdePDF":[309.38802057513465,309.4023860102444,309.4311682114648,309.4744696620986,309.53244364083116,309.60529368755556,309.69327289338037,309.7966830167308,309.9158734279286,310.0512398850909,310.2032231446485,310.372307410227,310.5590186240712,310.7639226056174,310.98762304223067,311.2307593375253,311.49400432306555,311.7780618396215,312.08366419450016,312.411569501812,312.7625589128479,313.1374337440434,313.5370125102792,313.96212787153473,314.4136235011376,314.89235088407736,315.39916605403647,315.9349262779685,316.50048669719547,317.0966969341247,317.72439767378035,318.38441722942645,319.0775681016053,319.80464353994586,320.5664141170984,321.3636243241323,322.1969891966887,323.0671909811095,323.97487584967564,324.92065067396595,325.9050798652177,326.9286822903981,327.9919282725238,329.09523668354973,330.2389721379345,331.42344229472934,332.6488952757878,333.91551720739204,335.2234298923045,336.57268861891947,337.9632801138653,339.39512064404335,340.8680542737363,342.3818512820254,343.9362067453748,345.53073928982553,347.16499001684133,348.8384216064042,350.5504176005491,352.3002818700631,354.0872382666488,355.9104304623841,357.7689219778728,359.66169640000106,361.5876577897826,363.5456312802869,365.5343638642128,367.5525253701911,369.59870962646096,371.6714358101026,373.76914997957715,375.890226787867,378.0329713731015,380.1956214231029,382.3763494098983,384.57326498981644,386.78441756441356,389.00779899707237,391.24134647977047,393.4829455441344,395.7304332105799,397.98160126899035,400.23419968409394,402.48594011838867,404.734499565207,406.977524084232,409.2126326315558,411.4374209761309,413.6494656942786,415.8463282337186,418.025559038435,420.18470172553765,422.3212973051635,424.43288843435346,426.5170236957626,428.5712618919959,430.5931763463266,432.5803592005279,434.5304257005582,436.44101846085346,438.3098116980315,440.13451542486933,441.91287959550385,443.64269819290615,445.3218132498055,446.9481187943808,448.51956471220046,450.034160516072,451.48997901566054,452.8851598789545,454.2179130778891,455.48652221068966,456.6893476937622,457.82482981624395,458.89149165062054,459.88794181312977,460.8128770679966,461.66508476988133,462.44344513927086,463.1469333659088,463.7746215357259,464.32568037711644,464.7993808227955,465.19509538387194,465.5122993331701,465.7505716952569,465.9095960410329,465.9891610851808]}],"reportKeys":["time","cpuTime","cycles","iters","allocated","numGcs","bytesCopied","mutatorWallSeconds","mutatorCpuSeconds","gcWallSeconds","gcCpuSeconds"],"reportNumber":8,"reportName":"union/union identical 10x10000","reportOutliers":{"highSevere":0,"highMild":0,"lowMild":0,"samplesSeen":3,"lowSevere":0},"reportMeasured":[[0.5213010670049698,0.5209129200000007,990462359,1,null,null,null,null,null,null,null],[1.029929477001133,1.0291960659999972,1956856394,2,null,null,null,null,null,null,null],[1.5510303970004315,1.5498950729999947,2946947849,3,null,null,null,null,null,null,null],[2.066198341002746,2.064697297000002,3925769673,4,null,null,null,null,null,null,null]]},{"reportAnalysis":{"anMean":{"estError":{"confIntLDX":1.9136268846312587e-3,"confIntUDX":1.0778112309037247e-3,"confIntCL":5.0e-2},"estPoint":0.3374978199984254},"anRegress":[{"regRSquare":{"estError":{"confIntLDX":7.048604004911141e-7,"confIntUDX":9.653846087087636e-6,"confIntCL":5.0e-2},"estPoint":0.9999903461539129},"regResponder":"time","regCoeffs":{"y":{"estError":{"confIntLDX":3.7081885020606234e-3,"confIntUDX":7.930082494565614e-3,"confIntCL":5.0e-2},"estPoint":-1.5550898497166503e-2},"iters":{"estError":{"confIntLDX":2.273477398556878e-3,"confIntUDX":2.4901846016293083e-3,"confIntCL":5.0e-2},"estPoint":0.3432690643996462}}}],"anStdDev":{"estError":{"confIntLDX":1.6965376723717264e-3,"confIntUDX":1.702861405217474e-4,"confIntCL":5.0e-2},"estPoint":1.6965376723717264e-3},"anOutlierVar":{"ovFraction":0.1875,"ovDesc":"moderate","ovEffect":"Moderate"},"anOverhead":2.1820495514718956e-3},"reportKDEs":[{"kdeValues":[0.335260849744523,0.335291401873903,0.3353219540032829,0.3353525061326629,0.3353830582620428,0.33541361039142276,0.3354441625208027,0.33547471465018264,0.3355052667795626,0.3355358189089425,0.3355663710383225,0.33559692316770245,0.33562747529708237,0.33565802742646234,0.33568857955584225,0.3357191316852222,0.3357496838146022,0.3357802359439821,0.33581078807336207,0.335841340202742,0.33587189233212195,0.3359024444615019,0.3359329965908818,0.3359635487202618,0.3359941008496417,0.3360246529790217,0.33605520510840164,0.33608575723778156,0.3361163093671615,0.33614686149654144,0.3361774136259214,0.3362079657553014,0.3362385178846813,0.33626907001406126,0.33629962214344117,0.33633017427282114,0.3363607264022011,0.336391278531581,0.336421830660961,0.3364523827903409,0.33648293491972087,0.33651348704910083,0.33654403917848075,0.3365745913078607,0.33660514343724063,0.3366356955666206,0.33666624769600056,0.3366967998253805,0.33672735195476045,0.33675790408414036,0.3367884562135203,0.3368190083429003,0.3368495604722802,0.3368801126016602,0.3369106647310401,0.33694121686042006,0.3369717689898,0.33700232111917994,0.3370328732485599,0.3370634253779398,0.3370939775073198,0.3371245296366997,0.33715508176607967,0.33718563389545964,0.33721618602483955,0.3372467381542195,0.33727729028359943,0.3373078424129794,0.33733839454235937,0.3373689466717393,0.33739949880111925,0.33743005093049916,0.3374606030598791,0.3374911551892591,0.337521707318639,0.337552259448019,0.3375828115773989,0.33761336370677886,0.3376439158361588,0.33767446796553874,0.3377050200949187,0.3377355722242986,0.3377661243536786,0.33779667648305856,0.33782722861243847,0.33785778074181844,0.33788833287119835,0.3379188850005783,0.3379494371299583,0.3379799892593382,0.33801054138871817,0.3380410935180981,0.33807164564747805,0.338102197776858,0.33813274990623793,0.3381633020356179,0.3381938541649978,0.3382244062943778,0.33825495842375775,0.33828551055313766,0.3383160626825176,0.33834661481189754,0.3383771669412775,0.3384077190706575,0.3384382712000374,0.33846882332941736,0.33849937545879727,0.33852992758817724,0.3385604797175572,0.3385910318469371,0.3386215839763171,0.338652136105697,0.33868268823507697,0.33871324036445694,0.33874379249383685,0.3387743446232168,0.33880489675259673,0.3388354488819767,0.33886600101135667,0.3388965531407366,0.33892710527011655,0.33895765739949646,0.3389882095288764,0.3390187616582564,0.3390493137876363,0.3390798659170163,0.3391104180463962,0.33914097017577616],"kdeType":"time","kdePDF":[218.94440967899624,218.95328792946546,218.97107464851806,218.99783016481234,219.03364470271197,219.07863806077597,219.13295918447588,219.19678563433106,219.27032295094506,219.35380391871573,219.4474877302688,219.55165905394765,219.6666270069562,219.79272403701768,219.9303047156654,220.07974444652592,220.241438092194,220.415798523521,220.60325509535545,220.80425205297948,221.01924687367185,221.24870854801384,221.49311580571535,221.75295529089485,222.02871969188413,222.32090583075617,222.63001271788212,222.95653957692352,223.30098384574237,223.66383915878296,224.04559331652538,224.4467262476503,224.867707969572,225.30899655300368,225.77103609620795,226.25425471455912,226.75906255100557,227.28584981296243,227.83498484109774,228.40681221538733,229.0016509037195,229.61979245821323,230.2614992642938,230.92700284742511,231.6165022422535,232.33016242874683,233.0681128397482,233.8304459441655,234.61721590983643,235.42843734988787,236.26408415620688,237.12408842340642,238.00833946644545,238.91668293481632,239.84892002597644,240.80480680043843,241.78405360068845,242.78632457582972,243.8112373135947,244.85836258108932,245.92722417537553,247.01729888471294,248.12801656102025,249.25876030383247,250.40886675576718,251.5776265092326,252.76428462384968,253.96804125378225,255.18805238391855,256.4234306735713,257.67324640612435,258.93652854278633,260.21226587838197,261.4994082968573,262.79686812395653,264.1035215742887,265.41821028979865,266.73974296643223,268.0668970655977,269.3984206068207,270.73303403781875,272.0694321780345,273.4062862315169,274.7422458648741,276.0759413458871,277.4059857382356,278.7309771476714,280.0495010148576,281.3601324500009,282.6614386043089,283.9519810732365,285.23031832641135,286.49500815908596,287.7446101599129,288.97768818981825,290.19281286672356,291.3885640508648,292.5635333254589,293.7163264674862,294.84556590338235,295.9498931444749,297.02797119704576,298.0784869419626,299.100153478892,300.09171243018943,301.05193619964774,301.97963018139274,302.87363491431853,303.73282817757786,304.5561270227706,305.3424897386085,306.09091774398223,306.80045740550736,307.47020177578815,308.09929224880443,308.686920129005,309.23232811086694,309.7348116658736,310.19372033405386,310.6084589174242,310.97848857288096,311.30332780229577,311.5825533377822,311.81580092031595,312.00276597011117,312.1432041473806,312.2369318023264,312.2838263134446]}],"reportKeys":["time","cpuTime","cycles","iters","allocated","numGcs","bytesCopied","mutatorWallSeconds","mutatorCpuSeconds","gcWallSeconds","gcCpuSeconds"],"reportNumber":9,"reportName":"join/join identical 10x100","reportOutliers":{"highSevere":0,"highMild":0,"lowMild":0,"samplesSeen":3,"lowSevere":0},"reportMeasured":[[0.32650016200204846,0.32622583200000577,620340770,1,null,null,null,null,null,null,null],[0.6722594110033242,0.6717048900000009,1277284362,2,null,null,null,null,null,null,null],[1.0153659450006671,1.014700420000004,1929185516,3,null,null,null,null,null,null,null],[1.3563615320017561,1.3553818119999974,2577077214,4,null,null,null,null,null,null,null]]},{"reportAnalysis":{"anMean":{"estError":{"confIntLDX":3.73601811220009e-4,"confIntUDX":4.425636919137138e-4,"confIntCL":5.0e-2},"estPoint":4.70336206675725e-2},"anRegress":[{"regRSquare":{"estError":{"confIntLDX":2.663144455224975e-4,"confIntUDX":1.9416582717446396e-4,"confIntCL":5.0e-2},"estPoint":0.9997071105510539},"regResponder":"time","regCoeffs":{"y":{"estError":{"confIntLDX":3.720208282599045e-3,"confIntUDX":4.150284022617402e-3,"confIntCL":5.0e-2},"estPoint":1.1118184998988514e-3},"iters":{"estError":{"confIntLDX":6.232093546506001e-4,"confIntUDX":4.343548663097649e-4,"confIntCL":5.0e-2},"estPoint":4.700242177468782e-2}}}],"anStdDev":{"estError":{"confIntLDX":2.210909475749965e-4,"confIntUDX":4.015261754837878e-4,"confIntCL":5.0e-2},"estPoint":7.389605929837668e-4},"anOutlierVar":{"ovFraction":7.100591715976322e-2,"ovDesc":"slight","ovEffect":"Slight"},"anOverhead":2.1820495514718956e-3},"reportKDEs":[{"kdeValues":[4.5342716617225436e-2,4.537034085307174e-2,4.5397965088918045e-2,4.542558932476435e-2,4.5453213560610654e-2,4.548083779645696e-2,4.5508462032303264e-2,4.553608626814957e-2,4.556371050399587e-2,4.559133473984218e-2,4.561895897568848e-2,4.564658321153479e-2,4.567420744738109e-2,4.57018316832274e-2,4.57294559190737e-2,4.5757080154920006e-2,4.578470439076631e-2,4.5812328626612615e-2,4.583995286245892e-2,4.5867577098305225e-2,4.589520133415153e-2,4.592282556999783e-2,4.595044980584413e-2,4.597807404169044e-2,4.600569827753674e-2,4.6033322513383046e-2,4.606094674922935e-2,4.6088570985075655e-2,4.611619522092196e-2,4.6143819456768265e-2,4.617144369261457e-2,4.6199067928460874e-2,4.622669216430718e-2,4.625431640015348e-2,4.628194063599979e-2,4.630956487184609e-2,4.63371891076924e-2,4.63648133435387e-2,4.639243757938501e-2,4.642006181523131e-2,4.6447686051077616e-2,4.647531028692392e-2,4.6502934522770226e-2,4.653055875861653e-2,4.6558182994462835e-2,4.658580723030914e-2,4.6613431466155444e-2,4.664105570200175e-2,4.6668679937848054e-2,4.669630417369436e-2,4.672392840954066e-2,4.675155264538697e-2,4.677917688123327e-2,4.680680111707958e-2,4.683442535292588e-2,4.686204958877219e-2,4.688967382461849e-2,4.6917298060464796e-2,4.69449222963111e-2,4.6972546532157405e-2,4.700017076800371e-2,4.7027795003850015e-2,4.705541923969632e-2,4.7083043475542624e-2,4.711066771138893e-2,4.713829194723523e-2,4.716591618308153e-2,4.7193540418927836e-2,4.722116465477414e-2,4.7248788890620445e-2,4.727641312646675e-2,4.7304037362313055e-2,4.733166159815936e-2,4.7359285834005664e-2,4.738691006985197e-2,4.7414534305698273e-2,4.744215854154458e-2,4.746978277739088e-2,4.749740701323719e-2,4.752503124908349e-2,4.75526554849298e-2,4.75802797207761e-2,4.7607903956622406e-2,4.763552819246871e-2,4.7663152428315016e-2,4.769077666416132e-2,4.7718400900007625e-2,4.774602513585393e-2,4.7773649371700234e-2,4.780127360754654e-2,4.7828897843392844e-2,4.785652207923915e-2,4.788414631508545e-2,4.791177055093176e-2,4.793939478677806e-2,4.796701902262437e-2,4.799464325847067e-2,4.802226749431698e-2,4.804989173016328e-2,4.8077515966009586e-2,4.810514020185589e-2,4.8132764437702195e-2,4.81603886735485e-2,4.8188012909394805e-2,4.821563714524111e-2,4.8243261381087414e-2,4.827088561693371e-2,4.829850985278002e-2,4.832613408862632e-2,4.8353758324472626e-2,4.838138256031893e-2,4.8409006796165235e-2,4.843663103201154e-2,4.8464255267857845e-2,4.849187950370415e-2,4.8519503739550454e-2,4.854712797539676e-2,4.8574752211243064e-2,4.860237644708937e-2,4.863000068293567e-2,4.865762491878198e-2,4.868524915462828e-2,4.871287339047459e-2,4.874049762632089e-2,4.8768121862167196e-2,4.87957460980135e-2,4.8823370333859806e-2,4.885099456970611e-2],"kdeType":"time","kdePDF":[180.7066702348903,180.9719240045234,181.50219832628855,182.29702211669093,183.35567720041018,184.67718464857958,186.26028689121557,188.10342587989197,190.20471763947612,192.5619236063687,195.17241920452054,198.0331601588513,201.14064708801422,204.49088895417466,208.0793659761974,211.9009926339555,215.95008140516987,220.22030788200254,224.70467791254836,229.39549740231462,234.28434539291874,239.3620510096893,244.6186748369565,250.04349523988074,255.6250001051848,261.35088442059885,267.20805405484504,273.18263603718617,279.25999556869925,285.4247599272309,291.66084935528124,297.95151494563567,304.27938346429937,310.6265089750045,316.97443105513565,323.30423932015566,329.59664390336394,335.83205147081725,341.9906462882729,348.05247579871656,353.99754011608786,359.8058847937328,365.45769618542874,370.93339868292287,376.213753087167,381.2799553510425,386.1137349195468,390.6974518891999,395.01419221187126,399.0478601791835,402.7832674419933,406.2062178449142,409.30358738811253,412.0633986673012,414.47488918751793,416.5285729963998,418.21629513772353,419.5312784853462,420.4681625807675,421.02303416366624,421.1934491532794,420.97844590873973,420.3785496677486,419.39576813460917,418.0335782599829,416.2969043251439,414.1920875123588,411.7268472097373,408.91023436290783,405.7525772466858,402.265420087001,398.46145501635357,394.35444789452725,389.9591585699285,385.29125619537956,380.3672302453001,375.204297908688,369.8203085541007,364.23364597874206,358.4631291638203,352.5279122624661,346.4473845447892,340.24107101713133,333.9285344194105,327.52927928574854,321.06265872959966,314.5477845854907,308.0034415056188,301.44800557111483,294.89936793520053,288.37486396902364,281.8912083310832,275.46443632822775,269.1098518806838,262.84198234586427,256.67454039631576,250.62039308653493,244.69153818204202,238.8990877624984,233.25325904934462,227.76337234786595,222.437855934309,217.28425766112548,212.3092629981241,207.51871917469725,202.91766503883875,198.51036620276332,194.30035500301904,190.29047476536158,186.4829278317167,182.87932677853706,179.4807482330505,176.28778867646864,173.30062161137337,170.51905546429037,167.9425915940039,165.5704817814179,163.4017845877428,161.43541998432605,159.67022167946666,158.10498659480345,156.73852097614758,155.56968266061475,154.597419063293,153.82080049205896,153.2390484481336,152.85155862208785,152.6579183497972]}],"reportKeys":["time","cpuTime","cycles","iters","allocated","numGcs","bytesCopied","mutatorWallSeconds","mutatorCpuSeconds","gcWallSeconds","gcCpuSeconds"],"reportNumber":10,"reportName":"group/group 10x100","reportOutliers":{"highSevere":0,"highMild":1,"lowMild":1,"samplesSeen":12,"lowSevere":0},"reportMeasured":[[4.733783099800348e-2,4.729594499999479e-2,89933067,1,null,null,null,null,null,null,null],[9.236117100226693e-2,9.229272000000321e-2,175476934,2,null,null,null,null,null,null,null],[0.1467669389967341,0.14663487400000008,278850352,3,null,null,null,null,null,null,null],[0.19217661800212227,0.19201940499999637,365128697,4,null,null,null,null,null,null,null],[0.23845176000031643,0.23822424000000098,453048611,5,null,null,null,null,null,null,null],[0.2795953179956996,0.27936914700000415,531223200,6,null,null,null,null,null,null,null],[0.32963063600618625,0.32937225999999953,626288132,7,null,null,null,null,null,null,null],[0.37576673999865307,0.37543541600000196,713946679,8,null,null,null,null,null,null,null],[0.41889376099425135,0.4185946119999997,795888891,9,null,null,null,null,null,null,null],[0.47289522900246084,0.47253408000000263,898494306,10,null,null,null,null,null,null,null],[0.5178376870026113,0.5173864999999935,983884057,11,null,null,null,null,null,null,null],[0.5629826369986404,0.5625096440000021,1069660598,12,null,null,null,null,null,null,null],[0.6169776949973311,0.6164689009999975,1172250821,13,null,null,null,null,null,null,null]]},{"reportAnalysis":{"anMean":{"estError":{"confIntLDX":2.003231136058002e-5,"confIntUDX":2.1716394519442038e-5,"confIntCL":5.0e-2},"estPoint":1.5673276303702817e-3},"anRegress":[{"regRSquare":{"estError":{"confIntLDX":2.287732357285077e-3,"confIntUDX":2.8044257401604877e-3,"confIntCL":5.0e-2},"estPoint":0.9947378540776748},"regResponder":"time","regCoeffs":{"y":{"estError":{"confIntLDX":1.695555392863235e-3,"confIntUDX":1.4411773046691034e-3,"confIntCL":5.0e-2},"estPoint":1.3698047924828793e-3},"iters":{"estError":{"confIntLDX":4.561650805884527e-5,"confIntUDX":5.800165002655105e-5,"confIntCL":5.0e-2},"estPoint":1.559488558699208e-3}}}],"anStdDev":{"estError":{"confIntLDX":8.596322276843379e-6,"confIntUDX":9.843940796524229e-6,"confIntCL":5.0e-2},"estPoint":6.970009193368111e-5},"anOutlierVar":{"ovFraction":0.30346203307926556,"ovDesc":"moderate","ovEffect":"Moderate"},"anOverhead":2.1820495514718956e-3},"reportKDEs":[{"kdeValues":[1.411207944848685e-3,1.413266956772664e-3,1.4153259686966431e-3,1.417384980620622e-3,1.419443992544601e-3,1.42150300446858e-3,1.4235620163925591e-3,1.425621028316538e-3,1.427680040240517e-3,1.429739052164496e-3,1.4317980640884752e-3,1.4338570760124541e-3,1.435916087936433e-3,1.437975099860412e-3,1.4400341117843912e-3,1.4420931237083701e-3,1.444152135632349e-3,1.446211147556328e-3,1.4482701594803072e-3,1.4503291714042861e-3,1.452388183328265e-3,1.454447195252244e-3,1.4565062071762232e-3,1.4585652191002022e-3,1.4606242310241811e-3,1.46268324294816e-3,1.4647422548721392e-3,1.4668012667961182e-3,1.4688602787200971e-3,1.4709192906440763e-3,1.4729783025680553e-3,1.4750373144920342e-3,1.4770963264160132e-3,1.4791553383399923e-3,1.4812143502639713e-3,1.4832733621879502e-3,1.4853323741119292e-3,1.4873913860359083e-3,1.4894503979598873e-3,1.4915094098838662e-3,1.4935684218078452e-3,1.4956274337318244e-3,1.4976864456558033e-3,1.4997454575797823e-3,1.5018044695037612e-3,1.5038634814277404e-3,1.5059224933517193e-3,1.5079815052756983e-3,1.5100405171996774e-3,1.5120995291236564e-3,1.5141585410476353e-3,1.5162175529716143e-3,1.5182765648955932e-3,1.5203355768195724e-3,1.5223945887435514e-3,1.5244536006675303e-3,1.5265126125915095e-3,1.5285716245154884e-3,1.5306306364394674e-3,1.5326896483634463e-3,1.5347486602874255e-3,1.5368076722114044e-3,1.5388666841353834e-3,1.5409256960593623e-3,1.5429847079833415e-3,1.5450437199073205e-3,1.5471027318312994e-3,1.5491617437552784e-3,1.5512207556792575e-3,1.5532797676032365e-3,1.5553387795272154e-3,1.5573977914511944e-3,1.5594568033751735e-3,1.5615158152991525e-3,1.5635748272231314e-3,1.5656338391471106e-3,1.5676928510710896e-3,1.5697518629950685e-3,1.5718108749190475e-3,1.5738698868430264e-3,1.5759288987670056e-3,1.5779879106909845e-3,1.5800469226149635e-3,1.5821059345389426e-3,1.5841649464629216e-3,1.5862239583869005e-3,1.5882829703108795e-3,1.5903419822348587e-3,1.5924009941588376e-3,1.5944600060828166e-3,1.5965190180067955e-3,1.5985780299307747e-3,1.6006370418547536e-3,1.6026960537787326e-3,1.6047550657027115e-3,1.6068140776266907e-3,1.6088730895506696e-3,1.6109321014746486e-3,1.6129911133986275e-3,1.6150501253226067e-3,1.6171091372465857e-3,1.6191681491705646e-3,1.6212271610945438e-3,1.6232861730185227e-3,1.6253451849425017e-3,1.6274041968664806e-3,1.6294632087904596e-3,1.6315222207144387e-3,1.6335812326384177e-3,1.6356402445623966e-3,1.6376992564863758e-3,1.6397582684103548e-3,1.6418172803343337e-3,1.6438762922583127e-3,1.6459353041822918e-3,1.6479943161062708e-3,1.6500533280302497e-3,1.6521123399542287e-3,1.6541713518782078e-3,1.6562303638021868e-3,1.6582893757261657e-3,1.660348387650145e-3,1.6624073995741239e-3,1.6644664114981028e-3,1.6665254234220818e-3,1.6685844353460607e-3,1.6706434472700399e-3,1.6727024591940188e-3],"kdeType":"time","kdePDF":[2506.6285948748873,2507.5132282578,2509.280798079016,2511.92792163584,2515.4495527478293,2519.8390149463667,2525.088045298574,2531.1868485029063,2538.1241608090195,2545.887323233859,2554.4623634697314,2563.834085809405,2573.9861683482545,2584.9012666650774,2596.561123131605,2608.946680956582,2622.03820203378,2635.815387634873,2650.2575009677985,2665.3434906093603,2681.0521138172426,2697.3620587315713,2714.252064489267,2731.70103829578,2749.6881685280428,2768.193032979295,2787.195701400504,2806.6768315440595,2826.6177579726027,2847.0005729589725,2867.80819887155,2889.0244515121776,2910.634093950855,2932.622880481539,2954.977590406378,2977.68605144037,3000.7371526145403,3024.1208466421117,3047.8281417984563,3071.851083450867,3096.1827254579407,3120.817091739638,3145.749128397688,3170.974646840721,3196.490258439435,3222.293301303016,3248.3817598290984,3274.754177734588,3301.409565324172,3328.347301795797,3355.5670334188594,3383.068568449643,3410.851769670828,3438.91644545628,3467.262240269921,3495.888525507051,3524.7942915793733,3553.9780421298,3583.4376912416087,3613.1704644772994,3643.1728045472933,3673.4402823663845,3703.9675142082447,3734.7480856143784,3765.774482655577,3797.038031080142,3828.528843816015,3860.2357772224623,3892.146396413261,3924.2469498965584,3956.5223536988397,3988.956185060931,4021.530685714876,4054.2267746710186,4087.0240703669224,4119.9009219530635,4152.834449416572,4185.800592173178,4218.774165690617,4251.728925643593,4284.637639042842,4317.4721617279265,4350.203521567257,4382.80200666823,4415.237257867336,4447.478364743365,4479.493964378187,4511.252342077685,4542.721533261936,4573.869425737178,4604.6638615737675,4635.072737833035,4665.064105412297,4694.606265310368,4723.667861655906,4752.217970886897,4780.226186521543,4807.662699017694,4834.498370279555,4860.704802435734,4886.254400581195,4911.120429246513,4935.27706243021,4958.699427103074,4981.363640166318,5003.246838917533,5024.327205148598,5044.583983067409,5063.997491299518,5082.549129285964,5100.221378448797,5116.997798545679,5132.86301967862,5147.802730459079,5161.803662861807,5174.853574322603,5186.941227650244,5198.05636933041,5208.189706798808,5217.332885252613,5225.478464553367,5232.619896751204,5238.751504729787,5243.868462434318,5247.966777101571,5251.043273862134,5253.095583031122,5254.122130345616]}],"reportKeys":["time","cpuTime","cycles","iters","allocated","numGcs","bytesCopied","mutatorWallSeconds","mutatorCpuSeconds","gcWallSeconds","gcCpuSeconds"],"reportNumber":11,"reportName":"write/write 10x1000","reportOutliers":{"highSevere":0,"highMild":0,"lowMild":0,"samplesSeen":42,"lowSevere":0},"reportMeasured":[[1.8466379988240078e-3,7.274569999964342e-4,3507547,1,null,null,null,null,null,null,null],[3.749734998564236e-3,1.2929680000013377e-3,7124480,2,null,null,null,null,null,null,null],[4.955500997311901e-3,1.607750000005126e-3,9415768,3,null,null,null,null,null,null,null],[6.903895002324134e-3,2.134022999996432e-3,13116844,4,null,null,null,null,null,null,null],[7.662063995667268e-3,2.6392199999918375e-3,14557279,5,null,null,null,null,null,null,null],[9.14627699967241e-3,3.1539210000062212e-3,17377777,6,null,null,null,null,null,null,null],[1.0610110002744477e-2,3.6542269999984e-3,20159943,7,null,null,null,null,null,null,null],[1.342409599601524e-2,4.194209999994314e-3,25506664,8,null,null,null,null,null,null,null],[1.5978417002770584e-2,4.999694999995086e-3,30365722,9,null,null,null,null,null,null,null],[1.627196399931563e-2,5.0767970000009655e-3,30906348,10,null,null,null,null,null,null,null],[1.8321754003409296e-2,6.067248999997332e-3,34814408,11,null,null,null,null,null,null,null],[1.8981221997819375e-2,6.094036999996888e-3,36053167,12,null,null,null,null,null,null,null],[1.9602098000177648e-2,6.6276209999927005e-3,37243869,13,null,null,null,null,null,null,null],[2.327671800594544e-2,7.2572819999976446e-3,44224234,14,null,null,null,null,null,null,null],[2.4468238996632863e-2,7.5967469999937975e-3,46488668,15,null,null,null,null,null,null,null],[2.6962415999150835e-2,8.19859499999609e-3,51228227,16,null,null,null,null,null,null,null],[2.748465700278757e-2,8.59233600000664e-3,52221056,17,null,null,null,null,null,null,null],[2.8489768999861553e-2,9.275811999998496e-3,54130289,18,null,null,null,null,null,null,null],[3.1534058005490806e-2,9.509088000001498e-3,59914520,19,null,null,null,null,null,null,null],[3.3379975000570994e-2,1.0019051000000445e-2,63421768,20,null,null,null,null,null,null,null],[3.21486390021164e-2,1.0772243000005233e-2,61082639,21,null,null,null,null,null,null,null],[3.4810391000064556e-2,1.1085932000000298e-2,66140774,22,null,null,null,null,null,null,null],[3.674557199701667e-2,1.138365399999941e-2,69816213,23,null,null,null,null,null,null,null],[4.020284400030505e-2,1.2410384999995472e-2,76374480,25,null,null,null,null,null,null,null],[4.22221479966538e-2,1.307710599999723e-2,80222608,26,null,null,null,null,null,null,null],[4.329287900327472e-2,1.3273174999994808e-2,82256995,27,null,null,null,null,null,null,null],[4.476459800207522e-2,1.390862699999218e-2,85052355,28,null,null,null,null,null,null,null],[4.4805204997828696e-2,1.4815548999990824e-2,85129419,30,null,null,null,null,null,null,null],[4.578064000088489e-2,1.531027100000415e-2,86983684,31,null,null,null,null,null,null,null],[5.494126000121469e-2,1.6736143000002812e-2,104386904,33,null,null,null,null,null,null,null],[5.856170300103258e-2,1.7582637999993267e-2,111266691,35,null,null,null,null,null,null,null],[5.556844300008379e-2,1.8157706000010876e-2,105579654,36,null,null,null,null,null,null,null],[5.72225259966217e-2,1.899279000001286e-2,108722481,38,null,null,null,null,null,null,null],[5.996240700187627e-2,2.0061890999997445e-2,113928361,40,null,null,null,null,null,null,null],[6.269381900347071e-2,2.0921506999997064e-2,119117391,42,null,null,null,null,null,null,null],[6.556441300199367e-2,2.1952963000003933e-2,124571593,44,null,null,null,null,null,null,null],[7.594630800304003e-2,2.3481523999990372e-2,144278413,47,null,null,null,null,null,null,null],[8.108867700502742e-2,2.4290333999999802e-2,154067861,49,null,null,null,null,null,null,null],[8.529218500189018e-2,2.583146699998906e-2,162048520,52,null,null,null,null,null,null,null],[8.946721100073773e-2,2.7083283999999708e-2,169988974,54,null,null,null,null,null,null,null],[9.48865440004738e-2,2.821290299999646e-2,180284176,57,null,null,null,null,null,null,null],[9.93107329995837e-2,2.9940874999994094e-2,188691292,60,null,null,null,null,null,null,null],[0.10492485300346743,3.141047500000127e-2,199358070,63,null,null,null,null,null,null,null],[0.10985853100282839,3.322559500000466e-2,208730998,66,null,null,null,null,null,null,null],[0.11500390100263758,3.45653819999967e-2,218507729,69,null,null,null,null,null,null,null],[0.12155503199755913,3.6797472000003495e-2,230955873,73,null,null,null,null,null,null,null],[0.11707255199871724,3.8233618000006686e-2,222432487,76,null,null,null,null,null,null,null],[0.12409541200031526,4.020329300000469e-2,235780319,80,null,null,null,null,null,null,null],[0.1282499109947821,4.197388699999749e-2,243674964,84,null,null,null,null,null,null,null],[0.1427478890036582,4.436167599999408e-2,271221846,89,null,null,null,null,null,null,null],[0.15047681400028523,4.6265106000006995e-2,285906018,93,null,null,null,null,null,null,null],[0.1592981859939755,4.917918000001009e-2,302666382,98,null,null,null,null,null,null,null],[0.16632080000272254,5.1931293999999184e-2,316009119,103,null,null,null,null,null,null,null],[0.1761690359999193,5.399041799999793e-2,334720023,108,null,null,null,null,null,null,null],[0.18700433299818542,5.68943619999942e-2,355308629,113,null,null,null,null,null,null,null],[0.19666026499908185,5.982605599999147e-2,373655007,119,null,null,null,null,null,null,null],[0.19374608200450893,6.273283400000196e-2,368117847,125,null,null,null,null,null,null,null],[0.18881391399918357,6.604477399999098e-2,358746101,131,null,null,null,null,null,null,null],[0.20665175699832616,6.900736000000052e-2,392637938,138,null,null,null,null,null,null,null],[0.2148972130016773,7.214676499999939e-2,408311504,144,null,null,null,null,null,null,null]]}];
1156+ reports.map(mangulate);
1157+
1158+ var benches = ["create/relation 10x100","create/relation 10x1000","create/relation 10x10000","restrict/restrict relation 10x10000 to 10x1","restrict/restrict relation 10x10000 to 10x5000","project/project 10x1000 to 1x1000","project/project 10x1000 to 5x1000","union/union identical 10x1000","union/union identical 10x10000","join/join identical 10x100","group/group 10x100","write/write 10x1000",];
1159+ var ylabels = [[-0,'<a href="#b0">create/relation 10x100</a>'],[-1,'<a href="#b1">create/relation 10x1000</a>'],[-2,'<a href="#b2">create/relation 10x10000</a>'],[-3,'<a href="#b3">restrict/restrict relation 10x10000 to 10x1</a>'],[-4,'<a href="#b4">restrict/restrict relation 10x10000 to 10x5000</a>'],[-5,'<a href="#b5">project/project 10x1000 to 1x1000</a>'],[-6,'<a href="#b6">project/project 10x1000 to 5x1000</a>'],[-7,'<a href="#b7">union/union identical 10x1000</a>'],[-8,'<a href="#b8">union/union identical 10x10000</a>'],[-9,'<a href="#b9">join/join identical 10x100</a>'],[-10,'<a href="#b10">group/group 10x100</a>'],[-11,'<a href="#b11">write/write 10x1000</a>'],];
1160+ var means = $.scaleTimes([5.906283388143756e-4,5.770838309782314e-3,5.784195729887314e-2,1.448797309139284e-2,8.447258684075218e-2,1.243577405705988e-2,1.547382196820991e-2,4.923173514046889e-2,0.5157808375258943,0.3374978199984254,4.70336206675725e-2,1.5673276303702817e-3,]);
1161+ var stddevs = [4.502571301832575e-6,2.8815215559732134e-5,1.7121491767487851e-4,4.774249175945004e-4,1.4013810341920257e-3,4.600204612133745e-4,3.978143402171812e-4,3.275115670368287e-4,1.1935851498586624e-3,1.6965376723717264e-3,7.389605929837668e-4,6.970009193368111e-5,];
1162+ stddevs = $.scaleBy(means[1], stddevs);
1163+ var xs = [];
1164+ var prev = null;
1165+ var colors = ["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"];
1166+ var max_time = 0;
1167+ for (var i = 0; i < means[0].length; i++) {
1168+ var name = benches[i].split(/\//);
1169+ name.pop();
1170+ name = name.join('/');
1171+ if (name != prev) {
1172+ var color = colors[xs.length / 2 % colors.length];
1173+ xs.push({ data: [[means[0][i], -i]], label: name, color: color,
1174+ bars: { show: true, horizontal: true, barWidth: 0.75,
1175+ align: "center" } });
1176+ xs.push({ data: [[means[0][i], -i, stddevs[i]]], color: color,
1177+ lines: { show: false },
1178+ points: { radius: 0, errorbars: "x",
1179+ xerr: { show: true, radius: 5,
1180+ lowerCap: "-", upperCap: "-" } } });
1181+ prev = name;
1182+ } else {
1183+ xs[xs.length - 2].data.push([means[0][i], -i]);
1184+ xs[xs.length - 1].data.push([means[0][i], -i, stddevs[i]]);
1185+ }
1186+ max_time = Math.max(max_time, means[0][i] + stddevs[i]);
1187+ }
1188+ var oq = $("#overview");
1189+ o = $.plot(oq, xs, { grid: { borderColor: "#777", hoverable: true },
1190+ legend: { show: xs.length > 1 },
1191+ xaxis: { max: max_time * 1.02 },
1192+ yaxis: { ticks: ylabels, tickColor: '#ffffff' },
1193+ zoom: { interactive: true, amount: 1.05 },
1194+ pan: { interactive: true } });
1195+ if (benches.length > 3)
1196+ o.getPlaceholder().height(28*benches.length);
1197+ o.resize();
1198+ o.setupGrid();
1199+ o.draw();
1200+ $.addTooltip("#overview", function(x,y) { return $.renderTime(x / means[1]); });
1201+});
1202+$(document).ready(function () {
1203+ $(".time").text(function(_, text) {
1204+ return $.renderTime(text);
1205+ });
1206+ $(".citime").text(function(_, text) {
1207+ return $.renderTime(text);
1208+ });
1209+ $(".percent").text(function(_, text) {
1210+ return (text*100).toFixed(1);
1211+ });
1212+ });
1213+</script>
1214+
1215+ </div>
1216+ </div>
1217+ <div id="footer">
1218+ <div class="body">
1219+ <div class="footfirst">
1220+ <h2>colophon</h2>
1221+ <p>This report was created using the
1222+ <a href="http://hackage.haskell.org/package/criterion">criterion</a>
1223+ benchmark execution and performance analysis tool.</p>
1224+ <p>Criterion is developed and maintained
1225+ by <a href="http://www.serpentine.com/blog/">Bryan O'Sullivan</a>.</p>
1226+ </div>
1227+ </div>
1228+ </div>
1229+ </body>
1230+</html>
docs/commits_in_constant_time.markdownnew file+134
@@ -0,0 +1,134 @@
1+# Transactional Database Commits in O(1)
2+
3+A.M.
4+
5+[Project:M36](https://github.com/agentm/project-m36)
6+
7+## Synopsis
8+
9+Common relational database management systems operate in an imperative manner by executing statements immediately. This naive strategy quickly becomes an IO-bound bottleneck. By applying Haskell's laziness-in-evaluation to database updates, new doors for optimizations based on what is queried make themselves apparent. Furthermore, by serializing thunks representing idempotent database updates, the database can commit transactions in constant time with regards to the tuple count since the tuples themselves need not be serialized. This optimization, combined with *fsync*-coalescing, can allow databases to commit to disk faster than tuples updates can be processed.
10+
11+Using this deferred execution technique, database updates can be processed in the background or, in the case when the tuples are never requested, never.
12+
13+These database update thunks and other interesting optimizations are implemented in [Project:M36](https://github.com/agentm/project-m36): an experimental, clean-room, purely Haskell implementation of an RDBMS engine based on the mathematical principles of the relational algebra.
14+
15+## Rationale
16+
17+A typical SQL RDBMS such as PostgreSQL executes a list of commands serially against a serializable representation of the database state without concern to whether or not the commands are effectively necessary to service subsequent requests. A database update which affects *n* tuples will necessitate disk writes of *O(n)* plus *O(n\*log(n))* writes for each affected index.
18+
19+By validating and serializing thunks of validated commands, Project:M36 commits can be independent of the tuple write cost. The thunks, which are flushed to non-volatile storage to complete the transaction commit, allow the DBMS to defer execution in preference to commit time.
20+
21+The deferral is, however, not required, and could be left as a option to the user or application.
22+
23+The final cost of committing in Project:M36 relates to the size of the update expression. If the update expression is, for example, a insertion of a large number of rows, then the commit cost will be *O(t)* where *t* is the number of tuples expressed in the update, but still independent of the cost of the existing tuples in the database.
24+
25+## Example and Comparison to PostgreSQL
26+
27+Let us walk through a specific example using SQL. While Project:M36 does not support SQL (and for [good reasons](https://github.com/agentm/project-m36/blob/master/docs/on_null.markdown)), comparing both databases with a common language is useful for illustrative purposes.
28+
29+Let us consider an existing database with a table/relation named "BigTable" which has 10 billion rows/tuples (an arbitrarily large number) of which one column is named "x" and represents a randomly-assigned integer. Next, assume that the user of the database will execute an update which will update every row/tuple, commit the changes, then query a subset of the resultant updated rows/tuples.
30+
31+
32+### The Update Expression
33+
34+Consider the following database update:
35+
36+```
37+UPDATE "BigTable" SET x = x + 1;
38+```
39+In PostgreSQL, the cost of executing this expression is incurred immediately upon execution. New tuples are laid down to disk (if the dataset is larger than *shared_buffers*), duplicating the entirety of the existing table/relation in storage (due to MVCC) for a cost of *O(n)* where *n* is the number of existing rows/tuples in "BigTable". If *x* is indexed, then the index writes incur an additional cost of *O(n\*log(n))* writes. Furthermore, PostgreSQL will write all changes to its write-ahead log, so the cost is multiplied by some factor.
40+
41+In Project:M36, the same expression can first be statically validated to adhere to the database constraints. The only constraint affected here is for the column/attribute *x* which requires an integer. Since adding one to any integer retains the integer type, the constraint can be determined to be unviolated without evaluating the expression, thus at a cost of *O(1)*. Project:M36 uses a novel WORM (write-once, read-many) strategy over journaled filesystems to avoid the need for a separate journal.
42+
43+*For the purpose of this example, assume that integer overflow is not a concern.*
44+
45+### The Commit
46+
47+```
48+COMMIT;
49+```
50+
51+In PostgreSQL, the write-ahead log mentioned above containing all tuples changes must now be flushed to non-volatile storage, creating a bottleneck to the slowest form of storage. A necessary checkpoint (which is configurable) could incur further writes as the tuples are flushed to disk as well.
52+
53+In Project:M36, the update expression must also be flushed to disk, but the expression is a mere few bytes appended to the transaction graph.
54+
55+### The Subsequent Query
56+
57+Finally, the user queries a subset of the updated table/relation.
58+
59+```
60+SELECT a, b, c, x FROM "BigTable" WHERE x > 10000;
61+```
62+
63+In PostgreSQL, considering that the column/attribute has an index, *O(log(n))* reads are needed to identify on which pages in the table's on-disk storage the proper values can be found. Considering that the value *x* was previously described as random, despite the restriction, in the worst case, every page of the on-disk table may need to be read because each page could contain one value matching the restriction. This would necessitate reading *O(n)* tuples previously written to disk. After reading the tuples, the tuples must be filtered by the restriction to service the query.
64+
65+In Project:M36, the state of the database is determined to be the difference of the previous state *S* (before the *x+1* update above) and *S'* (after the update). The serialized update expression can be deserialized and merged into the rewritten query:
66+
67+```
68+SELECT orig.a, orig.b, orig.c, x_orig + 1 AS x FROM (SELECT a, b, c, x AS x_orig FROM "BigTable"@S) AS orig WHERE x > 10000;
69+```
70+
71+where the *@* symbol references the state of "BigTable" at transaction state *S* in the past. The rewrite process can occur in constant time regarding the tuple count, but the execution does require reading the previous state *S* of "BigTable", filtering it as expected. The tuple read cost is equivalent to that of the same statement at *S'*: *O(log(n))* utilizing a b-tree index.
72+
73+### Summary
74+
75+| | PostgreSQL | Project:M36 |
76+|-|------------|-------------|
77+| UPDATE x+1 | *O(nlog(n))* | *O(1)* |
78+| COMMIT | flush *n* tuples to disk | flush expression to disk |
79+| SELECT x>10000 | *Ω(log(n))*, *O(n)* worst case | *O(log(n))* |
80+
81+Even if the user were to query all the tuples back, the actual IO cost in Project:M36 would be lower since the updates are only "executed" on the fly and not necessarily written to disk. However, a clever cacheing strategy could note that state *S* is queried often enough to warrant a cached version. The table's data on disk, however, is not required to answer the query.
82+
83+## Constraint Oracles
84+
85+To be able to perform an update and commit in constant or less than *O(n)* time does have some preconditions:
86+
87+ * constraints must be able to be statically validated in linear or logarithmic time
88+
89+However, even if constraints lack a proper oracle such as an index or a static means of validation and, thus, cannot be validated in constant time, the user may still benefit from serialization of the database update expression since writing the validated tuples to disk can be deferred beyond commit time and could go directly into an on-disk cache.
90+
91+## Worst Case Behavior
92+
93+Every database constraint can be represented as an inclusion dependency whereby the evaluation of a relational expression `sub` must be a subset of the evaluation of relational expression `super` (`sub ⊆ super`) for the constraint to validate. Therefore, the worst case time to validate any constraint, assuming that the constraint has an ideal oracle, is O(n) in the tuple count. However, as mentioned above, there are many constraints that can be validated in constant or less-than-linear time. Furthermore, the validated tuples need not be written to disk once the constraint is found to hold.
94+
95+Since there is great variation in constraint validation cost, the RDBMS could pre-analyze and report on associated constraints costs or make use of data independence to guide storage to optimize queries needed to service the constraint checker.
96+
97+## Caveats
98+
99+Certain types of updates still take a similar amount of time to commit in Project:M36 in comparison to PostgreSQL. Specifically, any update which relies on data outside the database's purview will necessitate flushing the tuple data since the update expression contains new tuple data not based on existing tuples. For example, the equivalent of:
100+
101+```
102+INSERT INTO "BigTable"(a, b, c, x) VALUES (1,5,10,10),(20,20,21,30),.... #many tuples
103+```
104+will still necessitate a *O(n)* tuple writes to disk in both databases. Though the asymptotic costs are equivalent, the number of writes are cut in half in Project:M36 since it does not require a write-ahead log.
105+
106+While PostgreSQL makes use of MVCC (multi-version concurrency control) which marks which tuples belong to a linear progression of transaction states, Project:M36 stores a full history of database state using a transaction graph (a directed acyclic graph similar to the commit-based graph of `git`). The graph allows named branches to be created and merged which also reduce contention around a singular graph head.
107+
108+## Applying Laziness to SQL RDBMSes
109+
110+Would it be possible to apply transaction-based laziness to an SQL-based RDBMS? Certainly, with sufficient shoe-horning, it could work, but SQL includes a few malfeatures which would make it difficult, if not impossible:
111+
112+ * Non-idempotent server-side functions prevent laziness because of side effects. PostgreSQL can mark functions as idempotent, but does not validate or enforce the idempotence, Project:M36, via Safe Haskell, can validate pure functions.
113+ * The lack of "time travel", the ability to query database state in the past prevents reliance on previous states, prevents direct referencing of previous database states on which the state differences can be built.
114+ * Tightly-coupled table-to-storage management prevents alternative data models. Indexing and constraint checking need to be statically verifiable and deferrable.
115+
116+These hurdles are not insurmountable, just perhaps not a good fit for SQL databases with a lot of historical and implementation baggage.
117+
118+## Benchmarks
119+
120+Forthcoming.
121+
122+## Conclusion
123+
124+Transactional time-to-commit is critical in ensuring that business decisions can make it to non-volatile storage as quickly as possible. By introducing Haskell-like, lazy evaluation to update expressions and serializing the resultant thunk, commits can be serialized in constant time, disregarding the number of tuples modified in the expression.
125+
126+This serialization strategy turns modern RDBMS architecture on its head since the table/relation-to-file mapping is broken, resulting in true data independence. Any on-disk representation of a relation at a specific transaction state therefore merely becomes a cached and purgeable entity, drastically shrinking on-disk cacheing requirements while expanding the scope in which said strategies can operate. Hopefully, a truly data independent architecture will result in new optimization discoveries.
127+
128+Project:M36 implements a transaction graph which can represent the entirety of database state, leaving room for any number of alternative representations, even for a single relation or relation across transaction states. A simple example could include storing two different orderings of tuples of the same relation in order to optimally serve different join queries. Common RDBMSes offer only two on-disk representations: the set of fully-evaluated tuples and indexes to those tuples, preventing data independence. Data independence paves the way towards the elimination of implementation-specific, gatekeeper roles such as database administrators.
129+
130+The promise of the relational algebra has always been the liberation of data from its data structure representation in order to be able to answer arbitrary queries. Modern DBMSes which typically map tables directly to one or more files on disk fail to live up to this promise. Project:M36 sets out to rectify this failure.
131+
132+In a greater context, applying laziness to an architecture to make use of more interesting optimizations is hardly new. The OpenGL API views its "immediate" mode as effectively deprecated. Filesystems take advantage of laziness using copy-on-write semantics. High-level programming languages can make greater, more interesting inferences about how a computation must be execute. A computer can always consider many more possible solution paths than a human can.
133+
134+The adherence to mathematical priniciples in Project:M36 results in features and optimization opportunities which have not yet been discovered. In contrast to RDBMSes designed around specific optimizations (such as indexes, specific disk layouts, or key-value lookups), Project:M36 sets out to demonstrate practically that future optimizations can only be discovered when operating within a mathematically-coherent architecture.
docs/data_independence.markdownnew file+109
@@ -0,0 +1,109 @@
1+# Project:M36: Towards an Architecture for Data Independence
2+
3+## Introduction
4+
5+The Project:M36 relational algebra architecture sets itself apart from typical DBMSes by ensuring strict transactional isolation, a branchable/mergeable (rather than linear) transaction graph, and storage of relational expressions (rather than storage of tuples). Let's look at how these architectural features work together to make Project:M36 the first relational algebra engine to implement true data independence.
6+
7+## What is Data Independence?
8+
9+C.J. Date writes:
10+
11+`Certainly most SQL products have failed to live up to the [relational] model's full potential...in those products, what the user sees and what is physically stored are essentially the same thing... In particular, it accounts for the argument, so often heard, to the effect that we have to "denormalize for performance."`
12+
13+`In principle, logical design has absolutely nothing to do with performance at all.`
14+
15+(Date, C.J. "Database In Depth: Relational Theory for Practitioners". O'Reilly Media. 2005. pages 156-157.)
16+
17+Data independence is therefore defined as the separation of the database user's experience from the database's means of in-memory or on-disk representation. As Date points out, virtually all database products implement a one-to-one mapping of relations to files in storage.
18+
19+One advantage of high-level abstractions in programming languages is to leverage advanced algorithms which can choose optimization paths on behalf of the user which a human may never be able to discover. While the promise of ever higher-level abstractions is realized by progamming languages such as Haskell, DBMS implementors have been resistant to data independence. This is due to several legacy factors such as companies pushing one-trick-pony database technologies and middlemen such as DBAs required to play gatekeeper against "bad" schema changes. The result is customers forced to run multiple disparate databases such as one for realtime transaction processing and another for analytics and another for audit logging. This recalcitrance has also led to the rise of databases such as "document" JSON databases with weak mathematical underpinnings in the name of performance as users become frustrated when hitting performance walls and dealing with arbitrary database limitations.
20+
21+Implementations which closely tie the user interface to backend representation close the door on interesting alternative representations and optimizations. For example, SQL databases typically store a single relation as a list of tuples on disk with supplementary indexes stored in separate files. There is no reason that the same relation couldn't be on disk or in memory in any number of formats. Such a table might be useful in various formats ideal for servicing different types of queries. Data independence grants the DBMS the permission to create any number of representations- including none at all- as long as the correct answer is provided to the user. "Column-store" databases may try to slice the tuples in a different axis, but those databases simply shift the performance problems elsewhere. Only implementation details prevent a database from offering both column-oriented *and* tuple-oriented representation while allowing the database to choose.
22+
23+That is why it is critical for the user's interface to the database *not* to include features such as "query hints" which would force a specific implementation in the backend. The user's interface must be declarative (describing the state change or query rather than *how* to execute it) and sufficiently high level. Any implementation detail leakage to the user's interface is a lost potential algorithmic optimization. While the topic of providing high-level interfaces is not specific to database design, we will continue to explore the ramifications of data independence in databases.
24+
25+
26+## Transactional Isolation
27+
28+While other databases offer various transaction isolation levels with differing levels of implementation-specific surprises, Project:M36 solely suppports the maximum transaction isolation level. Instead of relying on details of [MVCC](https://www.postgresql.org/docs/current/mvcc-intro.html) which marks each tuple in a relation with a monotonically-increasing number identifying from which transaction the tuple was added or deleted, Project:M36 includes no singular backing store for tuples, instead storing a stream of state change requests. Because the transaction graph supports branching and merging (similar to version control such as git), transactions can be committed without contention at a singular head of the graph. Committing to disk can be implemented as writing a file to represent the transaction's state and
29+
30+## The Transaction Graph
31+
32+These state changes are, in fact, the idempotent relational update expressions that the user has submitted. For example, given a transaction which includes a single relation `s`:
33+
34+```
35+┌──────────┬────────┬───────────┬───────────┐
36+│city::Text│s#::Text│sname::Text│status::Int│
37+├──────────┼────────┼───────────┼───────────┤
38+│"Paris" │"S2" │"Jones" │10 │
39+└──────────┴────────┴───────────┴───────────┘
40+```
41+
42+if the user commits a transaction with an insert such as:
43+
44+```
45+insert x relation{tuple{city "Boston", s# "S3", sname "Smith", status 400}}
46+```
47+
48+then a typical database will find the file representing the relation, find some free space in it and save the new tuple along with the MVCC transaction identifier. Subsequent transactions will find the tuple and compare it to their own transaction id in order to determine its "visibility". Project:M36, on the other hand, after validating that all relational constraints (such as primary and foreign keys) still hold, will simply serialize and append the expression to the transaction graph log. By default, there is no file representing the relation.
49+
50+For those familiar with Haskell, note how serializing the update expression is similar to being able to serialize a thunk or deferred execution.
51+
52+The transaction graph also allows users to travel back to previously-committed transactions. This may be useful for audit logging or alternative schemas.
53+
54+## Storage Representations
55+
56+Given the ever-growing transaction graph based on state changes, let's examine how Project:M36 services subsequent queries.
57+
58+## Benefits
59+
60+The primary goal of a database should be to ensure data integrity. Project:M36 takes no shortcuts in achieving this goal, but choosing a backend architecture which minimizes the time which it takes to get the transaction to non-volatile storage (disk) by storing update expressions rather than attempting to shuffle tuples on disk. This architecture open the door to many optimization techniques, many of which are new to databases.
61+
62+### Multiple On-Disk Representations
63+
64+The promise of data independence allows database backends to store relations as they see fit. That can include any number of on-disk representations including none at all. For example, for a table accessed by multiple projections, the database may choose to materialize the relation in those projections. The representations are therefore created in service to the queries submitted or anticipated instead of being based on past update expressions. Because on-disk storage is obviously limited, the database must decide what is valuable to keep around for future queries. This could open a new area of research into the appropriate machine learning algorithms, but, fundamentally, this set of materialized query responses is effectively a cache which can always be refreshed.
65+
66+The alternative representations need not be a direct answer to queries- for example, a materialized relation from a transaction could be used to service a query from a later transaction if the updates since that transaction are applied.
67+
68+The database could also anticipate, for example, scheduled queries and actually materialize relations before the query is executed. On-disk cache could represent "denormalized" tuple sets while the user-facing interface shows a properly normalized schema, thereby supporting data independence.
69+
70+More research in determining just what should be in the cache is needed.
71+
72+### Transactional Commits in O(1) Time
73+
74+Because the Project:M36 backend need not save tuples into a specific file representing a relation, the backend can drastically reduce the amount of time needed to commit a transaction to disk. Specifically, following constraint validation (which can often be done in constant or logarithmic time relative to the tuple count), the fastest means of committing the transaction is to save the update expression itself. Since the previous state has already been presumably committed, any idempotent operation can be saved for deferred execution. This means that transactions can be committed to disk relative to the size of the update expression rather than the number of the tuples affected- committing can occur at a rate relative to that of update expression size (typically a few kilobytes) rather than relative to the number of tuples that the update expression happened to alter.
75+
76+This technique gets transactions to disk faster, thus drastically increasing the rate transactions can be committed overall. Note that the execution of the update expression may be deferred by this process, so the cost to evaluate it may occur later, but this processing may be performed in the background after the transaction is committed. When the data is never requested, for example, for a defunct transaction graph branch, the actual execution could be deferred indefinitely, incurring zero cost to calculate the consquence of the update.
77+
78+### Less Disk Usage
79+
80+Because Project:M36 stores a stream of update expressions rather than tuples themselves, the minimum storage requirements for a given database may be reduced. For example, if a relation with an attribute `x` of type `Integer` has 1,000,000 tuples, a subsequent update to increment all 1,000,000 values by one may be cheaper to evaluate on-demand rather than immediately generating 1,000,000 new tuples and saving them to disk. If the new tuples are requested, the database can determine that the tuples are not materialized, calculate them, and return them, all without ever having the tuples on disk. Furthermore, if only a subset of the tuples are ever requested, for example, due to a query restriction, then some of the tuples may never need to be calculated or materialized.
81+
82+### Audit Logging
83+
84+Typical databases implement various strategies for audit logging, including:
85+
86+* exposing MVCC-like values such as tuple "created at" and "created by" to the user and forcing all tables to be insert-only
87+* shuttling audit logs to a secondary database
88+
89+Project: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
92+
93+Typical 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
96+
97+Queries 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
106+
107+Project: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.
108+
109+Project:M36's novel architecture opens the door for further database and algorithmic research.
docs/database_context_functions.markdown+51−1
@@ -6,7 +6,7 @@ While "atom functions" operate on individual values and return new values (atoms
66
77Other DBMS software may include a similar feature called "stored procedures". However, "stored procedures" are stored outside the transaction stream and are not versioned by the database as in Project:M36.
88
9−In order to use this feature in Project:M36, be sure to build your own Project:M36 library so that the optional scripting is enabled.
9+In order to use compile functions at runtime in Project:M36, be sure to build your own Project:M36 library so that the optional scripting is enabled. Alternatively, precompiled database context functions can be loaded from object files.
1010
1111## Database Context Function Types
1212
@@ -112,6 +112,56 @@ executeDatabaseContextExpr sessionId dbconn (ExecuteDatabaseContextFunction func
112112```
113113from the same module.
114114
115+## Loading Precompiled Modules
116+
117+Database context functions compiled with GHC to object files can be loaded at runtime. Let's walk through an example:
118+
119+```haskell
120+module DynamicDatabaseContextFunctions where
121+import ProjectM36.Base
122+import ProjectM36.Relation
123+import ProjectM36.DatabaseContextFunctionError
124+import qualified ProjectM36.Attribute as A
125+
126+import qualified Data.Map as M
127+
128+
129+someDBCFunctions :: [DatabaseContextFunction]
130+someDBCFunctions = [DatabaseContextFunction {
131+ dbcFuncName = "addtestrel",
132+ dbcFuncType = [],
133+ dbcFuncBody = DatabaseContextFunctionBody Nothing addTestRel
134+ }]
135+ where
136+ addTestRel _ ctx = do
137+ let attrs = A.attributesFromList [Attribute "word" TextAtomType]
138+ eRel = mkRelationFromList attrs [[TextAtom "nice"]]
139+ case eRel of
140+ Left err -> Left (DatabaseContextFunctionUserError (show err))
141+ Right testRel ->
142+ pure $ ctx { relationVariables = M.insert "testRel" testRel (relationVariables ctx) }
143+```
144+
145+The function returns a list of `DatabaseContextFunction`s (just one in this case). The function adds a relation variable to the current database context.
146+
147+Compile it with GHC:
148+
149+```
150+cabal exec ghc -- examples/DynamicDatabaseContextFunctions.hs -package project-m36
151+```
152+
153+or invoked GHC via stack.
154+
155+Finally, connect to your database with `tutd` and load the module:
156+
157+```
158+TutorialD (master/main): loaddatabasecontextfunctions "DynamicDatabaseContextFunctions" "someDBCFunctions" "examples/DynamicDatabaseContextFunctions.o"
159+```
160+
161+If the load reports an "unknown symbol" error, double check that the installed "project-m36" package is identical to one used to link the Haskell module.
162+
163+Note that such functions do not survive a server restart; this will likely be improved in a future release.
164+
115165## Future Improvements
116166
117167There are likely a variety of convenience functions which would make sense in the context of the scripted function. If you have ideas for such functions, please open a GitHub issue.
docs/dataframes.markdownnew file+53
@@ -0,0 +1,53 @@
1+# Project:M36 DataFrames
2+
3+Users of typical relational algebra engines have come to expect sorting and limiting of query results despite the fact that relations do not support ordering. To that end, Project:M36 supports converting relations to "data frames" to support sorting on attributes and limiting the maximum tuple count in the result set.
4+
5+The equivalent feature in SQL is invoked by the `ORDER BY`, `LIMIT`, and `OFFSET` clauses.
6+
7+## Usage
8+
9+From within the `tutd` console, converting a relation to be sorted as a data frame is invoked using the `:showdataframe` command.
10+
11+```
12+:showdataframe <relational expression> orderby {<attribute {ascending,descending}>} {offset <num>} {limit <num>}
13+```
14+
15+The default sort order is `ascending`.
16+
17+## Examples
18+
19+```
20+TutorialD (master/main): :showdataframe s orderby {status}
21+┌──┬───────────┬─────────┬────────────┬────────────────┐
22+│DF│city::Text↕│s#::Text↕│sname::Text↕│status::Integer⬆│
23+├──┼───────────┼─────────┼────────────┼────────────────┤
24+│1 │"Paris" │"S2" │"Jones" │10 │
25+│2 │"London" │"S1" │"Smith" │20 │
26+│3 │"London" │"S4" │"Clark" │20 │
27+│4 │"Athens" │"S5" │"Adams" │30 │
28+│5 │"Paris" │"S3" │"Blake" │30 │
29+└──┴───────────┴─────────┴────────────┴────────────────┘
30+TutorialD (master/main): :showdataframe s{status} orderby {status}
31+┌──┬────────────────┐
32+│DF│status::Integer⬆│
33+├──┼────────────────┤
34+│1 │10 │
35+│2 │20 │
36+│3 │30 │
37+└──┴────────────────┘
38+TutorialD (master/main): :showdataframe s{status} orderby {status descending} limit 1
39+┌──┬────────────────┐
40+│DF│status::Integer⬇│
41+├──┼────────────────┤
42+│1 │30 │
43+└──┴────────────────┘
44+TutorialD (master/main): :showdataframe s{status} orderby {status descending} offset 1 limit 3
45+┌──┬────────────────┐
46+│DF│status::Integer⬇│
47+├──┼────────────────┤
48+│1 │20 │
49+│2 │10 │
50+└──┴────────────────┘
51+
52+```
53+The arrow in the attributes indicates the sort order while the DF column indicates the row number based on the sort order. Column ordering can also be arbitrary.
docs/filesystem-persistence.markdown+1−1
@@ -1,4 +1,4 @@
1−# Project-M36 Filesystem Persistence
1+# Project-M36 Filesystem Persistence (Change Proposal)
22
33## Introduction
44
docs/import_export_csv.markdownnew file+65
@@ -0,0 +1,65 @@
1+# Project:M36 CSV Import/Export
2+
3+Project:M36's `tutd` console supports the import and export of CSV files as a lowest-common denominator format for moving data. Because the CSV file format does not support all the features of Project:M36- most notably, nested relations- not all relation variables can be marshalled to-and-from CSV files.
4+
5+## CSV Export
6+
7+If a relation variable cannot be exported due to data types which are not supported by the CSV format- such as with a nested relation- then Project:M36 throws an error rather than export a partial file.
8+
9+### Example Export
10+
11+```
12+TutorialD (master/main): :importexample cjdate
13+TutorialD (master/main): :exportcsv s "/tmp/csv"
14+```
15+```
16+$ cat /tmp/csv
17+s#,sname,status,city
18+S2,Jones,10,Paris
19+S1,Smith,20,London
20+S4,Clark,20,London
21+S5,Adams,30,Athens
22+S3,Blake,30,Paris
23+```
24+
25+## CSV Import
26+
27+An import is equivalent to an insert and does not replace the target relation variable.
28+
29+Because relations do not have a natural ordering for their attributes, the CSV file to import must contain a header row which matches the names of attributes.
30+
31+If a value in the CSV file cannot be converted to the expected type (determined by the existing relation attributes), then the entire import is aborted rather than perform a partial import.
32+
33+### Example Import
34+```
35+$ cat /tmp/csv
36+s#,sname,status,city
37+S6,Samson,100,New York
38+```
39+```
40+TutorialD (master/main): :importexample cjdate
41+TutorialD (master/main): :showexpr s
42+┌──────────┬────────┬───────────┬───────────────┐
43+│city::Text│s#::Text│sname::Text│status::Integer│
44+├──────────┼────────┼───────────┼───────────────┤
45+│"Paris" │"S2" │"Jones" │10 │
46+│"Paris" │"S3" │"Blake" │30 │
47+│"London" │"S4" │"Clark" │20 │
48+│"London" │"S1" │"Smith" │20 │
49+│"Athens" │"S5" │"Adams" │30 │
50+└──────────┴────────┴───────────┴───────────────┘
51+TutorialD (master/main): :importcsv "/tmp/csv" s
52+TutorialD (master/main): :showexpr s
53+┌──────────┬────────┬───────────┬───────────────┐
54+│city::Text│s#::Text│sname::Text│status::Integer│
55+├──────────┼────────┼───────────┼───────────────┤
56+│"Paris" │"S3" │"Blake" │30 │
57+│"London" │"S4" │"Clark" │20 │
58+│"New York"│"S6" │"Samson" │100 │
59+│"Athens" │"S5" │"Adams" │30 │
60+│"London" │"S1" │"Smith" │20 │
61+│"Paris" │"S2" │"Jones" │10 │
62+└──────────┴────────┴───────────┴───────────────┘
63+```
64+
65+Note that relations do not have ordering, thus, no ordering from the CSV file is preserved.
docs/introduction_to_projectm36.markdown+35−14
@@ -1,7 +1,7 @@
11# Introduction to Project:M36
22
33## What is Project:M36?
4−Project:M36 is a relational-algebra-based database management system. It can be used a production-level database backend or for learning more about the relational algebra.
4+Project:M36 is a relational-algebra-based database management system. It can be used as a production-level database backend or for learning more about the relational algebra.
55
66The principled mathematical approach to Project:M36's design sets it apart from competing DBMSs. Specifically, Project:M36 adheres strongly to the mathematics of the relational algebra and makes no compromises nor apologies in doing so. To that end, Project:M36 is implemented in the programming language "Haskell" which is itself based on the lambda calculus.
77
@@ -15,38 +15,59 @@ The relational algebra is the mathematical model underpinning Project:M36. When
1515
1616## Binary Releases
1717
18−### Windows
19−Project:M36 now provides binary installations for Windows. Check the (releases page)[https://github.com/agentm/project-m36/releases] for downloads.
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.
2019
21−### MacOS X
20+### Install Docker:
2221
23−Binary releases are not yet available for MacOS X, but compiling from source is easy.
22+* [Windows 10 Docker Installation](https://docs.docker.com/docker-for-windows/wsl/)
23+* [MacOS Docker Installation](https://docs.docker.com/docker-for-mac/install/)
24+* [Linux Docker Installation](https://docs.docker.com/engine/install/#server)
2425
25−### Linux
26+### Run TutorialD from Docker Image
2627
27−The currently-preferred method of installation is from source. A future enhancement would be installation from deb or rpm.
28+This downloads the docker image tagged "latest" and runs `tutd`, the TutorialD command line interface. Try the [15-Minute TutorialD Tutorial](15_minute_tutorial.markdown) and try some expressions.
29+
30+```bash
31+docker run -it projectm36/project-m36 tutd
32+```
33+
34+### Run Project:M36 Server
35+
36+The default port for the project-m36 server is 6543.
37+
38+```bash
39+docker run --network host projectm36/project-m36 project-m36-server -n <database_name>
40+```
41+
42+### Connect to Project:M36 Server
43+
44+```bash
45+docker run --network host projectm36/project-m36
46+```
2847
2948## Source Installation
3049
3150Requirements:
3251
33−* [GHC 7.10 or greater](https://www.haskell.org/downloads)
52+To build with stack:
53+
54+* [GHC 8.6.5 or greater](https://www.haskell.org/downloads)
3455* [Haskell stack](https://docs.haskellstack.org/en/stable/README/)
35−* Linux, MacOS X, or Windows OS
56+* Linux, macOS, or Microsoft Windows
3657
3758Compilation steps:
3859
3960* ```git clone https://github.com/agentm/project-m36```
4061* ```cd project-m36```
41−* ```stack build```
62+* ```stack --stack-yaml stack.ghc8.6.yaml build```
4263
4364At this point, the TutorialD interactive interpreter can be run using ```stack exec tutd```.
4465
45−Alternative building with GHC 8.0.x:
66+Alternative building with GHC 8.6.5 or greater:
4667
4768* ```cabal new-build```
4869
49−The resultant binaries can be found in ```./dist-newstyle/build/project-m36-0.1/build```.
70+The resultant binaries can be found in ```./dist-newstyle/build/project-m36-<version>/build```.
5071
5172## Accessing Project:M36 Databases
5273
@@ -65,7 +86,7 @@ In addition to being a relational algebra engine, Project:M36 supports features
6586
6687Most DBMSs provide a way to allow the user to specify atomic database state changes. These changes are often wrapped up as "transactions" which, when applied to the database state, offer the illusion of sequential and grouped, atomic changes applied to the databases. Often the only state which can be queried is the snapshot at the time the transaction is opened.
6788
68−Project:M36 extends this transaction model with the "transaction graph". This feture can be adequately described as version control for transactions. In the legacy DBMS model, the transactions are added to a linear transaction stream where each client is contending over the "head" of the stream- the latest transactions. In the transaction graph model, clients can add named branches and add transactions to the branches, then merge changes back, if necessary.
89+Project:M36 extends this transaction model with the "transaction graph". This feature can be adequately described as version control for transactions. In the legacy DBMS model, the transactions are added to a linear transaction stream where each client is contending over the "head" of the stream- the latest transactions. In the transaction graph model, clients can add named branches and add transactions to the branches, then merge changes back, if necessary.
6990
7091This feature is useful, for example:
7192* during testing- create a testing branch which production will never see. This obviates the need for a separate production data set.
@@ -87,7 +108,7 @@ Decreasing a transaction's durability can reduce IO contention at the cost of re
87108
88109### Native Haskell Compatibility
89110
90−Any Haskell data type which implements the ```Atom``` typeclass can be manipulated as a value in the database.
111+Any Haskell data type which implements the ```Atomable``` typeclass can be manipulated as a value in the database.
91112
92113Haskell functions which operate on those values can also be added to the database.
93114
docs/introduction_to_the_relational_algebra.markdown+2−2
@@ -202,7 +202,7 @@ Join (Instructor relation)
202202
203203(Course Relation)
204204
205−|(Course Name, Course Name Type)|(Instructor, Instructor Name Type)|(Course Room Number, Room Number Type)|
205+|(Course Name, Course Name Type)|(Instructor Name, Instructor Name Type)|(Course Room Number, Room Number Type)|
206206|-------------------------------|----------------------------------|--------------------------------------|
207207|English 1|Steve|Room 104|
208208|French 2|Bob|Room 103|
@@ -378,7 +378,7 @@ Since a value can store any (immutable) type, it can certainly hold a relation.
378378
379379For 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.
380380
381−In the relational algebra, The aggregate value can be placed alongside the relation value from whic the aggregate was derived.
381+In the relational algebra, The aggregate value can be placed alongside the relation value from which the aggregate was derived.
382382
383383Example:
384384
docs/merkle_transaction_graph.markdownnew file+33
@@ -0,0 +1,33 @@
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/new_datatypes.markdown+1−1
@@ -106,6 +106,6 @@ The essential ```Atomable``` typeclass functions are:
106106| ```toAtomType :: Proxy a -> AtomType``` | generate a database AtomType for a Haskell datatype |
107107| ```toAddTypeExpr :: Proxy a -> DatabaseContextExpr``` | generate a ```DatabaseContextExpr``` which can be executed against a database context in order to add the new type |
108108
109−In addition, basic Haskell data types like ```Int```, ```Double```, ```Text```, ```Day```, ```Bool```, ```UTCTime```, and l```ByteString``` already have `Atomable` instances ready-to-go. In addition, an ```Atomable``` instance is available for lists: ```Atomable a => [a]```, though one should be very careful not to use this in a common anti-pattern. Typically, it makes more sense to store one-to-many relationships as discrete relation variables; when storing them as lists, one gives up the various query capabilities and optimizations of the relational algebra.
109+In addition, basic Haskell data types like ```Int```, ```Double```, ```Text```, ```Day```, ```Bool```, ```UTCTime```, and ```ByteString``` already have `Atomable` instances ready-to-go. In addition, an ```Atomable``` instance is available for lists: ```Atomable a => [a]```, though one should be very careful not to use this in a common anti-pattern. Typically, it makes more sense to store one-to-many relationships as discrete relation variables; when storing them as lists, one gives up the various query capabilities and optimizations of the relational algebra.
110110
111111To be clear, these data types are not black boxes once stored in the database. These new types can be scanned and manipulated by Haskell scripts which can be created at runtime. For more information, read about [```AtomFunction```s](/docs/atomfunctions.markdown).
docs/reaching_out_of_the_tarpit.markdown+1−1
@@ -57,7 +57,7 @@ Project:M36 implements multiple interfaces:
5757To 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:
5858
5959```
60−TutorialD (master/main): :importexample date
60+TutorialD (master/main): :importexample cjdate
6161TutorialD (master/main): :showexpr p
6262┌───────────────────┬────────────┬───────────────────┬────────────┬────────────┐
6363│address::Address │agent::Agent│dateRegistered::Day│photo::Text │price::Price│
docs/server_mode.markdown+1−1
@@ -8,7 +8,7 @@ While Project:M36 is easy-to-use as an interactive, in-process database manageme
88
99To start the Project:M36 server to serve the local host with a database named "mydbname", run ```cabal run project-m36-server -- --database mydbname --hostname 127.0.0.1``` in the project-m36 source directory. The double-dash indicates that the arguments should be passed to ```project-m36-server``` instead of ```cabal```. Under normal conditions, this command will print nothing and block indefinitely to serve incoming requests on the default port 6543.
1010
11−Note that the above invocation will serve and in-memory, transient "mydbname" database. The database is deleted when the server exits. To serve a database with filesystem persistence, invoke ```cabal run project-m36-server -- --database mydbname --hostname 127.0.0.1 --database-directory /path/to/dbdirectory --fsync```.
11+Note that the above invocation will serve an in-memory, transient "mydbname" database. The database is deleted when the server exits. To serve a database with filesystem persistence, invoke ```cabal run project-m36-server -- --database mydbname --hostname 127.0.0.1 --database-directory /path/to/dbdirectory --fsync```.
1212
1313## Connecting an Interactive Client
1414
docs/transaction_graph_operators.markdown+8−18
@@ -10,23 +10,11 @@ When a new database is created, a new transaction graph is created for it with o
1010
1111As the user interactively alters the database context such as by adding a new relation variable, the database context is no longer equal to that of the first transactions. This is called "database context divergence" because many of the same components exist in both the updated context and the context of the first transaction.
1212
13−![Initial database starting state](http://g.gravizo.com/g?
14−digraph G {
15− base[label="base transaction",shape=rectangle];
16− new[label="mutable database context"];
17− new -> base;
18−})
13+![Initial database starting state](http://g.gravizo.com/g?%20digraph%20G%20{%20base[label=%22base%20transaction%22,shape=rectangle];%20new[label=%22mutable%20database%20context%22];%20new%20-%3E%20base;%20})
1914
2015Once the user decides that the changes in the updated database context are worth adding to the transaction graph, the user issues a "commit" request. The commit operation converts the current database context into a new transaction which is then added to the graph with the parent transaction set to the same parent transaction as the database context. The user's mutable database context is shifted to be a copy of the context of the newly-committed transaction.
2116
22−![Freshly committed transaction](http://g.gravizo.com/g?
23−digraph G {
24− base[label="base transaction",shape=rectangle];
25− discon[label="mutable database context"];
26− fresh[label="newly committed transaction",shape=rectangle];
27− fresh -> base;
28− discon -> fresh;
29−})
17+![Freshly committed transaction](http://g.gravizo.com/g?%20digraph%20G%20{%20base[label=%22base%20transaction%22,shape=rectangle];%20discon[label=%22mutable%20database%20context%22];%20fresh[label=%22newly%20committed%20transaction%22,shape=rectangle];%20fresh%20-%3E%20base;%20discon%20-%3E%20fresh;%20})
3018
3119It can be handy to attempt to modify the database without altering the data that others may wish to continue to use and modify. If a set of transactions may diverge from another use-case for the data, the user may choose to "branch" the transaction graph. Branching allows the user to assign an arbitrary name to a series of transactions and then potentially merge the set of transactions back to the originating branch. Project:M36 creates a "master" branch when the transaction graph is first created.
3220
@@ -55,15 +43,17 @@ TutorialD (master/main): :rollback
5543In 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.
5644
5745```
58−TutorialD (master/main): :showgraph
59−┌─────────────┬──────────┬──────────────────────────────────────┬────────────────────────────┬──────────────────────────────┐
60−│current::Bool│head::Text│id::Text │parents::relation {id::Text}│stamp::DateTime │
61−├─────────────┼──────────┼──────────────────────────────────────┼────────────────────────────┼──────────────────────────────┤
46+┌─────────────┬────────────────────────────────────────────┬──────────┬──────────────────────────────────────┬────────────────────────────────────────┬─────────────────────────────────┐
47+│current::Bool│hash::ByteString │head::Text│id::Text │parents::relation {id::Text} │stamp::DateTime │
48+├─────────────┼────────────────────────────────────────────┼──────────┼──────────────────────────────────────┼────────────────────────────────────────┼─────────────────────────────────┤
49+
6250
6351<big result elided>
6452```
6553The "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.
6654
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+
6757The "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.
6858
6959The "id" attribute is the UUID needed in order to navigate the graph.
docs/tupleable.markdown+23
@@ -23,12 +23,35 @@ instance Tupleable Person
2323
2424Now, ```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.
2525
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+
2645## Usage
2746
2847The ```Tupleable``` module includes the following functions:
2948
3049 * ```toInsertExpr :: forall a t. (Tupleable a, Traversable t) => t a -> RelVarName -> Either RelationalError DatabaseContextExpr```
3150 * creates an ```Insert``` expression which can be used to insert a set of ```Tupleable``` values into the relation variable named by the ```RelVarName```
51+ * ```toUpdateExpr :: forall a. Tupleable a => RelVarName -> [AttributeName] -> a -> Either RelationalError DatabaseContextExpr```
52+ * create an `Update` expression which updates the tuples with the attribute values of the argument `Tupleable` using the list of attribute names as the key to the underlying relation variable
53+ * ```toDeleteExpr :: forall a. Tupleable a => RelVarName -> [AttributeName] -> a -> Either RelationalError DatabaseContextExpr```
54+ * create a `Delete` expression which will remove the tuples from the relation variable matching the values of the argument `Tupleable` using the attribute name list as the matching key
3255 * ```toAttributes :: proxy a -> Attributes```
3356 * generates ```Attributes``` from a ```Tupleable``` value- can be used with ```undefined```, so an actual value is not necessary
3457 * ```toTuple :: a -> RelationTuple```
docs/tutd_cheatsheet.markdownnew file+99
@@ -0,0 +1,99 @@
1+# Tutorial D Cheatsheet
2+
3+The following tables list examples of expressions for `tutd`, Project:M36's "Tutorial D" implementation.
4+
5+## Relational Expressions
6+
7+Relational expressions query database state without being able to change it.
8+
9+|Relational Expression |Description |
10+|------------------------------------------------------|---------------------------------------|
11+|`:showexpr p`|Display the relation variable `p`|
12+|`:showexpr s rename {city as town}`|Display the result after renaming a relational attribute|
13+|`:showexpr p{color,city}`|Display the result of the projection on the `color` and `city` attributes|
14+|`:showexpr p{all but city}`|Display the result of the projection of all attribute of `p` except `city`|
15+|`:showexpr p join sp`|Display the result of the relational expression `p` joined against `sp` (equivalent to `NATURAL JOIN` in SQL)|
16+|`:showexpr (s join sp){all from s}`|Display the result of a join but only include attributes from `s`|
17+|`:showexpr s semijoin sp`|Equivalent to `(s join sp){all from s}`|
18+|`:showexpr s antijoin sp`|Display the result of all tuples in `s` which do not match appear in the result of `s semijoin sp`|
19+|`:showexpr s union s`| Display the result of `s` unioned with itself (which is equivalent to `s`)|
20+|`:showexpr s:{status2:=add(10,@status)}`| Display the result of extending the `s` relation variable with a new attribute which adds 10 to each `status` attribute|
21+|`:showexpr s group ({sname,status,s#} as subrel)`| Display the result of grouping the `sname`, `status`, and `s#` into a subrel for each tuple in the `s` relation where the `city` attribute (not mentioned) is the grouping criteria|
22+|`:showexpr (s group ({sname,status,s#} as subrel)) ungroup subrel`| Display the result of unwrapping a subrelation to create one new tuple for each subrelation tuple in the result|
23+|`:showexpr s minus s`|Display the result after removing all tuples that match the second argument. `x minus x` is equivalent to `x where false`|
24+|`:showexpr relation{tuple{name "Mike",age 6},tuple{name "Sam",age 10}}`|Display an unnamed relation using manually constructed tuples|
25+|`:showexpr relation{a Integer, b Text}`|Display an empty-tupled relation of a specified type|
26+|`:showexpr relation{a Integer, b Text}{tuple{a 4, b "four"}}`|Display a relation bound by the specified types and containing one or more tuples|
27+|`:showexpr s group ({s#,sname,status} as subrel):{citycount:=count(@subrel)}`|Display a result which groups `s` by `city` and extends the relation by a count for each city.|
28+|`:showrelvars`|Display a list of relation variables in the current context along with their types (attributes)|
29+
30+## Built-In Types
31+
32+|Example Value Expression |Type |Explanation|
33+|------------------------------------------------------|---------------------------------------|-----------|
34+|`"abc"`|Text|UTF-8 string|
35+|`123`|Integer|an integer of limitless size (using gmp)|
36+|`int(456)`|Int|machine-word-based integer|
37+|`12.56`|Double|64-bit IEEE 754 floating point number|
38+|`dateTimeFromEpochSeconds(1502304846)`|DateTime||
39+|`fromGregorian(2017,05,30)`|Date||
40+|`t`|Bool|`t` or `f`|
41+|`bytestring("dGVzdGRhdGE=")`|Bytestring|base-64-encoded string of bytes|
42+|`interval(3,5,f,f)`|Interval(Integer)|the constructor function includes two bounds and two boolean flags for inclusiveness|
43+
44+## Database Context Expressions
45+
46+Database context expressions take the current database context as input and alter it to create a new
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`|
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`|
54+|`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|
56+|`update s where status=20 (sname:="Mr. Twenty")`|Replace one or more values in matching tuples with a new value|
57+|`delete sp where s#="S4"`|Remove tuples matching the criteria|
58+|`key s_key_constraint {s#} s`|Add a constraint named `s_key_constraint` on relation variable `s` ensuring that `s#` is unique|
59+|`foreign key s#_in_sp sp{s#} in s{s#}`|Add a foreign key constraint that ensures that `sp`'s `s#` attribute always references a `s#` value in `s`|
60+|`constraint s_status_less_than_50 (s where ^lt(50,@status)){} in false`|Add a constraint that stipulates that the `status` values in `s` are less than 50|
61+|`createarbitraryrelation employee {name Text, empid Int, hired DateTime} 3-100`|Create a relation variable with random values with between 3-100 tuples- useful for testing|
62+|`notify steve_change person where name="Steve" true (person where name="Steve"){address}`|Notify the current connection with an asynchronous event if any committed tuples matching `person where name="Steve"` with `true` for the pre-change state and `person where name="Steve"){address}` for the post-change state- these states will be sent along with the notification|
63+|`data Hair = Bald | Brown | Blond | OtherColor Text`|Create a new algebraic data type for use with values inside tuples|
64+|`undata Hair`|Delete the `Hair` custom type|
65+
66+
67+## Transaction Graph Expressions
68+
69+Transaction graph expressions alter the state of the transaction graph by append new states.
70+
71+|Transaction Graph Expression |Description |
72+|------------------------------------------------------|---------------------------------------|
73+|`:commit`|Save the current database context to a new transaction and add it to the transaction graph|
74+|`:rollback`|Return the database context to the state before any alterations were made|
75+|`:branch experimental`|Create a new branch from the existing branch and switch the current context to be able to commit to the new branch|
76+|`:jumphead master`|Discard any changes in the current context and jump to the head of a different branch|
77+|`:jump 11b601c9-f46b-42b0-a2ce-cf18ced31b7f`|Jump to the specific transaction by UUID- useful for introspecting past states|
78+|`:showgraph`|Display a representation of the transaction graph|
79+|`:walkbacktotime "2017-08-10 16:44:00"`|Walk back in time from the current branch until a transaction less than or equal to the time is found and switch the current context to that past transaction- useful for auditing|
80+
81+## Data Frame Expressions
82+
83+In contrast to relational expressions, data frame expressions generate ordered tuples.
84+
85+|Data Frame Expression |Description |
86+|------------------------------------------------------|---------------------------------------|
87+|`:showdataframe s orderby {status}`|Display a data frame result for the relational expression `s` and sort the tuples by `status`|
88+|`:showdataframe s{status} orderby {status descending} offset 1 limit 3`|Display a data frame result for `s{status}` but ordered by `status` values descending, skip the first tuple, and return no more than 3 tuples|
89+
90+## Trans-Graph Relational Expressions
91+
92+Trans-graph relational expressions allow queries spanning multiple transactions.
93+
94+|Trans-Graph Relational Expressions |Description |
95+|------------------------------------------------------|---------------------------------------|
96+|`:showtransgraphexpr s@master join sp@master`|Display a result for joining `s` and `sp` on the branch `master`|
97+|`:showtransgraphexpr s@master~ join sp@master`|Display a result for joining `s` on the parent transaction of `master`'s current head and `sp` on master|
98+|`:showtransgraphexpr s@master~^2`|Display a result for `s` two parents previous to the parent of the current `master`'s head|
99+
docs/tutd_tutorial.markdown+268−186
@@ -14,20 +14,55 @@ TutorialD (master/main):
1414
1515"master" refers to the name of the branch to which the current transaction will be potentially committing.
1616
17+### Date's Sample Relations
18+
19+The examples in this tutorial can be executed after loading Chris Date's sample relations using:
20+
21+```
22+:importexample cjdate
23+```
24+
25+Each section assumes a fresh instance of the Date examples. The relation variables created in the script are:
26+
27+|Relation Variable Name|Description|
28+|----------------------|-----------|
29+|s|suppliers|
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+
1751### Types
1852
1953TutorialD is strongly-typed. The basic built-in types are:
2054
2155|Type Name|Explanation|Example|
2256|---------|-----------|-------|
23−|text|arbitrary text|"The Old Man and the Sea"|
24−|int|any integer|-4|
25−|datetime|timestamp UTC|dateTimeFromEpochSeconds(1502304846)|
26−|date|calendar date|fromGregorian(2017,05,30)|
27−|double|floating point number|3.1459|
28−|bool|boolean value|t|
29−|bytestring|arbitrary-length string of bytes- input is base64-encoded|bytestring("dGVzdGRhdGE=")|
30−|interval x|interval/range type for ints, doubles, datetimes, and dates|interval(3,5,f,f)|
57+|Text|arbitrary text|"The Old Man and the Sea"|
58+|Integer|arbitarily-sized integer|-4|
59+|Int|machine word integer|int(10)|
60+|DateTime|timestamp UTC|dateTimeFromEpochSeconds(1502304846)|
61+|Date|calendar date|fromGregorian(2017,05,30)|
62+|Double|floating point number|3.1459|
63+|Bool|boolean value|t|
64+|Bytestring|arbitrary-length string of bytes- input is base64-encoded|bytestring("dGVzdGRhdGE=")|
65+|Interval x|interval/range type for ints, doubles, datetimes, and dates|interval(3,5,f,f)|
3166
3267With regards to boolean values, be sure not to conflate ```t``` or ```f``` as a boolean value with ```true``` and ```false``` which are relation variables.
3368
@@ -36,7 +71,7 @@ The ```interval``` function last two arguments are boolean values indicating whe
3671Project:M36 will complain loudly if the expected types do not match. Automatic type coercion does not exist.
3772
3873```
39−TutorialD (master/main): :showexpr S:{more:=add(10,@sname)}
74+TutorialD (master/main): :showexpr s:{more:=add(10,@sname)}
4075ERR: AtomFunctionTypeError "add" 2 IntAtomType StringAtomType
4176```
4277
@@ -48,7 +83,7 @@ Relation Variables are named cells which reference relations within a transactio
4883
4984Definition of a relation variable:
5085```
51−products :: {name char, age int}
86+products :: {name Text, age Integer}
5287```
5388This expression creates a new relation variable in the current context which can refer to any relation with the header of "name" of type "char" and "age" of type int.
5489
@@ -67,22 +102,6 @@ Chris Date refers to these relations as "TABLE_DUM" and "TABLE_DEE" but such arb
67102products{}
68103```
69104
70−### Date's Sample Relations
71−
72−The examples in this tutorial can be executed after loading Chris Date's sample relations using:
73−
74−```
75−:importexample date
76−```
77−
78−Each section assumes a fresh instance of the Date examples. The relation variables created in the script are:
79−
80−|Relation Variable Name|Description|
81−|----------------------|-----------|
82−|s|suppliers|
83−|p|parts|
84−|sp|contains mapping of which suppliers supply which parts|
85−
86105### Relational Expressions
87106
88107A relational expression combines relational operators to create a new relation. ```tutd``` can display the result of executing a relational expression with ":showexpr".
@@ -151,15 +170,15 @@ The unary rename operator outputs a new relation with chosen attributes renamed.
151170
152171```
153172TutorialD (master/main): :showexpr s rename {city as town}
154−┌──┬─────┬──────┬──────┐
155−│s#│sname│status│town │
156−├──┼─────┼──────┼──────┤
157−│S3│Blake│30 │Paris │
158−│S4│Clark│20 │London│
159−│S5│Adams│30 │Athens│
160−│S1│Smith│20 │London│
161−│S2│Jones│10 │Paris │
162−└──┴─────┴──────┴──────┘
173+┌────────┬───────────┬───────────────┬──────────┐
174+│s#::Text│sname::Text│status::Integer│town::Text│
175+├────────┼───────────┼───────────────┼──────────┤
176+│"S3" │"Blake" │30 │"Paris" │
177+│"S4" │"Clark" │20 │"London" │
178+│"S5" │"Adams" │30 │"Athens" │
179+│"S1" │"Smith" │20 │"London" │
180+│"S2" │"Jones" │10 │"Paris" │
181+└────────┴───────────┴───────────────┴──────────┘
163182```
164183
165184#### Projection
@@ -170,14 +189,15 @@ For example:
170189
171190```
172191TutorialD (master/main): :showexpr p{color,city}
173−┌──────┬─────┐
174−│city │color│
175−├──────┼─────┤
176−│London│Red │
177−│Paris │Blue │
178−│Oslo │Blue │
179−│Paris │Green│
180−└──────┴─────┘
192+┌──────────┬───────────┐
193+│city::Text│color::Text│
194+├──────────┼───────────┤
195+│"London" │"Red" │
196+│"Paris" │"Green" │
197+│"Oslo" │"Blue" │
198+│"Paris" │"Blue" │
199+└──────────┴───────────┘
200+
181201```
182202
183203Projection attributes can also be inverted using `all but`:
@@ -195,7 +215,7 @@ TutorialD (master/main): :showexpr s{all but city}
195215└────────┴───────────┴───────────────┘
196216```
197217
198−Projection attributes can also be derived from a relational expression using `all from`:
218+Projection attributes can be derived from a relational expression using `all from`:
199219
200220```
201221TutorialD (master/main): :showexpr (s join sp){all from s}
@@ -211,28 +231,64 @@ TutorialD (master/main): :showexpr (s join sp){all from s}
211231
212232Above, we join `s` and `sp` but project the result back onto the attributes of `s`.
213233
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+
214270#### Restriction
215271
216272Restriction is applied using a "where" clause, much like in SQL.
217273
218274```
219275TutorialD (master/main): :showexpr p where color="Blue" and city="Paris"
220−┌─────┬─────┬──┬─────┬──────┐
221−│city │color│p#│pname│weight│
222−├─────┼─────┼──┼─────┼──────┤
223−│Paris│Blue │P5│Cam │12 │
224−└─────┴─────┴──┴─────┴──────┘
276+┌──────────┬───────────┬────────┬───────────┬───────────────┐
277+│city::Text│color::Text│p#::Text│pname::Text│weight::Integer│
278+├──────────┼───────────┼────────┼───────────┼───────────────┤
279+│"Paris" │"Blue" │"P5" │"Cam" │12 │
280+└──────────┴───────────┴────────┴───────────┴───────────────┘
225281```
226282
227283The restriction predicate can be built from "and", "not", and "or". Boolean atom functions can also appear in a restriction as long as they are preceded by "^". For example:
228284
229285```
230286TutorialD (master/main): :showexpr s where ^lt(@status,20)
231−┌─────┬──┬─────┬──────┐
232−│city │s#│sname│status│
233−├─────┼──┼─────┼──────┤
234−│Paris│S2│Jones│10 │
235−└─────┴──┴─────┴──────┘
287+┌──────────┬────────┬───────────┬───────────────┐
288+│city::Text│s#::Text│sname::Text│status::Integer│
289+├──────────┼────────┼───────────┼───────────────┤
290+│"Paris" │"S2" │"Jones" │10 │
291+└──────────┴────────┴───────────┴───────────────┘
236292```
237293
238294#### Join
@@ -241,21 +297,22 @@ Joins are binary operators and are applied with the "join" keyword. The equivale
241297
242298```
243299TutorialD (master/main): :showexpr s join sp
244−┌──────┬──┬───┬──┬─────┬──────┐
245−│city │p#│QTY│s#│sname│status│
246−├──────┼──┼───┼──┼─────┼──────┤
247−│London│P6│100│S1│Smith│20 │
248−│London│P3│400│S1│Smith│20 │
249−│London│P5│400│S4│Clark│20 │
250−│London│P1│300│S1│Smith│20 │
251−│Paris │P2│200│S3│Blake│30 │
252−│Paris │P1│300│S2│Jones│10 │
253−│London│P5│100│S1│Smith│20 │
254−│London│P4│300│S4│Clark│20 │
255−│Paris │P2│400│S2│Jones│10 │
256−│London│P2│200│S1│Smith│20 │
257−│London│P4│200│S1│Smith│20 │
258−└──────┴──┴───┴──┴─────┴──────┘
300+┌──────────┬────────┬────────────┬────────┬───────────┬───────────────┐
301+│city::Text│p#::Text│qty::Integer│s#::Text│sname::Text│status::Integer│
302+├──────────┼────────┼────────────┼────────┼───────────┼───────────────┤
303+│"London" │"P2" │200 │"S1" │"Smith" │20 │
304+│"London" │"P6" │100 │"S1" │"Smith" │20 │
305+│"London" │"P3" │400 │"S1" │"Smith" │20 │
306+│"Paris" │"P2" │400 │"S2" │"Jones" │10 │
307+│"London" │"P5" │400 │"S4" │"Clark" │20 │
308+│"Paris" │"P1" │300 │"S2" │"Jones" │10 │
309+│"London" │"P1" │300 │"S1" │"Smith" │20 │
310+│"Paris" │"P2" │200 │"S3" │"Blake" │30 │
311+│"London" │"P4" │300 │"S4" │"Clark" │20 │
312+│"London" │"P2" │200 │"S4" │"Clark" │20 │
313+│"London" │"P4" │200 │"S1" │"Smith" │20 │
314+│"London" │"P5" │100 │"S1" │"Smith" │20 │
315+└──────────┴────────┴────────────┴────────┴───────────┴───────────────┘
259316```
260317
261318As a convenience, `tutd` also supports semijoin (`matching`) and antijoin (`not matching`) syntax.
@@ -269,16 +326,16 @@ As a convenience, `tutd` also supports semijoin (`matching`) and antijoin (`not
269326The binary union operator merges tuples from both relations if-and-only-if the attributes of both relations are identical. The SQL equivalent is the "UNION" operator. Unlike SQL, however, duplicate tuples are not tolerated, so there is no "UNION ALL" equivalent in the relational algebra.
270327
271328```
272−TutorialD (master/main): :showexpr S union S
273−┌──────┬──┬─────┬──────┐
274−│city │s#│sname│status│
275−├──────┼──┼─────┼──────┤
276−│Paris │S3│Blake│30 │
277−│London│S4│Clark│20 │
278−│Athens│S5│Adams│30 │
279−│London│S1│Smith│20 │
280−│Paris │S2│Jones│10 │
281−└──────┴──┴─────┴──────┘
329+TutorialD (master/main): :showexpr s union s
330+┌──────────┬────────┬───────────┬───────────────┐
331+│city::Text│s#::Text│sname::Text│status::Integer│
332+├──────────┼────────┼───────────┼───────────────┤
333+│"Paris" │"S3" │"Blake" │30 │
334+│"Athens" │"S5" │"Adams" │30 │
335+│"London" │"S1" │"Smith" │20 │
336+│"Paris" │"S2" │"Jones" │10 │
337+│"London" │"S4" │"Clark" │20 │
338+└──────────┴────────┴───────────┴───────────────┘
282339```
283340
284341The union of any relation with itself is itself.
@@ -289,15 +346,15 @@ The extend unary operator adds an attribute to a relation's header and body and
289346
290347```
291348TutorialD (master/main): :showexpr s:{status2:=add(10,@status)}
292−┌──────┬──┬─────┬──────┬───────┐
293−│city │s#│sname│status│status2│
294−├──────┼──┼─────┼──────┼───────┤
295−│Paris │S2│Jones│10 │20 │
296−│Athens│S5│Adams│30 │40 │
297−│Paris │S3│Blake│30 │40 │
298−│London│S1│Smith│20 │30 │
299−│London│S4│Clark│20 │30 │
300−└──────┴──┴─────┴──────┴───────┘
349+┌──────────┬────────┬───────────┬───────────────┬────────────────┐
350+│city::Text│s#::Text│sname::Text│status::Integer│status2::Integer│
351+├──────────┼────────┼───────────┼───────────────┼────────────────┤
352+│"Paris" │"S2" │"Jones" │10 │20 │
353+│"Athens" │"S5" │"Adams" │30 │40 │
354+│"London" │"S4" │"Clark" │20 │30 │
355+│"Paris" │"S3" │"Blake" │30 │40 │
356+│"London" │"S1" │"Smith" │20 │30 │
357+└──────────┴────────┴───────────┴───────────────┴────────────────┘
301358```
302359
303360The "@" is required in the above query in order to distinguish the attribute's name from a relation's name.
@@ -323,27 +380,27 @@ The group operator can also be used to emulate functionality similar to SQL's OU
323380
324381```
325382TutorialD (master/main): :showexpr s group ({sname,status,s#} as subrel)
326−┌──────┬─────────────────┐
327−│city │subrel │
328−├──────┼─────────────────┤
329−│Athens│┌──┬─────┬──────┐│
330−│ ││s#│sname│status││
331−│ │├──┼─────┼──────┤│
332−│ ││S5│Adams│30 ││
333−│ │└──┴─────┴──────┘│
334−│London│┌──┬─────┬──────┐│
335−│ ││s#│sname│status││
336−│ │├──┼─────┼──────┤│
337−│ ││S1│Smith│20 ││
338−│ ││S4│Clark│20 ││
339−│ │└──┴─────┴──────┘│
340−│Paris │┌──┬─────┬──────┐│
341−│ ││s#│sname│status││
342−│ │├──┼─────┼──────┤│
343−│ ││S3│Blake│30 ││
344−│ ││S2│Jones│10 ││
345−│ │└──┴─────┴──────┘│
346−└──────┴─────────────────┘
383+┌──────────┬───────────────────────────────────────────────────────┐
384+│city::Text│subrel::relation {s#::Text,sname::Text,status::Integer}│
385+├──────────┼───────────────────────────────────────────────────────┤
386+│"Athens" │┌────────┬───────────┬───────────────┐ │
387+│ ││s#::Text│sname::Text│status::Integer│ │
388+│ │├────────┼───────────┼───────────────┤ │
389+│ ││"S5" │"Adams" │30 │ │
390+│ │└────────┴───────────┴───────────────┘ │
391+│"Paris" │┌────────┬───────────┬───────────────┐ │
392+│ ││s#::Text│sname::Text│status::Integer│ │
393+│ │├────────┼───────────┼───────────────┤ │
394+│ ││"S2" │"Jones" │10 │ │
395+│ ││"S3" │"Blake" │30 │ │
396+│ │└────────┴───────────┴───────────────┘ │
397+│"London" │┌────────┬───────────┬───────────────┐ │
398+│ ││s#::Text│sname::Text│status::Integer│ │
399+│ │├────────┼───────────┼───────────────┤ │
400+│ ││"S4" │"Clark" │20 │ │
401+│ ││"S1" │"Smith" │20 │ │
402+│ │└────────┴───────────┴───────────────┘ │
403+└──────────┴───────────────────────────────────────────────────────┘
347404```
348405
349406#### Ungroup
@@ -352,15 +409,15 @@ The unary ungroup operator "unwraps" subrelations in a relation-valued attribute
352409
353410```
354411TutorialD (master/main): :showexpr (s group ({sname,status,s#} as subrel)) ungroup subrel
355−┌──────┬──┬─────┬──────┐
356−│city │s#│sname│status│
357−├──────┼──┼─────┼──────┤
358−│Paris │S3│Blake│30 │
359−│London│S4│Clark│20 │
360−│Athens│S5│Adams│30 │
361−│London│S1│Smith│20 │
362−│Paris │S2│Jones│10 │
363−└──────┴──┴─────┴──────┘
412+┌──────────┬────────┬───────────┬───────────────┐
413+│city::Text│s#::Text│sname::Text│status::Integer│
414+├──────────┼────────┼───────────┼───────────────┤
415+│"Paris" │"S2" │"Jones" │10 │
416+│"Paris" │"S3" │"Blake" │30 │
417+│"London" │"S4" │"Clark" │20 │
418+│"London" │"S1" │"Smith" │20 │
419+│"Athens" │"S5" │"Adams" │30 │
420+└──────────┴────────┴───────────┴───────────────┘
364421```
365422
366423#### Minus
@@ -393,11 +450,11 @@ The relation variable assignment mentioned above certainly changes the state of
393450```
394451TutorialD (master/main): newrelvar:=relation{tuple{age 3}}
395452TutorialD (master/main): :showexpr newrelvar
396−┌───┐
397−│age│
398−├───┤
399−│3 │
400−└───┘
453+┌────────────┐
454+│age::Integer│
455+├────────────┤
456+│3 │
457+└────────────┘
401458```
402459
403460All further operators are convenience operators and could be implemented with simple assignment. SQL has no equivalent to relational assignment; instead, one must issue "CREATE TABLE" commands and insert rows into the resultant tables.
@@ -419,16 +476,16 @@ The insert operators accepts a relation variable and a relation of the same type
419476```
420477TutorialD (master/main): insert s relation{tuple{city "Boston",s# "S10",sname "Gonzalez",status 10}}
421478TutorialD (master/main): :showexpr s
422−┌──────┬───┬────────┬──────┐
423−│city │s# │sname │status│
424−├──────┼───┼────────┼──────┤
425−│Paris │S3 │Blake │30 │
426−│London│S4 │Clark │20 │
427−│Athens│S5 │Adams │30 │
428−│London│S1 │Smith │20 │
429−│Paris │S2 │Jones │10 │
430−│Boston│S10│Gonzalez│10 │
431−└──────┴───┴────────┴──────┘
479+┌──────────┬────────┬───────────┬───────────────┐
480+│city::Text│s#::Text│sname::Text│status::Integer│
481+├──────────┼────────┼───────────┼───────────────┤
482+│"Athens" │"S5" │"Adams" │30 │
483+│"Paris" │"S2" │"Jones" │10 │
484+│"Boston" │"S10" │"Gonzalez" │10 │
485+│"London" │"S4" │"Clark" │20 │
486+│"London" │"S1" │"Smith" │20 │
487+│"Paris" │"S3" │"Blake" │30 │
488+└──────────┴────────┴───────────┴───────────────┘
432489```
433490
434491This insertion operation is equivalent to:
@@ -443,15 +500,15 @@ The update operator accepts a relation argument and a predicate, optionally filt
443500```
444501TutorialD (master/main): update s where status=20 (sname:="Mr. Twenty")
445502TutorialD (master/main): :showexpr s
446−┌──────┬──┬──────────┬──────┐
447−│city │s#│sname │status│
448−├──────┼──┼──────────┼──────┤
449−│Paris │S3│Blake │30 │
450−│London│S1│Mr. Twenty│20 │
451−│Athens│S5│Adams │30 │
452−│Paris │S2│Jones │10 │
453−│London│S4│Mr. Twenty│20 │
454−└──────┴──┴──────────┴──────┘
503+┌──────────┬────────┬────────────┬───────────────┐
504+│city::Text│s#::Text│sname::Text │status::Integer│
505+├──────────┼────────┼────────────┼───────────────┤
506+│"Paris" │"S2" │"Jones" │10 │
507+│"London" │"S1" │"Mr. Twenty"│20 │
508+│"Paris" │"S3" │"Blake" │30 │
509+│"London" │"S4" │"Mr. Twenty"│20 │
510+│"Athens" │"S5" │"Adams" │30 │
511+└──────────┴────────┴────────────┴───────────────┘
455512```
456513
457514This is logically equivalent to:
@@ -459,15 +516,15 @@ This is logically equivalent to:
459516```
460517TutorialD (master/main): s:=(((s where status=20){city,s#,status}):{sname:="Mr. Twenty"}) union (s where not status=20)
461518TutorialD (master/main): :showexpr s
462−┌──────┬──┬──────────┬──────┐
463−│city │s#│sname │status│
464−├──────┼──┼──────────┼──────┤
465−│Paris │S3│Blake │30 │
466−│London│S1│Mr. Twenty│20 │
467−│Athens│S5│Adams │30 │
468−│Paris │S2│Jones │10 │
469−│London│S4│Mr. Twenty│20 │
470−└──────┴──┴──────────┴──────┘
519+┌──────────┬────────┬────────────┬───────────────┐
520+│city::Text│s#::Text│sname::Text │status::Integer│
521+├──────────┼────────┼────────────┼───────────────┤
522+│"Paris" │"S2" │"Jones" │10 │
523+│"London" │"S1" │"Mr. Twenty"│20 │
524+│"Paris" │"S3" │"Blake" │30 │
525+│"London" │"S4" │"Mr. Twenty"│20 │
526+│"Athens" │"S5" │"Adams" │30 │
527+└──────────┴────────┴────────────┴───────────────┘
471528```
472529
473530This query means: "Drop the sname attribute from S filtered where status equals 20, extend the resultant relation by sname with value 'Mr. Twenty', then union the resultant relation with S filtered by status not equaling 20, and assign that to S."
@@ -479,19 +536,19 @@ The delete operator accepts a relation argument and a filtering predicate, creat
479536```
480537TutorialD (master/main): delete sp where s#="S4"
481538TutorialD (master/main): :showexpr sp
482−┌──┬───┬──┐
483−│p#│QTY│s#│
484−├──┼───┼──┤
485−│P3│400│S1│
486−│P4│200│S1│
487−│P2│400│S2│
488−│P2│200│S1│
489−│P6│100│S1│
490−│P1│300│S1│
491−│P2│200│S3│
492−│P1│300│S2│
493−│P5│100│S1│
494−└──┴───┴──┘
539+┌────────┬────────────┬────────┐
540+│p#::Text│qty::Integer│s#::Text│
541+├────────┼────────────┼────────┤
542+│"P2" │200 │"S3" │
543+│"P2" │400 │"S2" │
544+│"P1" │300 │"S1" │
545+│"P5" │100 │"S1" │
546+│"P4" │200 │"S1" │
547+│"P1" │300 │"S2" │
548+│"P3" │400 │"S1" │
549+│"P2" │200 │"S1" │
550+│"P6" │100 │"S1" │
551+└────────┴────────────┴────────┘
495552```
496553
497554This is logically equivalent to:
@@ -526,7 +583,7 @@ Foreign keys are constraints which require that certain values appearing in one
526583TutorialD (master/main): foreign key s#_in_sp sp{s#} in s{s#}
527584```
528585
529−This expression ensure that any sp{s#} must also appear as a value in s{s#}.
586+This expression ensure that any sp{s#} must also appear as a value in s{s#}. Note that the sub-expression (on the left of "in") and the super-expression (on the right) must be of the same relation type- the generated relation values' attribute names and types must be equal. Use `rename` to make attribute names identical.
530587
531588#### Functional dependencies
532589
@@ -560,27 +617,27 @@ SQL supports aggregate queries using aggregate functions (SUM(), COUNT(), AVERAG
560617
561618```
562619TutorialD (master/main): :showexpr s group ({s#,sname,status} as subrel):{citycount:=count(@subrel)}
563−┌──────┬─────────┬─────────────────┐
564−│city │citycount│subrel │
565−├──────┼─────────┼─────────────────┤
566−│Paris │2 │┌──┬─────┬──────┐│
567−│ │ ││s#│sname│status││
568−│ │ │├──┼─────┼──────┤│
569−│ │ ││S3│Blake│30 ││
570−│ │ ││S2│Jones│10 ││
571−│ │ │└──┴─────┴──────┘│
572−│London│2 │┌──┬─────┬──────┐│
573−│ │ ││s#│sname│status││
574−│ │ │├──┼─────┼──────┤│
575−│ │ ││S1│Smith│20 ││
576−│ │ ││S4│Clark│20 ││
577−│ │ │└──┴─────┴──────┘│
578−│Athens│1 │┌──┬─────┬──────┐│
579−│ │ ││s#│sname│status││
580−│ │ │├──┼─────┼──────┤│
581−│ │ ││S5│Adams│30 ││
582−│ │ │└──┴─────┴──────┘│
583−└──────┴─────────┴─────────────────┘
620+┌──────────┬──────────────────┬───────────────────────────────────────────────────────┐
621+│city::Text│citycount::Integer│subrel::relation {s#::Text,sname::Text,status::Integer}│
622+├──────────┼──────────────────┼───────────────────────────────────────────────────────┤
623+│"Athens" │1 │┌────────┬───────────┬───────────────┐ │
624+│ │ ││s#::Text│sname::Text│status::Integer│ │
625+│ │ │├────────┼───────────┼───────────────┤ │
626+│ │ ││"S5" │"Adams" │30 │ │
627+│ │ │└────────┴───────────┴───────────────┘ │
628+│"Paris" │2 │┌────────┬───────────┬───────────────┐ │
629+│ │ ││s#::Text│sname::Text│status::Integer│ │
630+│ │ │├────────┼───────────┼───────────────┤ │
631+│ │ ││"S2" │"Jones" │10 │ │
632+│ │ ││"S3" │"Blake" │30 │ │
633+│ │ │└────────┴───────────┴───────────────┘ │
634+│"London" │2 │┌────────┬───────────┬───────────────┐ │
635+│ │ ││s#::Text│sname::Text│status::Integer│ │
636+│ │ │├────────┼───────────┼───────────────┤ │
637+│ │ ││"S4" │"Clark" │20 │ │
638+│ │ ││"S1" │"Smith" │20 │ │
639+│ │ │└────────┴───────────┴───────────────┘ │
640+└──────────┴──────────────────┴───────────────────────────────────────────────────────┘
584641```
585642
586643In this query result, we can simultaneously answer how many suppliers are located in each city and which suppliers they are. The expression is constructed by first grouping to isolate the city, then extending the query to add a attribute containing the tuple count for each subrelation.
@@ -591,3 +648,28 @@ In this query result, we can simultaneously answer how many suppliers are locate
591648|sum(relation{int})|return the int sum of the relation's values|
592649|max(relation{int})|return the maximum int from all the relation's values|
593650|min(relation{int})|return the minimum int from all the relation's values|
651+
652+#### Arbitrary Relation Variables
653+
654+For testing purposes, it can be useful to populate a database with randomly generated data. Project:M36 can automatically create such data based solely on the type of the relation.
655+
656+```
657+TutorialD (master/main): createarbitraryrelation employee {name Text, empid Int, hired DateTime} 3-100
658+TutorialD (master/main): :showexpr employee
659+┌──────────┬───────────────────────┬──────────┐
660+│empid::Int│hired::DateTime │name::Text│
661+├──────────┼───────────────────────┼──────────┤
662+│23 │1858-11-04 10:50:14 UTC│"LLL" │
663+│22 │1858-12-10 14:53:37 UTC│"LLL" │
664+│25 │1858-11-07 01:14:15 UTC│"SSS" │
665+│-12 │1858-11-06 06:20:57 UTC│"VVV" │
666+│-6 │1858-11-01 16:26:38 UTC│"SSS" │
667+│-1 │1858-10-31 14:41:26 UTC│"DDD" │
668+│-15 │1858-11-26 04:14:03 UTC│"VVV" │
669+│-18 │1858-12-17 00:01:09 UTC│"AAA" │
670+│-9 │1858-10-31 08:36:53 UTC│"XXX" │
671+│4 │1858-11-23 01:48:04 UTC│"VVV" │
672+└──────────┴───────────────────────┴──────────┘
673+```
674+
675+The `createarbitraryrelation` syntax specifies the name of the relation variable, the type for the relation, and then an acceptable range for the tuple count.
docs/websocket_server.markdown+3−3
@@ -6,7 +6,7 @@ The Project:M36 WebSocket server makes it easy to connect non-Haskell programs t
66
77## Setup
88
9−The websocket server is started with the same arguments as the normal [Project:M36 server](docs/server_mode.markdown):
9+The websocket server is started with the same arguments as the normal [Project:M36 server](server_mode.markdown):
1010
1111```
1212cabal run project-m36-websocket-server -- --database mydbname --hostname 127.0.0.1
@@ -16,8 +16,8 @@ except that the websocket server is now listening for websocket connections on p
1616
1717## Client Connection
1818
19−A [simple JavaScript library](/ProjectM36/Server/WebSocket/project-m36.js) to manage the WebSocket connection is available.
19+A [simple JavaScript library](/src/bin/ProjectM36/Server/WebSocket/project-m36.js) to manage the WebSocket connection is available.
2020
2121## Sample Application
2222
23−The [WebSocket example application](/ProjectM36/Server/WebSocket/websocket-client.html) can be used to learn TutorialD and for remote database access from the web browser.
23+The [WebSocket example application](/src/bin/ProjectM36/Server/WebSocket/websocket-client.html) can be used to learn TutorialD and for remote database access from the web browser.
examples/CustomTupleable.hsnew file+67
@@ -0,0 +1,67 @@
1+{-# LANGUAGE DeriveGeneric, OverloadedStrings #-}
2+--this example shows how to implement a non-generics-defined Tupleable instance which is required in scenarios where Haskell-side types are not supported server-side or where one wishes to represent a nested relation
3+import ProjectM36.Client
4+import ProjectM36.Tuple
5+import ProjectM36.Tupleable
6+import ProjectM36.Relation
7+import ProjectM36.Atom
8+import ProjectM36.Attribute as A
9+import qualified Data.Set as S
10+import qualified Data.Map as M
11+import Data.Text (Text)
12+import GHC.Generics
13+import Data.Proxy
14+
15+--in this contrived example, we wish to represent one relation with a nested relation of comments
16+data Blog = Blog {
17+ title :: Text,
18+ comments :: S.Set Comment
19+ } deriving (Show)
20+
21+data Comment = Comment {
22+ authorName :: Text,
23+ comment :: Text
24+ } deriving (Eq, Show, Generic, Ord)
25+
26+instance Tupleable Comment
27+
28+instance Tupleable Blog where
29+ toTuple blogentry =
30+ mkRelationTupleFromMap (M.fromList [("title", TextAtom (title blogentry)),
31+ ("comments", RelationAtom relFromComments)])
32+ where
33+ commentTuples = map toTuple (S.toList (comments blogentry))
34+ relFromComments = case mkRelationFromTuples (toAttributes (Proxy :: Proxy Comment)) commentTuples of
35+ Left err -> error (show err)
36+ Right rel -> rel
37+
38+ fromTuple tupIn = do
39+ titleAtom <- atomForAttributeName "title" tupIn
40+ commentsAtom <- atomForAttributeName "comments" tupIn
41+ commentsRel <- relationForAtom commentsAtom
42+ comments' <- mapM fromTuple (tuplesList commentsRel)
43+ pure Blog {
44+ title = atomToText titleAtom,
45+ comments = S.fromList comments'}
46+
47+ toAttributes _ = A.attributesFromList [Attribute "title" TextAtomType,
48+ Attribute "comments" $ RelationAtomType (toAttributes (Proxy :: Proxy Comment))]
49+
50+main :: IO ()
51+main = do
52+ let exampleBlog = Blog { title = "Cat Pics",
53+ comments = S.fromList [Comment {authorName = "Steve",
54+ comment = "great"},
55+ Comment {authorName = "Bob",
56+ comment = "enough"}
57+ ]}
58+ print (toTuple exampleBlog)
59+ print (fromTuple (toTuple exampleBlog) :: Either RelationalError Blog)
60+
61+
62+
63+
64+
65+
66+
67+
examples/DerivingCustomTupleable.hsnew file+54
@@ -0,0 +1,54 @@
1+{-# LANGUAGE DeriveGeneric, DerivingVia, GeneralizedNewtypeDeriving, TypeOperators, DataKinds, OverloadedStrings #-}
2+
3+import ProjectM36.Tupleable.Deriving
4+import ProjectM36.Atomable (Atomable)
5+import Control.DeepSeq (NFData)
6+import Data.Text (Text)
7+import GHC.Generics (Generic)
8+import Codec.Winery
9+
10+newtype BlogId = BlogId { getBlogId :: Int }
11+ deriving stock (Eq, Ord, Show, Generic)
12+ deriving newtype (Num)
13+ deriving Serialise via WineryRecord BlogId
14+
15+instance NFData BlogId
16+instance Atomable BlogId
17+
18+data Blog = Blog
19+ { blogId :: BlogId
20+ , blogTitle :: Text
21+ , blogAuthorName :: Text
22+ }
23+ deriving stock (Show, Generic)
24+ deriving (Tupleable)
25+ via Codec (Field (DropPrefix "blog" >>> CamelCase)) Blog
26+ deriving Serialise via WineryRecord Blog
27+
28+data Comment = Comment
29+ { commentAuthorName :: Text
30+ , commentComment :: Text
31+ , commentFor :: BlogId
32+ }
33+ deriving stock (Show, Generic)
34+ deriving (Tupleable)
35+ via Codec (Field (DropPrefix "comment" >>> CamelCase)) Comment
36+ deriving Serialise via WineryRecord Comment
37+
38+main :: IO ()
39+main = do
40+ let exampleBlog = Blog
41+ { blogId = 0
42+ , blogTitle = "Cat Pics"
43+ , blogAuthorName = "Alice"
44+ }
45+ exampleComment = Comment
46+ { commentAuthorName = "Bob"
47+ , commentComment = "great"
48+ , commentFor = 0
49+ }
50+ print exampleBlog
51+ print (toTuple exampleBlog)
52+ putStrLn ""
53+ print exampleComment
54+ print (toTuple exampleComment)
examples/DynamicAtomFunctions.hsnew file+12
@@ -0,0 +1,12 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+--compile with `cabal exec ghc -- examples/DynamicAtomFunctions.hs -package project-m36`
3+--load with `loadatomfunctions "DynamicAtomFunctions" "someAtomFunctions" "examples/DynamicAtomFunctions.o"`
4+
5+module DynamicAtomFunctions where
6+import ProjectM36.Base
7+
8+someAtomFunctions :: [AtomFunction]
9+someAtomFunctions = [AtomFunction{
10+ atomFuncName = "constTrue",
11+ atomFuncType = [TypeVariableType "a", BoolAtomType],
12+ atomFuncBody = AtomFunctionBody Nothing (\(x:_) -> pure (BoolAtom True))}]
examples/DynamicDatabaseContextFunctions.hsnew file+26
@@ -0,0 +1,26 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+--compile with `cabal exec ghc -- examples/DynamicDatabaseContextFunctions.hs -package project-m36`
3+--load with `loaddatabasecontextfunctions "DynamicDatabaseContextFunctions" "someDBCFunctions" "examples/DynamicDatabaseContextFunctions.o"`
4+module DynamicDatabaseContextFunctions where
5+import ProjectM36.Base
6+import ProjectM36.Relation
7+import ProjectM36.DatabaseContextFunctionError
8+import qualified ProjectM36.Attribute as A
9+
10+import qualified Data.Map as M
11+
12+
13+someDBCFunctions :: [DatabaseContextFunction]
14+someDBCFunctions = [DatabaseContextFunction {
15+ dbcFuncName = "addtestrel",
16+ dbcFuncType = [],
17+ dbcFuncBody = DatabaseContextFunctionBody Nothing addTestRel
18+ }]
19+ where
20+ addTestRel _ ctx = do
21+ let attrs = A.attributesFromList [Attribute "word" TextAtomType]
22+ eRel = mkRelationFromList attrs [[TextAtom "nice"]]
23+ case eRel of
24+ Left err -> Left (DatabaseContextFunctionUserError (show err))
25+ Right testRel ->
26+ pure $ ctx { relationVariables = M.insert "testRel" testRel (relationVariables ctx) }
examples/Plantfarm.hsnew file+446
@@ -0,0 +1,446 @@
1+{-# LANGUAGE DeriveGeneric #-}
2+
3+{-# LANGUAGE OverloadedStrings #-}
4+
5+{-# LANGUAGE DeriveAnyClass #-}
6+
7+{-# LANGUAGE DerivingVia #-}
8+
9+
10+import Codec.Winery (Serialise, WineryVariant(WineryVariant))
11+import Control.DeepSeq (NFData)
12+import Data.Aeson (FromJSON, ToJSON(toEncoding, toJSON))
13+import Data.Data (Proxy(Proxy))
14+import Data.Either (lefts, rights)
15+import Data.Functor (($>))
16+import Data.Text as T (Text)
17+import qualified Data.Text.Lazy as TL (pack)
18+import GHC.Generics (Generic)
19+import qualified ProjectM36.Base as Base
20+import ProjectM36.Client
21+ ( AtomExprBase(NakedAtomExpr)
22+ , Atomable(toAddTypeExpr, toAtom)
23+ , AttributeName
24+ , Connection
25+ , ConnectionInfo(InProcessConnectionInfo)
26+ , DatabaseContextExpr
27+ , DatabaseContextExprBase(Delete)
28+ , PersistenceStrategy(NoPersistence)
29+ , RelationalError
30+ , RelationalExprBase(RelationVariable, Restrict)
31+ , RestrictionPredicateExprBase(AttributeEqualityPredicate)
32+ , SessionId
33+ , close
34+ , commit
35+ , connectProjectM36
36+ , createSessionAtHead
37+ , databaseContextExprForUniqueKey
38+ , defaultHeadName
39+ , emptyNotificationCallback
40+ , executeDatabaseContextExpr
41+ , executeRelationalExpr
42+ , withTransaction
43+ )
44+import qualified ProjectM36.Relation as Relation
45+import ProjectM36.Tupleable
46+ ( Tupleable(fromTuple)
47+ , toDefineExpr
48+ , toDeleteExpr
49+ , toInsertExpr
50+ , toUpdateExpr
51+ )
52+import qualified System.Random as R
53+
54+
55+import Control.Monad.IO.Class (MonadIO(liftIO))
56+import qualified Web.Scotty as S
57+
58+-- | This is an example showcasing the updating of data
59+-- with the help of plants. \\
60+-- This is a very simple example and of course not how
61+-- plants grow in nature. \\
62+-- The main goal of this example is to showcase the updating
63+-- of data and the different options of persistence.
64+-- You can just pipe the output from curl into jq:
65+--
66+-- curl -X POST -H 'Accept: application/json' http://localhost:8001/plant/water/angu | jq -r '.stage'
67+
68+
69+data Stage = Seed | Sprout | Seedling | Adult | Dead
70+ deriving (Show, Eq, Ord, Generic, NFData, Atomable)
71+ deriving Serialise via WineryVariant Stage
72+
73+
74+instance ToJSON Stage where -- The where can be removed and the implementation commented out
75+ -- if the ascii values are not wanted
76+ toJSON s = toJSON $ show s <> "\nascii only provided for visualisation:\n" <> stagetoAscii s
77+
78+ toEncoding s = toEncoding $ show s <> "\nascii only provided for visualisation:\n" <> stagetoAscii s
79+
80+instance FromJSON Stage
81+
82+instance S.Parsable Stage where
83+ parseParam t
84+ | t == "seed" || t == "Seed" = Right Seed
85+ | t == "sprout" || t == "Sprout" = Right Sprout
86+ | t == "seedling" || t == "Seedling" = Right Seedling
87+ | t == "adult" || t == "Adult" = Right Adult
88+ | t == "dead" || t == "Dead" = Right Dead
89+ | otherwise = Left t
90+
91+
92+-- Just for ToJSON for ilustration of stage
93+type ASCIIStage = String
94+
95+seedStr :: ASCIIStage
96+seedStr = "<>\n\
97+ \'''\n"
98+sproutStr :: ASCIIStage
99+sproutStr = " ..\n\
100+ \<|>\n\
101+ \''''\n"
102+seedlingStr :: ASCIIStage
103+seedlingStr = " `\\⁄o \n\
104+ \ v|/\n\
105+ \'´;'''\n"
106+adultStr :: ASCIIStage
107+adultStr = "*~(#)~\n\
108+ \ \\,Y,e\n\
109+ \ \\|/\n\
110+ \''+'\\''\n"
111+deadStr :: ASCIIStage
112+deadStr = " ,__:<\n\
113+ \'/'''''\n"
114+
115+-- Just used for ToJSON illustration of stages
116+stagetoAscii :: Stage -> ASCIIStage
117+stagetoAscii Seed = seedStr
118+stagetoAscii Sprout = sproutStr
119+stagetoAscii Seedling = seedlingStr
120+stagetoAscii Adult = adultStr
121+stagetoAscii Dead = deadStr
122+
123+-- used for update stage
124+next :: Stage -> Stage
125+next Seed = Sprout
126+next Sprout = Seedling
127+next Seedling = Adult
128+next s = s
129+
130+data Plant = Plant { name :: Text, species :: Text, stage :: Stage, waterings:: Integer } deriving (Show, Generic)
131+instance Tupleable Plant
132+instance ToJSON Plant
133+instance FromJSON Plant
134+
135+
136+main :: IO ()
137+main = do
138+ putStrLn "Connecting to plant farm"
139+ c <- dbConnection
140+ _ <- createSchema c
141+ putStrLn "Planting some plants"
142+ _ <- insertSampleData c
143+ let port = 8001
144+ putStrLn $ "Started Plant farm at " <> show port
145+ S.scotty port $ do
146+
147+ -- retrieve a plant by name
148+ S.get "/plant/:name" $ do
149+ n <- S.param "name"
150+ e <- liftIO $ getPlant c n
151+ p <- handleWebError e
152+ S.json p
153+
154+
155+ -- save a plant providing it as json data
156+ S.post "/plant" $ do
157+ pl <- S.jsonData :: S.ActionM Plant
158+ e <- liftIO $ savePlant c [pl]
159+ p <- handleWebError e
160+ S.json p
161+
162+ -- updating a plant providing it as json data
163+ S.put "/plant" $ do
164+ pl <- S.jsonData :: S.ActionM Plant
165+ e <- liftIO $ updatePlantFst c pl
166+ p <- handleWebError e
167+ S.json p
168+
169+ -- watering the plant having the provided name.
170+ -- This will water the plant and might let it progress to the next stage. It might also die.
171+ S.post "/plant/water/:name" $ do
172+ n <- S.param "name"
173+ e <- liftIO $ waterPlant c n
174+ p <- handleWebError e
175+ S.json p
176+
177+ -- retriving all the plants as json data
178+ S.get "/plants" $ do
179+ e <- liftIO $ getAllPlants c
180+ ps <- handleWebErrors e
181+ S.json ps
182+
183+ -- saving many plants at the same time
184+ S.post "/plants" $ do
185+ pl <- S.jsonData :: S.ActionM [Plant]
186+ e <- liftIO $ savePlant c pl
187+ p <- handleWebError e
188+ S.json p
189+
190+ -- deleting all plants at a specific stage
191+ S.delete "/plants?stage=:stage" $ do
192+ s <- S.param "stage"
193+ e <- liftIO $ deletePlantsByStage c s
194+ p <- handleWebError e
195+ S.json p
196+
197+ -- deleting all plants at a specific stage
198+ S.delete "/plants" $ do
199+ s <- S.param "name"
200+ e <- liftIO $ deletePlantByName c s
201+ p <- handleWebError e
202+ S.json p
203+
204+ -- deleting all dead plants
205+ S.delete "/plants/clear" $ do
206+ e <- liftIO $ clearDeadPlants c
207+ ps <- handleWebErrors e
208+ S.json ps
209+
210+handleWebError :: Either Err b -> S.ActionM b
211+handleWebError (Left e) = S.raise (TL.pack $ "An error occurred:\n" <> show e)
212+handleWebError (Right v) = pure v
213+
214+handleWebErrors :: [Either Err b] -> S.ActionM [b]
215+handleWebErrors e = do
216+ case lefts e of
217+ [] -> pure (rights e)
218+ l -> S.raise (TL.pack $ "Errors occurred:\n" <> concatMap ((<>"\n") . show) l)
219+
220+
221+-- | watering a plant and thereby possibly updating its stage
222+waterPlant :: DBConnection -> Text -> IO (Either Err Plant)
223+waterPlant db n = do
224+ p <- getPlant db n
225+ case p of
226+ Left e -> pure $ Left e
227+ Right v -> updateStage db $ v { waterings = waterings v + 1 }
228+
229+-- | used by 'waterPlant' updates the stage depending on random numbers
230+updateStage :: DBConnection -> Plant -> IO (Either Err Plant)
231+updateStage db p@(Plant _ _ Dead _ ) = do
232+ tmp <- updatePlantFst db p
233+ case tmp of
234+ Left e -> pure $ Left e
235+ Right _ -> pure $ Right p
236+updateStage db p = do
237+ res <- calculateStage p
238+ tmp <- updatePlantFst db res
239+ case tmp of
240+ Left e -> pure $ Left e
241+ Right _ -> pure $ Right res
242+ where calculateStage p' = do
243+ r1 <- R.randomRIO (1, 10) :: IO Integer
244+ let np = if r1 < waterings p' then p' { stage = next $ stage p', waterings = 0 } else p'
245+ r2 <- R.randomRIO (1, 20)
246+ pure $ if r2 < waterings np then np { stage = Dead, waterings = 0 } else np
247+
248+-- | deletes all plants with Stage = Dead
249+clearDeadPlants :: DBConnection -> IO [Either Err Plant]
250+clearDeadPlants db = do
251+ _ <- deletePlantsByStage db Dead
252+ getAllPlants db
253+
254+
255+-- ****************************
256+-- | *Database functions* :
257+-- ****************************
258+
259+
260+-- | Error type for passing. It is not very specific.
261+-- Just minimal and non optimal for this example.
262+data Err = NotSpecified | NotFound deriving (Show ,Generic)
263+
264+instance ToJSON Err
265+
266+-- | Just for convinience for passing around the SessionId
267+-- and the Connection
268+data DBConnection = DB SessionId Connection
269+
270+
271+-- | Getting plants by their name.\
272+-- Because plant has name as primary key \
273+-- we can assume will get at most one result. \
274+-- Alternatively we could return a list.
275+getPlant :: DBConnection -> Text -> IO (Either Err Plant)
276+getPlant db n = defaultHead (Left NotFound) <$> (
277+ get db
278+ ( Restrict -- Restrict can be thought of as similar to "WITH" in SQL
279+ (AttributeEqualityPredicate "name" (NakedAtomExpr (toAtom n))) -- This is the Predicate we are "restricting" our RelationalExprBase with
280+ (RelationVariable "plants" ())
281+ )
282+ :: IO [Either Err Plant] -- this is needed because our 'get' function is
283+ )
284+
285+defaultHead :: a -> [a] -> a
286+defaultHead d [] = d
287+defaultHead _ (x:_) = x
288+
289+-- | Getting all the plants
290+getAllPlants :: DBConnection -> IO [Either Err Plant]
291+getAllPlants db = get db (RelationVariable "plants" ())
292+
293+-- | Getting all the plants that satisfy the restrictions
294+getAllPlantsWith :: DBConnection -> Base.RestrictionPredicateExpr -> IO [Either Err Plant]
295+getAllPlantsWith db ex = get db (Restrict ex (RelationVariable "plants" ()))
296+
297+
298+-- | Saving a plant
299+savePlant :: (Traversable t) => DBConnection -> t Plant -> IO (Either Err ())
300+savePlant db sps = insert db sps "plants"
301+
302+-- | An alternative to update alone because due to updates
303+-- not being cached yet \
304+-- they have to be calculated every update. \
305+-- This seems like an alternative until caching is implemented.
306+updatePlantFst :: DBConnection -> Plant -> IO (Either Err ())
307+updatePlantFst db pln = do
308+ _ <- delete db pln ["name"] "plants"
309+ savePlant db [pln]
310+
311+-- | Updating a plant. Due to the way project 36 works, \
312+-- updates have to be executed every time.\
313+-- This is slow but won't be an issue soon because they will
314+-- be cached.\
315+-- But because of this project 36 can provide O(1) commits.
316+updatePlant :: DBConnection -> Plant -> IO (Either Err ())
317+updatePlant db sps = update
318+ db -- db connection
319+ sps -- plant value
320+ ["name"] -- the attributes to be updated by (in case of unique key)
321+ "plants" -- the relation we want to update on
322+
323+
324+-- | deleting all plants that have given name.
325+deletePlantByName :: DBConnection -> Text -> IO (Either Err ())
326+deletePlantByName db s = executeWithTransaction db $ Right $ Delete "plants" $ AttributeEqualityPredicate "name" (NakedAtomExpr (toAtom s))
327+
328+-- | deleting all plants that have given stage.
329+deletePlantsByStage :: DBConnection -> Stage -> IO (Either Err ())
330+deletePlantsByStage db s = executeWithTransaction db $ Right $ Delete "plants" $ AttributeEqualityPredicate "stage" (NakedAtomExpr (toAtom s))
331+
332+
333+-- | Inserting the schema into the DB
334+createSchema :: DBConnection -> IO ()
335+createSchema (DB sessionId conn) = do
336+ _ <- handleIOErrorsAndQuit $ mapM (executeDatabaseContextExpr sessionId conn) [
337+ toAddTypeExpr (Proxy :: Proxy Stage) -- Adds the Type Stage as data to the DB
338+ , toDefineExpr (Proxy :: Proxy Plant) "plants" -- Creates the plants relation
339+ , databaseContextExprForUniqueKey "plants" ["name"] -- Makes name of the plants relation a uniqe Key,
340+ -- Foreign Key restrictions are available too
341+ ]
342+ pure ()
343+
344+
345+-- | inserting some sample data
346+insertSampleData :: DBConnection -> IO (Either Err ())
347+insertSampleData (DB sid conn) = do
348+ insert (DB sid conn) [
349+ Plant "angu" "Caladenia angustata" Seed 0
350+ , Plant "thely" "Thelymitra alcockiae" Seed 0
351+ , Plant "monstera" "Araceae" Seed 0
352+ ] "plants"
353+
354+dbConnection :: IO DBConnection
355+dbConnection = do
356+ -- connect to the database
357+ let connInfo = InProcessConnectionInfo NoPersistence emptyNotificationCallback []
358+ -- The code below persists the data in a DB with the name "base". \\
359+-- let connInfo = InProcessConnectionInfo (CrashSafePersistence "base") emptyNotificationCallback [] \\
360+ -- In addition minimal persistance is available. \\
361+-- let connInfo = InProcessConnectionInfo (MinimalPersistence "base") emptyNotificationCallback []
362+ conn <- handleIOErrorAndQuit $ connectProjectM36 connInfo
363+ --create a database session at the default branch of the database
364+ sessionId <- handleIOErrorAndQuit $ createSessionAtHead conn defaultHeadName
365+ pure (DB sessionId conn)
366+
367+
368+-- | A polymorphic function to insert data (a traversable of data) into the DB
369+insert :: (Tupleable a, Traversable t) => DBConnection -> t a -> Base.RelVarName -> IO (Either Err ())
370+insert db rlv rlvName = executeWithTransaction db $ toInsertExpr rlv rlvName
371+
372+-- | A polymorphic function to update data in the DB.
373+-- An update in one funtion would take:
374+--
375+-- - SessionId
376+-- - Connection
377+-- - Tuplable a -- the Tuplable you want to update
378+-- - [AttributeName] -- the Attributes of the Tuplable you want to update those are of StringType
379+-- - RelVarName -- the name of the relation
380+--
381+-- With that you can via 'toUpdateExpr' create a 'DatabaseContextExpr' to be executed. \\
382+-- For inserting its very similarly done with 'toInsertExpr'.
383+update :: (Tupleable a) => DBConnection -> a -> [AttributeName]-> Base.RelVarName -> IO (Either Err ())
384+update db rlv attr rlvName = executeWithTransaction db $ toUpdateExpr rlvName attr rlv
385+
386+-- | A polymorphic function to delete data in the DB
387+delete :: (Tupleable a) => DBConnection -> a -> [AttributeName]-> Base.RelVarName -> IO (Either Err ())
388+delete db rlv attr rlvName = executeWithTransaction db $ toDeleteExpr rlvName attr rlv
389+
390+-- | A convenience function to make executing DBContextExpr with commiting simpler. \\
391+-- In particular for expr that just insert, delete and update.
392+-- Therefor ultimately return Either _ ()
393+executeWithTransaction :: DBConnection -> Either RelationalError DatabaseContextExpr -> IO (Either Err ())
394+executeWithTransaction (DB sid conn) expr = do
395+ iEx <- handleError expr
396+ case iEx of
397+ Left e -> pure $ Left e
398+ Right v -> handleIOError $ withTransaction sid conn (executeDatabaseContextExpr sid conn v) (commit sid conn)
399+
400+-- | A polymorphic function to get data (a list of data and possibly errors) from the DB
401+get :: Tupleable b => DBConnection -> Base.RelationalExpr -> IO [Either Err b]
402+get (DB sessionId conn) q = do
403+ eRel <- executeRelationalExpr sessionId conn q
404+ e <- handleError eRel
405+ case e of
406+ Left err -> pure [Left err]
407+ Right pRel -> do
408+ ws <- Relation.toList pRel
409+ mapM (handleError . fromTuple) ws
410+
411+-- | for closing the DB connection.
412+-- Not really needed when using in-memory DB
413+closeConn :: DBConnection -> IO ()
414+closeConn (DB _ conn) = close conn
415+
416+
417+-- | Error handling is heavily inspired by 'blog.hs' the blog example \\
418+-- by (agentm)[https://github.com/agentm] (https://github.com/agentm/project-m36, commit: f8432522adaafeae7c32bc2b8b6cb09c00396fc6). \\
419+-- As stated there, your application should have proper error handling.
420+handleIOErrorAndQuit :: Show e => IO (Either e a) -> IO a
421+handleIOErrorAndQuit m = do
422+ v <- m
423+ handleErrorAndQuit v
424+
425+handleError :: Show e => Either e a -> IO (Either Err a)
426+handleError eErr = case eErr of
427+ Left err -> print err $> Left NotSpecified
428+ Right v -> pure $ Right v
429+
430+handleIOError :: Show e => IO (Either e a) -> IO (Either Err a)
431+handleIOError m = do
432+ v <- m
433+ handleError v
434+
435+handleErrorAndQuit :: Show e => Either e a -> IO a
436+handleErrorAndQuit eErr = case eErr of
437+ Left err -> print err >> error "Quit."
438+ Right v -> pure v
439+
440+handleIOErrorsAndQuit :: Show e => IO [Either e a] -> IO [a]
441+handleIOErrorsAndQuit m = do
442+ eErrs <- m
443+ case lefts eErrs of
444+ [] -> pure (rights eErrs)
445+ err:_ -> handleErrorAndQuit (Left err)
446+
examples/SimpleClient.hs+3−2
@@ -1,11 +1,12 @@
11import ProjectM36.Client
22import ProjectM36.TupleSet
33import ProjectM36.Relation.Show.Term
4+import Data.Text.IO as TIO
45
56main :: IO ()
67main = do
78 -- 1. create a ConnectionInfo
8− let connInfo = RemoteProcessConnectionInfo "mytestdb" (createNodeId "127.0.0.1" defaultServerPort) emptyNotificationCallback
9+ let connInfo = RemoteConnectionInfo "mytestdb" "127.0.0.1" (show defaultServerPort) emptyNotificationCallback
910 -- 2. conncted to the remote database
1011 eConn <- connectProjectM36 connInfo
1112 case eConn of
@@ -32,7 +33,7 @@ main = do
3233 eRel <- executeRelationalExpr sessionId conn (Restrict restrictionPredicate (RelationVariable "person" ()))
3334 case eRel of
3435 Left err -> print err
35− Right rel -> print (showRelation rel)
36+ Right rel -> TIO.putStrLn (showRelation rel)
3637
3738 --7. close the connection
3839 close conn
examples/blog.hs+11−8
@@ -1,5 +1,5 @@
11-- a simple example of a blog schema
2−{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings #-}
2+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings, CPP, DerivingVia #-}
33
44import ProjectM36.Client
55import ProjectM36.Base
@@ -10,16 +10,18 @@ import ProjectM36.Tuple (atomForAttributeName)
1010
1111import Data.Either
1212import GHC.Generics
13−import Data.Binary
1413import qualified Data.Text as T
1514import qualified Data.Text.Lazy as TL
1615import Data.Time.Clock
1716import Data.Time.Calendar
1817import Control.DeepSeq
1918import Data.Proxy
19+#if __GLASGOW_HASKELL__ < 804
2020import Data.Monoid
21+#endif
2122import Data.List
2223import Control.Monad (when, forM_)
24+import Codec.Winery
2325
2426import Web.Scotty as S
2527import Text.Blaze.Html5 (h1, h2, h3, p, form, input, (!), toHtml, Html, a, toValue, hr, textarea)
@@ -33,7 +35,7 @@ import Data.Time.Format
3335data Blog = Blog {
3436 title :: T.Text,
3537 entry :: T.Text,
36− stamp :: UTCTime,
38+ tstamp :: UTCTime,
3739 category :: Category --note that this type is an algebraic data type
3840 }
3941 deriving (Generic, Show) --derive Generic so that Tupleable can use default instances
@@ -50,7 +52,8 @@ data Comment = Comment {
5052instance Tupleable Comment
5153
5254data Category = Food | Cats | Photos | Other T.Text -- note that this data type could not be represented by an "enumeration" as found in SQL databases
53− deriving (Atomable, Eq, Show, NFData, Binary, Generic) -- derive Atomable so that values of this type can be stored as a database value
55+ deriving (Atomable, Eq, Show, NFData, Generic) -- derive Atomable so that values of this type can be stored as a database value
56+ deriving Serialise via WineryVariant Category -- derive Serialisable to be able to transmit this data remotely
5457
5558-- add some short-hand error handling- your application should have proper handling
5659handleIOError :: Show e => IO (Either e a) -> IO a
@@ -103,11 +106,11 @@ insertSampleData :: SessionId -> Connection -> IO ()
103106insertSampleData sessionId conn = do
104107 let blogs = [Blog { title = "Haskell Lenses",
105108 entry = "I wear Haskell rose-colored lenses.",
106− stamp = UTCTime (fromGregorian 2017 5 8) (secondsToDiffTime 1000),
109+ tstamp = UTCTime (fromGregorian 2017 5 8) (secondsToDiffTime 1000),
107110 category = Food },
108111 Blog { title = "Haskell Monad Analogy",
109112 entry = "Monads are like burritos going through intestines.",
110− stamp = UTCTime (fromGregorian 2017 6 10) (secondsToDiffTime 2000),
113+ tstamp = UTCTime (fromGregorian 2017 6 10) (secondsToDiffTime 2000),
111114 category = Cats }
112115 ]
113116 comments = [Comment { blogTitle = "Haskell Lenses",
@@ -136,7 +139,7 @@ listBlogs sessionId conn = do
136139 Left err -> render500 (toHtml (show err))
137140 Right blogRel -> do
138141 blogs <- liftIO (toList blogRel) >>= mapM (handleWebError . fromTuple) :: ActionM [Blog]
139− let sortedBlogs = sortBy (\b1 b2 -> stamp b1 `compare` stamp b2) blogs
142+ let sortedBlogs = sortBy (\b1 b2 -> tstamp b1 `compare` tstamp b2) blogs
140143 html . renderHtml $ do
141144 h1 "Blog Posts"
142145 forM_ sortedBlogs $ \blog -> a ! href (toValue $ "/blog/" <> title blog) $ h2 (toHtml (title blog))
@@ -182,7 +185,7 @@ showBlogEntry sessionId conn = do
182185 render $ do
183186 --show blog details
184187 h1 (toHtml (title blog))
185− p (toHtml ("Posted at " <> formatStamp (stamp blog) <> " under " <> show (category blog)))
188+ p (toHtml ("Posted at " <> formatStamp (tstamp blog) <> " under " <> show (category blog)))
186189 p (toHtml (entry blog))
187190 hr
188191 h3 "Comments"
examples/hair.hs+9−6
@@ -1,16 +1,17 @@
1−{-# LANGUAGE DeriveGeneric, DeriveAnyClass, OverloadedStrings #-}
1+{-# LANGUAGE DeriveGeneric, DeriveAnyClass, OverloadedStrings, DerivingVia #-}
22import ProjectM36.Client
33import ProjectM36.Relation.Show.Term
44import GHC.Generics
55import Data.Text
6−import Data.Binary
76import Control.DeepSeq
87import qualified Data.Map as M
98import qualified Data.Text.IO as TIO
109import Data.Proxy
10+import Codec.Winery
1111
1212data Hair = Bald | Brown | Blond | OtherColor Text
13− deriving (Generic, Show, Eq, Binary, NFData, Atomable)
13+ deriving (Generic, Show, Eq, NFData, Atomable)
14+ deriving Serialise via WineryVariant Hair
1415
1516main :: IO ()
1617main = do
@@ -31,11 +32,13 @@ main = do
3132
3233 --create a relation with the new Hair AtomType
3334 let blond = NakedAtomExpr (toAtom Blond)
34− eCheck $ executeDatabaseContextExpr sessionId conn (Assign "people" (MakeRelationFromExprs Nothing [
35− TupleExpr (M.fromList [("hair", blond), ("name", NakedAtomExpr (TextAtom "Colin"))])]))
35+ eCheck $ executeDatabaseContextExpr sessionId conn
36+ (Assign "people"
37+ (MakeRelationFromExprs Nothing $ TupleExprs () [
38+ TupleExpr (M.fromList [("hair", blond), ("name", NakedAtomExpr (TextAtom "Colin"))])]))
3639
3740 let restrictionPredicate = AttributeEqualityPredicate "hair" blond
3841 peopleRel <- eCheck $ executeRelationalExpr sessionId conn (Restrict restrictionPredicate (RelationVariable "people" ()))
3942
4043 TIO.putStrLn (showRelation peopleRel)
41−
44+
examples/out_of_the_tarpit.hs+11−7
@@ -1,5 +1,5 @@
11-- the Out-of-the-Tarpit example in Haskell and Project:M36
2−{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings #-}
2+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings, DerivingVia #-}
33import ProjectM36.Client
44import ProjectM36.DataTypes.Primitive
55import ProjectM36.Tupleable
@@ -7,11 +7,11 @@ import ProjectM36.Relation
77import ProjectM36.Error
88import Data.Either
99import GHC.Generics
10−import Data.Binary
1110import Control.DeepSeq
1211import qualified Data.Text as T
1312import Data.Time.Calendar
1413import Data.Proxy
14+import Codec.Winery
1515
1616--create various database value (atom) types
1717type Price = Double
@@ -21,16 +21,20 @@ type Name = T.Text
2121type Address = T.Text
2222
2323data RoomType = Kitchen | Bathroom | LivingRoom
24− deriving (Generic, Atomable, Eq, Show, Binary, NFData)
24+ deriving (Generic, Atomable, Eq, Show, NFData)
25+ deriving Serialise via WineryVariant RoomType
2526
2627data PriceBand = Low | Medium | High | Premium
27− deriving (Generic, Atomable, Eq, Show, Binary, NFData)
28+ deriving (Generic, Atomable, Eq, Show, NFData)
29+ deriving Serialise via WineryVariant PriceBand
2830
2931data AreaCode = City | Suburban | Rural
30− deriving (Generic, Atomable, Eq, Show, Binary, NFData)
32+ deriving (Generic, Atomable, Eq, Show, NFData)
33+ deriving Serialise via WineryVariant AreaCode
3134
3235data SpeedBand = VeryFastBand | FastBand | MediumBand | SlowBand
33− deriving (Generic, Atomable, Eq, Show, Binary, NFData)
36+ deriving (Generic, Atomable, Eq, Show, NFData)
37+ deriving Serialise via WineryVariant SpeedBand
3438
3539main :: IO ()
3640main = do
@@ -257,4 +261,4 @@ handleIOErrors m = do
257261 [] -> pure (rights eErrs)
258262 errs -> handleError (Left (someErrors errs))
259263
260−
264+
examples/out_of_the_tarpit.tutd+4−4
@@ -3,9 +3,9 @@
33data Address = Address Text
44data Agent = Agent Text
55data Name = Name Text
6−data Price = Price Double
6+data Price = Price Integer --dollars
77data RoomType = Kitchen | Bathroom | LivingRoom
8−data PriceBand = Low | Medium | High | Premium
8+data PriceBand = Low | Med | High | Premium
99data AreaCode = City | Suburban | Rural
1010data SpeedBand = VeryFast | Fast | Medium | Slow
1111
@@ -57,9 +57,9 @@ constraint noOffersAfterSale (offer join decision where ^dayEarlierThan(@offerDa
5757--1. identify offerPrices > 2000 (arbitrarily-chosen high price band which is not specified in the paper)
5858--2. remove the properties which have been sold
5959--3. group and count sub-relation and restrict by greater than 50
60−constraint noMoreThan50PremiumProperties ((((property where ^gt(offerPrice,2000.0)) minus ((property join decision){address,agent,dateRegistered,photo,price})) group ({} as x) : {z:=gt(count(@x),50)}) {z}){} equals false
60+constraint noMoreThan50PremiumProperties ((((property where ^gt(@price,Price 2000)) minus ((property join decision){address,agent,dateRegistered,photo,price})) group ({} as x) : {z:=gt(count(@x),50)}) {z}){} equals false
6161
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
6363
6464-- sample data
6565
jupyter/TutorialD Notebook Walkthrough.ipynb+1−1
@@ -38,7 +38,7 @@
3838 }
3939 ],
4040 "source": [
41− ":importexample date"
41+ ":importexample cjdate"
4242 ]
4343 },
4444 {
nix/sources.jsonnew file+50
@@ -0,0 +1,50 @@
1+{
2+ "curryer": {
3+ "branch": "master",
4+ "description": "Fast Haskell RPC",
5+ "homepage": null,
6+ "owner": "agentm",
7+ "repo": "curryer",
8+ "rev": "74ecaac619ad1165a4517d5c0f4e530493bda130",
9+ "sha256": "1izdvzj00k0y76ixm7dfgvq2fzphb8h4nzqgwkl3p0bg0806rsn1",
10+ "type": "tarball",
11+ "url": "https://github.com/agentm/curryer/archive/74ecaac619ad1165a4517d5c0f4e530493bda130.tar.gz",
12+ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
13+ },
14+ "niv": {
15+ "branch": "master",
16+ "description": "Easy dependency management for Nix projects",
17+ "homepage": "https://github.com/nmattia/niv",
18+ "owner": "nmattia",
19+ "repo": "niv",
20+ "rev": "1819632b5823e0527da28ad82fecd6be5136c1e9",
21+ "sha256": "08jz17756qchq0zrqmapcm33nr4ms9f630mycc06i6zkfwl5yh5i",
22+ "type": "tarball",
23+ "url": "https://github.com/nmattia/niv/archive/1819632b5823e0527da28ad82fecd6be5136c1e9.tar.gz",
24+ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
25+ },
26+ "nixpkgs": {
27+ "branch": "master",
28+ "description": "Nix Packages collection",
29+ "homepage": "",
30+ "owner": "NixOS",
31+ "repo": "nixpkgs",
32+ "rev": "429c23aad0fce9ef38b0e60d55d7459c19d53ddc",
33+ "sha256": "1nj8sh1fnxp07jdlvjkijwfd1pnsi2zj0ivy7a0dhx02g63byhg3",
34+ "type": "tarball",
35+ "url": "https://github.com/NixOS/nixpkgs/archive/429c23aad0fce9ef38b0e60d55d7459c19d53ddc.tar.gz",
36+ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
37+ },
38+ "streamly": {
39+ "branch": "ac3af8749194f1788704dda8667d0b3807075cc2",
40+ "description": "Beautiful Streaming, Concurrent and Reactive Composition (Haskell)",
41+ "homepage": "https://hackage.haskell.org/package/streamly",
42+ "owner": "composewell",
43+ "repo": "streamly",
44+ "rev": "ac3af8749194f1788704dda8667d0b3807075cc2",
45+ "sha256": "04d8fk654vawdfs0dfidmq2awwgwi8x44iv8r7vqz70zkcsd5fij",
46+ "type": "tarball",
47+ "url": "https://github.com/composewell/streamly/archive/ac3af8749194f1788704dda8667d0b3807075cc2.tar.gz",
48+ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
49+ }
50+}
nix/sources.nixnew file+171
@@ -0,0 +1,171 @@
1+# This file has been generated by Niv.
2+
3+let
4+
5+ #
6+ # The fetchers. fetch_<type> fetches specs of type <type>.
7+ #
8+
9+ fetch_file = pkgs: name: spec:
10+ let
11+ name' = sanitizeName name + "-src";
12+ in
13+ if spec.builtin or true then
14+ builtins_fetchurl { inherit (spec) url sha256; name = name'; }
15+ else
16+ pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
17+
18+ fetch_tarball = pkgs: name: spec:
19+ let
20+ name' = sanitizeName name + "-src";
21+ in
22+ if spec.builtin or true then
23+ builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
24+ else
25+ pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
26+
27+ fetch_git = name: spec:
28+ let
29+ ref =
30+ if spec ? ref then spec.ref else
31+ if spec ? branch then "refs/heads/${spec.branch}" else
32+ if spec ? tag then "refs/tags/${spec.tag}" else
33+ abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
34+ in
35+ builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
36+
37+ fetch_local = spec: spec.path;
38+
39+ fetch_builtin-tarball = name: throw
40+ ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
41+ $ niv modify ${name} -a type=tarball -a builtin=true'';
42+
43+ fetch_builtin-url = name: throw
44+ ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
45+ $ niv modify ${name} -a type=file -a builtin=true'';
46+
47+ #
48+ # Various helpers
49+ #
50+
51+ # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
52+ sanitizeName = name:
53+ (
54+ concatMapStrings (s: if builtins.isList s then "-" else s)
55+ (
56+ builtins.split "[^[:alnum:]+._?=-]+"
57+ ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
58+ )
59+ );
60+
61+ # The set of packages used when specs are fetched using non-builtins.
62+ mkPkgs = sources: system:
63+ let
64+ sourcesNixpkgs =
65+ import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
66+ hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
67+ hasThisAsNixpkgsPath = <nixpkgs> == ./.;
68+ in
69+ if builtins.hasAttr "nixpkgs" sources
70+ then sourcesNixpkgs
71+ else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
72+ import <nixpkgs> {}
73+ else
74+ abort
75+ ''
76+ Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
77+ add a package called "nixpkgs" to your sources.json.
78+ '';
79+
80+ # The actual fetching function.
81+ fetch = pkgs: name: spec:
82+
83+ if ! builtins.hasAttr "type" spec then
84+ abort "ERROR: niv spec ${name} does not have a 'type' attribute"
85+ else if spec.type == "file" then fetch_file pkgs name spec
86+ else if spec.type == "tarball" then fetch_tarball pkgs name spec
87+ else if spec.type == "git" then fetch_git name spec
88+ else if spec.type == "local" then fetch_local spec
89+ else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
90+ else if spec.type == "builtin-url" then fetch_builtin-url name
91+ else
92+ abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
93+
94+ # If the environment variable NIV_OVERRIDE_${name} is set, then use
95+ # the path directly as opposed to the fetched source.
96+ replace = name: drv:
97+ let
98+ saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
99+ ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
100+ in
101+ if ersatz == "" then drv else ersatz;
102+
103+ # Ports of functions for older nix versions
104+
105+ # a Nix version of mapAttrs if the built-in doesn't exist
106+ mapAttrs = builtins.mapAttrs or (
107+ f: set: with builtins;
108+ listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
109+ );
110+
111+ # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
112+ range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
113+
114+ # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
115+ stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
116+
117+ # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
118+ stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
119+ concatMapStrings = f: list: concatStrings (map f list);
120+ concatStrings = builtins.concatStringsSep "";
121+
122+ # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
123+ optionalAttrs = cond: as: if cond then as else {};
124+
125+ # fetchTarball version that is compatible between all the versions of Nix
126+ builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
127+ let
128+ inherit (builtins) lessThan nixVersion fetchTarball;
129+ in
130+ if lessThan nixVersion "1.12" then
131+ fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
132+ else
133+ fetchTarball attrs;
134+
135+ # fetchurl version that is compatible between all the versions of Nix
136+ builtins_fetchurl = { url, name ? null, sha256 }@attrs:
137+ let
138+ inherit (builtins) lessThan nixVersion fetchurl;
139+ in
140+ if lessThan nixVersion "1.12" then
141+ fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
142+ else
143+ fetchurl attrs;
144+
145+ # Create the final "sources" from the config
146+ mkSources = config:
147+ mapAttrs (
148+ name: spec:
149+ if builtins.hasAttr "outPath" spec
150+ then abort
151+ "The values in sources.json should not have an 'outPath' attribute"
152+ else
153+ spec // { outPath = replace name (fetch config.pkgs name spec); }
154+ ) config.sources;
155+
156+ # The "config" used by the fetchers
157+ mkConfig =
158+ { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
159+ , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
160+ , system ? builtins.currentSystem
161+ , pkgs ? mkPkgs sources system
162+ }: rec {
163+ # The sources, i.e. the attribute set of spec name to spec
164+ inherit sources;
165+
166+ # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
167+ inherit pkgs;
168+ };
169+
170+in
171+mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
project-m36.cabal+198−216
@@ -1,6 +1,8 @@
1+Cabal-Version: 2.2
12Name: project-m36
2−Version: 0.3
3−License: PublicDomain
3+Version: 0.9.3
4+License: MIT
5+--note that this license specification is erroneous and only labeled MIT to appease hackage which does not recognize public domain packages in cabal >2.2- Project:M36 is dedicated to the public domain
46Build-Type: Simple
57Homepage: https://github.com/agentm/project-m36
68Bug-Reports: https://github.com/agentm/project-m36/issues
@@ -8,7 +10,6 @@ Author: AgentM
810Stability: experimental
911Category: Relational Algebra
1012Maintainer: agentm@themactionfaction.com
11−Cabal-Version: >= 1.10
1213Synopsis: Relational Algebra Engine
1314Description: A relational algebra engine which can be used to persist and query Haskell data types.
1415Extra-Source-Files: Changelog.markdown README.markdown
@@ -22,66 +23,27 @@ Flag profiler
2223 Default: False
2324 Manual: True
2425
26+--flag to allow stack to use its older, pinned packages
27+Flag stack
28+ Description: build with stack and stackage
29+ Manual: True
30+ Default: False
31+
32+Flag haskell-scripting
33+ Description: enables Haskell scripting which links against GHC as a library
34+ Manual: True
35+ Default: True
36+
2537Library
26− Build-Depends: base>=4.8 && < 6.0
27− ,ghc >= 7.8 && < 8.3
28− ,ghc-paths
29− ,mtl
30− ,containers
31− ,unordered-containers
32− ,hashable
33− ,haskeline
34− ,directory
35− ,MonadRandom
36− ,random-shuffle
37− --critical uuid bug in lesser versions https://www.reddit.com/r/haskell/comments/4myot5/psa_make_sure_to_use_uuid_1312/
38− ,uuid >= 1.3.12
39− ,cassava >= 0.4.5.1 && < 0.6
40− ,text
41− ,bytestring
42− ,deepseq
43− ,deepseq-generics
44− ,vector
45− ,parallel
46− ,monad-parallel
47− ,transformers
48− ,gnuplot
49− ,binary
50− ,filepath
51− ,zlib
52− ,directory
53− ,vector-binary-instances
54− ,temporary
55− ,stm
56− ,time
57− ,hashable-time
58− ,old-locale
59− --used for CSV parsing
60− ,attoparsec
61− ,either
62− ,base64-bytestring
63− ,data-interval
64− ,extended-reals
65− ,network-transport
66− -- aeson 1.1 and above includes instances for UUID types
67− ,aeson >= 1.1
68− ,path-pieces
69− ,conduit
70− ,resourcet
71− ,http-api-data
72−--needed for remote access
73− ,distributed-process-client-server >= 0.2.3
74− ,distributed-process >= 0.6.6
75− ,distributed-process-extras >= 0.3.2
76− ,distributed-process-async >= 0.2.4
77− ,network-transport-tcp
78− ,network-transport
79− ,list-t
80− ,stm-containers >= 0.2.15
81− ,optparse-applicative
82− ,Glob
83−--used for hashing the transaction graph file to check for differences
84− ,cryptohash-sha256
38+ Build-Depends: base>=4.8 && < 4.15, ghc-paths, mtl, containers, unordered-containers, hashable, haskeline, directory, MonadRandom, random-shuffle, uuid >= 1.3.12, cassava >= 0.4.5.1 && < 0.6, text, bytestring, deepseq, deepseq-generics, vector, parallel, monad-parallel, exceptions, transformers, gnuplot, filepath, zlib, directory, temporary, stm, time, hashable-time, old-locale, rset, attoparsec, either, base64-bytestring, data-interval, extended-reals, aeson >= 1.1, path-pieces, conduit, resourcet, http-api-data, semigroups, QuickCheck, quickcheck-instances, list-t, stm-containers >= 0.2.15, foldl, optparse-applicative, Glob, cryptohash-sha256, text-manipulate >= 0.2.0.1 && < 0.4, winery, curryer-rpc, network, async, vector-instances, recursion-schemes, streamly >= 0.7.2, convertible
39+ if flag(haskell-scripting)
40+ Build-Depends: ghc >= 8.2 && < 8.11
41+ CPP-Options: -DPM36_HASKELL_SCRIPTING
42+ if impl(ghc>= 8) && flag(haskell-scripting)
43+ build-depends:
44+ ghc-boot, ghci
45+ if impl(ghc>= 8.6)
46+ Build-Depends: deferred-folds
8547 Exposed-Modules: ProjectM36.Error,
8648 ProjectM36.Transaction,
8749 ProjectM36.TransactionGraph,
@@ -90,6 +52,9 @@ Library
9052 ProjectM36.TransactionGraph.Merge,
9153 ProjectM36.TransGraphRelationalExpression,
9254 ProjectM36.Base,
55+ ProjectM36.Serialise.Base,
56+ ProjectM36.Serialise.Error,
57+ ProjectM36.DataFrame,
9358 ProjectM36.Attribute,
9459 ProjectM36.AttributeNames,
9560 ProjectM36.Tuple,
@@ -98,6 +63,7 @@ Library
9863 ProjectM36.AtomFunction,
9964 ProjectM36.AtomFunctionError,
10065 ProjectM36.ScriptSession,
66+ ProjectM36.Shortcuts,
10167 ProjectM36.DatabaseContextFunction,
10268 ProjectM36.DatabaseContextFunctionError,
10369 ProjectM36.DatabaseContextFunctionUtils,
@@ -111,26 +77,32 @@ Library
11177 ProjectM36.Relation.Show.HTML,
11278 ProjectM36.StaticOptimizer,
11379 ProjectM36.Relation.Show.Term,
80+ ProjectM36.WCWidth,
11481 ProjectM36.Relation.Show.CSV,
11582 ProjectM36.Relation.Show.Gnuplot,
11683 ProjectM36.Relation.Parse.CSV,
11784 ProjectM36.IsomorphicSchema,
11885 ProjectM36.InclusionDependency,
86+ ProjectM36.MerkleHash,
11987 ProjectM36.Client,
12088 ProjectM36.Client.Simple,
12189 ProjectM36.Persist,
12290 ProjectM36.AtomType,
91+ ProjectM36.AttributeExpr,
12392 ProjectM36.AtomFunctions.Basic,
12493 ProjectM36.AtomFunctions.Primitive,
12594 ProjectM36.Atomable,
12695 ProjectM36.Tupleable,
96+ ProjectM36.Tupleable.Deriving,
12797 ProjectM36.DataConstructorDef,
12898 ProjectM36.DataTypes.Basic,
99+ ProjectM36.DataTypes.Sorting,
129100 ProjectM36.DataTypes.Day,
130101 ProjectM36.DataTypes.DateTime,
131102 ProjectM36.DataTypes.Either,
132103 ProjectM36.DataTypes.Maybe,
133104 ProjectM36.DataTypes.List,
105+ ProjectM36.DataTypes.NonEmptyList,
134106 ProjectM36.DataTypes.Primitive,
135107 ProjectM36.DataTypes.Interval,
136108 ProjectM36.DataTypes.ByteString,
@@ -142,31 +114,42 @@ Library
142114 ProjectM36.Server.EntryPoints,
143115 ProjectM36.Server.ParseArgs,
144116 ProjectM36.Server.RemoteCallTypes,
117+ ProjectM36.Serialise.AtomFunctionError,
118+ ProjectM36.Serialise.DataFrame,
119+ ProjectM36.Serialise.DatabaseContextFunctionError,
120+ ProjectM36.Serialise.IsomorphicSchema,
145121 ProjectM36.Session,
146122 ProjectM36.Sessions,
147123 ProjectM36.Transaction.Persist,
148124 ProjectM36.TypeConstructor,
149125 ProjectM36.TypeConstructorDef,
150126 ProjectM36.FileLock,
151− ProjectM36.FSType
152− GHC-Options: -Wall
127+ ProjectM36.FSType,
128+ ProjectM36.Arbitrary,
129+ ProjectM36.GraphRefRelationalExpr,
130+ ProjectM36.NormalizeExpr,
131+ ProjectM36.TransactionInfo,
132+ ProjectM36.WithNameExpr
133+ GHC-Options: -Wall -rdynamic
153134 if os(windows)
154− Build-Depends: Win32 >= 2.3
135+ Build-Depends: Win32 >= 2.5.4.1
155136 Other-Modules: ProjectM36.Win32Handle
156137 else
138+ --219- too many exported symbols under Windows and GHC 8.4
139+ GHC-Options: -rdynamic -fexternal-interpreter
157140 C-sources: cbits/DirectoryFsync.c, cbits/darwin_statfs.c
158141 Build-Depends: unix
159142 CC-Options: -fPIC
160143 Hs-Source-Dirs: ./src/lib
161144 Default-Language: Haskell2010
162145 Default-Extensions: OverloadedStrings, CPP
163− if impl(ghc>= 8)
164− build-depends:
165− ghc-boot
146+ if !flag(stack)
147+ Build-Depends: deferred-folds
166148
167149Executable tutd
150+ if flag(haskell-scripting)
151+ Build-Depends: ghc >= 8.2 && < 8.11
168152 Build-Depends: base >=4.8 && <5.0,
169− ghc >= 7.8 && < 8.3,
170153 ghc-paths,
171154 project-m36,
172155 containers,
@@ -180,13 +163,11 @@ Executable tutd
180163 MonadRandom, MonadRandom,
181164 vector,
182165 text,
183− vector-binary-instances,
184166 time,
185167 hashable-time,
186168 bytestring,
187169 stm,
188170 deepseq,
189− binary,
190171 data-interval,
191172 parallel,
192173 cassava,
@@ -194,14 +175,23 @@ Executable tutd
194175 directory,
195176 filepath,
196177 temporary,
197− megaparsec >= 5.2.0 && < 5.4,
178+ megaparsec >= 5.2.0 && < 10,
198179 haskeline,
199180 random, MonadRandom,
200181 base64-bytestring,
201182 optparse-applicative,
202183 attoparsec,
203− stm-containers,
204− list-t
184+ stm-containers >= 1.0.0,
185+ list-t,
186+ parser-combinators,
187+ curryer-rpc,
188+ prettyprinter,
189+ cryptohash-sha256,
190+ --due to decode signature change
191+ base16-bytestring >= 1.0.0.0,
192+ http-conduit,
193+ modern-uri,
194+ http-types
205195 Other-Modules: TutorialD.Interpreter,
206196 TutorialD.Interpreter.Base,
207197 TutorialD.Interpreter.DatabaseContextExpr,
@@ -220,20 +210,21 @@ Executable tutd
220210 TutorialD.Interpreter.SchemaOperator,
221211 TutorialD.Interpreter.TransGraphRelationalOperator,
222212 TutorialD.Interpreter.SchemaOperator
213+ TutorialD.Printer
223214 main-is: TutorialD/tutd.hs
224215 CC-Options: -fPIC
225− GHC-Options: -Wall
216+ GHC-Options: -Wall -threaded
226217 Hs-Source-Dirs: ./src/bin
227218 Default-Language: Haskell2010
228219 Default-Extensions: OverloadedStrings
229220
230221Executable project-m36-server
222+ if flag(haskell-scripting)
223+ Build-Depends: ghc >= 8.2 && < 8.11
231224 Build-Depends: base,
232− ghc >= 7.8 && < 8.3,
233225 ghc-paths,
234− project-m36,
235− binary,
236226 transformers,
227+ project-m36,
237228 temporary,
238229 data-interval,
239230 deepseq,
@@ -246,7 +237,6 @@ Executable project-m36-server
246237 optparse-applicative,
247238 hashable-time,
248239 time,
249− vector-binary-instances,
250240 text,
251241 deepseq-generics,
252242 mtl,
@@ -268,7 +258,7 @@ Executable project-m36-server
268258Executable bigrel
269259 Default-Language: Haskell2010
270260 Default-Extensions: OverloadedStrings
271− 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
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
272262 Other-Modules: TutorialD.Interpreter.Base,
273263 TutorialD.Interpreter.DatabaseContextExpr,
274264 TutorialD.Interpreter.RelationalExpr,
@@ -279,233 +269,220 @@ Executable bigrel
279269 if flag(profiler)
280270 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall
281271
282−Test-Suite test-tutoriald
272+Common commontest
283273 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
284275 Default-Extensions: OverloadedStrings
285− type: exitcode-stdio-1.0
286− main-is: test/TutorialD/Interpreter.hs
287− 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
288− 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
289− GHC-Options: -Wall
290− Hs-Source-Dirs: ./src/bin, ., test
276+ GHC-Options: -Wall -threaded
277+ Hs-Source-Dirs: test, src/bin
291278
292−Test-Suite test-tutoriald-atomfunctionscript
279+Benchmark basic-benchmark
293280 Default-Language: Haskell2010
294281 Default-Extensions: OverloadedStrings
282+ Build-Depends: base, criterion, project-m36, text, vector, transformers, containers, temporary, directory, filepath
283+ Main-Is: benchmark/Basic.hs
284+ Type: exitcode-stdio-1.0
285+ GHC-Options: -Wall -threaded -rtsopts
286+ HS-Source-Dirs: ./src/bin
287+ if flag(profiler)
288+ GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall
289+
290+--benchmark inserts, updates, deletes for a basic use-case to shake out any space leaks
291+Benchmark update-exprs
292+ Default-Language: Haskell2010
293+ Default-Extensions: OverloadedStrings
294+ Build-Depends: base, criterion, project-m36, text, winery
295+ Main-Is: benchmark/Server.hs
296+ Type: exitcode-stdio-1.0
297+ GHC-Options: -Wall -threaded -rtsopts
298+ HS-Source-Dirs: ./src/bin
299+ if flag(profiler)
300+ GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall -fexternal-interpreter
301+
302+Test-Suite test-tutoriald
303+ import: commontest
295304 type: exitcode-stdio-1.0
296− 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
297− main-is: test/TutorialD/Interpreter/AtomFunctionScript.hs
298− Build-Depends: base, HUnit, project-m36, uuid, containers, megaparsec, text, vector, directory, bytestring, mtl, haskeline, random, MonadRandom, semigroups, time
299− GHC-Options: -Wall
300− Hs-Source-Dirs: ./src/bin, ./test, .
305+ main-is: TutorialD/InterpreterTest.hs
306+ Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.SchemaOperator, TutorialD.Printer
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
308+
309+Test-Suite test-tutoriald-atomfunctionscript
310+ import: commontest
311+ 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
313+ main-is: TutorialD/Interpreter/AtomFunctionScript.hs
301314
302315Test-Suite test-tutoriald-databasecontextfunctionscript
303− Default-Language: Haskell2010
304− Default-Extensions: OverloadedStrings
316+ import: commontest
305317 type: exitcode-stdio-1.0
306− 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
307− main-is: test/TutorialD/Interpreter/DatabaseContextFunctionScript.hs
308− Build-Depends: base, HUnit, project-m36, uuid, containers, megaparsec, text, vector, directory, bytestring, mtl, haskeline, random, MonadRandom, semigroups, time
309− GHC-Options: -Wall
310− Hs-Source-Dirs: ./src/bin, ./test, .
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
319+ main-is: TutorialD/Interpreter/DatabaseContextFunctionScript.hs
311320
312321Test-Suite test-relation
313− Default-Language: Haskell2010
314− Default-Extensions: OverloadedStrings
322+ import: commontest
315323 type: exitcode-stdio-1.0
316− main-is: test/Relation/Basic.hs
317− 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
318− GHC-Options: -Wall
324+ main-is: Relation/Basic.hs
319325
320326Test-Suite test-static-optimizer
321− Default-Language: Haskell2010
322− Default-Extensions: OverloadedStrings
327+ import: commontest
323328 type: exitcode-stdio-1.0
324− main-is: test/Relation/StaticOptimizer.hs
325− 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
326− GHC-Options: -Wall
329+ main-is: Relation/StaticOptimizer.hs
327330
328331Test-Suite test-transactiongraph-persist
329− Default-Language: Haskell2010
330− Default-Extensions: OverloadedStrings
332+ import: commontest
331333 type: exitcode-stdio-1.0
332− main-is: test/TransactionGraph/Persist.hs
333− 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
334− Other-Modules: TutorialD.Interpreter.Base, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.BasicExamples
335− Hs-Source-Dirs: ., ./src/bin
336− GHC-Options: -Wall
334+ main-is: TransactionGraph/Persist.hs
335+ Other-Modules: TutorialD.Interpreter.Base, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Printer
337336
338337Test-Suite test-relation-import-csv
339− Default-Language: Haskell2010
340− Default-Extensions: OverloadedStrings
338+ import: commontest
341339 type: exitcode-stdio-1.0
342− main-is: test/Relation/Import/CSV.hs
343− 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
344− GHC-Options: -Wall
340+ main-is: Relation/Import/CSV.hs
345341
346342Test-Suite test-tutoriald-import-tutoriald
347− Default-Language: Haskell2010
348− Default-Extensions: OverloadedStrings
343+ import: commontest
349344 type: exitcode-stdio-1.0
350− main-is: test/TutorialD/Interpreter/Import/TutorialD.hs
351− 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
352− 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
353− GHC-Options: -Wall
354− Hs-Source-Dirs: ., ./src/bin
345+ main-is: TutorialD/Interpreter/Import/ImportTest.hs
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
355347
356348Test-Suite test-relation-export-csv
357− Default-Language: Haskell2010
358− Default-Extensions: OverloadedStrings
349+ import: commontest
359350 type: exitcode-stdio-1.0
360− main-is: test/Relation/Export/CSV.hs
361− 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
362− GHC-Options: -Wall
351+ main-is: Relation/Export/CSV.hs
363352
364353Test-Suite test-transactiongraph-merge
365− Default-Language: Haskell2010
366− Default-Extensions: OverloadedStrings
354+ import: commontest
367355 type: exitcode-stdio-1.0
368− main-is: test/TransactionGraph/Merge.hs
369− 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
370− GHC-Options: -Wall
356+ main-is: TransactionGraph/Merge.hs
357+
358+
359+Test-Suite test-prettyprinter
360+ import: commontest
361+ type: exitcode-stdio-1.0
362+ main-is: TutorialD/PrinterTest.hs
363+ Other-Modules: TutorialD.Printer, TutorialD.Interpreter.Base, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types
371364
372365benchmark bench
373− Default-Language: Haskell2010
374− Default-Extensions: OverloadedStrings
366+ import: commontest
375367 type: exitcode-stdio-1.0
376368 main-is: benchmark/Relation.hs
377− 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
378− GHC-Options: -Wall -rtsopts
379− Hs-Source-Dirs: ./src/bin
380369
381370Test-Suite test-server
382− Default-Language: Haskell2010
383− Default-Extensions: OverloadedStrings
371+ import: commontest
384372 type: exitcode-stdio-1.0
385− main-is: test/Server/Main.hs
386− 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
387− HS-Source-Dirs: ., ./src/bin
388− GHC-Options: -Wall
373+ main-is: Server/Main.hs
374+
389375
390376Executable Example-SimpleClient
391377 Default-Language: Haskell2010
392378 Default-Extensions: OverloadedStrings
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, ghc, ghc-paths, project-m36, random, MonadRandom
379+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, ghc, ghc-paths, project-m36, random, MonadRandom
394380 Main-Is: examples/SimpleClient.hs
395− GHC-Options: -Wall
381+ GHC-Options: -Wall -threaded
396382
397383Executable Example-OutOfTheTarpit
398384 Default-Language: Haskell2010
399385 Default-Extensions: OverloadedStrings
400− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36
386+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36, winery
401387 Main-Is: examples/out_of_the_tarpit.hs
402− GHC-Options: -Wall
388+ GHC-Options: -Wall -threaded
403389
404390Executable Example-Blog
405391 Default-Language: Haskell2010
406392 Default-Extensions: OverloadedStrings
407− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36, scotty, blaze-html, http-types
393+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36, scotty, blaze-html, http-types, winery
408394 Main-Is: examples/blog.hs
409− GHC-Options: -Wall
410−
395+ GHC-Options: -Wall -threaded
411396
412397Executable Example-Hair
413398 Default-Language: Haskell2010
414399 Default-Extensions: OverloadedStrings
415− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36
400+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36, winery
416401 Main-Is: examples/hair.hs
417− GHC-Options: -Wall
402+ GHC-Options: -Wall -threaded
418403
419−Test-Suite test-scripts
404+Executable Example-Plantfarm
420405 Default-Language: Haskell2010
421406 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+
411+Executable Example-CustomTupleable
412+ Default-Language: Haskell2010
413+ 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
415+ Main-Is: examples/CustomTupleable.hs
416+ GHC-Options: -Wall -threaded
417+
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+
428+Test-Suite test-scripts
429+ import: commontest
422430 type: exitcode-stdio-1.0
423− main-is: test/scripts.hs
424− 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
425− 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
426− GHC-Options: -Wall
427− Hs-Source-Dirs: ., ./src/bin
431+ main-is: scripts.hs
432+ Other-Modules: TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.Types, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Printer
428433
429434Executable project-m36-websocket-server
430435 Default-Language: Haskell2010
431− 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
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
432437 Main-Is: ProjectM36/Server/WebSocket/websocket-server.hs
433− 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
434− GHC-Options: -Wall
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
439+ GHC-Options: -Wall -threaded
435440 Hs-Source-Dirs: ./src/bin
436441 Default-Extensions: OverloadedStrings
437442
438443Test-Suite test-websocket-server
439− Default-Language: Haskell2010
444+ import: commontest
440445 type: exitcode-stdio-1.0
441− main-is: test/Server/WebSocket.hs
442− 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
443− 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
444− Default-Extensions: OverloadedStrings
445− GHC-Options: -Wall
446− Hs-Source-Dirs: ./src/bin, .
446+ main-is: Server/WebSocket.hs
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
447448
448449Test-Suite test-isomorphic-schemas
449− Default-Language: Haskell2010
450+ import: commontest
450451 type: exitcode-stdio-1.0
451− main-is: test/IsomorphicSchema.hs
452− 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
453− Default-Extensions: OverloadedStrings
454− GHC-Options: -Wall
455− Hs-Source-Dirs: ./src/bin, .
452+ main-is: IsomorphicSchema.hs
456453
457454Test-Suite test-atomable
458− Default-Language: Haskell2010
455+ import: commontest
459456 type: exitcode-stdio-1.0
460− main-is: test/Relation/Atomable.hs
461− 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
462− 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
463− Default-Extensions: OverloadedStrings
464− GHC-Options: -Wall
465− Hs-Source-Dirs: ./src/bin, ., test/
457+ main-is: Relation/Atomable.hs
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
466459
467460Test-Suite test-multiprocess-access
468− Default-Language: Haskell2010
461+ import: commontest
469462 type: exitcode-stdio-1.0
470− main-is: test/MultiProcessDatabaseAccess.hs
471− 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
472− Default-Extensions: OverloadedStrings
473− GHC-Options: -Wall
474− Hs-Source-Dirs: ./src/bin, ., test/
463+ main-is: MultiProcessDatabaseAccess.hs
475464
476465Test-Suite test-transactiongraph-automerge
477− Default-Language: Haskell2010
466+ import: commontest
478467 type: exitcode-stdio-1.0
479− main-is: test/TransactionGraph/Automerge.hs
480− 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
481− 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
482− Default-Extensions: OverloadedStrings
483− GHC-Options: -Wall
484− Hs-Source-Dirs: ./src/bin, ., test/
468+ main-is: TransactionGraph/Automerge.hs
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
485470
486471Test-Suite test-tupleable
487− Default-Language: Haskell2010
472+ import: commontest
488473 type: exitcode-stdio-1.0
489− main-is: test/Relation/Tupleable.hs
490− 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
491− Default-Extensions: OverloadedStrings
492− GHC-Options: -Wall
493− Hs-Source-Dirs: ./src/bin, ., test/
474+ main-is: Relation/Tupleable.hs
494475
495476Test-Suite test-client-simple
496− Default-Language: Haskell2010
497− Main-Is: test/Client/Simple.hs
477+ import: commontest
478+ Main-Is: Client/Simple.hs
498479 type: exitcode-stdio-1.0
499− 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
500− Default-Extensions: OverloadedStrings
501− GHC-Options: -Wall
502− Hs-Source-Dirs: ./src/bin, ., test/
503480
504481-- test for file handle leaks
505482Executable handles
506483 Default-Language: Haskell2010
507484 Default-Extensions: OverloadedStrings
508− 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
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
509486 main-is: benchmark/Handles.hs
510487 Other-Modules: TutorialD.Interpreter,
511488 TutorialD.Interpreter.Base,
@@ -524,9 +501,14 @@ Executable handles
524501 TutorialD.Interpreter.TransGraphRelationalOperator,
525502 TutorialD.Interpreter.TransactionGraphOperator,
526503 TutorialD.Interpreter.Types
504+ TutorialD.Printer
527505 GHC-Options: -Wall -threaded -rtsopts
528506 HS-Source-Dirs: ./src/bin
529507 if flag(profiler)
530508 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall
531−
532−
509+
510+Test-Suite test-dataframe
511+ import: commontest
512+ 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
release.nixnew file+36
@@ -0,0 +1,36 @@
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+}
runghcid.sh+1−1
@@ -1,2 +1,2 @@
11#!/bin/sh
2−./.cabal-sandbox/bin/ghcid --command="cabal repl $1"
2+~/.cabal/bin/ghcid --command="cabal new-repl $1"
scripts/DateExamples.tutd+2−2
@@ -20,7 +20,7 @@ sp := relation{tuple{s# "S1",p# "P1",qty 300},
2020 tuple{s# "S3",p# "P2",qty 200},
2121 tuple{s# "S4",p# "P4",qty 300},
2222 tuple{s# "S4",p# "P5",qty 400}};
23−key s_pkey {s#} s
24−key p_key {p#} p
23+key s_pkey {s#} s;
24+key p_key {p#} p;
2525foreign key s_sp_fk sp{s#} in s{s#};
2626foreign key p_sp_fk sp{p#} in p{p#};
scripts/multiline.tutdnew file+2
@@ -0,0 +1,2 @@
1+x:=relation{
2+tuple{ x 2}} -- nice
shell.nixnew file+1
@@ -0,0 +1 @@
1+(import ./release.nix { }).shell
src/bin/ProjectM36/Client/Json.hs+4−1
@@ -3,6 +3,7 @@ module ProjectM36.Client.Json where
33import Data.Aeson
44import ProjectM36.Server.RemoteCallTypes.Json ()
55import ProjectM36.Client
6+import ProjectM36.TransactionGraph
67import Control.Exception (IOException)
78
89instance ToJSON EvaluatedNotification
@@ -11,4 +12,6 @@ instance FromJSON EvaluatedNotification
1112instance ToJSON ConnectionError
1213
1314instance ToJSON IOException where
14− toJSON err = object ["IOException" .= show err]
15+ toJSON err = object ["IOException" .= show err]
16+
17+instance ToJSON MerkleValidationError
src/bin/ProjectM36/Server/RemoteCallTypes/Json.hs+51−21
@@ -1,14 +1,17 @@
11--create a bunch of orphan instances for use with the websocket server
2−{-# LANGUAGE FlexibleInstances, TypeSynonymInstances #-}
2+{-# LANGUAGE FlexibleInstances #-}
33{-# OPTIONS_GHC -fno-warn-orphans #-}
44module ProjectM36.Server.RemoteCallTypes.Json where
55import ProjectM36.AtomFunctionError
66import ProjectM36.Base
7+import ProjectM36.DataFrame
78import ProjectM36.DatabaseContextFunctionError
89import ProjectM36.DataTypes.Primitive
910import ProjectM36.Error
1011import ProjectM36.IsomorphicSchema
1112import ProjectM36.Server.RemoteCallTypes
13+import ProjectM36.MerkleHash
14+import ProjectM36.Attribute as A
1215
1316import Data.Aeson
1417import Data.ByteString.Base64 as B64
@@ -21,6 +24,9 @@ instance FromJSON RelationalExpr
2124instance ToJSON TupleExpr
2225instance FromJSON TupleExpr
2326
27+instance ToJSON TupleExprs
28+instance FromJSON TupleExprs
29+
2430instance ToJSON RestrictionPredicateExpr
2531instance FromJSON RestrictionPredicateExpr
2632
@@ -39,8 +45,11 @@ instance FromJSON ExecuteRelationalExpr
3945instance ToJSON Relation
4046instance FromJSON Relation
4147
42−instance ToJSON Attribute
43−instance FromJSON Attribute
48+instance ToJSON Attribute where
49+ toJSON (Attribute attrName aType) = object [ "name" .= attrName
50+ , "type" .= toJSON aType ]
51+instance FromJSON Attribute where
52+ parseJSON = withObject "Attribute" $ \v -> Attribute <$> v .: "name" <*> v .: "type"
4453
4554instance ToJSON ExtendTupleExpr
4655instance FromJSON ExtendTupleExpr
@@ -63,6 +72,18 @@ instance FromJSON SchemaExpr
6372instance ToJSON SchemaIsomorph
6473instance FromJSON SchemaIsomorph
6574
75+instance ToJSON DataFrame
76+instance FromJSON DataFrame
77+
78+instance ToJSON DataFrameTuple
79+instance FromJSON DataFrameTuple
80+
81+instance ToJSON AttributeOrder
82+instance FromJSON AttributeOrder
83+
84+instance ToJSON Order
85+instance FromJSON Order
86+
6687instance ToJSON Atom where
6788 toJSON atom@(IntegerAtom i) = object [ "type" .= atomTypeForAtom atom,
6889 "val" .= i ]
@@ -80,17 +101,10 @@ instance ToJSON Atom where
80101 "val" .= decodeUtf8 (B64.encode i) ]
81102 toJSON atom@(BoolAtom i) = object [ "type" .= atomTypeForAtom atom,
82103 "val" .= i ]
83−
84− toJSON atom@(IntervalAtom b e i1 i2) = object [ "type" .= atomTypeForAtom atom,
85− "val" .= object [
86− "begin" .= toJSON b,
87− "end" .= toJSON e,
88− "beginopen" .= i1,
89− "endopen" .= i2
90− ]
91− ]
92104 toJSON atom@(RelationAtom i) = object [ "type" .= atomTypeForAtom atom,
93105 "val" .= i ]
106+ toJSON atom@(RelationalExprAtom i) = object [ "type" .= atomTypeForAtom atom,
107+ "val" .= i ]
94108 toJSON (ConstructedAtom dConsName atomtype atomlist) = object [
95109 "dataconstructorname" .= dConsName,
96110 "type" .= toJSON atomtype,
@@ -103,9 +117,7 @@ instance FromJSON Atom where
103117 case atype of
104118 TypeVariableType _ -> fail "cannot pass TypeVariableType over the wire"
105119 caType@(ConstructedAtomType _ _) -> ConstructedAtom <$> o .: "dataconstructorname" <*> pure caType <*> o .: "atom"
106− RelationAtomType _ -> do
107− rel <- o .: "val"
108− pure $ RelationAtom rel
120+ RelationAtomType _ -> RelationAtom <$> o .: "val"
109121 IntAtomType -> IntAtom <$> o .: "val"
110122 IntegerAtomType -> IntegerAtom <$> o .: "val"
111123 DoubleAtomType -> DoubleAtom <$> o .: "val"
@@ -120,12 +132,7 @@ instance FromJSON Atom where
120132 Left err -> fail ("Failed to parse base64-encoded ByteString: " ++ err)
121133 Right bs -> pure (ByteStringAtom bs)
122134 BoolAtomType -> BoolAtom <$> o .: "val"
123− IntervalAtomType _ -> IntervalAtom <$>
124− ((o .: "val") >>= (.: "begin")) <*>
125− ((o .: "val") >>= (.: "end")) <*>
126− ((o .: "val") >>= (.: "beginopen")) <*>
127− ((o .: "val") >>= (.: "endopen"))
128−
135+ RelationalExprAtomType -> RelationalExprAtom <$> o .: "val"
129136
130137instance ToJSON Notification
131138instance FromJSON Notification
@@ -133,6 +140,21 @@ instance FromJSON Notification
133140instance ToJSON ScriptCompilationError
134141instance FromJSON ScriptCompilationError
135142
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+
136158instance ToJSON RelationalError
137159instance FromJSON RelationalError
138160
@@ -142,6 +164,9 @@ instance FromJSON SchemaError
142164instance ToJSON MergeError
143165instance FromJSON MergeError
144166
167+instance ToJSON ImportError'
168+instance FromJSON ImportError'
169+
145170instance ToJSON DatabaseContextFunctionError
146171instance FromJSON DatabaseContextFunctionError
147172
@@ -153,3 +178,8 @@ instance FromJSON PersistenceError
153178
154179instance ToJSON AtomFunctionError
155180instance FromJSON AtomFunctionError
181+
182+instance ToJSON WithNameExpr
183+instance FromJSON WithNameExpr
184+
185+
src/bin/ProjectM36/Server/WebSocket.hs+41−22
@@ -1,4 +1,4 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase, CPP #-}
22module ProjectM36.Server.WebSocket where
33-- while the tutd client performs TutorialD parsing on the client, the websocket server will pass tutd to be parsed and executed on the server- otherwise I have to pull in ghcjs as a dependency to allow client-side parsing- that's not appealing because then the frontend is not language-agnostic, but this could change in the future, perhaps by sending different messages over the websocket
44-- ideally, the wire protocol should not be exposed to a straight string-based API ala SQL, so we could make perhaps a javascript DSL which compiles to the necessary JSON- anaylyze tradeoffs
@@ -10,20 +10,26 @@ import qualified Data.Text as T
1010import qualified Network.WebSockets as WS
1111import ProjectM36.Server.RemoteCallTypes.Json ()
1212import ProjectM36.Client.Json ()
13+import ProjectM36.DataFrame
1314import ProjectM36.Relation.Show.Term
1415import ProjectM36.Relation.Show.HTML
1516import Data.Aeson
1617import TutorialD.Interpreter
17−import TutorialD.Interpreter.Base
18+import TutorialD.Interpreter.Base (TutorialDOperatorResult(..))
1819import ProjectM36.Client
1920import Control.Exception
2021import Data.Attoparsec.Text
2122import Control.Applicative
2223import Text.Megaparsec.Error
2324import Data.Functor
25+import Data.Either (fromRight)
26+
27+#if MIN_VERSION_megaparsec(7,0,0)
28+import Data.List.NonEmpty as NE
29+#endif
2430
2531websocketProxyServer :: Port -> Hostname -> WS.ServerApp
26−websocketProxyServer port host pending = do
32+websocketProxyServer port host pending = do
2733 conn <- WS.acceptRequest pending
2834 let unexpectedMsg = WS.sendTextData conn ("messagenotexpected" :: T.Text)
2935 --phase 1- accept database name for connection
@@ -32,10 +38,10 @@ websocketProxyServer port host pending = do
3238 if not (connectdbmsg `T.isPrefixOf` dbmsg) then unexpectedMsg >> WS.sendClose conn ("" :: T.Text)
3339 else do
3440 let dbname = T.unpack $ T.drop (T.length connectdbmsg) dbmsg
35− bracket (createConnection conn dbname port host)
41+ bracket (createConnection conn dbname port host)
3642 (\case
3743 Right dbconn -> close dbconn
38− Left _ -> pure ()) $ \case
44+ Left _ -> pure ()) $ \case
3945 Left err -> sendError conn err
4046 Right dbconn -> do
4147 eSessionId <- createSessionAtHead dbconn "master"
@@ -46,34 +52,41 @@ websocketProxyServer port host pending = do
4652 _ <- forever $ do
4753 pInfo <- promptInfo sessionId dbconn
4854 --figure out why sending three times during startup is necessary
49− sendPromptInfo pInfo conn
55+ sendPromptInfo pInfo conn
5056 sendPromptInfo pInfo conn
5157 msg <- WS.receiveData conn :: IO T.Text
5258 case parseOnly parseExecuteMessage msg of
5359 Left _ -> unexpectedMsg
5460 Right (presentation, tutdString) ->
5561 case parseTutorialD tutdString of
56− Left err -> handleOpResult conn dbconn presentation (DisplayErrorResult ("parse error: " `T.append` T.pack (parseErrorPretty err)))
62+ Left err -> handleOpResult conn dbconn presentation
63+#if MIN_VERSION_megaparsec(7,0,0)
64+ (DisplayErrorResult
65+ ("parse error: " `T.append` T.pack
66+ (parseErrorPretty . NE.head . bundleErrors $ err)))
67+#else
68+ (DisplayErrorResult ("parse error: " `T.append` T.pack (parseErrorPretty err)))
69+#endif
5770 Right parsed -> do
58− let timeoutFilter exc = if exc == RequestTimeoutException
59− then Just exc
71+ let timeoutFilter exc = if exc == RequestTimeoutException
72+ then Just exc
6073 else Nothing
6174 responseHandler = do
6275 result <- evalTutorialD sessionId dbconn SafeEvaluation parsed
6376 pInfo' <- promptInfo sessionId dbconn
64− sendPromptInfo pInfo' conn
77+ sendPromptInfo pInfo' conn
6578 handleOpResult conn dbconn presentation result
6679 catchJust timeoutFilter responseHandler (\_ -> handleOpResult conn dbconn presentation (DisplayErrorResult "Request Timed Out."))
6780 pure ()
68−
69−notificationCallback :: WS.Connection -> NotificationCallback
81+
82+notificationCallback :: WS.Connection -> NotificationCallback
7083notificationCallback conn notifName evaldNotif = WS.sendTextData conn (encode (object ["notificationname" .= notifName,
7184 "evaldnotification" .= evaldNotif
7285 ]))
73−
86+
7487--this creates a new database for each connection- perhaps not what we want (?)
7588createConnection :: WS.Connection -> DatabaseName -> Port -> Hostname -> IO (Either ConnectionError Connection)
76−createConnection wsconn dbname port host = connectProjectM36 (RemoteProcessConnectionInfo dbname (createNodeId host port) (notificationCallback wsconn))
89+createConnection wsconn dbname port host = connectProjectM36 (RemoteConnectionInfo dbname host (show port) (notificationCallback wsconn))
7790
7891sendError :: (ToJSON a) => WS.Connection -> a -> IO ()
7992sendError conn err = WS.sendTextData conn (encode (object ["displayerror" .= err]))
@@ -94,34 +107,40 @@ handleOpResult conn _ presentation (DisplayRelationResult rel) = do
94107 texto = ["text" .= showRelation rel | textPresentation presentation]
95108 htmlo = ["html" .= relationAsHTML rel | htmlPresentation presentation]
96109 WS.sendTextData conn (encode (object ["displayrelation" .= object (jsono ++ texto ++ htmlo)]))
110+handleOpResult conn _ presentation (DisplayDataFrameResult df) = do
111+ let jsono = ["json" .= df | jsonPresentation presentation]
112+ texto = ["text" .= showDataFrame df | textPresentation presentation]
113+ htmlo = ["html" .= dataFrameAsHTML df | htmlPresentation presentation]
114+ WS.sendTextData conn (encode (object ["displaydataframe" .= object (jsono ++ texto ++ htmlo)]))
115+
97116-- get current schema and head name for client
98117promptInfo :: SessionId -> Connection -> IO (HeadName, SchemaName)
99118promptInfo sessionId conn = do
100− eHeadName <- headName sessionId conn
119+ eHeadName <- headName sessionId conn
101120 eSchemaName <- currentSchemaName sessionId conn
102− pure (either (const "<unknown>") id eHeadName, either (const "<no schema>") id eSchemaName)
103−
121+ pure (fromRight "<unknown>" eHeadName, fromRight "<no schema>" eSchemaName)
122+
104123sendPromptInfo :: (HeadName, SchemaName) -> WS.Connection -> IO ()
105124sendPromptInfo (hName, sName) conn = WS.sendTextData conn (encode (object ["promptInfo" .= object ["headname" .= hName, "schemaname" .= sName]]))
106125
107126--a returning relation can be returned as JSON, Text (for consoles), or HTML
108127data Presentation = Presentation {
109− jsonPresentation :: Bool,
128+ jsonPresentation :: Bool,
110129 textPresentation :: Bool,
111130 htmlPresentation :: Bool }
112−
131+
113132data PresentationFlag = JSONFlag | TextFlag | HTMLFlag
114−
133+
115134parseExecuteMessage :: Parser (Presentation, T.Text)
116135parseExecuteMessage = do
117136 _ <- string "executetutd/"
118137 flags <- sepBy ((string "json" $> JSONFlag) <|>
119138 (string "text" $> TextFlag) <|>
120139 (string "html" $> HTMLFlag)) "+"
121− let presentation = foldr (\flag acc -> case flag of
140+ let presentation = foldr (\flag acc -> case flag of
122141 JSONFlag -> acc {jsonPresentation = True}
123142 TextFlag -> acc {textPresentation = True}
124143 HTMLFlag -> acc {htmlPresentation = True}) (Presentation False False False) flags
125144 _ <- char ':'
126145 tutd <- T.pack <$> manyTill anyChar endOfInput
127− pure (presentation, tutd)
146+ pure (presentation, tutd)
src/bin/ProjectM36/Server/WebSocket/project-m36.js+45−6
@@ -55,9 +55,10 @@ var ProjectM36Connection = function (protocol, host, port, path, dbname, openCal
5555* @param {Object} acknowledgementresult - The status update containing an acknowledgement that the query was executed or null.
5656* @param {Object} errorResult - The status update containing the error information or null.
5757*/
58−var ProjectM36Status = function (relationResult, acknowledgementResult, errorResult)
58+var ProjectM36Status = function (relationResult, dataFrameResult, acknowledgementResult, errorResult)
5959{
6060 this.relation = relationResult;
61+ this.dataframe = dataFrameResult;
6162 this.acknowledgement = acknowledgementResult;
6263 this.error = errorResult;
6364}
@@ -75,6 +76,7 @@ ProjectM36Connection.prototype.readyState = function()
7576ProjectM36Connection.prototype.handleResponse = function(message)
7677{
7778 var relation = message["displayrelation"];
79+ var dataframe = message["displaydataframe"];
7880 var acknowledged = message["acknowledged"];
7981 var error = message["displayerror"];
8082 var prompt = message["promptInfo"];
@@ -82,12 +84,17 @@ ProjectM36Connection.prototype.handleResponse = function(message)
8284
8385 if(relation)
8486 {
85− this.statuscallback(new ProjectM36Status(relation['json'], null, null));
87+ this.statuscallback(new ProjectM36Status(relation['json'], null, null, null));
88+ }
89+
90+ if(dataframe)
91+ {
92+ this.statuscallback(new ProjectM36Status(null, dataframe['json'], null, null));
8693 }
8794
8895 if(acknowledged)
8996 {
90− this.statuscallback(new ProjectM36Status(null, true, null));
97+ this.statuscallback(new ProjectM36Status(null, null, true, null));
9198 }
9299
93100 if(error)
@@ -96,7 +103,7 @@ ProjectM36Connection.prototype.handleResponse = function(message)
96103 {
97104 error=error.tag; // for error objects
98105 }
99− this.statuscallback(new ProjectM36Status(null, null, error['json']));
106+ this.statuscallback(new ProjectM36Status(null, null, null, error['json']));
100107 }
101108
102109 if(prompt)
@@ -161,6 +168,7 @@ ProjectM36Connection.prototype.generateAtomType = function(attr)
161168{
162169 var atomType = attr[1]["tag"];
163170 var attrName = attr[0];
171+ var accessory = attr[2];
164172 var element = document.createElement("span");
165173 element.textContent = attrName + "::";
166174 if (atomType == "RelationAtomType")
@@ -185,7 +193,11 @@ ProjectM36Connection.prototype.generateAtomType = function(attr)
185193 var readableType = atomType.slice(0,-8);
186194 element.textContent += readableType;
187195 }
188− return element
196+ if(accessory)
197+ {
198+ element.textContent += accessory;
199+ }
200+ return element;
189201}
190202
191203ProjectM36Connection.prototype.generateRelationBody = function (body)
@@ -230,6 +242,33 @@ ProjectM36Connection.prototype.generateAtom = function(atom)
230242 return element;
231243}
232244
245+ProjectM36Connection.prototype.generateDataFrame = function(dataframe)
246+{
247+ for(var attrIndex=0; attrIndex < dataframe.attributes.length; attrIndex++)
248+ {
249+ var attr = dataframe.attributes[attrIndex];
250+ var ordering = "↕";
251+ for(var orderIndex=0; orderIndex < dataframe.orders.length; orderIndex++)
252+ {
253+ var order = dataframe.orders[orderIndex];
254+ if(order[0] == attr[0])
255+ {
256+ if(order[1] == "AscendingOrder")
257+ {
258+ ordering = "⬆";
259+ }
260+ else if(order[1] == "DescendingOrder")
261+ {
262+ ordering = "⬇";
263+ }
264+ }
265+ }
266+ dataframe.attributes[attrIndex].push(ordering);
267+ }
268+ return this.generateRelation([dataframe.attributes,
269+ {asList:dataframe.tuples}]);
270+}
271+
233272//special case to make sure that a table appears for "true" and "false"
234273function mungeEmptyRows()
235274{
@@ -249,4 +288,4 @@ function mungeEmptyRows()
249288 empty.appendChild(dudHeader);
250289 }
251290 }
252−}
291+}
src/bin/ProjectM36/Server/WebSocket/websocket-client.html+1−1
@@ -126,7 +126,7 @@ margin-bottom: 5pt;
126126 <li>:showrelvars</li>
127127 <li>:showexpr true</li>
128128 <li>:showexpr false</li>
129− <li>:importexample date</li>
129+ <li>:importexample cjdate</li>
130130 <li>:showexpr s join sp</li>
131131 <li>update s where city=&quot;Paris&quot; (status:=10)</li>
132132 <li>:showexpr s</li>
src/bin/ProjectM36/Server/WebSocket/websocket-client.js+7−1
@@ -30,6 +30,12 @@ function updateStatus(status)
3030 appendResult(tutd, relastable);
3131 mungeEmptyRows();
3232 }
33+ if(status.dataframe)
34+ {
35+ var dataframeastable = conn.generateDataFrame(status.dataframe);
36+ appendResult(tutd, dataframeastable);
37+ mungeEmptyRows();
38+ }
3339 if(status.acknowledgement)
3440 {
3541 var ok = document.createElement("span");
@@ -253,4 +259,4 @@ function pageload()
253259{
254260 installSampleHandlers();
255261 setupDefaultConfig();
256−}
262+}
src/bin/ProjectM36/Server/WebSocket/websocket-server.hs+49−12
@@ -1,26 +1,63 @@
1−import ProjectM36.Server.WebSocket
2−import ProjectM36.Server.Config
3−import ProjectM36.Server.ParseArgs
4−import ProjectM36.Server
1+{-# LANGUAGE CPP #-}
2+
53import Control.Concurrent
6−import qualified Network.WebSockets as WS
7−import Network.Transport.TCP (decodeEndPointAddress)
84import Control.Exception
5+import Control.Monad (when)
6+import Data.Maybe (isJust)
7+import Data.String (fromString)
8+import Network.HTTP.Types (status400)
9+import Network.Socket
10+import Network.Wai (Application, responseLBS)
11+import Network.Wai.Handler.Warp
12+import Network.Wai.Handler.WarpTLS (runTLS, tlsSettings)
13+import qualified Network.Wai.Handler.WebSockets as WS
14+import Network.WebSockets (defaultConnectionOptions)
15+import ProjectM36.Server
16+import ProjectM36.Server.Config
17+import ProjectM36.Server.ParseArgs
18+import ProjectM36.Server.WebSocket
919
1020main :: IO ()
1121main = do
1222 -- launch normal project-m36-server
1323 addressMVar <- newEmptyMVar
14− serverConfig <- parseConfigWithDefaults (defaultServerConfig { bindPort = 8000, bindHost = "127.0.0.1" })
24+ wsConfig <- parseWSConfigWithDefaults (defaultServerConfig {bindPort = 8000, bindHost = "127.0.0.1"})
25+
1526 --usurp the serverConfig for our websocket server and make the proxied server run locally
16− let wsHost = bindHost serverConfig
27+ let serverConfig = wsServerConfig wsConfig
28+ wsHost = bindHost serverConfig
1729 wsPort = bindPort serverConfig
1830 serverHost = "127.0.0.1"
1931 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+
2038 _ <- forkFinally (launchServer serverConfig' (Just addressMVar) >> pure ()) (either throwIO pure)
2139 --wait for server to be listening
22− address <- takeMVar addressMVar
23− let Just (_, serverPort, _) = decodeEndPointAddress address
24− --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
25− WS.runServer wsHost (fromIntegral wsPort) (websocketProxyServer (read serverPort) serverHost)
40+ addr <- takeMVar addressMVar
41+ let port =
42+ case addr of
43+ SockAddrInet port' _ -> fromIntegral port'
44+ _ -> error "unsupported socket address (IPv4 only currently)"
45+ wsApp = websocketProxyServer port serverHost
46+ waiApp = WS.websocketsOr defaultConnectionOptions wsApp backupApp
47+ settings = warpSettings wsHost (fromIntegral wsPort)
48+
49+ case (configCertificateFile, configKeyFile) of
50+ (Just certificate, Just key) -> runTLS (tlsSettings certificate key) settings waiApp
51+ _ -> runSettings settings waiApp
52+
53+backupApp :: Application
54+backupApp _ respond = respond $ responseLBS status400 [] "Not a WebSocket request"
2655
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+34−32
@@ -1,4 +1,4 @@
1−{-# LANGUAGE GADTs, LambdaCase #-}
1+{-# LANGUAGE GADTs, LambdaCase, CPP #-}
22module TutorialD.Interpreter where
33import TutorialD.Interpreter.Base
44import TutorialD.Interpreter.RODatabaseContextOperator
@@ -24,16 +24,17 @@ import ProjectM36.TransactionGraph
2424import qualified ProjectM36.Client as C
2525import ProjectM36.Relation (attributes)
2626
27−import Text.Megaparsec
28−import Text.Megaparsec.Text
2927import System.Console.Haskeline
3028import System.Directory (getHomeDirectory)
3129import qualified Data.Text as T
3230import System.IO (hPutStrLn, stderr)
31+#if __GLASGOW_HASKELL__ < 804
3332import Data.Monoid
33+#endif
3434import Data.List (isPrefixOf)
3535import Control.Exception
3636import System.Exit
37+import Data.Either (fromRight)
3738
3839{-
3940context ops are read-only operations which only operate on the database context (relvars and constraints)
@@ -61,7 +62,7 @@ interpreterParserP = safeInterpreterParserP <|>
6162 fmap ImportDBContextOp (tutdImportP <* eof) <|>
6263 fmap RelVarExportOp (exportCSVP <* eof) <|>
6364 fmap DatabaseContextIOExprOp (dbContextIOExprP <* eof)
64−
65+
6566-- the safe interpreter never reads or writes the file system
6667safeInterpreterParserP :: Parser ParsedOperation
6768safeInterpreterParserP = fmap RODatabaseContextOp (roDatabaseContextOperatorP <* eof) <|>
@@ -77,13 +78,13 @@ safeInterpreterParserP = fmap RODatabaseContextOp (roDatabaseContextOperatorP <*
7778promptText :: Either RelationalError HeadName -> Either RelationalError SchemaName -> StringType
7879promptText eHeadName eSchemaName = "TutorialD (" <> transInfo <> "): "
7980 where
80− transInfo = either (const "<unknown>") id eHeadName <> "/" <> either (const "<no schema>") id eSchemaName
81−
82−parseTutorialD :: T.Text -> Either (ParseError Char Dec) ParsedOperation
81+ transInfo = fromRight "<unknown>" eHeadName <> "/" <> fromRight "<no schema>" eSchemaName
82+
83+parseTutorialD :: T.Text -> Either ParserError ParsedOperation
8384parseTutorialD = parse interpreterParserP ""
8485
8586--only parse tutoriald which doesn't result in file I/O
86−safeParseTutorialD :: T.Text -> Either (ParseError Char Dec) ParsedOperation
87+safeParseTutorialD :: T.Text -> Either ParserError ParsedOperation
8788safeParseTutorialD = parse safeInterpreterParserP ""
8889
8990data SafeEvaluationFlag = SafeEvaluation | UnsafeEvaluation deriving (Eq)
@@ -106,20 +107,20 @@ evalTutorialDInteractive sessionId conn safe interactive expr = case expr of
106107 else
107108 pure res
108109 _ -> pure res
109−
110− (DatabaseContextExprOp execOp) ->
111− eHandler $ C.executeDatabaseContextExpr sessionId conn execOp
112−
113− (DatabaseContextIOExprOp execOp) ->
110+
111+ (DatabaseContextExprOp execOp) ->
112+ eHandler $ C.executeDatabaseContextExpr sessionId conn execOp
113+
114+ (DatabaseContextIOExprOp execOp) ->
114115 if needsSafe then
115116 unsafeError
116117 else
117118 eHandler $ C.executeDatabaseContextIOExpr sessionId conn execOp
118−
119+
119120 (GraphOp execOp) -> do
120121 -- warn if the graph op could cause uncommited changes to be discarded
121122 eIsDirty <- C.disconnectedTransactionIsDirty sessionId conn
122− let runGraphOp = eHandler $ C.executeGraphExpr sessionId conn execOp
123+ let runGraphOp = eHandler $ C.executeGraphExpr sessionId conn execOp
123124 settings = Settings {complete = noCompletion,
124125 historyFile = Nothing,
125126 autoAddHistory = False}
@@ -143,20 +144,20 @@ evalTutorialDInteractive sessionId conn safe interactive expr = case expr of
143144 pure (DisplayErrorResult "Graph operation cancelled.")
144145 else
145146 runGraphOp
146−
147+
147148 (ConvenienceGraphOp execOp) ->
148149 eHandler $ evalConvenienceGraphOp sessionId conn execOp
149150
150151 (ROGraphOp execOp) -> do
151152 opResult <- evalROGraphOp sessionId conn execOp
152− case opResult of
153+ case opResult of
153154 Left err -> barf err
154155 Right rel -> pure (DisplayRelationResult rel)
155−
156+
156157 (SchemaOp execOp) ->
157158 eHandler $ evalSchemaOperator sessionId conn execOp
158−
159− (ImportRelVarOp execOp@(RelVarDataImportOperator relVarName _ _)) ->
159+
160+ (ImportRelVarOp execOp@(RelVarDataImportOperator relVarName _ _)) ->
160161 if needsSafe then
161162 unsafeError
162163 else do
@@ -174,8 +175,8 @@ evalTutorialDInteractive sessionId conn safe interactive expr = case expr of
174175 case exprErr of
175176 Left err -> barf err
176177 Right dbexpr -> evalTutorialD sessionId conn safe (DatabaseContextExprOp dbexpr)
177−
178− (ImportDBContextOp execOp) ->
178+
179+ (ImportDBContextOp execOp) ->
179180 if needsSafe then
180181 unsafeError
181182 else do
@@ -183,15 +184,15 @@ evalTutorialDInteractive sessionId conn safe interactive expr = case expr of
183184 case eErr of
184185 Left err -> barf err
185186 Right dbexprs -> evalTutorialD sessionId conn safe (DatabaseContextExprOp dbexprs)
186−
187− (InfoOp execOp) ->
187+
188+ (InfoOp execOp) ->
188189 if needsSafe then
189190 unsafeError
190191 else
191192 case evalInformationOperator execOp of
192193 Left err -> pure (DisplayErrorResult err)
193194 Right info -> pure (DisplayResult info)
194−
195+
195196 (RelVarExportOp execOp@(RelVarDataExportOperator relExpr _ _)) ->
196197 --eval relexpr to relation and pass to export function
197198 if needsSafe then
@@ -215,19 +216,20 @@ evalTutorialDInteractive sessionId conn safe interactive expr = case expr of
215216 unsafeError = pure $ DisplayErrorResult "File I/O operation prohibited."
216217 barf :: RelationalError -> IO TutorialDOperatorResult
217218 barf (ScriptError (OtherScriptCompilationError errStr)) = pure (DisplayErrorResult (T.pack errStr))
219+ barf (ParseError err) = pure (DisplayErrorResult err)
218220 barf err = return $ DisplayErrorResult (T.pack (show err))
219221 eHandler io = do
220222 eErr <- io
221223 case eErr of
222224 Left err -> barf err
223225 Right () -> return QuietSuccessResult
224−
225−type GhcPkgPath = String
226+
227+type GhcPkgPath = String
226228type TutorialDExec = String
227229type CheckFS = Bool
228−
230+
229231data InterpreterConfig = LocalInterpreterConfig PersistenceStrategy HeadName (Maybe TutorialDExec) [GhcPkgPath] CheckFS |
230− RemoteInterpreterConfig C.NodeId C.DatabaseName HeadName (Maybe TutorialDExec) CheckFS
232+ RemoteInterpreterConfig C.Hostname C.Port C.DatabaseName HeadName (Maybe TutorialDExec) CheckFS
231233
232234outputNotificationCallback :: C.NotificationCallback
233235outputNotificationCallback notName evaldNot = hPutStrLn stderr $ "Notification received " ++ show notName ++ ":\n" ++ "\n" ++ prettyEvaluatedNotification evaldNot
@@ -256,12 +258,12 @@ reprLoop config sessionId conn = do
256258 Just line -> do
257259 runTutorialD sessionId conn (Just (T.length prompt)) (T.pack line)
258260 reprLoop config sessionId conn
259−
261+
260262
261263runTutorialD :: C.SessionId -> C.Connection -> Maybe PromptLength -> T.Text -> IO ()
262−runTutorialD sessionId conn mPromptLength tutd =
264+runTutorialD sessionId conn mPromptLength tutd =
263265 case parseTutorialD tutd of
264− Left err ->
266+ Left err ->
265267 displayOpResult $ DisplayParseErrorResult mPromptLength err
266268 Right parsed ->
267269 catchJust (\exc -> if exc == C.RequestTimeoutException then Just exc else Nothing) (do
src/bin/TutorialD/Interpreter/Base.hs+115−40
@@ -1,33 +1,61 @@
11{-# LANGUAGE DeriveGeneric, CPP #-}
2−module TutorialD.Interpreter.Base where
2+module TutorialD.Interpreter.Base (
3+ module TutorialD.Interpreter.Base,
4+ module Text.Megaparsec,
5+#if MIN_VERSION_megaparsec(6,0,0)
6+ module Text.Megaparsec.Char,
7+ module Control.Applicative
8+#else
9+ module Text.Megaparsec.Text
10+#endif
11+ )
12+ where
313import ProjectM36.Base
414import ProjectM36.AtomType
15+import ProjectM36.Attribute as A
516import ProjectM36.Relation
17+import ProjectM36.DataFrame
618
19+#if MIN_VERSION_megaparsec(6,0,0)
20+import Text.Megaparsec.Char
21+import qualified Text.Megaparsec.Char.Lexer as Lex
722import Text.Megaparsec
23+import Data.Void
24+import Control.Applicative hiding (many, some)
25+#else
826import Text.Megaparsec.Text
927import qualified Text.Megaparsec.Lexer as Lex
28+#endif
29+
1030import Data.Text hiding (count)
1131import System.Random
1232import qualified Data.Text as T
1333import qualified Data.List as L
14−import qualified Data.Vector as V
1534import qualified Data.Text.IO as TIO
1635import System.IO
1736import ProjectM36.Relation.Show.Term
1837import GHC.Generics
38+#if __GLASGOW_HASKELL__ < 804
1939import Data.Monoid
40+#endif
2041import qualified Data.UUID as U
2142import Control.Monad.Random
2243import Data.List.NonEmpty as NE
2344import Data.Time.Clock
2445import Data.Time.Format
46+import Control.Monad (void)
47+import Data.Char
48+
49+#if !MIN_VERSION_megaparsec(7,0,0)
50+anySingle :: Parsec Void Text (Token Text)
51+anySingle = anyChar
52+#endif
2553
2654displayOpResult :: TutorialDOperatorResult -> IO ()
2755displayOpResult QuitResult = return ()
2856displayOpResult (DisplayResult out) = TIO.putStrLn out
2957displayOpResult (DisplayIOResult ioout) = ioout
30−displayOpResult (DisplayErrorResult err) = let outputf = if T.length err > 0 && T.last err /= '\n' then TIO.hPutStrLn else TIO.hPutStr in
58+displayOpResult (DisplayErrorResult err) = let outputf = if T.length err > 0 && T.last err /= '\n' then TIO.hPutStrLn else TIO.hPutStr in
3159 outputf stderr ("ERR: " <> err)
3260displayOpResult QuietSuccessResult = return ()
3361displayOpResult (DisplayRelationResult rel) = do
@@ -35,22 +63,36 @@ displayOpResult (DisplayRelationResult rel) = do
3563 let randomlySortedRel = evalRand (randomizeTupleOrder rel) gen
3664 TIO.putStrLn (showRelation randomlySortedRel)
3765displayOpResult (DisplayParseErrorResult mPromptLength err) = do
38− let errString = T.pack (parseErrorPretty err)
39− errorIndent = unPos (sourceColumn (NE.head (errorPos err)))
66+#if MIN_VERSION_megaparsec(7,0,0)
67+ let errorIndent = errorOffset . NE.head . bundleErrors $ err
68+ errString = T.pack (parseErrorPretty . NE.head . bundleErrors $ err)
69+#else
70+ let errorIndent = unPos (sourceColumn (NE.head (errorPos err)))
71+ errString = T.pack (parseErrorPretty err)
72+#endif
4073 pointyString len = T.justifyRight (len + fromIntegral errorIndent) '_' "^"
4174 maybe (pure ()) (TIO.putStrLn . pointyString) mPromptLength
4275 TIO.putStr ("ERR:" <> errString)
76+displayOpResult (DisplayDataFrameResult dFrame) = TIO.putStrLn (showDataFrame dFrame)
4377
78+#if MIN_VERSION_megaparsec(6,0,0)
79+type Parser = Parsec Void Text
80+type ParseStr = Text
81+#else
82+type ParseStr = String
83+#endif
84+
85+-- consumes only horizontal spaces
4486spaceConsumer :: Parser ()
45−spaceConsumer = Lex.space (void spaceChar) (Lex.skipLineComment "--") (Lex.skipBlockComment "{-" "-}")
46−
87+spaceConsumer = Lex.space space1 (Lex.skipLineComment "--") (Lex.skipBlockComment "{-" "-}")
88+
4789opChar :: Parser Char
4890opChar = oneOf (":!#$%&*+./<=>?\\^|-~" :: String)-- remove "@" so it can be used as attribute marker without spaces
4991
50−reserved :: String -> Parser ()
92+reserved :: ParseStr -> Parser ()
5193reserved word = try (string word *> notFollowedBy opChar *> spaceConsumer)
5294
53−reservedOp :: String -> Parser ()
95+reservedOp :: ParseStr -> Parser ()
5496reservedOp op = try (spaceConsumer *> string op *> notFollowedBy opChar *> spaceConsumer)
5597
5698parens :: Parser a -> Parser a
@@ -62,12 +104,20 @@ braces = between (symbol "{") (symbol "}")
62104identifier :: Parser Text
63105identifier = do
64106 istart <- letterChar <|> char '_'
65− irest <- many (alphaNumChar <|> char '_' <|> char '#')
107+ identifierRemainder istart
108+
109+identifierRemainder :: Char -> Parser Text
110+identifierRemainder c = do
111+ rest <- many (alphaNumChar <|> char '_' <|> char '#')
66112 spaceConsumer
67− pure (pack (istart:irest))
113+ pure (pack (c:rest))
68114
69−symbol :: String -> Parser Text
115+symbol :: ParseStr -> Parser Text
116+#if MIN_VERSION_megaparsec(6,0,0)
117+symbol sym = Lex.symbol spaceConsumer sym
118+#else
70119symbol sym = pack <$> Lex.symbol spaceConsumer sym
120+#endif
71121
72122comma :: Parser Text
73123comma = symbol ","
@@ -87,67 +137,80 @@ arrow = symbol "->"
87137semi :: Parser Text
88138semi = symbol ";"
89139
90−{-
91−whiteSpace :: Parser ()
92−whiteSpace = Token.whiteSpace lexer
93−-}
140+nline :: Parser Text
141+nline = (T.singleton <$> newline) <|> crlf
94142
95143integer :: Parser Integer
96−integer = Lex.integer
144+#if MIN_VERSION_megaparsec(6,0,0)
145+integer = Lex.signed (pure ()) Lex.decimal <* spaceConsumer
146+#else
147+integer = Lex.signed (pure ()) Lex.integer <* spaceConsumer
148+#endif
149+
150+natural :: Parser Integer
151+#if MIN_VERSION_megaparsec(6,0,0)
152+natural = Lex.decimal <* spaceConsumer
153+#else
154+natural = Lex.integer <* spaceConsumer
155+#endif
97156
98157float :: Parser Double
99−float = Lex.float
158+float = Lex.float <* spaceConsumer
100159
101160capitalizedIdentifier :: Parser Text
102−capitalizedIdentifier = do
103− fletter <- upperChar
104− restOfIdentifier_ fletter
105−
106−restOfIdentifier_ :: Char -> Parser Text
107−restOfIdentifier_ fletter = do
108− rest <- option "" identifier
109− spaceConsumer
110− pure (T.cons fletter rest)
111−
161+capitalizedIdentifier =
162+ upperChar >>= identifierRemainder
163+
112164uncapitalizedIdentifier :: Parser Text
113−uncapitalizedIdentifier = do
114− fletter <- lowerChar
115− restOfIdentifier_ fletter
165+uncapitalizedIdentifier =
166+ lowerChar >>= identifierRemainder
116167
117168showRelationAttributes :: Attributes -> Text
118169showRelationAttributes attrs = "{" <> T.concat (L.intersperse ", " $ L.map showAttribute attrsL) <> "}"
119170 where
120− showAttribute (Attribute name atomType) = name <> " " <> prettyAtomType atomType
121− attrsL = V.toList attrs
171+ showAttribute (Attribute name atomType') = name <> " " <> prettyAtomType atomType'
172+ attrsL = A.toList attrs
173+
174+type PromptLength = Int
122175
123−type PromptLength = Int
176+#if MIN_VERSION_megaparsec(7,0,0)
177+type ParserError = ParseErrorBundle T.Text Void
178+#elif MIN_VERSION_megaparsec(6,0,0)
179+type ParserError = ParseError Char Void
180+#else
181+type ParserError = ParseError Char Dec
182+#endif
124183
125184data TutorialDOperatorResult = QuitResult |
126185 DisplayResult StringType |
127186 DisplayIOResult (IO ()) |
128187 DisplayRelationResult Relation |
188+ DisplayDataFrameResult DataFrame |
129189 DisplayErrorResult StringType |
130− DisplayParseErrorResult (Maybe PromptLength) (ParseError Char Dec) | -- Int refers to length of prompt text
190+ DisplayParseErrorResult (Maybe PromptLength) ParserError | -- PromptLength refers to length of prompt text
131191 QuietSuccessResult
132192 deriving (Generic)
133−
193+
134194type TransactionGraphWasUpdated = Bool
135195
136196--allow for python-style triple quoting because guessing the correct amount of escapes in different contexts is annoying
137197tripleQuotedString :: Parser Text
138198tripleQuotedString = do
139199 _ <- tripleQuote
140− pack <$> manyTill anyChar (try (tripleQuote >> notFollowedBy quote))
141−
200+ pack <$> manyTill anySingle (try (tripleQuote >> notFollowedBy quote))
201+
142202normalQuotedString :: Parser Text
143203normalQuotedString = quote *> (T.pack <$> manyTill Lex.charLiteral quote)
144204
145205quotedString :: Parser Text
146206quotedString = try tripleQuotedString <|> normalQuotedString
147207
208+quoted :: Parser a -> Parser a
209+quoted = between quote quote
210+
148211uuidP :: Parser U.UUID
149212uuidP = do
150− uuidStart <- count 8 hexDigitChar
213+ uuidStart <- count 8 hexDigitChar
151214 _ <- char '-' -- min 28 with no dashes, maximum 4 dashes
152215 uuidMid1 <- count 4 hexDigitChar
153216 _ <- char '-'
@@ -166,5 +229,17 @@ utcTimeP = do
166229 timeStr <- quotedString
167230 case parseTimeM True defaultTimeLocale "%Y-%m-%d %H:%M:%S" (T.unpack timeStr) of
168231 Nothing -> fail "invalid datetime input, use \"YYYY-MM-DD HH:MM:SS\""
169− Just stamp -> pure stamp
232+ Just stamp' -> pure stamp'
233+
234+
235+colonOp :: Text -> Parser ()
236+colonOp opStr = do
237+ _ <- string opStr <* (void spaceChar <|> eof) <* spaceConsumer
238+ pure ()
239+
240+hex :: Parser Text
241+hex = takeWhileP (Just "hexadecimal")
242+ (\c ->
243+ isDigit c
244+ || (c >= 'a' && c <= 'f'))
170245
src/bin/TutorialD/Interpreter/DatabaseContextExpr.hs+31−34
@@ -1,20 +1,20 @@
1+{-# LANGUAGE CPP #-}
12module TutorialD.Interpreter.DatabaseContextExpr where
2−import Text.Megaparsec
3−import Text.Megaparsec.Text
43import ProjectM36.Base
54import TutorialD.Interpreter.Base
65import qualified Data.Text as T
76import TutorialD.Interpreter.RelationalExpr
87import TutorialD.Interpreter.Types
98import qualified Data.Map as M
10−import Control.Monad.State
119import ProjectM36.StaticOptimizer
1210import qualified ProjectM36.Error as PM36E
1311import ProjectM36.Error
1412import qualified ProjectM36.RelationalExpression as RE
1513import ProjectM36.Key
1614import ProjectM36.FunctionalDependency
15+#if __GLASGOW_HASKELL__ < 804
1716import Data.Monoid
17+#endif
1818import Data.Functor
1919
2020--parsers which create "database expressions" which modify the database context (such as relvar assignment)
@@ -44,53 +44,47 @@ nothingP = spaceConsumer >> pure NoOperation
4444assignP :: Parser DatabaseContextExpr
4545assignP = do
4646 relVarName <- try $ do
47− relVarName <- identifier
47+ relVarName <- relVarNameP
4848 reservedOp ":="
4949 return relVarName
50− expr <- relExprP
51− pure $ Assign relVarName expr
50+ Assign relVarName <$> relExprP
5251
5352multilineSep :: Parser T.Text
5453multilineSep = newline >> pure "\n"
5554
5655multipleDatabaseContextExprP :: Parser DatabaseContextExpr
5756multipleDatabaseContextExprP = do
58− exprs <- sepBy1 databaseContextExprP semi
59− pure $ MultipleExpr exprs
57+ exprs <- filter (/= NoOperation) <$> sepBy1 databaseContextExprP semi
58+ pure (MultipleExpr exprs)
6059
6160insertP :: Parser DatabaseContextExpr
6261insertP = do
6362 reservedOp "insert"
64− relvar <- identifier
65− expr <- relExprP
66− pure $ Insert relvar expr
63+ relvar <- relVarNameP
64+ Insert relvar <$> relExprP
6765
6866defineP :: Parser DatabaseContextExpr
6967defineP = do
7068 relVarName <- try $ do
71− relVarName <- identifier
69+ relVarName <- relVarNameP
7270 reservedOp "::"
7371 return relVarName
74− attributeSet <- makeAttributeExprsP
75− pure $ Define relVarName attributeSet
72+ Define relVarName <$> makeAttributeExprsP
7673
7774undefineP :: Parser DatabaseContextExpr
7875undefineP = do
7976 reservedOp "undefine"
80− relVarName <- identifier
81− return $ Undefine relVarName
77+ Undefine <$> relVarNameP
8278
8379deleteP :: Parser DatabaseContextExpr
8480deleteP = do
8581 reservedOp "delete"
86− relVarName <- identifier
87− predicate <- option TruePredicate (reservedOp "where" *> restrictionPredicateP)
88− return $ Delete relVarName predicate
82+ Delete <$> relVarNameP <*> option TruePredicate (reservedOp "where" *> restrictionPredicateP)
8983
9084updateP :: Parser DatabaseContextExpr
9185updateP = do
9286 reservedOp "update"
93− relVarName <- identifier
87+ relVarName <- relVarNameP
9488 predicate <- option TruePredicate (reservedOp "where" *> restrictionPredicateP <* spaceConsumer)
9589 attributeAssignments <- M.fromList <$> parens (sepBy attributeAssignmentP comma)
9690 return $ Update relVarName attributeAssignments predicate
@@ -114,8 +108,7 @@ addConstraintP = do
114108deleteConstraintP :: Parser DatabaseContextExpr
115109deleteConstraintP = do
116110 reserved "deleteconstraint"
117− constraintName <- identifier
118− pure $ RemoveInclusionDependency constraintName
111+ RemoveInclusionDependency <$> identifier
119112
120113-- key <constraint name> {<uniqueness attributes>} <uniqueness relexpr>
121114keyP :: Parser DatabaseContextExpr
@@ -155,14 +148,12 @@ addNotificationP = do
155148 notName <- identifier
156149 triggerExpr <- relExprP
157150 resultOldExpr <- relExprP
158− resultNewExpr <- relExprP
159− pure $ AddNotification notName triggerExpr resultOldExpr resultNewExpr
151+ AddNotification notName triggerExpr resultOldExpr <$> relExprP
160152
161153removeNotificationP :: Parser DatabaseContextExpr
162154removeNotificationP = do
163155 reserved "unnotify"
164− notName <- identifier
165− pure $ RemoveNotification notName
156+ RemoveNotification <$> identifier
166157
167158-- | data Hair = Bald | Color Text
168159addTypeConstructorP :: Parser DatabaseContextExpr
@@ -176,7 +167,7 @@ addTypeConstructorP = do
176167removeTypeConstructorP :: Parser DatabaseContextExpr
177168removeTypeConstructorP = do
178169 reserved "undata"
179− RemoveTypeConstructor <$> identifier
170+ RemoveTypeConstructor <$> typeConstructorNameP
180171
181172removeAtomFunctionP :: Parser DatabaseContextExpr
182173removeAtomFunctionP = do
@@ -188,29 +179,35 @@ removeDatabaseContextFunctionP = do
188179 reserved "removedatabasecontextfunction"
189180 RemoveDatabaseContextFunction <$> quotedString
190181
182+functionNameP :: Parser AtomFunctionName
183+functionNameP = uncapitalizedIdentifier
184+
191185executeDatabaseContextFunctionP :: Parser DatabaseContextExpr
192186executeDatabaseContextFunctionP = do
193187 reserved "execute"
194− funcName <- identifier
188+ funcName <- functionNameP
195189 args <- parens (sepBy atomExprP comma)
196190 pure (ExecuteDatabaseContextFunction funcName args)
197191
198192databaseExprOpP :: Parser DatabaseContextExpr
199193databaseExprOpP = multipleDatabaseContextExprP
200194
195+{-
201196evalDatabaseContextExpr :: Bool -> DatabaseContext -> DatabaseContextExpr -> Either RelationalError DatabaseContext
202197evalDatabaseContextExpr useOptimizer context expr = do
203198 optimizedExpr <- evalState (applyStaticDatabaseOptimization expr) (RE.freshDatabaseState context)
204199 case runState (RE.evalDatabaseContextExpr (if useOptimizer then optimizedExpr else expr)) (RE.freshDatabaseState context) of
205200 (Right (), (context',_, _)) -> Right context'
206201 (Left err, _) -> Left err
202+-}
207203
208−
209−interpretDatabaseContextExpr :: DatabaseContext -> T.Text -> Either RelationalError DatabaseContext
210−interpretDatabaseContextExpr context tutdstring = case parse databaseExprOpP "" tutdstring of
211− Left err -> Left $ PM36E.ParseError (T.pack (show err))
212− Right parsed ->
213− evalDatabaseContextExpr True context parsed
204+interpretDatabaseContextExpr :: DatabaseContext -> TransactionId -> TransactionGraph -> T.Text -> Either RelationalError DatabaseContext
205+interpretDatabaseContextExpr context transId graph tutdstring =
206+ case parse databaseExprOpP "" tutdstring of
207+ Left err -> Left $ PM36E.ParseError (T.pack (show err))
208+ Right parsed -> do
209+ let env = RE.mkDatabaseContextEvalEnv transId graph
210+ RE.dbc_context <$> RE.runDatabaseContextEvalMonad context env (optimizeAndEvalDatabaseContextExpr True parsed)
214211
215212{-
216213--no optimization
src/bin/TutorialD/Interpreter/DatabaseContextIOOperator.hs+27−8
@@ -1,11 +1,8 @@
11--compiling the script requires the IO monad because it must load modules from the filesystem, so we create the function and generate the requisite DatabaseExpr here.
22module TutorialD.Interpreter.DatabaseContextIOOperator where
33import ProjectM36.Base
4−
54import TutorialD.Interpreter.Base
65import TutorialD.Interpreter.Types
7−import Text.Megaparsec
8−import Text.Megaparsec.Text
96import Data.Text
107
118addAtomFunctionExprP :: Parser DatabaseContextIOExpr
@@ -13,19 +10,41 @@ addAtomFunctionExprP = dbioexprP "addatomfunction" AddAtomFunction
1310
1411addDatabaseContextFunctionExprP :: Parser DatabaseContextIOExpr
1512addDatabaseContextFunctionExprP = dbioexprP "adddatabasecontextfunction" AddDatabaseContextFunction
13+
14+createArbitraryRelationP :: Parser DatabaseContextIOExpr
15+createArbitraryRelationP = do
16+ reserved "createarbitraryrelation"
17+ relVarName <- identifier
18+ attrExprs <- makeAttributeExprsP :: Parser [AttributeExpr]
19+ min' <- fromInteger <$> integer
20+ _ <- symbol "-"
21+ max' <- fromInteger <$> integer
22+ pure $ CreateArbitraryRelation relVarName attrExprs (min',max')
1623
17−dbioexprP :: String -> (Text -> [TypeConstructor] -> Text -> DatabaseContextIOExpr) -> Parser DatabaseContextIOExpr
24+dbioexprP :: ParseStr -> (Text -> [TypeConstructor] -> Text -> DatabaseContextIOExpr) -> Parser DatabaseContextIOExpr
1825dbioexprP res adt = do
1926 reserved res
2027 funcName <- quotedString
2128 funcType <- atomTypeSignatureP
22− funcScript <- quotedString
23− pure $ adt funcName funcType funcScript
29+ adt funcName funcType <$> quotedString
2430
2531atomTypeSignatureP :: Parser [TypeConstructor]
2632atomTypeSignatureP = sepBy typeConstructorP arrow
2733
2834dbContextIOExprP :: Parser DatabaseContextIOExpr
29−dbContextIOExprP = addAtomFunctionExprP <|> addDatabaseContextFunctionExprP
30−
35+dbContextIOExprP = addAtomFunctionExprP <|>
36+ addDatabaseContextFunctionExprP <|>
37+ loadAtomFunctionsP <|>
38+ loadDatabaseContextFunctionsP <|>
39+ createArbitraryRelationP
40+
41+loadAtomFunctionsP :: Parser DatabaseContextIOExpr
42+loadAtomFunctionsP = do
43+ reserved "loadatomfunctions"
44+ LoadAtomFunctions <$> quotedString <*> quotedString <*> fmap unpack quotedString
45+
46+loadDatabaseContextFunctionsP :: Parser DatabaseContextIOExpr
47+loadDatabaseContextFunctionsP = do
48+ reserved "loaddatabasecontextfunctions"
49+ LoadDatabaseContextFunctions <$> quotedString <*> quotedString <*> fmap unpack quotedString
3150
src/bin/TutorialD/Interpreter/Export/Base.hs+3
@@ -1,7 +1,10 @@
1+{-# LANGUAGE CPP #-}
12module TutorialD.Interpreter.Export.Base where
23import ProjectM36.Base
34import ProjectM36.Error
5+#if __GLASGOW_HASKELL__ < 804
46import Data.Monoid
7+#endif
58
69data RelVarDataExportOperator = RelVarDataExportOperator RelationalExpr FilePath (RelVarDataExportOperator -> Relation -> IO (Maybe RelationalError))
710
src/bin/TutorialD/Interpreter/Export/CSV.hs+1−2
@@ -2,10 +2,9 @@ module TutorialD.Interpreter.Export.CSV where
22import ProjectM36.Relation.Show.CSV
33import TutorialD.Interpreter.Export.Base
44import TutorialD.Interpreter.RelationalExpr
5−import TutorialD.Interpreter.Base
5+import TutorialD.Interpreter.Base hiding (try)
66import ProjectM36.Base
77import ProjectM36.Error
8−import Text.Megaparsec.Text
98import qualified Data.ByteString.Lazy as BS
109import Control.Exception (try)
1110import qualified Data.Text as T
src/bin/TutorialD/Interpreter/Import/Base.hs+11−3
@@ -1,7 +1,12 @@
1+{-# LANGUAGE CPP #-}
12module TutorialD.Interpreter.Import.Base where
23import ProjectM36.Base
34import ProjectM36.Error
5+import Text.URI (URI)
6+import Data.Text (Text)
7+#if __GLASGOW_HASKELL__ < 804
48import Data.Monoid
9+#endif
510
611-- | import data into a relation variable
712data RelVarDataImportOperator = RelVarDataImportOperator RelVarName FilePath (RelVarName -> TypeConstructorMapping -> Attributes -> FilePath -> IO (Either RelationalError DatabaseContextExpr))
@@ -9,11 +14,14 @@ data RelVarDataImportOperator = RelVarDataImportOperator RelVarName FilePath (Re
914instance Show RelVarDataImportOperator where
1015 show (RelVarDataImportOperator rv path _) = "RelVarDataImportOperator " <> show rv <> " " <> path
1116
17+type HashVerification = Maybe Text
18+
1219-- | import data into a database context
13−data DatabaseContextDataImportOperator = DatabaseContextDataImportOperator FilePath (FilePath -> IO (Either RelationalError DatabaseContextExpr))
20+data DatabaseContextDataImportOperator = DatabaseContextDataImportOperator URI HashVerification (URI -> HashVerification -> IO (Either RelationalError DatabaseContextExpr))
1421
1522instance Show DatabaseContextDataImportOperator where
16− show (DatabaseContextDataImportOperator path _) = "DatabaseContextDataImportOperator " <> path
23+ show (DatabaseContextDataImportOperator uri hash _) =
24+ "DatabaseContextDataImportOperator " <> show uri <> " " <> show hash
1725
1826-- perhaps create a structure to import a whole transaction graph section in the future
1927
@@ -21,4 +29,4 @@ evalRelVarDataImportOperator :: RelVarDataImportOperator -> TypeConstructorMappi
2129evalRelVarDataImportOperator (RelVarDataImportOperator relVarName path importFunc) tConsMap attrs = importFunc relVarName tConsMap attrs path
2230
2331evalDatabaseContextDataImportOperator :: DatabaseContextDataImportOperator -> IO (Either RelationalError DatabaseContextExpr)
24−evalDatabaseContextDataImportOperator (DatabaseContextDataImportOperator path importFunc) = importFunc path
32+evalDatabaseContextDataImportOperator (DatabaseContextDataImportOperator uri hash importFunc) = importFunc uri hash
src/bin/TutorialD/Interpreter/Import/BasicExamples.hs+6−2
@@ -1,10 +1,14 @@
1+{-# LANGUAGE CPP #-}
12--includes some hardcoded examples which can be imported even during safe evaluation (no file I/O)
23module TutorialD.Interpreter.Import.BasicExamples where
34import ProjectM36.DateExamples
45import ProjectM36.Base
56import ProjectM36.DatabaseContext
67import TutorialD.Interpreter.Base
8+
9+#if !MIN_VERSION_megaparsec(6,0,0)
710import Text.Megaparsec.Text
11+#endif
812
913data ImportBasicExampleOperator = ImportBasicDateExampleOperator
1014 deriving (Show)
@@ -16,8 +20,8 @@ importBasicExampleOperatorP :: Parser ImportBasicExampleOperator
1620importBasicExampleOperatorP = do
1721 reservedOp ":importexample"
1822 example <- identifier
19− if example == "date" then
23+ if example == "cjdate" then
2024 pure ImportBasicDateExampleOperator
2125 else
2226 fail "Unknown example name"
23−
27+
src/bin/TutorialD/Interpreter/Import/CSV.hs+5−5
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12module TutorialD.Interpreter.Import.CSV where
23import TutorialD.Interpreter.Import.Base
34import ProjectM36.Base
@@ -5,8 +6,7 @@ import ProjectM36.Error
56import ProjectM36.Relation.Parse.CSV hiding (quotedString)
67import qualified Data.ByteString.Lazy as BS
78import qualified Data.Text as T
8−import Text.Megaparsec.Text
9−import TutorialD.Interpreter.Base
9+import TutorialD.Interpreter.Base hiding (try)
1010import Control.Exception
1111
1212importCSVRelation :: RelVarName -> TypeConstructorMapping -> Attributes -> FilePath -> IO (Either RelationalError DatabaseContextExpr)
@@ -14,10 +14,10 @@ importCSVRelation relVarName tConsMap attrs pathIn = do
1414 --TODO: handle filesystem errors
1515 csvData <- try (BS.readFile pathIn) :: IO (Either IOError BS.ByteString)
1616 case csvData of
17− Left err -> return $ Left (ImportError $ T.pack (show err))
17+ Left err -> pure $ Left (ImportError (ImportFileError (T.pack (show err))))
1818 Right csvData' -> case csvAsRelation attrs tConsMap csvData' of
19− Left err -> return $ Left (ParseError $ T.pack (show err))
20− Right csvRel -> return $ Right (Insert relVarName (ExistingRelation csvRel))
19+ Left err -> pure $ Left (ParseError $ T.pack (show err))
20+ Right csvRel -> pure $ Right (Insert relVarName (ExistingRelation csvRel))
2121
2222importCSVP :: Parser RelVarDataImportOperator
2323importCSVP = do
src/bin/TutorialD/Interpreter/Import/TutorialD.hs+70−15
@@ -1,31 +1,86 @@
11module TutorialD.Interpreter.Import.TutorialD where
22import ProjectM36.Base
33import TutorialD.Interpreter.Import.Base
4−import TutorialD.Interpreter.Base
4+import TutorialD.Interpreter.Base hiding (try)
55import TutorialD.Interpreter.DatabaseContextExpr
6−import Text.Megaparsec.Text
7−import Text.Megaparsec hiding (try)
86import ProjectM36.Error
97import qualified ProjectM36.Error as PM36E
108import qualified Data.Text as T
119import Control.Exception
12−import qualified Data.Text.IO as TIO
13−--import a file containing TutorialD database context expressions
10+import qualified Data.ByteString as BS
11+import 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
1419
15−importTutorialD :: FilePath -> IO (Either RelationalError DatabaseContextExpr)
16−importTutorialD pathIn = do
17− tutdData <- try (TIO.readFile pathIn) :: IO (Either IOError T.Text)
18− case tutdData of
19− Left err -> return $ Left (ImportError $ T.pack (show err))
20− Right tutdData' ->
21− case parse multipleDatabaseContextExprP "import" tutdData' of
20+importTutorialDFromFile :: URI -> HashVerification -> IO (Either RelationalError DatabaseContextExpr)
21+importTutorialDFromFile fileURI mHash = do
22+ case URI.uriPath fileURI of
23+ Just (False, _) -> do
24+ eTutdBytes <- try (BS.readFile filePath) :: IO (Either IOError BS.ByteString)
25+ case eTutdBytes of
26+ Left err -> pure $ Left (ImportError (ImportFileError (T.pack (show err))))
27+ Right tutdBytes ->
28+ case validateBytes tutdBytes mHash of
29+ Left err -> pure (Left err)
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
39+ Left err -> pure (Left (ImportError (ImportFileDecodeError (T.pack (show err)))))
40+ Right tutdUtf8 ->
41+ case parse (multipleDatabaseContextExprP <* eof) "import" tutdUtf8 of
2242 --parseErrorPretty is new in megaparsec 5
23− Left err -> pure (Left (PM36E.ParseError (T.pack (show err))))
43+ Left err -> pure (Left (PM36E.ParseError (T.pack (errorBundlePretty err))))
2444 Right expr -> pure (Right expr)
2545
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+
2675tutdImportP :: Parser DatabaseContextDataImportOperator
2776tutdImportP = do
2877 reserved ":importtutd"
29− path <- quotedString
78+ uri <- quoted URI.parser
3079 spaceConsumer
31− return $ DatabaseContextDataImportOperator (T.unpack path) importTutorialD
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
src/bin/TutorialD/Interpreter/InformationOperator.hs+5−1
@@ -2,8 +2,12 @@
22module TutorialD.Interpreter.InformationOperator where
33import Data.Text
44import Text.Megaparsec
5−import Text.Megaparsec.Text
65import TutorialD.Interpreter.Base
6+-- older versions of stack fail to
7+#if !defined(VERSION_project_m36)
8+# warning Failed to discover proper version from cabal_macros.h
9+# define VERSION_project_m36 "<unknown>"
10+#endif
711
812-- this module provides information about the current interpreter
913
src/bin/TutorialD/Interpreter/RODatabaseContextOperator.hs+94−25
@@ -1,14 +1,16 @@
11{-# LANGUAGE GADTs #-}
22module TutorialD.Interpreter.RODatabaseContextOperator where
33import ProjectM36.Base
4+import ProjectM36.Relation
5+import qualified ProjectM36.DataFrame as DF
46import ProjectM36.Error
7+import ProjectM36.Tuple
58import ProjectM36.InclusionDependency
69import qualified ProjectM36.Client as C
7−import Text.Megaparsec
8−import Text.Megaparsec.Text
910import TutorialD.Interpreter.Base
1011import TutorialD.Interpreter.RelationalExpr
1112import TutorialD.Interpreter.DatabaseContextExpr
13+import TutorialD.Printer
1214import Control.Monad.State
1315import qualified Data.Text as T
1416import ProjectM36.Relation.Show.Gnuplot
@@ -20,53 +22,57 @@ data RODatabaseContextOperator where
2022 ShowRelation :: RelationalExpr -> RODatabaseContextOperator
2123 PlotRelation :: RelationalExpr -> RODatabaseContextOperator
2224 ShowRelationType :: RelationalExpr -> RODatabaseContextOperator
23− ShowConstraint :: StringType -> RODatabaseContextOperator
25+ ShowConstraints :: StringType -> RODatabaseContextOperator
2426 ShowPlan :: DatabaseContextExpr -> RODatabaseContextOperator
2527 ShowTypes :: RODatabaseContextOperator
2628 ShowRelationVariables :: RODatabaseContextOperator
29+ ShowAtomFunctions :: RODatabaseContextOperator
30+ ShowDatabaseContextFunctions :: RODatabaseContextOperator
31+ ShowDataFrame :: DF.DataFrameExpr -> RODatabaseContextOperator
2732 Quit :: RODatabaseContextOperator
2833 deriving (Show)
2934
3035typeP :: Parser RODatabaseContextOperator
3136typeP = do
32− reservedOp ":type"
33− expr <- relExprP
34− return $ ShowRelationType expr
37+ colonOp ":type"
38+ ShowRelationType <$> relExprP
3539
3640showRelP :: Parser RODatabaseContextOperator
3741showRelP = do
38− reservedOp ":showexpr"
39− expr <- relExprP
40− return $ ShowRelation expr
42+ colonOp ":showexpr"
43+ ShowRelation <$> relExprP
4144
4245showPlanP :: Parser RODatabaseContextOperator
4346showPlanP = do
44− reservedOp ":showplan"
45− expr <- databaseContextExprP
46− return $ ShowPlan expr
47+ colonOp ":showplan"
48+ ShowPlan <$> databaseContextExprP
4749
4850showTypesP :: Parser RODatabaseContextOperator
49−showTypesP = reserved ":showtypes" >> pure ShowTypes
51+showTypesP = colonOp ":showtypes" >> pure ShowTypes
5052
5153showRelationVariables :: Parser RODatabaseContextOperator
52−showRelationVariables = reserved ":showrelvars" >> pure ShowRelationVariables
54+showRelationVariables = colonOp ":showrelvars" >> pure ShowRelationVariables
55+
56+showAtomFunctionsP :: Parser RODatabaseContextOperator
57+showAtomFunctionsP = colonOp ":showatomfunctions" >> pure ShowAtomFunctions
58+
59+showDatabaseContextFunctionsP :: Parser RODatabaseContextOperator
60+showDatabaseContextFunctionsP = colonOp ":showdatabasecontextfunctions" >> pure ShowDatabaseContextFunctions
5361
5462quitP :: Parser RODatabaseContextOperator
5563quitP = do
56− reservedOp ":quit"
64+ colonOp ":quit"
5765 return Quit
5866
5967showConstraintsP :: Parser RODatabaseContextOperator
6068showConstraintsP = do
61− reservedOp ":constraints"
62− constraintName <- option "" identifier
63− return $ ShowConstraint constraintName
69+ colonOp ":constraints"
70+ ShowConstraints <$> option "" identifier
6471
6572plotRelExprP :: Parser RODatabaseContextOperator
6673plotRelExprP = do
67− reserved ":plotexpr"
68− expr <- relExprP
69− return $ PlotRelation expr
74+ colonOp ":plotexpr"
75+ PlotRelation <$> relExprP
7076
7177roDatabaseContextOperatorP :: Parser RODatabaseContextOperator
7278roDatabaseContextOperatorP = typeP
@@ -76,6 +82,9 @@ roDatabaseContextOperatorP = typeP
7682 <|> showConstraintsP
7783 <|> showPlanP
7884 <|> showTypesP
85+ <|> showAtomFunctionsP
86+ <|> showDatabaseContextFunctionsP
87+ <|> showDataFrameP
7988 <|> quitP
8089
8190--logically, these read-only operations could happen purely, but not if a remote call is required
@@ -100,15 +109,16 @@ evalRODatabaseContextOp sessionId conn (PlotRelation expr) = do
100109 err <- plotRelation rel
101110 when (isJust err) $ print err
102111
103−evalRODatabaseContextOp sessionId conn (ShowConstraint name) = do
112+evalRODatabaseContextOp sessionId conn (ShowConstraints name) = do
104113 eIncDeps <- C.inclusionDependencies sessionId conn
105114 let val = case eIncDeps of
106115 Left err -> Left err
107116 Right incDeps -> case name of
108− "" -> inclusionDependenciesAsRelation incDeps
117+ "" -> inclusionDependenciesAsRelation incDeps >>= renderRelExprsInIncDeps
109118 depName -> case M.lookup depName incDeps of
110119 Nothing -> Left (InclusionDependencyNameNotInUseError depName)
111− Just dep -> inclusionDependenciesAsRelation (M.singleton depName dep)
120+ Just dep ->
121+ inclusionDependenciesAsRelation (M.singleton depName dep) >>= renderRelExprsInIncDeps
112122 pure $ case val of
113123 Left err -> DisplayErrorResult (T.pack (show err))
114124 Right rel -> DisplayRelationResult rel
@@ -130,7 +140,25 @@ evalRODatabaseContextOp sessionId conn ShowRelationVariables = do
130140 case eRel of
131141 Left err -> pure $ DisplayErrorResult (T.pack (show err))
132142 Right rel -> evalRODatabaseContextOp sessionId conn (ShowRelation (ExistingRelation rel))
143+
144+evalRODatabaseContextOp sessionId conn ShowAtomFunctions = do
145+ eRel <- C.atomFunctionsAsRelation sessionId conn
146+ case eRel of
147+ Left err -> pure $ DisplayErrorResult (T.pack (show err))
148+ Right rel -> evalRODatabaseContextOp sessionId conn (ShowRelation (ExistingRelation rel))
149+
150+evalRODatabaseContextOp sessionId conn ShowDatabaseContextFunctions = do
151+ eRel <- C.databaseContextFunctionsAsRelation sessionId conn
152+ case eRel of
153+ Left err -> pure $ DisplayErrorResult (T.pack (show err))
154+ Right rel -> evalRODatabaseContextOp sessionId conn (ShowRelation (ExistingRelation rel))
133155
156+evalRODatabaseContextOp sessionId conn (ShowDataFrame dfExpr) = do
157+ eDataFrame <- C.executeDataFrameExpr sessionId conn dfExpr
158+ case eDataFrame of
159+ Left err -> pure (DisplayErrorResult (T.pack (show err)))
160+ Right dframe -> pure (DisplayDataFrameResult dframe)
161+
134162evalRODatabaseContextOp _ _ Quit = pure QuitResult
135163
136164interpretRODatabaseContextOp :: C.SessionId -> C.Connection -> T.Text -> IO TutorialDOperatorResult
@@ -138,4 +166,45 @@ interpretRODatabaseContextOp sessionId conn tutdstring = case parse roDatabaseCo
138166 Left err -> pure $ DisplayErrorResult (T.pack (show err))
139167 Right parsed -> evalRODatabaseContextOp sessionId conn parsed
140168
141−
169+showDataFrameP :: Parser RODatabaseContextOperator
170+showDataFrameP = do
171+ colonOp ":showdataframe"
172+ relExpr <- relExprP
173+ reservedOp "orderby"
174+ attrOrdersExpr <- attrOrdersExprP
175+ mbOffset <- optional offsetP
176+ mbLimit <- optional limitP
177+ pure $ ShowDataFrame (DF.DataFrameExpr relExpr attrOrdersExpr mbOffset mbLimit)
178+
179+
180+offsetP :: Parser Integer
181+offsetP = do
182+ reservedOp "offset"
183+ natural
184+
185+limitP :: Parser Integer
186+limitP = do
187+ reservedOp "limit"
188+ natural
189+
190+attrOrdersExprP :: Parser [DF.AttributeOrderExpr]
191+attrOrdersExprP = braces (sepBy attrOrderExprP comma)
192+
193+attrOrderExprP :: Parser DF.AttributeOrderExpr
194+attrOrderExprP = DF.AttributeOrderExpr <$> identifier <*> orderP
195+
196+orderP :: Parser DF.Order
197+orderP = 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+94−71
@@ -1,8 +1,12 @@
1+{-# LANGUAGE CPP #-}
12module TutorialD.Interpreter.RelationalExpr where
23import Text.Megaparsec
4+#if MIN_VERSION_megaparsec(7,0,0)
5+import Control.Monad.Combinators.Expr
6+#else
37import Text.Megaparsec.Expr
8+#endif
49import ProjectM36.Base
5−import Text.Megaparsec.Text
610import TutorialD.Interpreter.Base
711import TutorialD.Interpreter.Types
812import qualified Data.Text as T
@@ -11,40 +15,38 @@ import qualified Data.Map as M
1115import Data.List (sort)
1216import ProjectM36.MiscUtils
1317
14−class RelationalMarkerExpr a where
15− parseMarkerP :: Parser a
16−
17−instance RelationalMarkerExpr () where
18− parseMarkerP = pure ()
19−
2018--used in projection
2119attributeListP :: RelationalMarkerExpr a => Parser (AttributeNamesBase a)
22−attributeListP =
20+attributeListP =
2321 (reservedOp "all but" >>
24− InvertedAttributeNames . S.fromList <$> sepBy identifier comma) <|>
22+ InvertedAttributeNames . S.fromList <$> sepBy attributeNameP comma) <|>
23+
2524 (reservedOp "all from" >>
2625 RelationalExprAttributeNames <$> relExprP) <|>
27− (AttributeNames . S.fromList <$> sepBy identifier comma)
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)
34+
2835
2936makeRelationP :: RelationalMarkerExpr a => Parser (RelationalExprBase a)
3037makeRelationP = do
3138 reserved "relation"
3239 attrExprs <- try (fmap Just makeAttributeExprsP) <|> pure Nothing
3340 tupleExprs <- braces (sepBy tupleExprP comma) <|> pure []
34− pure $ MakeRelationFromExprs attrExprs tupleExprs
41+ marker <- parseMarkerP
42+ pure $ MakeRelationFromExprs attrExprs (TupleExprs marker tupleExprs)
3543
36−--used in relation creation
37−makeAttributeExprsP :: RelationalMarkerExpr a => Parser [AttributeExprBase a]
38−makeAttributeExprsP = braces (sepBy attributeAndTypeNameP comma)
3944
40−attributeAndTypeNameP :: RelationalMarkerExpr a => Parser (AttributeExprBase a)
41−attributeAndTypeNameP = AttributeAndTypeNameExpr <$> identifier <*> typeConstructorP <*> parseMarkerP
42−
4345--abstract data type parser- in this context, the type constructor must not include any type arguments
4446--Either Text Int
4547adTypeConstructorP :: Parser TypeConstructor
4648adTypeConstructorP = do
47− tConsName <- capitalizedIdentifier
49+ tConsName <- typeConstructorNameP
4850 tConsArgs <- many typeConstructorP
4951 pure $ ADTypeConstructor tConsName tConsArgs
5052
@@ -54,27 +56,25 @@ tupleExprP = do
5456 attrAssocs <- braces (sepBy tupleAtomExprP comma)
5557 --detect duplicate attribute names
5658 let dupAttrNames = dupes (sort (map fst attrAssocs))
57− if not (null dupAttrNames) then
59+ if not (null dupAttrNames) then
5860 fail ("Attribute names duplicated: " ++ show dupAttrNames)
5961 else
6062 pure (TupleExpr (M.fromList attrAssocs))
6163
6264tupleAtomExprP :: RelationalMarkerExpr a => Parser (AttributeName, AtomExprBase a)
6365tupleAtomExprP = do
64− attributeName <- identifier
66+ attributeName <- attributeNameP
6567 atomExpr <- atomExprP
6668 pure (attributeName, atomExpr)
67−
69+
6870projectP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a)
69−projectP = do
70− attrs <- braces attributeListP
71− pure $ Project attrs
71+projectP = Project <$> braces attributeListP
7272
7373renameClauseP :: Parser (T.Text, T.Text)
7474renameClauseP = do
75− oldAttr <- identifier
75+ oldAttr <- attributeNameP
7676 reservedOp "as"
77− newAttr <- identifier
77+ newAttr <- attributeNameP
7878 pure (oldAttr, newAttr)
7979
8080renameP :: Parser (RelationalExprBase a -> RelationalExprBase a)
@@ -83,7 +83,7 @@ renameP = do
8383 renameList <- braces (sepBy renameClauseP comma)
8484 case renameList of
8585 [] -> pure (Restrict TruePredicate) --no-op when rename list is empty
86− renames ->
86+ renames ->
8787 pure $ \expr -> foldl (\acc (oldAttr, newAttr) -> Rename oldAttr newAttr acc) expr renames
8888
8989whereClauseP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a)
@@ -93,7 +93,7 @@ groupClauseP :: RelationalMarkerExpr a => Parser (AttributeNamesBase a, T.Text)
9393groupClauseP = do
9494 attrs <- braces attributeListP
9595 reservedOp "as"
96− newAttrName <- identifier
96+ newAttrName <- attributeNameP
9797 pure (attrs, newAttrName)
9898
9999groupP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a)
@@ -106,28 +106,30 @@ groupP = do
106106ungroupP :: Parser (RelationalExprBase a -> RelationalExprBase a)
107107ungroupP = do
108108 reservedOp "ungroup"
109− rvaAttrName <- identifier
110− pure $ Ungroup rvaAttrName
109+ Ungroup <$> attributeNameP
111110
112111extendP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a)
113112extendP = do
114113 reservedOp ":"
115− tupleExpr <- braces extendTupleExpressionP
116− return $ Extend tupleExpr
117−
114+ extends <- braces (sepBy extendTupleExpressionP comma)
115+ case extends of
116+ [] -> pure (Restrict TruePredicate)
117+ extends' ->
118+ pure $ \expr -> foldl (flip Extend) expr extends'
119+
118120semijoinP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a -> RelationalExprBase a)
119121semijoinP = do
120122 reservedOp "semijoin" <|> reservedOp "matching"
121− pure (\exprA exprB ->
123+ pure (\exprA exprB ->
122124 Project (RelationalExprAttributeNames exprA) (Join exprA exprB))
123−
124−antijoinP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a -> RelationalExprBase a)
125+
126+antijoinP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a -> RelationalExprBase a)
125127antijoinP = do
126128 reservedOp "not matching" <|> reservedOp "antijoin"
127129 pure (\exprA exprB ->
128130 Difference exprA (
129131 Project (RelationalExprAttributeNames exprA) (Join exprA exprB)))
130−
132+
131133relOperators :: RelationalMarkerExpr a => [[Operator Parser (RelationalExprBase a)]]
132134relOperators = [
133135 [Postfix projectP],
@@ -140,15 +142,23 @@ relOperators = [
140142 [InfixL antijoinP],
141143 [InfixL (reservedOp "union" >> return Union)],
142144 [InfixL (reservedOp "minus" >> return Difference)],
143− [InfixN (reservedOp "=" >> return Equals)],
145+ [InfixN (reservedOp "=" >> return Equals),
146+ InfixN (reservedOp "/=" >> return NotEquals)],
144147 [Postfix extendP]
145148 ]
146149
147150relExprP :: RelationalMarkerExpr a => Parser (RelationalExprBase a)
148−relExprP = makeExprParser relTerm relOperators
151+relExprP = try withMacroExprP <|> makeExprParser relTerm relOperators
152+
153+--allow for additional characters
154+attributeNameP :: Parser AttributeName
155+attributeNameP = uncapitalizedIdentifier
156+
157+relVarNameP :: Parser RelVarName
158+relVarNameP = uncapitalizedIdentifier
149159
150160relVarP :: RelationalMarkerExpr a => Parser (RelationalExprBase a)
151−relVarP = RelationVariable <$> identifier <*> parseMarkerP
161+relVarP = RelationVariable <$> relVarNameP <*> parseMarkerP
152162
153163relTerm :: RelationalMarkerExpr a => Parser (RelationalExprBase a)
154164relTerm = parens relExprP
@@ -169,17 +179,15 @@ restrictionPredicateP = makeExprParser predicateTerm predicateOperators
169179 <|> relationalBooleanExprP
170180
171181relationalBooleanExprP :: RelationalMarkerExpr a => Parser (RestrictionPredicateExprBase a)
172−relationalBooleanExprP = do
173− relexpr <- parens relExprP <|> relTerm
182+relationalBooleanExprP =
174183 --we can't actually detect if the type is relational boolean, so we just pass it to the next phase
175− return $ RelationalExprPredicate relexpr
176−
184+ RelationalExprPredicate <$> (parens relExprP <|> relTerm)
185+
177186restrictionAttributeEqualityP :: RelationalMarkerExpr a => Parser (RestrictionPredicateExprBase a)
178187restrictionAttributeEqualityP = do
179− attributeName <- identifier
188+ attributeName <- attributeNameP
180189 reservedOp "="
181− atomexpr <- atomExprP
182− return $ AttributeEqualityPredicate attributeName atomexpr
190+ AttributeEqualityPredicate attributeName <$> atomExprP
183191
184192restrictionAtomExprP :: RelationalMarkerExpr a=> Parser (RestrictionPredicateExprBase a) --atoms which are of type "boolean"
185193restrictionAtomExprP = do
@@ -194,10 +202,9 @@ extendTupleExpressionP = attributeExtendTupleExpressionP
194202
195203attributeExtendTupleExpressionP :: RelationalMarkerExpr a => Parser (ExtendTupleExprBase a)
196204attributeExtendTupleExpressionP = do
197− newAttr <- identifier
205+ newAttr <- attributeNameP
198206 reservedOp ":="
199− atom <- atomExprP
200− return $ AttributeExtendTupleExpr newAttr atom
207+ AttributeExtendTupleExpr newAttr <$> atomExprP
201208
202209atomExprP :: RelationalMarkerExpr a => Parser (AtomExprBase a)
203210atomExprP = consumeAtomExprP True
@@ -207,38 +214,34 @@ consumeAtomExprP consume = try functionAtomExprP <|>
207214 try (parens (constructedAtomExprP True)) <|>
208215 constructedAtomExprP consume <|>
209216 attributeAtomExprP <|>
210− nakedAtomExprP <|>
217+ try nakedAtomExprP <|>
211218 relationalAtomExprP
219+
212220
213221attributeAtomExprP :: Parser (AtomExprBase a)
214222attributeAtomExprP = do
215223 _ <- string "@"
216− attrName <- identifier
217− return $ AttributeAtomExpr attrName
224+ AttributeAtomExpr <$> attributeNameP
218225
219226nakedAtomExprP :: Parser (AtomExprBase a)
220227nakedAtomExprP = NakedAtomExpr <$> atomP
221228
222229constructedAtomExprP :: RelationalMarkerExpr a => Bool -> Parser (AtomExprBase a)
223230constructedAtomExprP consume = do
224− dConsName <- capitalizedIdentifier
231+ dConsName <- dataConstructorNameP
225232 dConsArgs <- if consume then sepBy (consumeAtomExprP False) spaceConsumer else pure []
226− marker <- parseMarkerP
227− pure $ ConstructedAtomExpr dConsName dConsArgs marker
228−
233+ ConstructedAtomExpr dConsName dConsArgs <$> parseMarkerP
234+
229235-- used only for primitive type parsing ?
230236atomP :: Parser Atom
231−atomP = stringAtomP <|>
232− doubleAtomP <|>
233− integerAtomP <|>
237+atomP = stringAtomP <|>
238+ try doubleAtomP <|>
239+ integerAtomP <|>
234240 boolAtomP
235−
241+
236242functionAtomExprP :: RelationalMarkerExpr a => Parser (AtomExprBase a)
237−functionAtomExprP = do
238− funcName <- identifier
239− argList <- parens (sepBy atomExprP comma)
240− marker <- parseMarkerP
241− return $ FunctionAtomExpr funcName argList marker
243+functionAtomExprP =
244+ FunctionAtomExpr <$> uncapitalizedIdentifier <*> parens (sepBy atomExprP comma) <*> parseMarkerP
242245
243246relationalAtomExprP :: RelationalMarkerExpr a => Parser (AtomExprBase a)
244247relationalAtomExprP = RelationAtomExpr <$> relExprP
@@ -246,16 +249,36 @@ relationalAtomExprP = RelationAtomExpr <$> relExprP
246249stringAtomP :: Parser Atom
247250stringAtomP = TextAtom <$> quotedString
248251
249−doubleAtomP :: Parser Atom
250−doubleAtomP = DoubleAtom <$> try float
252+doubleAtomP :: Parser Atom
253+doubleAtomP = DoubleAtom <$> float
251254
252255integerAtomP :: Parser Atom
253256integerAtomP = IntegerAtom <$> integer
254257
255258boolAtomP :: Parser Atom
256259boolAtomP = do
257− val <- char 't' <|> char 'f'
258− return $ BoolAtom (val == 't')
259−
260+ v <- identifier
261+ if v == "t" || v == "f" then
262+ pure $ BoolAtom (v == "t")
263+ else
264+ fail "invalid boolAtom"
265+
266+
260267relationAtomExprP :: RelationalMarkerExpr a => Parser (AtomExprBase a)
261268relationAtomExprP = RelationAtomExpr <$> makeRelationP
269+
270+withMacroExprP :: RelationalMarkerExpr a => Parser (RelationalExprBase a)
271+withMacroExprP = do
272+ reservedOp "with"
273+ views <- parens (sepBy1 createMacroP comma)
274+ With views <$> relExprP
275+
276+createMacroP :: RelationalMarkerExpr a => Parser (WithNameExprBase a, RelationalExprBase a)
277+createMacroP = do
278+ name <- identifier
279+ reservedOp "as"
280+ expr <- relExprP
281+ marker <- parseMarkerP
282+ pure (WithNameExpr name marker, expr)
283+
284+
src/bin/TutorialD/Interpreter/SchemaOperator.hs+3−5
@@ -1,7 +1,5 @@
11module TutorialD.Interpreter.SchemaOperator where
22import Text.Megaparsec
3−import Text.Megaparsec.Text
4−
53import ProjectM36.Base
64import ProjectM36.IsomorphicSchema
75import ProjectM36.Session
@@ -44,7 +42,7 @@ isoRestrictP = do
4442 reserved "isorestrict"
4543 relVarIn <- qrelVarP
4644 relvarsOut <- isoRestrictOutRelVarsP
47− IsoRestrict <$> pure relVarIn <*> restrictionPredicateP <*> pure relvarsOut
45+ IsoRestrict relVarIn <$> restrictionPredicateP <*> pure relvarsOut
4846
4947isoRestrictOutRelVarsP :: Parser (RelVarName, RelVarName)
5048isoRestrictOutRelVarsP = (,) <$> qrelVarP <*> qrelVarP
@@ -57,7 +55,7 @@ isoUnionP = do
5755 reserved "isounion"
5856 relVarsIn <- isoUnionInRelVarsP
5957 relVarsOut <- qrelVarP
60− IsoUnion <$> pure relVarsIn <*> restrictionPredicateP <*> pure relVarsOut
58+ IsoUnion relVarsIn <$> restrictionPredicateP <*> pure relVarsOut
6159
6260isoRenameP :: Parser SchemaIsomorph
6361isoRenameP = do
@@ -76,4 +74,4 @@ isoUnionInRelVarsP = (,) <$> qrelVarP <*> qrelVarP
7674evalSchemaOperator :: SessionId -> Connection -> SchemaOperator -> IO (Either RelationalError ())
7775evalSchemaOperator sessionId conn (ModifySchemaExpr expr) = executeSchemaExpr sessionId conn expr
7876evalSchemaOperator sessionId conn (SetCurrentSchema sname) = setCurrentSchemaName sessionId conn sname
79−
77+
src/bin/TutorialD/Interpreter/TransGraphRelationalOperator.hs+5−9
@@ -1,21 +1,19 @@
1−{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
1+{-# LANGUAGE FlexibleInstances #-}
22{-# OPTIONS_GHC -fno-warn-orphans #-}
33module TutorialD.Interpreter.TransGraphRelationalOperator where
44import ProjectM36.TransGraphRelationalExpression
55import ProjectM36.TransactionGraph
6+import TutorialD.Interpreter.Types
67import qualified ProjectM36.Client as C
78
89import TutorialD.Interpreter.Base
910import TutorialD.Interpreter.RelationalExpr
1011
11−import Text.Megaparsec
12−import Text.Megaparsec.Text
13−
1412import qualified Data.Text as T
1513
1614instance RelationalMarkerExpr TransactionIdLookup where
1715 parseMarkerP = string "@" *> transactionIdLookupP
18−
16+
1917newtype TransGraphRelationalOperator = ShowTransGraphRelation TransGraphRelationalExpr
2018 deriving Show
2119
@@ -29,9 +27,7 @@ transactionIdHeadBacktrackP = (string "~" *> (TransactionIdHeadParentBacktrack <
2927 (string "@" *> (TransactionStampHeadBacktrack <$> utcTimeP))
3028
3129backtrackP :: Parser Int
32−backtrackP = do
33− steps <- integer <|> pure 1
34− pure (fromIntegral steps)
30+backtrackP = fromIntegral <$> integer <|> pure 1
3531
3632transGraphRelationalOpP :: Parser TransGraphRelationalOperator
3733transGraphRelationalOpP = showTransGraphRelationalOpP
@@ -47,4 +43,4 @@ evalTransGraphRelationalOp sessionId conn (ShowTransGraphRelation expr) = do
4743 case res of
4844 Left err -> pure $ DisplayErrorResult $ T.pack (show err)
4945 Right rel -> pure $ DisplayRelationResult rel
50−
46+
src/bin/TutorialD/Interpreter/TransactionGraphOperator.hs+18−19
@@ -1,11 +1,10 @@
11{-# LANGUAGE GADTs #-}
22module TutorialD.Interpreter.TransactionGraphOperator where
33import TutorialD.Interpreter.Base
4−import Text.Megaparsec.Text
5−import Text.Megaparsec
64import ProjectM36.TransactionGraph hiding (autoMergeToHead)
7−import ProjectM36.Client
5+import ProjectM36.Client as C
86import ProjectM36.Base
7+import ProjectM36.Relation (relationTrue)
98import Data.Functor
109
1110data ConvenienceTransactionGraphOperator = AutoMergeToHead MergeStrategy HeadName
@@ -22,14 +21,12 @@ autoMergeToHeadP = do
2221jumpToHeadP :: Parser TransactionGraphOperator
2322jumpToHeadP = do
2423 reservedOp ":jumphead"
25− headid <- identifier
26− return $ JumpToHead headid
24+ JumpToHead <$> identifier
2725
2826jumpToTransactionP :: Parser TransactionGraphOperator
2927jumpToTransactionP = do
3028 reservedOp ":jump"
31− uuid <- uuidP
32− return $ JumpToTransaction uuid
29+ JumpToTransaction <$> uuidP
3330
3431walkBackToTimeP :: Parser TransactionGraphOperator
3532walkBackToTimeP = do
@@ -39,8 +36,7 @@ walkBackToTimeP = do
3936branchTransactionP :: Parser TransactionGraphOperator
4037branchTransactionP = do
4138 reservedOp ":branch"
42− branchName <- identifier
43− return $ Branch branchName
39+ Branch <$> identifier
4440
4541deleteBranchP :: Parser TransactionGraphOperator
4642deleteBranchP = do
@@ -66,20 +62,18 @@ mergeTransactionStrategyP :: Parser MergeStrategy
6662mergeTransactionStrategyP = (reserved "union" $> UnionMergeStrategy) <|>
6763 (do
6864 reserved "selectedbranch"
69− branch <- identifier
70− pure (SelectedBranchMergeStrategy branch)) <|>
65+ SelectedBranchMergeStrategy <$> identifier) <|>
7166 (do
7267 reserved "unionpreferbranch"
73− branch <- identifier
74− pure (UnionPreferMergeStrategy branch))
68+ UnionPreferMergeStrategy <$> identifier)
7569
7670mergeTransactionsP :: Parser TransactionGraphOperator
7771mergeTransactionsP = do
7872 reservedOp ":mergetrans"
79− strategy <- mergeTransactionStrategyP
80− headA <- identifier
81− headB <- identifier
82− pure (MergeTransactions strategy headA headB)
73+ MergeTransactions <$> mergeTransactionStrategyP <*> identifier <*> identifier
74+
75+validateMerkleHashesP :: Parser ROTransactionGraphOperator
76+validateMerkleHashesP = reservedOp ":validatemerklehashes" $> ValidateMerkleHashes
8377
8478transactionGraphOpP :: Parser TransactionGraphOperator
8579transactionGraphOpP =
@@ -93,7 +87,7 @@ transactionGraphOpP =
9387 <|> mergeTransactionsP
9488
9589roTransactionGraphOpP :: Parser ROTransactionGraphOperator
96−roTransactionGraphOpP = showGraphP
90+roTransactionGraphOpP = showGraphP <|> validateMerkleHashesP
9791
9892
9993
@@ -111,6 +105,11 @@ interpretOps newUUID trans@(DisconnectedTransaction _ context) transGraph instri
111105
112106evalROGraphOp :: SessionId -> Connection -> ROTransactionGraphOperator -> IO (Either RelationalError Relation)
113107evalROGraphOp 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)
114113
115114evalConvenienceGraphOp :: SessionId -> Connection -> ConvenienceTransactionGraphOperator -> IO (Either RelationalError ())
116−evalConvenienceGraphOp sessionId conn (AutoMergeToHead strat head') = autoMergeToHead sessionId conn strat head'
115+evalConvenienceGraphOp sessionId conn (AutoMergeToHead strat head') = autoMergeToHead sessionId conn strat head'
src/bin/TutorialD/Interpreter/Types.hs+32−21
@@ -1,49 +1,60 @@
11--parse type and data constructors
22module TutorialD.Interpreter.Types where
33import ProjectM36.Base
4−import Text.Megaparsec.Text
54import Text.Megaparsec
65import TutorialD.Interpreter.Base
7−import ProjectM36.DataTypes.Primitive
8−import qualified Data.Text as T
6+
7+class RelationalMarkerExpr a where
8+ parseMarkerP :: Parser a
9+
10+instance RelationalMarkerExpr () where
11+ parseMarkerP = pure ()
12+
13+typeConstructorNameP :: Parser TypeConstructorName
14+typeConstructorNameP = capitalizedIdentifier
15+
16+dataConstructorNameP :: Parser DataConstructorName
17+dataConstructorNameP = capitalizedIdentifier
918
1019-- | Upper case names are type names while lower case names are polymorphic typeconstructor arguments.
1120-- data *Either a b* = Left a | Right b
1221typeConstructorDefP :: Parser TypeConstructorDef
13−typeConstructorDefP = ADTypeConstructorDef <$> capitalizedIdentifier <*> typeVarNamesP
22+typeConstructorDefP = ADTypeConstructorDef <$> typeConstructorNameP <*> typeVarNamesP
1423
1524typeVarNamesP :: Parser [TypeVarName]
1625typeVarNamesP = many uncapitalizedIdentifier
1726
1827-- data Either a b = *Left a* | *Right b*
1928dataConstructorDefP :: Parser DataConstructorDef
20−dataConstructorDefP = DataConstructorDef <$> capitalizedIdentifier <*> many dataConstructorDefArgP
29+dataConstructorDefP = DataConstructorDef <$> typeConstructorNameP <*> many dataConstructorDefArgP
2130
2231-- data *Either a b* = Left *a* | Right *b*
2332dataConstructorDefArgP :: Parser DataConstructorDefArg
24−dataConstructorDefArgP = parens (DataConstructorDefTypeConstructorArg <$> typeConstructorP) <|>
25− DataConstructorDefTypeConstructorArg <$> typeConstructorP <|>
33+dataConstructorDefArgP = DataConstructorDefTypeConstructorArg <$> (monoTypeConstructorP <|> parens typeConstructorP) <|>
2634 DataConstructorDefTypeVarNameArg <$> uncapitalizedIdentifier
2735
28−--built-in, nullary type constructors
29−-- Int, Text, etc.
30−primitiveTypeConstructorP :: Parser TypeConstructor
31−primitiveTypeConstructorP = choice (map (\(PrimitiveTypeConstructorDef name typ, _) -> do
32− tName <- try $ symbol (T.unpack name)
33− pure $ PrimitiveTypeConstructor tName typ)
34− primitiveTypeConstructorMapping)
36+-- relation{a Int} in type construction (no tuples parsed)
37+relationTypeConstructorP :: Parser TypeConstructor
38+relationTypeConstructorP = do
39+ reserved "relation"
40+ RelationAtomTypeConstructor <$> makeAttributeExprsP
41+
42+--used in relation creation
43+makeAttributeExprsP :: RelationalMarkerExpr a => Parser [AttributeExprBase a]
44+makeAttributeExprsP = braces (sepBy attributeAndTypeNameP comma)
45+
46+attributeAndTypeNameP :: RelationalMarkerExpr a => Parser (AttributeExprBase a)
47+attributeAndTypeNameP = AttributeAndTypeNameExpr <$> identifier <*> typeConstructorP <*> parseMarkerP
3548
3649-- *Either Int Text*, *Int*
3750typeConstructorP :: Parser TypeConstructor
38−typeConstructorP = primitiveTypeConstructorP <|>
39− TypeVariable <$> uncapitalizedIdentifier <|>
40− ADTypeConstructor <$> capitalizedIdentifier <*> many (parens typeConstructorP <|>
41− monoTypeConstructorP)
51+typeConstructorP = relationTypeConstructorP <|>
52+ ADTypeConstructor <$> capitalizedIdentifier <*> many (monoTypeConstructorP <|> parens typeConstructorP) <|>
53+ monoTypeConstructorP
4254
4355monoTypeConstructorP :: Parser TypeConstructor
44−monoTypeConstructorP = primitiveTypeConstructorP <|>
45− ADTypeConstructor <$> capitalizedIdentifier <*> pure [] <|>
46− TypeVariable <$> uncapitalizedIdentifier
56+monoTypeConstructorP = ADTypeConstructor <$> typeConstructorNameP <*> pure [] <|>
57+ TypeVariable <$> uncapitalizedIdentifier
4758
4859
4960
src/bin/TutorialD/Printer.hsnew file+165
@@ -0,0 +1,165 @@
1+{-# OPTIONS_GHC -fno-warn-orphans #-}
2+{-# LANGUAGE FlexibleInstances #-}
3+{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE ScopedTypeVariables #-}
5+{-# LANGUAGE TypeApplications #-}
6+module TutorialD.Printer where
7+import ProjectM36.Base
8+import ProjectM36.Attribute as A hiding (null)
9+import Data.Text.Prettyprint.Doc
10+import qualified Data.Set as S hiding (fromList)
11+import qualified Data.Vector as V
12+import qualified Data.Map.Strict as M
13+import Data.Time.Calendar
14+import Data.Time.Clock.POSIX
15+import qualified Data.ByteString.Base64 as B64
16+import qualified Data.Text.Encoding as TE
17+
18+instance Pretty Atom where
19+ pretty (IntegerAtom x) = pretty x
20+ pretty (IntAtom x) = "int" <> parensList [pretty x]
21+ pretty (DoubleAtom x) = pretty x
22+ pretty (TextAtom x) = dquotes (pretty x)
23+ pretty (DayAtom x) = "fromGregorian" <> parensList [pretty a, pretty b, pretty c]
24+ where
25+ (a,b,c) = toGregorian x
26+ pretty (DateTimeAtom time) = "dateTimeFromEpochSeconds" <> parensList [pretty @Integer (round (utcTimeToPOSIXSeconds time))]
27+ pretty (ByteStringAtom bs) = "bytestring" <> parensList [dquotes (pretty (TE.decodeUtf8 (B64.encode bs)))]
28+ pretty (BoolAtom x) = if x then "t" else "f"
29+ pretty (RelationAtom x) = pretty x
30+ pretty (RelationalExprAtom re) = pretty re
31+ pretty (ConstructedAtom n _ as) = pretty n <+> prettyList as
32+
33+instance Pretty AtomExpr where
34+ pretty (AttributeAtomExpr attrName) = pretty attrName
35+ pretty (NakedAtomExpr atom) = pretty atom
36+ pretty (FunctionAtomExpr atomFuncName' atomExprs _) = pretty atomFuncName' <> prettyAtomExprsAsArguments atomExprs
37+ pretty (RelationAtomExpr relExpr) = pretty relExpr
38+ pretty (ConstructedAtomExpr dName [] _) = pretty dName
39+ pretty (ConstructedAtomExpr dName atomExprs _) = pretty dName <+> hsep (map prettyAtomExpr atomExprs)
40+
41+prettyAtomExpr :: AtomExpr -> Doc ann
42+prettyAtomExpr atomExpr =
43+ case atomExpr of
44+ AttributeAtomExpr attrName -> "@" <> pretty attrName
45+ ConstructedAtomExpr dConsName [] () -> pretty dConsName
46+ ConstructedAtomExpr dConsName atomExprs () -> parens (pretty dConsName <+> hsep (map prettyAtomExpr atomExprs))
47+ _ -> pretty atomExpr
48+
49+prettyAtomExprsAsArguments :: [AtomExpr] -> Doc ann
50+prettyAtomExprsAsArguments = align . parensList . map addAt
51+ where addAt (atomExpr :: AtomExpr) =
52+ case atomExpr of
53+ AttributeAtomExpr attrName -> "@" <> pretty attrName
54+ _ -> pretty atomExpr
55+
56+instance Pretty TupleExpr where
57+ pretty (TupleExpr map') = "tuple" <> bracesList (Prelude.map (\(attrName,atom)-> pretty attrName <+> pretty atom) (M.toList map'))
58+
59+instance Pretty RelationTuple where
60+ pretty (RelationTuple attrs atoms) = "tuple" <> bracesList (zipWith (\x y-> pretty x <+> pretty y) (V.toList (attributeNames attrs)) (V.toList atoms))
61+
62+instance Pretty Relation where
63+ pretty (Relation attrs tupSet) | attrs == mempty && null (asList tupSet) = "false"
64+ pretty (Relation attrs tupSet) | attrs == mempty && asList tupSet == [RelationTuple mempty mempty] = "true"
65+ pretty (Relation attrs tupSet) = "relation" <> prettyBracesList (A.toList attrs) <> prettyBracesList (asList tupSet)
66+
67+instance Pretty Attribute where
68+ pretty (Attribute n aTy) = pretty n <+> pretty (show aTy) -- workaround
69+
70+instance Pretty RelationalExpr where
71+ pretty (RelationVariable n _) = pretty n
72+ pretty (ExistingRelation r) = pretty r
73+ pretty (NotEquals a b) = pretty' a <+> "!=" <+> pretty' b
74+ pretty (Equals a b) = pretty' a <+> "==" <+> pretty' b
75+ pretty (Project ns r) = pretty' (ignoreProjects r) <> pretty ns
76+ pretty (Extend ext r) = collectExtends r <> pretty ext <> "}"
77+ pretty (MakeRelationFromExprs Nothing (TupleExprs () tupExprs)) = "relation" <> prettyBracesList tupExprs
78+ pretty (MakeRelationFromExprs (Just attrExprs) (TupleExprs () tupExprs)) = "relation" <> prettyBracesList attrExprs <> prettyBracesList tupExprs
79+ pretty (MakeStaticRelation attrs tupSet) = "relation" <> prettyBracesList (A.toList attrs) <> prettyBracesList (asList tupSet)
80+ pretty (Union a b) = parens $ pretty' a <+> "union" <+> pretty' b
81+ pretty (Join a b) = parens $ pretty' a <+> "join" <+> pretty' b
82+ pretty (Rename n1 n2 relExpr) = parens $ pretty relExpr <+> "rename" <+> braces (pretty n1 <+> "as" <+> pretty n2)
83+ pretty (Difference a b) = parens $ pretty' a <+> "minus" <+> pretty' b
84+ pretty (Group attrNames attrName relExpr) = parens $ pretty relExpr <+> "group" <+> parens (pretty attrNames <+> "as" <+> pretty attrName)
85+ pretty (Ungroup attrName relExpr) = parens $ pretty' relExpr <+> "ungroup" <+> pretty attrName
86+ pretty (Restrict resPreExpr relExpr) = parens $ pretty' relExpr <+> "where" <+> pretty resPreExpr
87+ pretty (With pairs a) = "with" <+> parensList (map (\(name,expr)-> pretty name <+> "as" <+> pretty expr) pairs) <+> pretty' a
88+
89+-- relvar:{a:=?}:{b:=?}:... in ADTs => relvar:{a:=?, b:=?, ...} in Doc ann
90+collectExtends :: RelationalExpr -> Doc ann
91+collectExtends (Extend ext r) = collectExtends r <> pretty ext <> ", "
92+collectExtends r = pretty r <> ":{"
93+
94+--relvar{a,b,c,...}{a,b,...}..{a} => relvar{a}
95+ignoreProjects :: RelationalExpr -> RelationalExpr
96+ignoreProjects (Project _ r) = ignoreProjects r
97+ignoreProjects r = r
98+
99+prettyRelationalExpr :: RelationalExpr -> Doc n
100+prettyRelationalExpr (RelationVariable n _) = pretty n
101+prettyRelationalExpr r = parens (pretty r)
102+
103+pretty' :: RelationalExpr -> Doc n
104+pretty' = prettyRelationalExpr
105+
106+instance Pretty AttributeNames where
107+ pretty (AttributeNames attrNames) = prettyBracesList (S.toList attrNames)
108+ pretty (InvertedAttributeNames attrNames) = braces $ "all but" <+> concatWith (surround ", ") (map pretty (S.toList attrNames))
109+ pretty (RelationalExprAttributeNames relExpr) = braces $ "all from" <+> pretty relExpr
110+ pretty (UnionAttributeNames aAttrNames bAttrNames) = braces ("union of" <+> pretty aAttrNames <+> pretty bAttrNames)
111+ pretty (IntersectAttributeNames aAttrNames bAttrNames) = braces ("intersection of" <+> pretty aAttrNames <+> pretty bAttrNames)
112+
113+instance Pretty AttributeExpr where
114+ pretty (NakedAttributeExpr attr) = pretty attr
115+ pretty (AttributeAndTypeNameExpr name typeCons _) = pretty name <+> pretty typeCons
116+
117+instance Pretty TypeConstructor where
118+ pretty (ADTypeConstructor tcName []) = pretty tcName
119+ pretty (ADTypeConstructor tcName tConsArgs) = pretty tcName <+> hsep (map pretty tConsArgs)
120+ pretty (PrimitiveTypeConstructor tcName atomType') = pretty tcName <+> pretty atomType'
121+ pretty (RelationAtomTypeConstructor attrExprs) = "relation" <> prettyBracesList attrExprs
122+ pretty (TypeVariable x) = pretty x
123+
124+instance Pretty AtomType where
125+ pretty IntAtomType = "Int"
126+ pretty IntegerAtomType = "Integer"
127+ pretty DoubleAtomType = "Double"
128+ pretty TextAtomType = "Text"
129+ pretty DayAtomType = "Day"
130+ pretty DateTimeAtomType = "DateTime"
131+ pretty ByteStringAtomType = "ByteString"
132+ pretty BoolAtomType = "Bool"
133+ pretty (RelationAtomType attrs) = "relation " <+> prettyBracesList (A.toList attrs)
134+ pretty (ConstructedAtomType tcName tvMap) = pretty tcName <+> hsep (map pretty (M.toList tvMap)) --order matters
135+ pretty RelationalExprAtomType = "RelationalExpr"
136+ pretty (TypeVariableType x) = pretty x
137+
138+instance Pretty ExtendTupleExpr where
139+ pretty (AttributeExtendTupleExpr attrName atomExpr) = pretty attrName <> ":=" <> pretty atomExpr
140+
141+
142+instance Pretty RestrictionPredicateExpr where
143+ pretty TruePredicate = "true"
144+ pretty (AndPredicate a b) = pretty a <+> "and" <+> pretty b
145+ pretty (OrPredicate a b) = pretty a <+> "or" <+> pretty b
146+ pretty (NotPredicate a) = "not" <+> pretty a
147+ pretty (RelationalExprPredicate relExpr) = pretty relExpr
148+ pretty (AtomExprPredicate atomExpr) = pretty atomExpr
149+ pretty (AttributeEqualityPredicate attrName atomExpr) = pretty attrName <> "=" <> pretty atomExpr
150+
151+instance Pretty WithNameExpr where
152+ pretty (WithNameExpr name _) = pretty name
153+
154+bracesList :: [Doc ann] -> Doc ann
155+bracesList = group . encloseSep (flatAlt "{ " "{") (flatAlt " }" "}") ", "
156+
157+prettyBracesList :: Pretty a => [a] -> Doc ann
158+prettyBracesList = align . bracesList . map pretty
159+
160+parensList :: [Doc ann] -> Doc ann
161+parensList = group . encloseSep (flatAlt "( " "(") (flatAlt " )" ")") ", "
162+
163+prettyParensList :: Pretty a => [a] -> Doc ann
164+prettyParensList = align . parensList . map pretty
165+
src/bin/TutorialD/tutd.hs+24−17
@@ -5,58 +5,58 @@ import ProjectM36.Client
55import ProjectM36.Server.ParseArgs
66import ProjectM36.Server
77import System.IO
8+import GHC.IO.Encoding
89import Options.Applicative
910import System.Exit
11+import Control.Monad
12+#if __GLASGOW_HASKELL__ < 804
1013import Data.Monoid
14+#endif
1115import Data.Maybe
1216import qualified Data.Text as T
1317
18+#if !defined(VERSION_project_m36)
19+# warning Failed to discover proper version from cabal_macros.h
20+# define VERSION_project_m36 "<unknown>"
21+#endif
22+
1423parseArgs :: Parser InterpreterConfig
1524parseArgs = LocalInterpreterConfig <$> parsePersistenceStrategy <*> parseHeadName <*> parseTutDExec <*> many parseGhcPkgPath <*> parseCheckFS <|>
16− RemoteInterpreterConfig <$> parseNodeId <*> parseDatabaseName <*> parseHeadName <*> parseTutDExec <*> parseCheckFS
25+ RemoteInterpreterConfig <$> parseHostname "127.0.0.1" <*> parsePort defaultServerPort <*> parseDatabaseName <*> parseHeadName <*> parseTutDExec <*> parseCheckFS
1726
1827parseHeadName :: Parser HeadName
1928parseHeadName = option auto (long "head" <>
2029 help "Start session at head name." <>
30+ metavar "GRAPH HEAD NAME" <>
2131 value "master"
2232 )
2333
24−parseNodeId :: Parser NodeId
25−parseNodeId = createNodeId <$>
26− strOption (long "host" <>
27− short 'h' <>
28− help "Remote host name" <>
29− value "127.0.0.1") <*>
30− option auto (long "port" <>
31− short 'p' <>
32− help "Remote port" <>
33− value defaultServerPort)
34−
3534--just execute some tutd and exit
3635parseTutDExec :: Parser (Maybe TutorialDExec)
3736parseTutDExec = optional $ strOption (long "exec-tutd" <>
3837 short 'e' <>
38+ metavar "TUTORIALD" <>
3939 help "Execute TutorialD expression and exit"
4040 )
4141
4242opts :: ParserInfo InterpreterConfig
43−opts = info parseArgs idm
43+opts = info (parseArgs <**> helpOption) idm
4444
4545connectionInfoForConfig :: InterpreterConfig -> ConnectionInfo
4646connectionInfoForConfig (LocalInterpreterConfig pStrategy _ _ ghcPkgPaths _) = InProcessConnectionInfo pStrategy outputNotificationCallback ghcPkgPaths
47−connectionInfoForConfig (RemoteInterpreterConfig remoteNodeId remoteDBName _ _ _) = RemoteProcessConnectionInfo remoteDBName remoteNodeId outputNotificationCallback
47+connectionInfoForConfig (RemoteInterpreterConfig remoteHost remotePort remoteDBName _ _ _) = RemoteConnectionInfo remoteDBName remoteHost (show remotePort) outputNotificationCallback
4848
4949headNameForConfig :: InterpreterConfig -> HeadName
5050headNameForConfig (LocalInterpreterConfig _ headn _ _ _) = headn
51−headNameForConfig (RemoteInterpreterConfig _ _ headn _ _) = headn
51+headNameForConfig (RemoteInterpreterConfig _ _ _ headn _ _) = headn
5252
5353execTutDForConfig :: InterpreterConfig -> Maybe String
5454execTutDForConfig (LocalInterpreterConfig _ _ t _ _) = t
55−execTutDForConfig (RemoteInterpreterConfig _ _ _ t _) = t
55+execTutDForConfig (RemoteInterpreterConfig _ _ _ _ t _) = t
5656
5757checkFSForConfig :: InterpreterConfig -> Bool
5858checkFSForConfig (LocalInterpreterConfig _ _ _ _ c) = c
59−checkFSForConfig (RemoteInterpreterConfig _ _ _ _ c) = c
59+checkFSForConfig (RemoteInterpreterConfig _ _ _ _ _ c) = c
6060
6161persistenceStrategyForConfig :: InterpreterConfig -> Maybe PersistenceStrategy
6262persistenceStrategyForConfig (LocalInterpreterConfig strat _ _ _ _) = Just strat
@@ -75,8 +75,15 @@ printWelcome = do
7575 putStrLn "A full tutorial is available at:"
7676 putStrLn "https://github.com/agentm/project-m36/blob/master/docs/tutd_tutorial.markdown"
7777
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+
7884main :: IO ()
7985main = do
86+ setLocaleIfNecessary
8087 interpreterConfig <- execParser opts
8188 let connInfo = connectionInfoForConfig interpreterConfig
8289 fscheck <- checkFSType (checkFSForConfig interpreterConfig) (fromMaybe NoPersistence (persistenceStrategyForConfig interpreterConfig))
src/bin/benchmark/Basic.hsnew file+106
@@ -0,0 +1,106 @@
1+import ProjectM36.Base
2+import Criterion.Main
3+import qualified ProjectM36.Attribute as A
4+import ProjectM36.Relation
5+import ProjectM36.Persist
6+import ProjectM36.RelationalExpression
7+import ProjectM36.Error
8+import ProjectM36.Transaction.Persist
9+import qualified Data.Text as T
10+import qualified Data.Vector as V
11+import Control.Monad.Trans.Reader
12+import qualified ProjectM36.DatabaseContext as DBC
13+import qualified Data.Set as S
14+import Data.Monoid
15+import System.IO.Temp
16+import System.FilePath
17+import System.Directory
18+
19+{-
20+* create a relation
21+* restrict a relation
22+* project a relation
23+* join two relations
24+-}
25+
26+validate :: Either RelationalError a -> a
27+validate (Left err) = error (show err)
28+validate (Right x) = x
29+
30+createRelation :: Int -> Int -> Either RelationalError Relation
31+createRelation attributeCount tupleCount = do
32+ let attrs = A.attributesFromList $ map (\c-> Attribute (T.pack $ "a" ++ show c) IntAtomType) [0 .. attributeCount-1]
33+ tuple tupleX = RelationTuple attrs (V.generate attributeCount (\_ -> IntAtom (fromIntegral tupleX)))
34+ tuples = map tuple [0 .. tupleCount]
35+ mkRelationDeferVerify attrs (RelationTupleSet tuples)
36+
37+createRelation' :: Int -> Int -> Relation
38+createRelation' x y = validate (createRelation x y)
39+
40+restrictRelationToOneTuple :: Int -> Relation -> Relation
41+restrictRelationToOneTuple match rel = validate (runReader (evalRelationalExpr restriction) exprState)
42+ where
43+ exprState = mkRelationalExprState DBC.empty
44+ restriction = Restrict predicateMatch (ExistingRelation rel)
45+ predicateMatch = AttributeEqualityPredicate "a0" (NakedAtomExpr (IntAtom match))
46+
47+restrictRelationToHalfRelation :: Int -> Relation -> Relation
48+restrictRelationToHalfRelation cutoff rel = validate (runReader (evalRelationalExpr restriction) exprState)
49+ where
50+ exprState = mkRelationalExprState DBC.basicDatabaseContext
51+ restriction = Restrict predicateMatch (ExistingRelation rel)
52+ predicateMatch = AtomExprPredicate (FunctionAtomExpr "lte" [AttributeAtomExpr "a0", NakedAtomExpr (IntAtom cutoff)] ())
53+
54+projectRelationToAttributes :: AttributeNames -> Relation -> Relation
55+projectRelationToAttributes attrNames rel = validate (runReader (evalRelationalExpr projection) exprState)
56+ where
57+ exprState = mkRelationalExprState DBC.empty
58+ projection = Project attrNames (ExistingRelation rel)
59+
60+unionRelations :: Relation -> Relation -> Relation
61+unionRelations relA relB = validate (relA `union` relB)
62+
63+joinRelations :: Relation -> Relation -> Relation
64+joinRelations relA relB = validate (join relA relB)
65+
66+groupRelation :: AttributeNames -> Relation -> Relation
67+groupRelation attrNames rel = validate (runReader (evalRelationalExpr (Group attrNames "x" (ExistingRelation rel))) exprState)
68+ where
69+ exprState = mkRelationalExprState DBC.empty
70+
71+bigRelAttrNames :: Int -> Int -> AttributeNames
72+bigRelAttrNames start end = AttributeNames (S.fromList (map (\i -> "a" <> T.pack (show i)) [start .. end]))
73+
74+main :: IO ()
75+main = do
76+ tmpDir <- getCanonicalTemporaryDirectory
77+ createDirectoryIfMissing False (tmpDir </> "relvars")
78+ defaultMain [createRel, restrictRel, projectRel, unionRel, joinRel, groupRel, writeRel tmpDir]
79+ where
80+ createRel = bgroup "create" $ map (\tupCount -> bench ("relation 10x" ++ show tupCount) (nf (createRelation' 10) tupCount)) [100, 1000, 10000]
81+ bigrel10000 = createRelation' 10 10000
82+ bigrel1000 = createRelation' 10 1000
83+ bigrel100 = createRelation' 10 100
84+
85+ restrictRel = bgroup "restrict" [restrictOneTupleRel, restrictHalfTuplesRel]
86+ restrictOneTupleRel = bench "restrict relation 10x10000 to 10x1" (nf (restrictRelationToOneTuple 5000) bigrel10000)
87+ restrictHalfTuplesRel = bench "restrict relation 10x10000 to 10x5000" (nf (restrictRelationToHalfRelation 5000) bigrel10000)
88+
89+ projectRel = bgroup "project" [projectOneAttr, projectHalfAttrs]
90+ projectOneAttr = bench "project 10x1000 to 1x1000" (nf (projectRelationToAttributes (bigRelAttrNames 0 0)) bigrel1000)
91+ projectHalfAttrs = bench "project 10x1000 to 5x1000" (nf (projectRelationToAttributes (bigRelAttrNames 0 4)) bigrel1000)
92+
93+ unionRel = bgroup "union" [unionIdenticalRelations1000, unionIdenticalRelations10000]
94+ unionIdenticalRelations1000 = bench "union identical 10x1000" (nf (unionRelations bigrel1000) bigrel1000)
95+ unionIdenticalRelations10000 = bench "union identical 10x10000" (nf (unionRelations bigrel10000) bigrel10000)
96+
97+ joinRel = bgroup "join" [joinIdenticalRelations100]
98+ joinIdenticalRelations100 = bench "join identical 10x100" (nf (joinRelations bigrel100) bigrel100)
99+
100+ groupRel = bgroup "group" [group100]
101+ group100 = bench "group 10x100" (nf (groupRelation (bigRelAttrNames 1 9)) bigrel100)
102+
103+ writeRel tmpDir = bgroup "write" [writeRel10000 tmpDir]
104+ writeRel10000 tmpDir = bench "write 10x1000" $ nfIO (writeRelVar FsyncDiskSync tmpDir ("x", bigrel10000))
105+
106+
src/bin/benchmark/Handles.hs+27−38
@@ -1,19 +1,20 @@
11{-# LANGUAGE CPP #-}
22--benchmark test for file handle leaks
33import ProjectM36.Client
4+import ProjectM36.Persist
45import Options.Applicative
56import TutorialD.Interpreter
6−import TutorialD.Interpreter.Base
7+import TutorialD.Interpreter.Base hiding (Parser, option)
78import qualified Data.Text as T
8−import Text.Megaparsec hiding (option)
9+#if __GLASGOW_HASKELL__ < 804
910import Data.Monoid
10−import System.Directory
11+#endif
1112import Control.Monad
1213
1314data HandlesArgs = HandlesArgs {
1415 openCloseCount :: Int,
1516 transactionCount :: Int,
16− dbdir :: FilePath,
17+ dbdir :: FilePath,
1718 tutdSetup :: String,
1819 tutdIterate :: String
1920 }
@@ -39,13 +40,13 @@ parseTutdIterate = strOption (short 'i' <> long "iterate-tutd" <> value "update
3940main :: IO ()
4041main = do
4142 args <- execParser $ info (helper <*> parseArgs) fullDesc
42− replicateM_ (openCloseCount args) (runOpenClose
43+ replicateM_ (openCloseCount args) (runOpenClose
4344 (T.pack (tutdSetup args))
4445 (T.pack (tutdIterate args))
45− (transactionCount args)
46+ (transactionCount args)
4647 (dbdir args))
47−
48−runOpenClose :: T.Text -> T.Text -> Int -> FilePath -> IO ()
48+
49+runOpenClose :: T.Text -> T.Text -> Int -> FilePath -> IO ()
4950runOpenClose tutdSetup' tutdIterate' tCount dbdir' = do
5051 let connInfo = InProcessConnectionInfo (MinimalPersistence dbdir') emptyNotificationCallback []
5152 eConn <- connectProjectM36 connInfo
@@ -55,7 +56,7 @@ runOpenClose tutdSetup' tutdIterate' tCount dbdir' = do
5556 eSess <- createSessionAtHead conn "master"
5657 case eSess of
5758 Left err -> error (show err)
58− Right session ->
59+ Right session ->
5960 --database setup
6061 case parseTutorialD tutdSetup' of
6162 Left err -> error (show err)
@@ -63,14 +64,19 @@ runOpenClose tutdSetup' tutdIterate' tCount dbdir' = do
6364 res <- evalTutorialD session conn UnsafeEvaluation parsed
6465 case res of
6566 DisplayErrorResult err -> error (T.unpack err)
66− DisplayParseErrorResult _ err -> error (parseErrorPretty err)
67− _ -> do
67+ DisplayParseErrorResult _ err ->
68+#if MIN_VERSION_megaparsec(7,0,0)
69+ error (errorBundlePretty err)
70+#else
71+ error (parseErrorPretty err)
72+#endif
73+ _ -> do
6874 replicateM_ tCount (runTransaction tutdIterate' session conn)
6975 close conn
7076 printFdCount
71−
77+
7278runTransaction :: T.Text -> SessionId -> Connection -> IO ()
73−runTransaction tutdIterate' sess conn =
79+runTransaction tutdIterate' sess conn =
7480 --run tutd on every iteration
7581 case parseTutorialD tutdIterate' of
7682 Left err -> error (show err)
@@ -78,31 +84,14 @@ runTransaction tutdIterate' sess conn =
7884 res <- evalTutorialD sess conn UnsafeEvaluation parsed
7985 case res of
8086 DisplayErrorResult err -> error (T.unpack err)
81− DisplayParseErrorResult _ err -> error (parseErrorPretty err)
82− _ -> do
83− eErr <- commit sess conn
87+ DisplayParseErrorResult _ err ->
88+#if MIN_VERSION_megaparsec(7,0,0)
89+ error (errorBundlePretty err)
90+#else
91+ error (parseErrorPretty err)
92+#endif
93+ _ -> do
94+ eErr <- commit sess conn
8495 case eErr of
8596 Left err -> error (show err)
8697 Right _ -> printFdCount
87−
88−--prints out number of consumed file descriptors
89−printFdCount :: IO ()
90−#if defined(linux_HOST_OS)
91−printFdCount = do
92− fdc <- fdCount
93− putStrLn ("Fd count: " ++ show fdc)
94− --getLine >> pure ()
95−#else
96−printFdCount = putStrLn "Fd count not supported on this OS."
97−#endif
98−
99−
100−fdCount :: IO Int
101−#if defined(linux_HOST_OS)
102−fdCount = do
103− fds <- getDirectoryContents "/proc/self/fd"
104− pure ((length fds) - 2)
105−#else
106−--not supported on non-linux
107−fdCount = pure 0
108−#endif
src/bin/benchmark/bigrel.hs+42−19
@@ -1,33 +1,39 @@
1−{-# LANGUAGE FlexibleInstances #-}
1+{-# LANGUAGE FlexibleInstances, CPP #-}
22{-# OPTIONS_GHC -fno-warn-orphans #-}
33import ProjectM36.Base
44import ProjectM36.Relation
55import ProjectM36.DateExamples
66import ProjectM36.Error
7+import ProjectM36.StaticOptimizer
78import qualified ProjectM36.Attribute as A
89import qualified Data.Text as T
9−import ProjectM36.Relation.Show.CSV
10+--import ProjectM36.Relation.Show.CSV
1011import ProjectM36.Relation.Show.HTML
11−import TutorialD.Interpreter.DatabaseContextExpr (interpretDatabaseContextExpr)
1212import ProjectM36.RelationalExpression
13−import qualified Data.HashSet as HS
14−import qualified Data.ByteString.Lazy.Char8 as BS
15−import qualified Data.IntMap as IM
16−import qualified Data.Hashable as Hash
13+import ProjectM36.TransactionGraph
14+--import qualified Data.HashSet as HS
15+--import qualified Data.ByteString.Lazy.Char8 as BS
16+--import qualified Data.IntMap as IM
17+--import qualified Data.Hashable as Hash
1718import qualified Data.Vector as V
1819import Options.Applicative
19−import qualified Data.Map as M
2020import qualified Data.Text.IO as TIO
2121import System.IO
22−import Control.Monad.State
2322import Control.DeepSeq
2423import Data.Text hiding (map)
24+import Data.Time.Clock
25+import Data.UUID.V4
26+#if __GLASGOW_HASKELL__ < 804
2527import Data.Monoid
28+#endif
2629
30+
31+{-
2732dumpcsv :: Relation -> IO ()
2833dumpcsv rel = case relationAsCSV rel of
2934 Left err -> hPrint stderr err
3035 Right bsData -> BS.putStrLn bsData
36+-}
3137
3238data BigrelArgs = BigrelArgs Int Int Text
3339
@@ -58,46 +64,63 @@ matrixRun (BigrelArgs attributeCount tupleCount tutd) =
5864 Right rel -> if tutd == "" then
5965 putStrLn "Done."
6066 else do
67+ now <- getCurrentTime
68+ tid <- nextRandom
6169 let setx = Assign "x" (ExistingRelation (force rel))
62− (context,_,_) = execState (evalDatabaseContextExpr setx) (freshDatabaseState dateExamples)
63− interpreted = interpretDatabaseContextExpr context tutd
70+ graph = bootstrapTransactionGraph now tid dateExamples
71+ env = mkDatabaseContextEvalEnv tid graph
72+ eNewState = runDatabaseContextEvalMonad dateExamples env (optimizeAndEvalDatabaseContextExpr True setx)
6473 --plan = interpretRODatabaseContextOp context $ ":showplan " ++ tutd
6574 --displayOpResult plan
66− case interpreted of
67− Right context' -> TIO.putStrLn $ relationAsHTML (relationVariables context' M.! "x")
75+ case eNewState of
76+ Right newState -> do
77+ let ctx = dbc_context newState
78+ Right x = optimizeAndEvalRelationalExpr env' (RelationVariable "x" ())
79+ env' = RelationalExprEnv ctx graph Nothing
80+ TIO.putStrLn $ relationAsHTML x
6881 Left err -> hPrint stderr err
6982
70−
83+{-
7184intmapMatrixRun :: IO ()
7285intmapMatrixRun = do
7386 let matrix = intmapMatrixRelation 100 100000
7487 print matrix
88+-}
7589
7690--compare IntMap speed and size
7791--this is about 3 times faster (9 minutes) for 10x100000 and uses 800 MB
92+{-
7893intmapMatrixRelation :: Int -> Int -> HS.HashSet (IM.IntMap Atom)
7994intmapMatrixRelation attributeCount tupleCount = HS.fromList $ map mapper [0..tupleCount]
8095 where
8196 mapper tupCount = IM.fromList $ map (\c-> (c, IntAtom (fromIntegral tupCount))) [0..attributeCount]
97+-}
98+-- instance Hash.Hashable (IM.IntMap Atom) where
99+-- hashWithSalt salt tupMap = Hash.hashWithSalt salt (show tupMap)
82100
83−instance Hash.Hashable (IM.IntMap Atom) where
84− hashWithSalt salt tupMap = Hash.hashWithSalt salt (show tupMap)
85−
101+{-
86102vectorMatrixRun :: IO ()
87103vectorMatrixRun = do
88104 let matrix = vectorMatrixRelation 100 100000
89105 print matrix
106+-}
107+-- 20 s 90 MBs- a clear win- ideal size is 10 * 100000 * 8 bytes = 80 MB! without IntAtom wrapper
108+--with IntAtom wrapper: 1m12s 90 MB
109+{-
110+
90111
91112-- 20 s 90 MBs- a clear win- ideal size is 10 * 100000 * 8 bytes = 80 MB! without IntAtom wrapper
92113--with IntAtom wrapper: 1m12s 90 MB
114+{-
115+
93116vectorMatrixRelation :: Int -> Int -> HS.HashSet (V.Vector Atom)
94117vectorMatrixRelation attributeCount tupleCount = HS.fromList $ map mapper [0..tupleCount]
95118 where
96119 mapper tupCount = V.replicate attributeCount (IntAtom (fromIntegral tupCount))
97−
120+-}
98121instance Hash.Hashable (V.Vector Atom) where
99122 hashWithSalt salt vec = Hash.hashWithSalt salt (show vec)
100−
123+-}
101124-- returns a relation with tupleCount tuples with a set of integer attributes attributesCount long
102125-- this is useful for performance and resource usage testing
103126matrixRelation :: Int -> Int -> Either RelationalError Relation
src/lib/ProjectM36/Arbitrary.hsnew file+127
@@ -0,0 +1,127 @@
1+{-# LANGUAGE ExistentialQuantification,FlexibleInstances,OverloadedStrings #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+
4+module ProjectM36.Arbitrary where
5+import ProjectM36.Base
6+import ProjectM36.Error
7+import ProjectM36.AtomFunctionError
8+import ProjectM36.AtomType
9+import ProjectM36.Attribute (atomType)
10+import ProjectM36.DataConstructorDef as DCD
11+import ProjectM36.DataTypes.Interval
12+import ProjectM36.Relation
13+import qualified Data.Vector as V
14+import Data.Text (Text)
15+import Test.QuickCheck
16+import Test.QuickCheck.Instances ()
17+import qualified Data.ByteString.Char8 as B
18+import Data.Time
19+import Control.Monad.Reader
20+
21+arbitrary' :: AtomType -> WithTCMap Gen (Either RelationalError Atom)
22+arbitrary' IntegerAtomType =
23+ Right . IntegerAtom <$> lift (arbitrary :: Gen Integer)
24+
25+arbitrary' (RelationAtomType attrs) = do
26+ tcMap <-ask
27+ maybeRel <- lift $ runReaderT (arbitraryRelation attrs (0,5)) tcMap
28+ case maybeRel of
29+ Left err -> pure $ Left err
30+ Right rel -> pure $ Right $ RelationAtom rel
31+
32+arbitrary' IntAtomType =
33+ Right . IntAtom <$> lift (arbitrary :: Gen Int)
34+
35+arbitrary' DoubleAtomType =
36+ Right . DoubleAtom <$> lift (arbitrary :: Gen Double)
37+
38+arbitrary' TextAtomType =
39+ Right . TextAtom <$> lift (arbitrary :: Gen Text)
40+
41+arbitrary' DayAtomType =
42+ Right . DayAtom <$> lift (arbitrary :: Gen Day)
43+
44+arbitrary' DateTimeAtomType =
45+ Right . DateTimeAtom <$> lift (arbitrary :: Gen UTCTime)
46+
47+arbitrary' ByteStringAtomType =
48+ Right . ByteStringAtom <$> lift (arbitrary :: Gen B.ByteString)
49+
50+arbitrary' BoolAtomType =
51+ Right . BoolAtom <$> lift (arbitrary :: Gen Bool)
52+
53+arbitrary' RelationalExprAtomType =
54+ pure (Right (RelationalExprAtom (ExistingRelation relationTrue))) -- don't bother with arbitrary relational expressions
55+
56+arbitrary' constructedAtomType@(ConstructedAtomType tcName tvMap)
57+ --special-casing for Interval type
58+ | isIntervalAtomType constructedAtomType = createArbitraryInterval (intervalSubType constructedAtomType)
59+ | otherwise = do
60+ tcMap <- ask
61+ let maybeTCons = findTypeConstructor tcName tcMap
62+ let eitherTCons = maybeToRight (NoSuchTypeConstructorName tcName) maybeTCons
63+ let eitherDCDefs = snd <$> eitherTCons
64+ let eitherGenDCDef = elements <$> eitherDCDefs
65+ case eitherGenDCDef of
66+ Left err -> pure $ Left err
67+ Right genDCDef -> do
68+ dcDef <- lift genDCDef
69+ case resolvedAtomTypesForDataConstructorDefArgs tcMap tvMap dcDef of
70+ Left err -> pure $ Left err
71+ Right atomTypes -> do
72+ let genListOfEitherAtom = mapM (\aTy->runReaderT (arbitrary' aTy) tcMap) atomTypes
73+ listOfEitherAtom <- lift genListOfEitherAtom
74+ let eitherListOfAtom = sequence listOfEitherAtom
75+ case eitherListOfAtom of
76+ Left err -> pure $ Left err
77+ Right listOfAtom -> pure $ Right $ ConstructedAtom (DCD.name dcDef) constructedAtomType listOfAtom
78+arbitrary' (TypeVariableType _) = error "arbitrary on type variable"
79+
80+maybeToRight :: b -> Maybe a -> Either b a
81+maybeToRight _ (Just x) = Right x
82+maybeToRight y Nothing = Left y
83+
84+arbitraryRelationTuple :: Attributes -> WithTCMap Gen (Either RelationalError RelationTuple)
85+arbitraryRelationTuple attris = do
86+ tcMap <- ask
87+ listOfMaybeAType <- lift $ mapM ((\aTy -> runReaderT (arbitrary' aTy) tcMap) . atomType) (V.toList (attributesVec attris))
88+ case sequence listOfMaybeAType of
89+ Left err -> pure $ Left err
90+ Right listOfAttr -> do
91+ let vectorOfAttr = V.fromList listOfAttr
92+ pure $ Right $ RelationTuple attris vectorOfAttr
93+
94+arbitraryWithRange :: Gen (Either RelationalError RelationTuple) -> Range -> Gen [Either RelationalError RelationTuple]
95+arbitraryWithRange genEitherTuple range = do
96+ num <- choose range
97+ vectorOf num genEitherTuple
98+
99+arbitraryRelation :: Attributes -> Range -> WithTCMap Gen (Either RelationalError Relation)
100+arbitraryRelation attris range = do
101+ tcMap <- ask
102+ let genEitherTuple = runReaderT (arbitraryRelationTuple attris) tcMap
103+ listOfEitherTuple <- lift $ arbitraryWithRange genEitherTuple range
104+ let eitherTupleList = sequence listOfEitherTuple
105+ case eitherTupleList of
106+ Left err -> pure $ Left err
107+ Right tupleList -> pure $ Right $ Relation attris $ RelationTupleSet tupleList
108+
109+type WithTCMap a = ReaderT TypeConstructorMapping a
110+
111+createArbitraryInterval :: AtomType -> WithTCMap Gen (Either RelationalError Atom)
112+createArbitraryInterval subType = if supportsInterval subType then do
113+ eBegin <- arbitrary' subType
114+ eEnd <- arbitrary' subType
115+ beginopen <- lift (arbitrary :: Gen Bool)
116+ endopen <- lift (arbitrary :: Gen Bool)
117+ case eBegin of
118+ Left err -> pure (Left err)
119+ Right begin ->
120+ case eEnd of
121+ Left err -> pure (Left err)
122+ Right end ->
123+ case createInterval begin end beginopen endopen of
124+ Left _ -> createArbitraryInterval subType
125+ Right val -> pure (Right val)
126+ else
127+ pure $ Left (ProjectM36.Error.AtomFunctionUserError (AtomTypeDoesNotSupportIntervalError (prettyAtomType subType)))
src/lib/ProjectM36/Atom.hs+15−10
@@ -1,11 +1,11 @@
11module ProjectM36.Atom where
22import ProjectM36.Base
33import ProjectM36.Error
4+import ProjectM36.DataTypes.Interval
45import qualified Data.Text as T
5−--import Data.Time.Calendar
6−--import Data.Time.Clock
7−--import Data.ByteString (ByteString)
6+#if __GLASGOW_HASKELL__ < 804
87import Data.Monoid
8+#endif
99
1010relationForAtom :: Atom -> Either RelationalError Relation
1111relationForAtom (RelationAtom rel) = Right rel
@@ -15,19 +15,24 @@ atomToText :: Atom -> T.Text
1515atomToText (IntegerAtom i) = (T.pack . show) i
1616atomToText (IntAtom i) = (T.pack . show) i
1717atomToText (DoubleAtom i) = (T.pack . show) i
18−atomToText (TextAtom i) = (T.pack . show) i --does this break quoting in CSV export?
18+atomToText (TextAtom i) = (T.pack . show) i --quotes necessary for ConstructedAtom subatoms
1919atomToText (DayAtom i) = (T.pack . show) i
2020atomToText (DateTimeAtom i) = (T.pack . show) i
2121atomToText (ByteStringAtom i) = (T.pack . show) i
2222atomToText (BoolAtom i) = (T.pack . show) i
23−atomToText (IntervalAtom b e bo be) = beginp <> begin <> "," <> end <> endp
24− where beginp = if bo then "(" else "["
25− begin = atomToText b
26− end = atomToText e
27− endp = if be then ")" else "]"
23+atomToText (RelationalExprAtom re) = (T.pack . show) re
2824
2925atomToText (RelationAtom i) = (T.pack . show) i
30−atomToText (ConstructedAtom dConsName _ atoms) = dConsName <> dConsArgs
26+atomToText (ConstructedAtom dConsName typ atoms)
27+ | isIntervalAtomType typ = case atoms of --special handling for printing intervals
28+ [b, e, BoolAtom bo, BoolAtom be] ->
29+ let beginp = if bo then "(" else "["
30+ begin = atomToText b
31+ end = atomToText e
32+ endp = if be then ")" else "]" in
33+ beginp <> begin <> "," <> end <> endp
34+ _ -> "invalid interval"
35+ | otherwise = dConsName <> dConsArgs
3136 where
3237 parensAtomToText a@(ConstructedAtom _ _ []) = atomToText a
3338 parensAtomToText a@ConstructedAtom{} = "(" <> atomToText a <> ")"
src/lib/ProjectM36/AtomFunction.hs+35−1
@@ -1,11 +1,20 @@
1+{-# LANGUAGE CPP #-}
12module ProjectM36.AtomFunction where
23import ProjectM36.Base
4+import ProjectM36.Serialise.Base ()
35import ProjectM36.Error
6+import ProjectM36.Relation
7+import ProjectM36.AtomType
48import ProjectM36.AtomFunctionError
9+import ProjectM36.ScriptSession
510import qualified ProjectM36.Attribute as A
611import qualified Data.HashSet as HS
12+import qualified Data.Text as T
13+import qualified Data.ByteString.Lazy as BL
14+import Codec.Winery
715
816foldAtomFuncType :: AtomType -> AtomType -> [AtomType]
17+--the underscore in the attribute name means that any attributes are acceptable
918foldAtomFuncType foldType returnType = [RelationAtomType (A.attributesFromList [Attribute "_" foldType]), returnType]
1019
1120atomFunctionForName :: AtomFunctionName -> AtomFunctions -> Either RelationalError AtomFunction
@@ -64,4 +73,29 @@ createScriptedAtomFunction funcName argsType retType = AddAtomFunction funcName
6473 argsType ++ [ADTypeConstructor "Either" [
6574 ADTypeConstructor "AtomFunctionError" [],
6675 retType]])
67−
76+
77+loadAtomFunctions :: ModName -> FuncName -> FilePath -> IO (Either LoadSymbolError [AtomFunction])
78+#ifdef PM36_HASKELL_SCRIPTING
79+loadAtomFunctions = loadFunction
80+#else
81+loadAtomFunctions _ _ _ = pure (Left LoadSymbolError)
82+#endif
83+
84+atomFunctionsAsRelation :: AtomFunctions -> Either RelationalError Relation
85+atomFunctionsAsRelation funcs = mkRelationFromList attrs tups
86+ where tups = map atomFuncToTuple (HS.toList funcs)
87+ attrs = A.attributesFromList [Attribute "name" TextAtomType,
88+ Attribute "arguments" TextAtomType]
89+ atomFuncToTuple aFunc = [TextAtom (atomFuncName aFunc),
90+ TextAtom (atomFuncTypeToText aFunc)]
91+ 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−2
@@ -1,6 +1,5 @@
11{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}
22module ProjectM36.AtomFunctionError where
3−import Data.Binary
43import GHC.Generics
54import Control.DeepSeq
65import Data.Text
@@ -9,9 +8,10 @@ data AtomFunctionError = AtomFunctionUserError String |
98 AtomFunctionTypeMismatchError |
109 InvalidIntervalOrderingError |
1110 InvalidIntervalBoundariesError |
11+ InvalidIntBoundError |
1212 AtomFunctionEmptyRelationError |
1313 AtomTypeDoesNotSupportOrderingError Text |
1414 AtomTypeDoesNotSupportIntervalError Text |
1515 AtomFunctionBytesDecodingError String
16− deriving(Generic, Eq, Show, Binary, NFData)
16+ deriving(Generic, Eq, Show, NFData)
1717
src/lib/ProjectM36/AtomFunctions/Basic.hs+2
@@ -6,6 +6,7 @@ import ProjectM36.DataTypes.Either
66import ProjectM36.DataTypes.Maybe
77import ProjectM36.DataTypes.Interval
88import ProjectM36.DataTypes.ByteString
9+import ProjectM36.DataTypes.NonEmptyList
910import ProjectM36.AtomFunctions.Primitive
1011import ProjectM36.AtomFunction
1112import ProjectM36.DataTypes.List
@@ -19,6 +20,7 @@ basicAtomFunctions = HS.unions [primitiveAtomFunctions,
1920 eitherAtomFunctions,
2021 maybeAtomFunctions,
2122 listAtomFunctions,
23+ nonEmptyListAtomFunctions,
2224 bytestringAtomFunctions,
2325 intervalAtomFunctions]
2426
src/lib/ProjectM36/AtomFunctions/Primitive.hs+9−1
@@ -43,7 +43,15 @@ primitiveAtomFunctions = HS.fromList [
4343 atomFuncBody = body $ integerAtomFuncLessThan True >=> boolAtomNot},
4444 AtomFunction { atomFuncName = "not",
4545 atomFuncType = [BoolAtomType, BoolAtomType],
46− atomFuncBody = body $ \(b:_) -> boolAtomNot b }
46+ atomFuncBody = body $ \(b:_) -> boolAtomNot b },
47+ AtomFunction { atomFuncName = "int",
48+ atomFuncType = [IntegerAtomType, IntAtomType],
49+ atomFuncBody = body $ \(IntegerAtom v:_) -> if v < fromIntegral (maxBound :: Int) then
50+ pure (IntAtom (fromIntegral v))
51+ else
52+ Left InvalidIntBoundError
53+ }
54+
4755 ]
4856 where
4957 body = AtomFunctionBody Nothing
src/lib/ProjectM36/AtomType.hs+210−64
@@ -6,6 +6,7 @@ import qualified ProjectM36.DataConstructorDef as DCD
66import ProjectM36.MiscUtils
77import ProjectM36.Error
88import ProjectM36.DataTypes.Primitive
9+import ProjectM36.AttributeExpr as AE
910import qualified ProjectM36.Attribute as A
1011import qualified Data.Vector as V
1112import qualified Data.Set as S
@@ -30,6 +31,7 @@ findDataConstructor dName = foldr tConsFolder Nothing
3031 [dCons] -> Just dCons
3132 _ -> error "More than one data constructor with the same name found"
3233
34+{-
3335-- | Scan the atom types and return the resultant ConstructedAtomType or error.
3436-- Used in typeFromAtomExpr to validate argument types.
3537atomTypeForDataConstructorName :: DataConstructorName -> [AtomType] -> TypeConstructorMapping -> Either RelationalError AtomType
@@ -38,28 +40,21 @@ atomTypeForDataConstructorName dConsName atomTypesIn tConsList =
3840 case findDataConstructor dConsName tConsList of
3941 Nothing -> Left (NoSuchDataConstructorError dConsName)
4042 Just (tCons, dCons) -> do
41− typeVars <- resolveDataConstructorTypeVars dCons atomTypesIn tConsList
42− pure (ConstructedAtomType (TCD.name tCons) typeVars)
43+ dConsVars <- resolveDataConstructorTypeVars dCons atomTypesIn tConsList
44+ let tConsVars = M.fromList (map TypeVariableType (TCD.typeVars tCons))
45+ allVars = M.union dConsVars tConsVars
46+ ConstructedAtomType (TCD.name tCons) <$> allVars
47+-}
4348
4449atomTypeForDataConstructorDefArg :: DataConstructorDefArg -> AtomType -> TypeConstructorMapping -> Either RelationalError AtomType
45−atomTypeForDataConstructorDefArg (DataConstructorDefTypeConstructorArg tCons) aType tConss =
46− case isValidAtomTypeForTypeConstructor aType tCons tConss of
47− Just err -> Left err
48− Nothing -> Right aType
50+atomTypeForDataConstructorDefArg (DataConstructorDefTypeConstructorArg tCons) aType tConss = do
51+ isValidAtomTypeForTypeConstructor aType tCons tConss
52+ pure aType
4953
5054atomTypeForDataConstructorDefArg (DataConstructorDefTypeVarNameArg _) aType _ = Right aType --any type is OK
5155
52−--reconcile the atom-in types with the type constructors
53−isValidAtomTypeForTypeConstructor :: AtomType -> TypeConstructor -> TypeConstructorMapping -> Maybe RelationalError
54−isValidAtomTypeForTypeConstructor aType (PrimitiveTypeConstructor _ expectedAType) _ = if expectedAType /= aType then Just (AtomTypeMismatchError expectedAType aType) else Nothing
55−
56−--lookup constructor name and check if the incoming atom types are valid
57−isValidAtomTypeForTypeConstructor (ConstructedAtomType tConsName _) (ADTypeConstructor expectedTConsName _) _ = if tConsName /= expectedTConsName then Just (TypeConstructorNameMismatch expectedTConsName tConsName) else Nothing
58−
59−isValidAtomTypeForTypeConstructor aType tCons _ = Just (AtomTypeTypeConstructorReconciliationError aType (TC.name tCons))
60−
6156-- | Used to determine if the atom arguments can be used with the data constructor.
62−-- | This is the entry point for type-checking from RelationalExpression.hs.
57+-- | This is the entry point for type-checking from RelationalExpression.hs
6358atomTypeForDataConstructor :: TypeConstructorMapping -> DataConstructorName -> [AtomType] -> Either RelationalError AtomType
6459atomTypeForDataConstructor tConss dConsName atomArgTypes =
6560 --lookup the data constructor
@@ -67,8 +62,12 @@ atomTypeForDataConstructor tConss dConsName atomArgTypes =
6762 Nothing -> Left (NoSuchDataConstructorError dConsName)
6863 Just (tCons, dCons) -> do
6964 --validate that the type constructor arguments are fulfilled in the data constructor
70− typeVars <- resolveDataConstructorTypeVars dCons atomArgTypes tConss
71− pure (ConstructedAtomType (TCD.name tCons) typeVars)
65+ dConsVars <- resolveDataConstructorTypeVars dCons atomArgTypes tConss
66+ let tConsVars = M.fromList (map (\v -> (v, TypeVariableType v)) (TCD.typeVars tCons))
67+ allVars = M.union dConsVars tConsVars
68+ unresolvedType = ConstructedAtomType (TCD.name tCons) allVars
69+ --validateAtomType unresolvedType tConss -- do not validate here because the type may not be fully resolved at this point
70+ pure unresolvedType
7271
7372-- | Walks the data and type constructors to extract the type variable map.
7473resolveDataConstructorTypeVars :: DataConstructorDef -> [AtomType] -> TypeConstructorMapping -> Either RelationalError TypeVarMap
@@ -82,10 +81,11 @@ resolveDataConstructorTypeVars dCons@(DataConstructorDef _ defArgs) aTypeArgs tC
8281 --if any two maps have the same key and different values, this indicates a type arg mismatch
8382 let typeVarMapFolder valMap acc = case acc of
8483 Left err -> Left err
85− Right accMap -> if accMap `M.isSubmapOf` valMap then
86− Right (M.union accMap valMap)
87− else
88− Left (DataConstructorTypeVarsMismatch (DCD.name dCons) accMap valMap)
84+ Right accMap ->
85+ case resolveAtomTypesInTypeVarMap valMap accMap of
86+ Left (TypeConstructorTypeVarMissing _) -> Left (DataConstructorTypeVarsMismatch (DCD.name dCons) accMap valMap)
87+ Left err -> Left err
88+ Right ok -> pure ok
8989 case foldr typeVarMapFolder (Right M.empty) maps of
9090 Left err -> Left err
9191 Right typeVarMaps -> pure typeVarMaps
@@ -116,36 +116,103 @@ resolveTypeConstructorTypeVars (ADTypeConstructor tConsName _) (ConstructedAtomT
116116 Right pVarMap'
117117 else
118118 Left (TypeConstructorTypeVarsMismatch expectedPVarNames (M.keysSet pVarMap'))
119−resolveTypeConstructorTypeVars (TypeVariable tvName) typ _ = Right (M.singleton tvName typ)
119+resolveTypeConstructorTypeVars (TypeVariable tvName) typ _ = case typ of
120+ TypeVariableType nam -> Left (TypeConstructorTypeVarMissing nam)
121+ _ -> Right (M.singleton tvName typ)
122+resolveTypeConstructorTypeVars (ADTypeConstructor tConsName []) typ tConss = case findTypeConstructor tConsName tConss of
123+ Just (PrimitiveTypeConstructorDef _ _, _) -> Right M.empty
124+ _ -> Left (TypeConstructorAtomTypeMismatch tConsName typ)
125+
120126resolveTypeConstructorTypeVars (ADTypeConstructor tConsName _) typ _ = Left (TypeConstructorAtomTypeMismatch tConsName typ)
127+
128+resolveTypeConstructorTypeVars (RelationAtomTypeConstructor attrExprs) typ tConsMap =
129+ case typ of
130+ RelationAtomType attrs ->
131+ --resolve any typevars in the attrExprs
132+ M.unions <$> mapM (\(expectedAtomType, attrExpr) -> resolveAttributeExprTypeVars attrExpr expectedAtomType tConsMap) (zip (A.atomTypesList attrs) attrExprs)
133+ otherType -> Left (AtomTypeMismatchError typ otherType)
134+
135+--used when recursing down sub-relation type definition
136+resolveAttributeExprTypeVars :: AttributeExprBase a -> AtomType -> TypeConstructorMapping -> Either RelationalError TypeVarMap
137+resolveAttributeExprTypeVars (NakedAttributeExpr attr) aType _ = pure $ resolveTypeVariable (A.atomType attr) aType
138+resolveAttributeExprTypeVars (AttributeAndTypeNameExpr _ tCons _) aType tConsMap = resolveTypeConstructorTypeVars tCons aType tConsMap
121139
122140-- check that type vars on the right also appear on the left
123141-- check that the data constructor names are unique
124−validateTypeConstructorDef :: TypeConstructorDef -> [DataConstructorDef] -> [RelationalError]
125−validateTypeConstructorDef tConsDef dConsList = execWriter $ do
142+validateTypeConstructorDef :: TypeConstructorDef -> [DataConstructorDef] -> TypeConstructorMapping -> Either RelationalError ()
143+validateTypeConstructorDef tConsDef dConsList tConsMap = do
126144 let duplicateDConsNames = dupes (L.sort (map DCD.name dConsList))
127− mapM_ tell [map DataConstructorNameInUseError duplicateDConsNames]
145+ unless (null duplicateDConsNames) (Left (someErrors (map DataConstructorNameInUseError duplicateDConsNames)))
128146 let leftSideVars = S.fromList (TCD.typeVars tConsDef)
129147 rightSideVars = S.unions (map DCD.typeVars dConsList)
130148 varsDiff = S.difference leftSideVars rightSideVars
131− mapM_ tell [map DataConstructorUsesUndeclaredTypeVariable (S.toList varsDiff)]
132− pure ()
133−
149+ when (S.size varsDiff > 0) (Left (someErrors (map DataConstructorUsesUndeclaredTypeVariable (S.toList varsDiff))))
150+ mapM_ (\dConsDef -> validateDataConstructorDef dConsDef tConsDef tConsMap) dConsList
151+
152+--check that the data constructor names are not in use (recursively)
153+validateDataConstructorDef :: DataConstructorDef -> TypeConstructorDef -> TypeConstructorMapping -> Either RelationalError ()
154+validateDataConstructorDef (DataConstructorDef dConsName dConsDefArgs) tConsDef tConsMap =
155+ case findDataConstructor dConsName tConsMap of
156+ Just _ -> Left (DataConstructorNameInUseError dConsName)
157+ Nothing ->
158+ mapM_ (\arg -> validateDataConstructorDefArg arg tConsDef tConsMap) dConsDefArgs
159+
160+
161+validateDataConstructorDefArg :: DataConstructorDefArg -> TypeConstructorDef -> TypeConstructorMapping -> Either RelationalError ()
162+validateDataConstructorDefArg (DataConstructorDefTypeConstructorArg (PrimitiveTypeConstructor _ _)) _ _ = Right ()
163+validateDataConstructorDefArg (DataConstructorDefTypeConstructorArg (TypeVariable _)) _ _ = Right ()
164+validateDataConstructorDefArg (DataConstructorDefTypeConstructorArg tCons) tConsDef tConsMap = case findTypeConstructor (TC.name tCons) tConsMap of
165+ Nothing ->
166+ when (TC.name tCons /= TCD.name tConsDef) (Left (NoSuchTypeConstructorName (TC.name tCons))) --allows for recursively-defined types
167+ Just (ADTypeConstructorDef _ tConsArgs, _) -> do --validate that the argument count matches- type matching can occur later
168+ let existingCount = length tConsArgs
169+ newCount = length (TC.arguments tCons)
170+ when (newCount /= existingCount) (Left (ConstructedAtomArgumentCountMismatchError existingCount newCount))
171+ Just (PrimitiveTypeConstructorDef _ _, _) -> pure ()
172+validateDataConstructorDefArg (DataConstructorDefTypeVarNameArg _) _ _ = Right ()
173+
174+atomTypeForTypeConstructor :: TypeConstructor -> TypeConstructorMapping -> TypeVarMap -> Either RelationalError AtomType
175+atomTypeForTypeConstructor = atomTypeForTypeConstructorValidate False
134176
135177-- | Create an atom type iff all type variables are provided.
136178-- Either Int Text -> ConstructedAtomType "Either" {Int , Text}
137−atomTypeForTypeConstructor :: TypeConstructor -> TypeConstructorMapping -> TypeVarMap -> Either RelationalError AtomType
138−atomTypeForTypeConstructor (PrimitiveTypeConstructor _ aType) _ _ = Right aType
139−atomTypeForTypeConstructor (TypeVariable tvname) _ tvMap = case M.lookup tvname tvMap of
140− Nothing -> Right (TypeVariableType tvname)
179+atomTypeForTypeConstructorValidate :: Bool -> TypeConstructor -> TypeConstructorMapping -> TypeVarMap -> Either RelationalError AtomType
180+atomTypeForTypeConstructorValidate _ (PrimitiveTypeConstructor _ aType) _ _ = Right aType
181+atomTypeForTypeConstructorValidate validate (TypeVariable tvname) _ tvMap = case M.lookup tvname tvMap of
182+ Nothing -> if validate then
183+ Left (TypeConstructorTypeVarMissing tvname)
184+ else
185+ pure (TypeVariableType tvname)
141186 Just typ -> Right typ
142−atomTypeForTypeConstructor tCons tConss tvMap = case findTypeConstructor (TC.name tCons) tConss of
187+atomTypeForTypeConstructorValidate _ (RelationAtomTypeConstructor attrExprs) tConsMap tvMap = do
188+ resolvedAtomTypes <- mapM (\expr -> atomTypeForAttributeExpr expr tConsMap tvMap) attrExprs
189+ let attrs = zipWith Attribute (map AE.attributeName attrExprs) resolvedAtomTypes
190+ pure (RelationAtomType (A.attributesFromList attrs))
191+atomTypeForTypeConstructorValidate val tCons tConss tvMap = case findTypeConstructor (TC.name tCons) tConss of
143192 Nothing -> Left (NoSuchTypeConstructorError (TC.name tCons))
193+ Just (PrimitiveTypeConstructorDef _ aType, _) -> Right aType
144194 Just (tConsDef, _) -> do
145− tConsArgTypes <- mapM (\tConsArg -> atomTypeForTypeConstructor tConsArg tConss tvMap) (TC.arguments tCons)
146− let pVarNames = TCD.typeVars tConsDef
147− tConsArgs = M.fromList (zip pVarNames tConsArgTypes)
148− Right (ConstructedAtomType (TC.name tCons) tConsArgs)
195+ tConsArgTypes <- mapM (\tConsArg -> atomTypeForTypeConstructorValidate val tConsArg tConss tvMap) (TC.arguments tCons)
196+ let pVarNames = TCD.typeVars tConsDef
197+ tConsArgs = M.fromList (zip pVarNames tConsArgTypes)
198+ Right (ConstructedAtomType (TC.name tCons) tConsArgs)
199+
200+
201+atomTypeForAttributeExpr :: AttributeExprBase a -> TypeConstructorMapping -> TypeVarMap -> Either RelationalError AtomType
202+atomTypeForAttributeExpr (NakedAttributeExpr attr) _ _ = pure (A.atomType attr)
203+atomTypeForAttributeExpr (AttributeAndTypeNameExpr _ tCons _) tConsMap tvMap = atomTypeForTypeConstructorValidate True tCons tConsMap tvMap
204+
205+--reconcile the atom-in types with the type constructors
206+isValidAtomTypeForTypeConstructor :: AtomType -> TypeConstructor -> TypeConstructorMapping -> Either RelationalError ()
207+isValidAtomTypeForTypeConstructor aType (PrimitiveTypeConstructor _ expectedAType) _ = if expectedAType /= aType then Left (AtomTypeMismatchError expectedAType aType) else pure ()
208+
209+--lookup constructor name and check if the incoming atom types are valid
210+isValidAtomTypeForTypeConstructor (ConstructedAtomType tConsName _) (ADTypeConstructor expectedTConsName _) _ = if tConsName /= expectedTConsName then Left (TypeConstructorNameMismatch expectedTConsName tConsName) else pure ()
211+
212+isValidAtomTypeForTypeConstructor (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)
215+isValidAtomTypeForTypeConstructor aType tCons _ = Left (AtomTypeTypeConstructorReconciliationError aType (TC.name tCons))
149216
150217findTypeConstructor :: TypeConstructorName -> TypeConstructorMapping -> Maybe (TypeConstructorDef, [DataConstructorDef])
151218findTypeConstructor name = foldr tConsFolder Nothing
@@ -154,17 +221,30 @@ findTypeConstructor name = foldr tConsFolder Nothing
154221 Just (tCons, dConsList)
155222 else
156223 accum
157−
224+
225+resolveAttributes :: Attribute -> Attribute -> Either RelationalError Attribute
226+resolveAttributes attrA attrB =
227+ if A.attributeName attrA /= A.attributeName attrB then
228+ Left $ AttributeNamesMismatchError (S.fromList (map A.attributeName [attrA, attrB]))
229+ else
230+ Attribute (A.attributeName attrA) <$> resolveAtomType (A.atomType attrA) (A.atomType attrB)
231+
232+--given two atom types, try to resolve type variables
158233resolveAtomType :: AtomType -> AtomType -> Either RelationalError AtomType
159−resolveAtomType (ConstructedAtomType tConsName resolvedTypeVarMap) (ConstructedAtomType _ unresolvedTypeVarMap) = do
160− tVarMap <- resolveAtomTypesInTypeVarMap resolvedTypeVarMap unresolvedTypeVarMap
161− pure (ConstructedAtomType tConsName tVarMap)
234+resolveAtomType (ConstructedAtomType tConsName resolvedTypeVarMap) (ConstructedAtomType _ unresolvedTypeVarMap) =
235+ ConstructedAtomType tConsName <$> resolveAtomTypesInTypeVarMap resolvedTypeVarMap unresolvedTypeVarMap
162236resolveAtomType typeFromRelation unresolvedType = if typeFromRelation == unresolvedType then
163237 Right typeFromRelation
164238 else
165239 Left (AtomTypeMismatchError typeFromRelation unresolvedType)
166240
167−-- this could be optimized to reduce new tuple creation- if anyatomtype does not appear, just return the original typevarmap
241+{-
242+--walk an `AtomType` and apply the type variables in the map
243+resolveAtomTypeVars :: TypeVarMap -> AtomType -> AtomType
244+resolveAtomTypeVars tvMap typ@(TypeVariableType nam) = fromMaybe typ (M.lookup nam tvMap)
245+resolveAtomTypeVars tvMap (RelationAtomType relAttrs) =
246+-}
247+-- this could be optimized to reduce new tuple creation
168248resolveAtomTypesInTypeVarMap :: TypeVarMap -> TypeVarMap -> Either RelationalError TypeVarMap
169249resolveAtomTypesInTypeVarMap resolvedTypeMap unresolvedTypeMap = do
170250 {-
@@ -180,29 +260,42 @@ resolveAtomTypesInTypeVarMap resolvedTypeMap unresolvedTypeMap = do
180260 let resolveTypePair resKey resType =
181261 -- if the key is missing in the unresolved type map, then fill it in with the value from the resolved map
182262 case M.lookup resKey unresolvedTypeMap of
183− Just unresType -> case unresType of
263+ Just unresType -> case unresType of
184264 --do we need to recurse for RelationAtomType?
185265 subType@(ConstructedAtomType _ _) -> do
186266 resSubType <- resolveAtomType resType subType
187267 pure (resKey, resSubType)
188− otherType -> pure (resKey, otherType)
268+ TypeVariableType _ -> pure (resKey, resType)
269+ typ -> if typ == resType then
270+ pure (resKey, resType)
271+ else
272+ Left $ AtomTypeMismatchError typ resType
189273 Nothing ->
190274 pure (resKey, resType) --swipe the missing type var from the expected map
191275 tVarList <- mapM (uncurry resolveTypePair) (M.toList resolvedTypeMap)
192276 pure (M.fromList tVarList)
193277
194278-- | See notes at `resolveTypesInTuple`. The typeFromRelation must not include any wildcards.
195−resolveTypeInAtom :: AtomType -> Atom -> Either RelationalError Atom
196−resolveTypeInAtom typeFromRelation atomIn@(ConstructedAtom dConsName _ args) = do
279+resolveTypeInAtom :: AtomType -> Atom -> TypeConstructorMapping -> Either RelationalError Atom
280+resolveTypeInAtom typeFromRelation@(ConstructedAtomType _ tvMap) atomIn@(ConstructedAtom dConsName _ args) tConss = do
197281 newType <- resolveAtomType typeFromRelation (atomTypeForAtom atomIn)
198− pure (ConstructedAtom dConsName newType args)
199−resolveTypeInAtom _ atom = Right atom
282+ case findDataConstructor dConsName tConss of
283+ Nothing -> -- the atom may have been constructed using a constructor function without a public data constructor, no further resolution is possible
284+ pure atomIn
285+ Just (_, dConsDef) -> do
286+ atomArgTypes <- resolvedAtomTypesForDataConstructorDefArgs tConss tvMap dConsDef
287+ newArgs <- mapM (\(atom, atomTyp) -> resolveTypeInAtom atomTyp atom tConss) (zip args atomArgTypes)
288+ pure (ConstructedAtom dConsName newType newArgs)
289+resolveTypeInAtom (RelationAtomType attrs) (RelationAtom (Relation _ tupSet)) tConss = do
290+ let newTups = mapM (resolveTypesInTuple attrs tConss) (asList tupSet)
291+ RelationAtom . Relation attrs . RelationTupleSet <$> newTups
292+resolveTypeInAtom _ atom _ = Right atom
200293
201294-- | When creating a tuple, the data constructor may not complete the type constructor arguments, so the wildcard "TypeVar x" fills in the type constructor's argument. The tuple type must be resolved before it can be part of a relation, however.
202295-- 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.
203−resolveTypesInTuple :: Attributes -> RelationTuple -> Either RelationalError RelationTuple
204−resolveTypesInTuple resolvedAttrs (RelationTuple _ tupAtoms) = do
205− newAtoms <- mapM (\(atom, resolvedType) -> resolveTypeInAtom resolvedType atom) (zip (V.toList tupAtoms) $ map A.atomType (V.toList resolvedAttrs))
296+resolveTypesInTuple :: Attributes -> TypeConstructorMapping -> RelationTuple -> Either RelationalError RelationTuple
297+resolveTypesInTuple resolvedAttrs tConss (RelationTuple _ tupAtoms) = do
298+ newAtoms <- mapM (\(atom, resolvedType) -> resolveTypeInAtom resolvedType atom tConss) (zip (V.toList tupAtoms) $ A.atomTypesList resolvedAttrs)
206299 Right (RelationTuple resolvedAttrs (V.fromList newAtoms))
207300
208301-- | Validate that the type is provided with complete type variables for type constructors.
@@ -217,12 +310,38 @@ validateAtomType typ@(ConstructedAtomType tConsName tVarMap) tConss =
217310 if not (S.null diff) then
218311 Left $ TypeConstructorTypeVarsMismatch expectedTyVarNames actualTyVarNames
219312 else
220− Right ()
221− _ -> Right ()
222−validateAtomType _ _ = Right ()
313+ validateTypeVarMap tVarMap tConss
314+ _ -> Right ()
315+validateAtomType (RelationAtomType attrs) tConss =
316+ mapM_ (\attr ->
317+ validateAtomType (A.atomType attr) tConss) (attributesVec attrs)
318+validateAtomType (TypeVariableType x) _ = Left (TypeConstructorTypeVarMissing x)
319+validateAtomType _ _ = pure ()
320+
321+validateAttributes :: TypeConstructorMapping -> Attributes -> Either RelationalError ()
322+validateAttributes tConss attrs =
323+ if not (null errs) then
324+ Left (someErrors errs)
325+ else
326+ pure ()
327+ where
328+ errs = lefts $ map (`validateAtomType` tConss) (A.atomTypesList attrs)
329+
330+--ensure that all type vars are fully resolved
331+validateTypeVarMap :: TypeVarMap -> TypeConstructorMapping -> Either RelationalError ()
332+validateTypeVarMap tvMap tConss = mapM_ (`validateAtomType` tConss) $ M.elems tvMap
223333
224334validateTuple :: RelationTuple -> TypeConstructorMapping -> Either RelationalError ()
225−validateTuple (RelationTuple _ atoms) tConss = mapM_ (\a -> validateAtomType (atomTypeForAtom a) tConss) atoms
335+validateTuple (RelationTuple _ atoms) tConss = mapM_ (`validateAtom` tConss) atoms
336+
337+--ensure that all types are fully resolved
338+validateAtom :: Atom -> TypeConstructorMapping -> Either RelationalError ()
339+validateAtom (RelationAtom (Relation _ tupSet)) tConss = mapM_ (`validateTuple` tConss) (asList tupSet)
340+validateAtom (ConstructedAtom _ dConsType atomArgs) tConss = do
341+ validateAtomType dConsType tConss
342+ mapM_ (`validateAtom` tConss) atomArgs
343+validateAtom _ _ = pure ()
344+
226345
227346-- | Determine if two types are equal or compatible (including special handling for TypeVar x).
228347atomTypeVerify :: AtomType -> AtomType -> Either RelationalError AtomType
@@ -239,9 +358,8 @@ atomTypeVerify x@(RelationAtomType attrs1) y@(RelationAtomType attrs2) = do
239358 if notElem "_" [name1, name2] && name1 /= name2 then
240359 Left $ AtomTypeMismatchError x y
241360 else
242− atomTypeVerify (A.atomType attr1) (A.atomType attr2)) $ V.toList (V.zip attrs1 attrs2)
361+ atomTypeVerify (A.atomType attr1) (A.atomType attr2)) $ V.toList (V.zip (attributesVec attrs1) (attributesVec attrs2))
243362 return x
244−atomTypeVerify (IntervalAtomType typA) (IntervalAtomType typB) = atomTypeVerify typA typB
245363atomTypeVerify x y = if x == y then
246364 Right x
247365 else
@@ -249,20 +367,26 @@ atomTypeVerify x y = if x == y then
249367
250368-- | Determine if two typeVars are logically compatible.
251369typeVarMapsVerify :: TypeVarMap -> TypeVarMap -> Bool
252−typeVarMapsVerify a b = M.keysSet a == M.keysSet b && (length . rights) (map (\((_,v1),(_,v2)) -> atomTypeVerify v1 v2) (zip (M.toAscList a) (M.toAscList b))) == M.size a
370+typeVarMapsVerify a b = M.keysSet a == M.keysSet b && (length . rights) zipped == M.size a
371+ where
372+ zipped = zipWith
373+ (curry (\ ((_, v1), (_, v2)) -> atomTypeVerify v1 v2))
374+ (M.toAscList a)
375+ (M.toAscList b)
253376
254377prettyAtomType :: AtomType -> T.Text
255−prettyAtomType (RelationAtomType attrs) = "relation {" `T.append` T.intercalate "," (map prettyAttribute (V.toList attrs)) `T.append` "}"
378+prettyAtomType (RelationAtomType attrs) = "relation {" `T.append` T.intercalate "," (map prettyAttribute (V.toList (attributesVec attrs))) `T.append` "}"
256379prettyAtomType (ConstructedAtomType tConsName typeVarMap) = tConsName `T.append` T.concat (map showTypeVars (M.toList typeVarMap))
257380 where
381+ showTypeVars (_, TypeVariableType x) = " " <> x
258382 showTypeVars (tyVarName, aType) = " (" `T.append` tyVarName `T.append` "::" `T.append` prettyAtomType aType `T.append` ")"
259383-- it would be nice to have the original ordering, but we don't have access to the type constructor here- maybe the typevarmap should be also positional (ordered map?)
260−prettyAtomType (TypeVariableType x) = "?TypeVariableType " <> x <> "?"
261−prettyAtomType (IntervalAtomType tv) = "Interval (" <> prettyAtomType tv <> ")"
384+prettyAtomType (TypeVariableType x) = x
262385prettyAtomType aType = T.take (T.length fullName - T.length "AtomType") fullName
263386 where fullName = (T.pack . show) aType
264387
265388prettyAttribute :: Attribute -> T.Text
389+prettyAttribute (Attribute _ (TypeVariableType x)) = x
266390prettyAttribute attr = A.attributeName attr `T.append` "::" `T.append` prettyAtomType (A.atomType attr)
267391
268392resolveTypeVariables :: [AtomType] -> [AtomType] -> Either RelationalError TypeVarMap
@@ -282,7 +406,6 @@ resolveTypeVariables expectedArgTypes actualArgTypes = do
282406
283407resolveTypeVariable :: AtomType -> AtomType -> TypeVarMap
284408resolveTypeVariable (TypeVariableType tv) typ = M.singleton tv typ
285−resolveTypeVariable (IntervalAtomType ityp) typ = resolveTypeVariable ityp typ
286409resolveTypeVariable (ConstructedAtomType _ _) (ConstructedAtomType _ actualTvMap) = actualTvMap
287410resolveTypeVariable _ _ = M.empty
288411
@@ -293,7 +416,6 @@ resolveFunctionReturnValue funcName tvMap (ConstructedAtomType tCons retMap) = d
293416 pure (ConstructedAtomType tCons (M.intersection tvMap retMap))
294417 else
295418 Left (AtomFunctionTypeVariableResolutionError funcName (fst (head (M.toList diff))))
296−resolveFunctionReturnValue funcName tvMap (IntervalAtomType tv) = IntervalAtomType <$> resolveFunctionReturnValue funcName tvMap tv
297419resolveFunctionReturnValue funcName tvMap (TypeVariableType tvName) = case M.lookup tvName tvMap of
298420 Nothing -> Left (AtomFunctionTypeVariableResolutionError funcName tvName)
299421 Just typ -> pure typ
@@ -308,3 +430,27 @@ resolvedAtomTypeForDataConstructorDefArg tConsMap tvMap (DataConstructorDefTypeC
308430resolvedAtomTypeForDataConstructorDefArg _ tvMap (DataConstructorDefTypeVarNameArg tvName) = case M.lookup tvName tvMap of
309431 Nothing -> Left (DataConstructorUsesUndeclaredTypeVariable tvName)
310432 Just typ -> Right typ
433+
434+isResolvedType :: AtomType -> Bool
435+isResolvedType typ =
436+ case typ of
437+ IntAtomType -> True
438+ IntegerAtomType -> True
439+ DoubleAtomType -> True
440+ TextAtomType -> True
441+ DayAtomType -> True
442+ DateTimeAtomType -> True
443+ ByteStringAtomType -> True
444+ BoolAtomType -> True
445+ RelationalExprAtomType -> True
446+ RelationAtomType attrs -> isResolvedAttributes attrs
447+ ConstructedAtomType _ tvMap -> all isResolvedType (M.elems tvMap)
448+ TypeVariableType _ -> False
449+
450+isResolvedAttributes :: Attributes -> Bool
451+isResolvedAttributes attrs = all isResolvedAttribute (V.toList (attributesVec attrs))
452+
453+isResolvedAttribute :: Attribute -> Bool
454+isResolvedAttribute = isResolvedType . A.atomType
455+
456+--given two AtomTypes x,y
src/lib/ProjectM36/Atomable.hs+68−56
@@ -1,39 +1,28 @@
11{-# LANGUAGE DefaultSignatures, TypeFamilies, TypeOperators, PolyKinds, FlexibleInstances, ScopedTypeVariables, FlexibleContexts #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
23module ProjectM36.Atomable where
34--http://stackoverflow.com/questions/13448361/type-families-with-ghc-generics-or-data-data
45--instances to marshal Haskell ADTs to ConstructedAtoms and back
56import ProjectM36.Base
6−import ProjectM36.DataTypes.Primitive
77import ProjectM36.DataTypes.List
8+import ProjectM36.DataTypes.NonEmptyList
89import ProjectM36.DataTypes.Maybe
910import ProjectM36.DataTypes.Either
1011import GHC.Generics
1112import qualified Data.Map as M
1213import qualified Data.Text as T
14+import qualified Data.Vector as V
1315import Control.DeepSeq (NFData)
14−import Data.Binary
1516import Control.Applicative
1617import Data.Time.Calendar
1718import Data.ByteString (ByteString)
1819import Data.Time.Clock
19−import Data.Maybe
2020import Data.Proxy
21+import qualified Data.List.NonEmpty as NE
22+import Codec.Winery
2123
22−--also add haskell scripting atomable support
23−--rename this module to Atomable along with test
24−
25−{-
26−data Test1T = Test1C Int
27− deriving (Generic, Show, Eq, Binary, NFData, Atomable)
28−
29−data Test2T = Test2C Int Int
30− deriving (Generic, Show, Eq, Binary, NFData, Atomable)
31−
32−data Test3T = Test3Ca | Test3Cb
33− deriving (Generic, Show, Eq, Binary, NFData, Atomable)
34−-}
3524-- | 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.
36−class (Eq a, NFData a, Binary a, Show a) => Atomable a where
25+class (Eq a, NFData a, Serialise a, Show a) => Atomable a where
3726 toAtom :: a -> Atom
3827 default toAtom :: (Generic a, AtomableG (Rep a)) => a -> Atom
3928 toAtom v = toAtomG (from v) (toAtomTypeG (from v))
@@ -52,9 +41,9 @@ class (Eq a, NFData a, Binary a, Show a) => Atomable a where
5241 toAtomType _ = toAtomTypeG (from (undefined :: a))
5342
5443 -- | Creates DatabaseContextExpr necessary to load the type constructor and data constructor into the database.
55− toAddTypeExpr :: Proxy a -> DatabaseContextExpr
44+ toAddTypeExpr :: proxy a -> DatabaseContextExpr
5645 default toAddTypeExpr :: (Generic a, AtomableG (Rep a)) => proxy a -> DatabaseContextExpr
57− toAddTypeExpr _ = toAddTypeExprG (from (undefined :: a)) (toAtomType (Proxy :: Proxy a))
46+ toAddTypeExpr _ = toAddTypeExprG (from (error "insufficient laziness" :: a)) (toAtomType (Proxy :: Proxy a))
5847
5948instance Atomable Integer where
6049 toAtom = IntegerAtom
@@ -146,15 +135,23 @@ instance (Atomable a, Atomable b) => Atomable (Either a b) where
146135--convert to ADT list
147136instance Atomable a => Atomable [a] where
148137 toAtom [] = ConstructedAtom "Empty" (listAtomType (toAtomType (Proxy :: Proxy a))) []
149− toAtom (x:xs) = ConstructedAtom "Cons" (listAtomType (toAtomType (Proxy :: Proxy a))) (map toAtom (x:xs))
138+ toAtom (x:xs) = ConstructedAtom "Cons" (listAtomType (toAtomType (Proxy :: Proxy a))) (toAtom x: [toAtom xs])
150139
151140 fromAtom (ConstructedAtom "Empty" _ _) = []
152− fromAtom (ConstructedAtom "Cons" _ (x:xs)) = fromAtom x:map fromAtom xs
141+ fromAtom (ConstructedAtom "Cons" _ [x,y]) = fromAtom x:fromAtom y
153142 fromAtom _ = error "improper fromAtom [a]"
154143
155144 toAtomType _ = ConstructedAtomType "List" (M.singleton "a" (toAtomType (Proxy :: Proxy a)))
156145 toAddTypeExpr _ = NoOperation
157146
147+instance Atomable a => Atomable (NE.NonEmpty a) where
148+ toAtom (x NE.:| []) = ConstructedAtom "NECons" (nonEmptyListAtomType (toAtomType (Proxy :: Proxy a))) [toAtom x]
149+ toAtom (x NE.:| xs) = ConstructedAtom "NECons" (nonEmptyListAtomType (toAtomType (Proxy :: Proxy a))) (map toAtom (x:xs))
150+ fromAtom _ = error "improper fromAtom (NonEmptyList a)"
151+
152+ toAtomType _ = ConstructedAtomType "NonEmptyList" (M.singleton "a" (toAtomType (Proxy :: Proxy a)))
153+ toAddTypeExpr _ = NoOperation
154+
158155-- Generics
159156class AtomableG g where
160157 --type AtomTG g
@@ -170,17 +167,17 @@ class AtomableG g where
170167instance (Datatype c, AtomableG a) => AtomableG (M1 D c a) where
171168 toAtomG (M1 v) = toAtomG v
172169 fromAtomG atom args = M1 <$> fromAtomG atom args
173− toAtomsG = undefined
170+ toAtomsG = error "invalid toAtomsG in M1 D"
174171 toAtomTypeG _ = ConstructedAtomType (T.pack typeName) M.empty -- generics don't allow us to get the type constructor variables- alternatives?
175172 where
176173 typeName = datatypeName (undefined :: M1 D c a x)
177− toAddTypeExprG (M1 v) (ConstructedAtomType tcName _) = AddTypeConstructor tcDef dataConstructors
174+ toAddTypeExprG ~(M1 v) (ConstructedAtomType tcName _) = AddTypeConstructor tcDef dataConstructors
178175 where
179176 tcDef = ADTypeConstructorDef tcName []
180177 dataConstructors = getConstructorsG v
181178 toAddTypeExprG _ _ = NoOperation
182− getConstructorsG (M1 v) = getConstructorsG v
183− getConstructorArgsG = undefined
179+ getConstructorsG ~(M1 v) = getConstructorsG v
180+ getConstructorArgsG = error "invalid getConstructorArgsG in M1 D"
184181
185182--constructor metadata
186183instance (Constructor c, AtomableG a) => AtomableG (M1 C c a) where
@@ -195,11 +192,11 @@ instance (Constructor c, AtomableG a) => AtomableG (M1 C c a) where
195192 Nothing
196193 where
197194 dName = T.pack (conName (undefined :: M1 C c a x))
198− fromAtomG _ _ = error "unsupported generic traversal"
199− toAtomsG = undefined
200− toAtomTypeG = undefined
201− toAddTypeExprG = undefined
202− getConstructorsG (M1 v) = [DataConstructorDef (T.pack dName) dArgs]
195+ fromAtomG _ _ = error "invalid fromAtomG in M1 C"
196+ toAtomsG = error "invalid toAtomsG in M1 C"
197+ toAtomTypeG = error "invalid toAtomTypeG in M1 C"
198+ toAddTypeExprG = error "invalid toAddTypeExprG in M1 C"
199+ getConstructorsG ~(M1 v) = [DataConstructorDef (T.pack dName) dArgs]
203200 where
204201 dName = conName (undefined :: M1 C c a x)
205202 dArgs = getConstructorArgsG v
@@ -211,9 +208,9 @@ instance (Selector c, AtomableG a) => AtomableG (M1 S c a) where
211208 fromAtomG atom args = M1 <$> fromAtomG atom args
212209 toAtomsG (M1 v) = toAtomsG v
213210 toAtomTypeG (M1 v) = toAtomTypeG v
214− toAddTypeExprG _ _ = undefined
215− getConstructorsG = undefined
216− getConstructorArgsG (M1 v) = getConstructorArgsG v
211+ toAddTypeExprG = error "invalid toAddTypeExprG in M1 S"
212+ getConstructorsG = error "invalid getConstructorsG in M1 S"
213+ getConstructorArgsG ~(M1 v) = getConstructorArgsG v
217214
218215-- field data metadata
219216instance (Atomable a) => AtomableG (K1 c a) where
@@ -223,48 +220,63 @@ instance (Atomable a) => AtomableG (K1 c a) where
223220 headatom [] = error "no more atoms for constructor!"
224221 toAtomsG (K1 v) = [toAtom v]
225222 toAtomTypeG _ = toAtomType (Proxy :: Proxy a)
226− toAddTypeExprG _ _ = undefined
227− getConstructorsG = undefined
228− getConstructorArgsG (K1 _) = [DataConstructorDefTypeConstructorArg tCons]
223+ toAddTypeExprG = error "invalid toAddTypeExprG in K1"
224+ getConstructorsG = error "invalid getConstructorsG in K1"
225+ getConstructorArgsG ~(K1 _) = [DataConstructorDefTypeConstructorArg tCons]
229226 where
230− tCons = PrimitiveTypeConstructor primitiveATypeName primitiveAType
231− primitiveAType = toAtomType (Proxy :: Proxy a)
232− primitiveATypeName = fromMaybe (error ("primitive type missing: " ++ show primitiveAType)) (foldr (\(PrimitiveTypeConstructorDef name typ, _) _ -> if typ == primitiveAType then Just name else Nothing) Nothing primitiveTypeConstructorMapping)
233−
227+ tCons = typeToTypeConstructor $ toAtomType (Proxy :: Proxy a)
228+
229+typeToTypeConstructor :: AtomType -> TypeConstructor
230+typeToTypeConstructor x@IntAtomType = PrimitiveTypeConstructor "Int" x
231+typeToTypeConstructor x@IntegerAtomType = PrimitiveTypeConstructor "Integer" x
232+typeToTypeConstructor x@DoubleAtomType = PrimitiveTypeConstructor "Double" x
233+typeToTypeConstructor x@TextAtomType = PrimitiveTypeConstructor "Text" x
234+typeToTypeConstructor x@DayAtomType = PrimitiveTypeConstructor "Day" x
235+typeToTypeConstructor x@DateTimeAtomType = PrimitiveTypeConstructor "DateTime" x
236+typeToTypeConstructor x@ByteStringAtomType = PrimitiveTypeConstructor "ByteString" x
237+typeToTypeConstructor x@BoolAtomType = PrimitiveTypeConstructor "Bool" x
238+typeToTypeConstructor x@RelationalExprAtomType = PrimitiveTypeConstructor "RelationalExpr" x
239+typeToTypeConstructor (RelationAtomType attrs)
240+ = RelationAtomTypeConstructor $ map attrToAttrExpr $ V.toList (attributesVec attrs)
241+ where
242+ attrToAttrExpr (Attribute n t) = AttributeAndTypeNameExpr n (typeToTypeConstructor t) ()
243+typeToTypeConstructor (ConstructedAtomType tcName tvMap)
244+ = ADTypeConstructor tcName $ map typeToTypeConstructor (M.elems tvMap)
245+typeToTypeConstructor (TypeVariableType tvName) = TypeVariable tvName
246+
234247instance AtomableG U1 where
235− toAtomG = undefined
248+ toAtomG = error "invalid toAtomG in U1"
236249 fromAtomG _ _ = pure U1
237250 toAtomsG _ = []
238− toAtomTypeG = undefined
239− toAddTypeExprG = undefined
240− getConstructorsG = undefined
251+ toAtomTypeG = error "invalid toAtomTypeG in U1"
252+ toAddTypeExprG = error "invalid toAddTypeExprG in U1"
253+ getConstructorsG = error "invalid getConstructorsG in U1"
241254 getConstructorArgsG _ = []
242255
243256-- product types
244257instance (AtomableG a, AtomableG b) => AtomableG (a :*: b) where
245258 toAtomG = undefined
246− fromAtomG atom args = (:*:) <$> fromAtomG atom [headatom args] <*> fromAtomG atom (tailatoms args)
247− where headatom (x:_) = x
248− headatom [] = error "no more atoms in head for product!"
249− tailatoms (_:xs) = xs
250− tailatoms [] = error "no more atoms in tail for product!"
251− toAtomTypeG = undefined
259+ fromAtomG atom args = (:*:) <$> fromAtomG atom splitargs1 <*> fromAtomG atom splitargs2
260+ where splitargs1 = take splitpoint args
261+ splitargs2 = drop splitpoint args
262+ splitpoint = length args `div` 2
263+ toAtomTypeG = error "invalid toAtomTypeG in :*:"
252264 toAtomsG (x :*: y) = toAtomsG x ++ toAtomsG y
253− toAddTypeExprG _ _ = undefined
254− getConstructorsG = undefined
255− getConstructorArgsG (x :*: y) = getConstructorArgsG x ++ getConstructorArgsG y
265+ toAddTypeExprG = error "invalid toAddTypeExprG in :*:"
266+ getConstructorsG = error "invalid getConstructorsG in :*:"
267+ getConstructorArgsG ~(x :*: y) = getConstructorArgsG x ++ getConstructorArgsG y
256268
257269-- sum types
258270instance (AtomableG a, AtomableG b) => AtomableG (a :+: b) where
259271 toAtomG (L1 x) = toAtomG x
260272 toAtomG (R1 x) = toAtomG x
261273 fromAtomG atom args = (L1 <$> fromAtomG atom args) <|> (R1 <$> fromAtomG atom args)
262− toAtomTypeG = undefined
274+ toAtomTypeG = error "invalid toAtomTypeG in :+:"
263275 toAtomsG (L1 x) = toAtomsG x
264276 toAtomsG (R1 x) = toAtomsG x
265− toAddTypeExprG _ _ = undefined
277+ toAddTypeExprG = error "invalid toAddTypeExprG in :+:"
266278 getConstructorsG _ = getConstructorsG (undefined :: a x) ++ getConstructorsG (undefined :: b x)
267− getConstructorArgsG = undefined
279+ getConstructorArgsG = error "invalid getConstructorArgsG in :+:"
268280
269281--this represents the unimplemented generics traversals which should never be called
270282{-
src/lib/ProjectM36/Attribute.hs+155−29
@@ -1,3 +1,4 @@
1+{-# OPTIONS_GHC -fno-warn-orphans #-}
12module ProjectM36.Attribute where
23import ProjectM36.Base
34import ProjectM36.Error
@@ -7,18 +8,57 @@ import qualified Data.Vector as V
78import qualified Data.Hashable as Hash
89import qualified Data.HashSet as HS
910import qualified Data.Map as M
11+import Data.Either
1012
1113arity :: Attributes -> Int
12−arity = V.length
14+arity a = V.length (attributesVec a)
15+
16+instance Semigroup Attributes where
17+ attrsA <> attrsB =
18+ case joinAttributes attrsA attrsB of
19+ Left err -> error (show err)
20+ Right attrs' -> attrs'
21+
22+instance Monoid Attributes where
23+ mempty = Attributes {
24+ attributesVec = mempty
25+ --,attributeSet = mempty
26+ }
1327
1428emptyAttributes :: Attributes
15−emptyAttributes = V.empty
29+emptyAttributes = mempty
1630
1731null :: Attributes -> Bool
18−null = V.null
32+null a = V.null (attributesVec a)
33+
34+singleton :: Attribute -> Attributes
35+singleton attr = Attributes {
36+ attributesVec = V.singleton attr
37+ --,attributesSet = HS.singleton attr
38+ }
39+
40+toList :: Attributes -> [Attribute]
41+toList attrs = V.toList (attributesVec attrs)
1942
2043attributesFromList :: [Attribute] -> Attributes
21−attributesFromList = V.fromList -- . L.nub --too expensive
44+attributesFromList attrsL = Attributes {
45+ attributesVec = vec
46+ --,attributesSet = hset
47+ }
48+ where
49+ vec = if length attrsL == HS.size hset then
50+ --fast path- no duplicates
51+ V.fromList attrsL
52+ else
53+ --duplicate detected, uniqueify while maintaining original ordering
54+ V.fromList uniquedL
55+ hset = HS.fromList attrsL
56+ uniquedL = fst $ foldr (\attr acc@(l,s) ->
57+ if HS.member attr s then
58+ acc
59+ else
60+ (l ++ [attr], HS.insert attr s))
61+ ([],mempty) attrsL
2262
2363attributeName :: Attribute -> AttributeName
2464attributeName (Attribute name _) = name
@@ -27,14 +67,16 @@ atomType :: Attribute -> AtomType
2767atomType (Attribute _ atype) = atype
2868
2969atomTypes :: Attributes -> V.Vector AtomType
30−atomTypes = V.map atomType
70+atomTypes attrs = V.map atomType (attributesVec attrs)
71+
72+atomTypesList :: Attributes -> [AtomType]
73+atomTypesList = V.toList . atomTypes
3174
32−--hm- no error-checking here
3375addAttribute :: Attribute -> Attributes -> Attributes
34−addAttribute attr attrs = attrs `V.snoc` attr
76+addAttribute attr attrs = attrs <> singleton attr
3577
3678--if some attribute names overlap but the types do not, then spit back an error
37−joinAttributes :: Attributes -> Attributes -> Either RelationalError Attributes
79+{-joinAttributes :: Attributes -> Attributes -> Either RelationalError Attributes
3880joinAttributes attrs1 attrs2 | V.length uniqueOverlappingAttributes /= V.length overlappingAttributes = Left (TupleAttributeTypeMismatchError overlappingAttributes)
3981 | V.length overlappingAttrsDifferentTypes > 0 = Left (TupleAttributeTypeMismatchError overlappingAttrsDifferentTypes)
4082 | otherwise = Right $ vectorUniqueify (attrs1 V.++ attrs2)
@@ -43,20 +85,52 @@ joinAttributes attrs1 attrs2 | V.length uniqueOverlappingAttributes /= V.length
4385 attrNames2 = V.map attributeName attrs2
4486 uniqueOverlappingAttributes = vectorUniqueify overlappingAttributes
4587 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+ }
46106
47107addAttributes :: Attributes -> Attributes -> Attributes
48−addAttributes = (V.++)
108+addAttributes = (<>)
109+
110+member :: Attribute -> Attributes -> Bool
111+member attr attrs = HS.member attr (attributesSet attrs)
49112
50113deleteAttributeName :: AttributeName -> Attributes -> Attributes
51−deleteAttributeName attrName = V.filter (\attr -> attributeName attr /= attrName)
114+deleteAttributeName attrName = deleteAttributeNames (S.singleton attrName)
115+
116+deleteAttributeNames :: S.Set AttributeName -> Attributes -> Attributes
117+deleteAttributeNames attrNames attrs = Attributes {
118+ attributesVec = vec
119+ }
120+ where
121+ vec = V.filter attrFilter (attributesVec attrs)
122+ attrFilter attr = S.notMember (attributeName attr) attrNames
52123
53124renameAttribute :: AttributeName -> Attribute -> Attribute
54125renameAttribute newAttrName (Attribute _ typeo) = Attribute newAttrName typeo
55126
56127renameAttributes :: AttributeName -> AttributeName -> Attributes -> Attributes
57−renameAttributes oldAttrName newAttrName = V.map renamer
128+renameAttributes oldAttrName newAttrName attrs = Attributes {
129+ attributesVec = vec
130+ }
58131 where
59− renamer attr = if attributeName attr == oldAttrName then
132+ vec = V.map renamer (attributesVec attrs)
133+ renamer attr = if attributeName attr == oldAttrName then
60134 renameAttribute newAttrName attr
61135 else
62136 attr
@@ -67,10 +141,13 @@ atomTypeForAttributeName attrName attrs = do
67141 return atype
68142
69143attributeForName :: AttributeName -> Attributes -> Either RelationalError Attribute
70−attributeForName attrName attrs = case V.find (\attr -> attributeName attr == attrName) attrs of
144+attributeForName attrName attrs = case V.find (\attr -> attributeName attr == attrName) (attributesVec attrs) of
71145 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
72146 Just attr -> Right attr
73147
148+isAttributeNameContained :: AttributeName -> Attributes -> Bool
149+isAttributeNameContained nam attrs = isRight (attributeForName nam attrs)
150+
74151--similar to attributesForNames, but returns error if some names are missing
75152projectionAttributesForNames :: S.Set AttributeName -> Attributes -> Either RelationalError Attributes
76153projectionAttributesForNames names attrsIn =
@@ -82,15 +159,18 @@ projectionAttributesForNames names attrsIn =
82159 missingNames = attributeNamesNotContained names (S.fromList (V.toList (attributeNames attrsIn)))
83160
84161attributesForNames :: S.Set AttributeName -> Attributes -> Attributes
85−attributesForNames attrNameSet = V.filter filt
162+attributesForNames attrNameSet attrs = Attributes {
163+ attributesVec = vec
164+ }
86165 where
166+ vec = V.filter filt (attributesVec attrs)
87167 filt attr = S.member (attributeName attr) attrNameSet
88168
89169attributeNameSet :: Attributes -> S.Set AttributeName
90−attributeNameSet attrVec = S.fromList $ V.toList $ V.map (\(Attribute name _) -> name) attrVec
170+attributeNameSet attrs = S.fromList $ V.toList $ V.map (\(Attribute name _) -> name) (attributesVec attrs)
91171
92172attributeNames :: Attributes -> V.Vector AttributeName
93−attributeNames = V.map attributeName
173+attributeNames attrs = V.map attributeName (attributesVec attrs)
94174
95175--checks if set s1 is wholly contained in the set s2
96176attributesContained :: Attributes -> Attributes -> Bool
@@ -111,42 +191,88 @@ attributeNamesNotContained subset superset = S.filter (`S.notMember` superset) s
111191
112192-- useful for display
113193orderedAttributes :: Attributes -> [Attribute]
114−orderedAttributes attrs = L.sortBy (\a b -> attributeName a `compare` attributeName b) (V.toList attrs)
194+orderedAttributes attrs = L.sortBy (\a b -> attributeName a `compare` attributeName b) (V.toList (attributesVec attrs))
115195
116196orderedAttributeNames :: Attributes -> [AttributeName]
117197orderedAttributeNames attrs = map attributeName (orderedAttributes attrs)
118198
119199-- 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
120201attributesDifference :: Attributes -> Attributes -> Attributes
121−attributesDifference attrsA attrsB = V.fromList $ diff (V.toList attrsA) (V.toList attrsB)
202+{-attributesDifference attrsA attrsB = V.fromList $ diff (V.toList attrsA) (V.toList attrsB)
122203 where
123204 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)
124219
125220vectorUniqueify :: (Hash.Hashable a, Eq a) => V.Vector a -> V.Vector a
126221vectorUniqueify vecIn = V.fromList $ HS.toList $ HS.fromList $ V.toList vecIn
127222
128223--check that each attribute only appears once
129224verifyAttributes :: Attributes -> Either RelationalError Attributes
130−verifyAttributes attrs = if collapsedAttrs /= attrs then
131− Left (TupleAttributeTypeMismatchError (attributesDifference collapsedAttrs attrs))
132− else
133− Right attrs
225+verifyAttributes attrs =
226+ if vecSet == attributesSet attrs then
227+ pure attrs
228+ else
229+ Left (TupleAttributeTypeMismatchError diffAttrs)
230+ where
231+ vecSet = V.foldr' HS.insert HS.empty (attributesVec attrs)
232+ diffSet = HS.difference vecSet (attributesSet attrs) <> HS.difference (attributesSet attrs) vecSet
233+ diffAttrs = Attributes {
234+ attributesVec = V.fromList (HS.toList diffSet)
235+ --,attributesSet = diffSet
236+ }
237+
238+--used in Generics derivation for ADTs without named attributes- not to be used elsewhere
239+--drop first n attributes from vector representation
240+drop :: Int -> Attributes -> Attributes
241+drop c attrs = Attributes { attributesVec = vec
242+ }
134243 where
135− collapsedAttrs = vectorUniqueify attrs
244+ vec = V.drop c (attributesVec attrs)
136245
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+
251+-- use to determine if the same attributes are contained (but ordering is irrelevant)
137252attributesEqual :: Attributes -> Attributes -> Bool
138−attributesEqual attrs1 attrs2 = V.null (attributesDifference attrs1 attrs2)
253+attributesEqual attrsA attrsB =
254+ attributesVec attrsA == attributesVec attrsB ||
255+ attributesSet attrsA == attributesSet attrsB
139256
140257attributesAsMap :: Attributes -> M.Map AttributeName Attribute
141−attributesAsMap attrs = (M.fromList . V.toList) (V.map (\attr -> (attributeName attr, attr)) attrs)
258+attributesAsMap attrs = V.foldr' (\attr acc -> M.insert (attributeName attr) attr acc) mempty (attributesVec attrs)
259+
142260
143261-- | Left-biased union of attributes.
144262union :: Attributes -> Attributes -> Attributes
145−union attrsA attrsB = V.fromList (M.elems unioned)
263+union attrsA attrsB = Attributes {
264+ attributesVec = vec
265+ --,attributesSet = hset
266+ }
146267 where
147− unioned = M.union (attributesAsMap attrsA) (attributesAsMap attrsB)
268+ hset = HS.union (attributesSet attrsA) (attributesSet attrsB)
269+ vec = HS.foldr (flip V.snoc) mempty hset
148270
149271intersection :: Attributes -> Attributes -> Attributes
150−intersection attrsA attrsB = V.fromList (M.elems intersected)
272+intersection attrsA attrsB = Attributes {
273+ attributesVec = vec
274+ --,attributesSet = hset
275+ }
151276 where
152− intersected = M.intersection (attributesAsMap attrsA) (attributesAsMap attrsB)
277+ hset = HS.intersection (attributesSet attrsA) (attributesSet attrsB)
278+ vec = HS.foldr (flip V.snoc) mempty hset
src/lib/ProjectM36/AttributeExpr.hsnew file+7
@@ -0,0 +1,7 @@
1+module ProjectM36.AttributeExpr where
2+import ProjectM36.Base
3+import ProjectM36.Attribute as A
4+
5+attributeName :: AttributeExprBase a -> AttributeName
6+attributeName (AttributeAndTypeNameExpr nam _ _) = nam
7+attributeName (NakedAttributeExpr attr) = A.attributeName attr
src/lib/ProjectM36/AttributeNames.hs+3−2
@@ -3,8 +3,9 @@ import ProjectM36.Base
33import qualified Data.Set as S
44--AttributeNames is a data structure which can represent inverted projection attributes and attribute names derived from relational expressions
55
6−empty :: AttributeNames
6+empty :: AttributeNamesBase a
77empty = AttributeNames S.empty
88
9−all :: AttributeNames
9+all :: AttributeNamesBase a
1010all = InvertedAttributeNames S.empty
11+
src/lib/ProjectM36/Base.hs+235−116
@@ -1,9 +1,12 @@
1−{-# LANGUAGE ExistentialQuantification,DeriveGeneric,DeriveAnyClass, TypeSynonymInstances, FlexibleInstances #-}
1+{-# LANGUAGE ExistentialQuantification,DeriveGeneric,DeriveAnyClass,FlexibleInstances,OverloadedStrings, DeriveTraversable, DerivingVia, TemplateHaskell, TypeFamilies #-}
22{-# OPTIONS_GHC -fno-warn-orphans #-}
3+
34module ProjectM36.Base where
45import ProjectM36.DatabaseContextFunctionError
56import ProjectM36.AtomFunctionError
7+import ProjectM36.MerkleHash
68
9+import Data.Functor.Foldable.TH
710import qualified Data.Map as M
811import qualified Data.HashSet as HS
912import Data.Hashable (Hashable, hashWithSalt)
@@ -12,19 +15,21 @@ import Data.UUID (UUID)
1215import Control.DeepSeq (NFData, rnf)
1316import Control.DeepSeq.Generics (genericRnf)
1417import GHC.Generics (Generic)
18+import GHC.Stack
1519import qualified Data.Vector as V
1620import qualified Data.List as L
1721import Data.Text (Text,unpack)
18−import Data.Binary
19−import Data.Vector.Binary()
2022import Data.Time.Clock
21−import Data.Time.Clock.POSIX
22−import Data.Time.Calendar (Day,toGregorian,fromGregorian)
2323import Data.Hashable.Time ()
24+import Data.Time.Calendar (Day)
2425import Data.Typeable
2526import Data.ByteString (ByteString)
27+import qualified Data.List.NonEmpty as NE
28+import Data.Vector.Instances ()
2629
2730type StringType = Text
31+
32+type DatabaseName = String
2833
2934-- | Database atoms are the smallest, undecomposable units of a tuple. Common examples are integers, text, or unique identity keys.
3035data Atom = IntegerAtom Integer |
@@ -35,12 +40,10 @@ data Atom = IntegerAtom Integer |
3540 DateTimeAtom UTCTime |
3641 ByteStringAtom ByteString |
3742 BoolAtom Bool |
38− IntervalAtom Atom Atom OpenInterval OpenInterval |
3943 RelationAtom Relation |
44+ RelationalExprAtom RelationalExpr | --used for returning inc deps
4045 ConstructedAtom DataConstructorName AtomType [Atom]
41− deriving (Eq, Show, Binary, Typeable, NFData, Generic)
42−
43−type OpenInterval = Bool
46+ deriving (Eq, Show, Typeable, NFData, Generic, Read)
4447
4548instance Hashable Atom where
4649 hashWithSalt salt (ConstructedAtom dConsName _ atoms) = salt `hashWithSalt` atoms
@@ -53,20 +56,8 @@ instance Hashable Atom where
5356 hashWithSalt salt (DateTimeAtom dt) = salt `hashWithSalt` dt
5457 hashWithSalt salt (ByteStringAtom bs) = salt `hashWithSalt` bs
5558 hashWithSalt salt (BoolAtom b) = salt `hashWithSalt` b
56− hashWithSalt salt (IntervalAtom a1 a2 bo be) = salt `hashWithSalt` a1 `hashWithSalt` a2 `hashWithSalt` bo `hashWithSalt` be
5759 hashWithSalt salt (RelationAtom r) = salt `hashWithSalt` r
58−
59−instance Binary UTCTime where
60− put utc = put $ toRational (utcTimeToPOSIXSeconds utc)
61− get = do
62− r <- get :: Get Rational
63− return (posixSecondsToUTCTime (fromRational r))
64−
65−instance Binary Day where
66− put day = put $ toGregorian day
67− get = do
68− (y,m,d) <- get :: Get (Integer, Int, Int)
69− return (fromGregorian y m d)
60+ hashWithSalt salt (RelationalExprAtom re) = salt `hashWithSalt` re
7061
7162-- 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.
7263-- | The AtomType uniquely identifies the type of a atom.
@@ -78,13 +69,17 @@ data AtomType = IntAtomType |
7869 DateTimeAtomType |
7970 ByteStringAtomType |
8071 BoolAtomType |
81− IntervalAtomType AtomType |
8272 RelationAtomType Attributes |
8373 ConstructedAtomType TypeConstructorName TypeVarMap |
74+ RelationalExprAtomType |
8475 TypeVariableType TypeVarName
8576 --wildcard used in Atom Functions and tuples for data constructors which don't provide all arguments to the type constructor
86− deriving (Eq, NFData, Generic, Binary, Show)
87−
77+ deriving (Eq, NFData, Generic, Show, Read, Hashable)
78+
79+instance Ord AtomType where
80+ compare = undefined
81+
82+-- this should probably be an ordered dictionary in order to be able to round-trip these arguments
8883type TypeVarMap = M.Map TypeVarName AtomType
8984
9085instance Hashable TypeVarMap where
@@ -99,25 +94,37 @@ isRelationAtomType _ = False
9994type AttributeName = StringType
10095
10196-- | A relation's type is composed of attribute names and types.
102−data Attribute = Attribute AttributeName AtomType deriving (Eq, Show, Generic, NFData, Binary)
97+data Attribute = Attribute AttributeName AtomType deriving (Eq, Show, Read, Generic, NFData)
10398
10499instance Hashable Attribute where
105100 hashWithSalt salt (Attribute attrName _) = hashWithSalt salt attrName
106101
102+type AttributesHash = Int
103+
107104-- | 'Attributes' represent the head of a relation.
108−type Attributes = V.Vector Attribute
105+newtype Attributes = Attributes {
106+ attributesVec :: V.Vector Attribute
107+ --,attributesSet :: HS.HashSet Attribute --compare with this generated in heap profile and benchmarks
108+ }
109+ deriving (NFData, Read, Hashable, Generic)
110+
111+attributesSet :: Attributes -> HS.HashSet Attribute
112+attributesSet = HS.fromList . V.toList . attributesVec
113+
114+instance Show Attributes where
115+ show attrs = "attributesFromList [" <> L.intercalate ", " (map (\attr -> "(" <> show attr <> ")") (V.toList (attributesVec attrs))) <> "]"
116+
117+--when attribute ordering is irrelevant
118+instance Eq Attributes where
119+ attrsA == attrsB =
120+ attributesVec attrsA == attributesVec attrsB ||
121+ attributesSet attrsA == attributesSet attrsB
109122
110−-- | Equality function for a set of attributes.
111−attributesEqual :: Attributes -> Attributes -> Bool
112−attributesEqual attrs1 attrs2 = attrsAsSet attrs1 == attrsAsSet attrs2
113− where
114− attrsAsSet = HS.fromList . V.toList
115−
116123sortedAttributesIndices :: Attributes -> [(Int, Attribute)]
117−sortedAttributesIndices attrs = L.sortBy (\(_, Attribute name1 _) (_,Attribute name2 _) -> compare name1 name2) $ V.toList (V.indexed attrs)
124+sortedAttributesIndices attrs = L.sortBy (\(_, Attribute name1 _) (_,Attribute name2 _) -> compare name1 name2) $ V.toList (V.indexed (attributesVec attrs))
118125
119126-- | The relation's tuple set is the body of the relation.
120−newtype RelationTupleSet = RelationTupleSet { asList :: [RelationTuple] } deriving (Hashable, Show, Generic, Binary)
127+newtype RelationTupleSet = RelationTupleSet { asList :: [RelationTuple] } deriving (Hashable, Show, Generic, Read)
121128
122129instance Read Relation where
123130 readsPrec = error "relation read not supported"
@@ -133,8 +140,8 @@ instance NFData RelationTupleSet where rnf = genericRnf
133140instance Hashable RelationTuple where
134141 --sanity check the tuple for attribute and tuple counts
135142 --this bit me when tuples were being hashed before being verified
136− hashWithSalt salt (RelationTuple attrs tupVec) = if V.length attrs /= V.length tupVec then
137− error "invalid tuple: attributes and tuple count mismatch"
143+ hashWithSalt salt (RelationTuple attrs tupVec) = if V.length (attributesVec attrs) /= V.length tupVec then
144+ error ("invalid tuple: attributes and tuple count mismatch " <> show (attributesVec attrs, tupVec))
138145 else
139146 salt `hashWithSalt`
140147 sortedAttrs `hashWithSalt`
@@ -145,24 +152,23 @@ instance Hashable RelationTuple where
145152 sortedTupVec = V.map (\(index, _) -> tupVec V.! index) $ V.fromList sortedAttrsIndices
146153
147154-- | A tuple is a set of attributes mapped to their 'Atom' values.
148−data RelationTuple = RelationTuple Attributes (V.Vector Atom) deriving (Show, Generic)
149−
150−instance Binary RelationTuple
155+data RelationTuple = RelationTuple Attributes (V.Vector Atom) deriving (Show, Read, Generic)
151156
152157instance Eq RelationTuple where
153− (==) tuple1@(RelationTuple attrs1 _) tuple2@(RelationTuple attrs2 _) = attributesEqual attrs1 attrs2 && atomsEqual
158+ tuple1@(RelationTuple attrs1 _) == tuple2@(RelationTuple attrs2 _) =
159+ attrs1 == attrs2 && atomsEqual
154160 where
155− atomForAttribute attr (RelationTuple attrs tupVec) = case V.findIndex (== attr) attrs of
156− Nothing -> Nothing
157− Just index -> tupVec V.!? index
158− atomsEqual = V.all (== True) $ V.map (\attr -> atomForAttribute attr tuple1 == atomForAttribute attr tuple2) attrs1
161+ atomForAttribute attr (RelationTuple attrs tupVec) = case V.findIndex (== attr) (attributesVec attrs) of
162+ Nothing -> Nothing
163+ Just index -> tupVec V.!? index
164+ atomsEqual = V.all (== True) $ V.map (\attr -> atomForAttribute attr tuple1 == atomForAttribute attr tuple2) (attributesVec attrs1)
159165
160166instance NFData RelationTuple where rnf = genericRnf
161167
162168data Relation = Relation Attributes RelationTupleSet deriving (Show, Generic,Typeable)
163169
164170instance Eq Relation where
165− Relation attrs1 tupSet1 == Relation attrs2 tupSet2 = attributesEqual attrs1 attrs2 && tupSet1 == tupSet2
171+ Relation attrs1 tupSet1 == Relation attrs2 tupSet2 = attrs1 == attrs2 && tupSet1 == tupSet2
166172
167173instance NFData Relation where rnf = genericRnf
168174
@@ -173,8 +179,6 @@ instance Hashable Relation where
173179 where
174180 sortedAttrs = map snd (sortedAttributesIndices attrs)
175181
176−instance Binary Relation
177−
178182-- | Used to represent the number of tuples in a relation.
179183data RelationCardinality = Countable | Finite Int deriving (Eq, Show, Generic, Ord)
180184
@@ -186,7 +190,7 @@ type RelationalExpr = RelationalExprBase ()
186190-- | A relational expression represents query (read) operations on a database.
187191data RelationalExprBase a =
188192 --- | Create a relation from tuple expressions.
189− MakeRelationFromExprs (Maybe [AttributeExprBase a]) [TupleExprBase a] |
193+ MakeRelationFromExprs (Maybe [AttributeExprBase a]) (TupleExprsBase a) |
190194 --- | Create and reference a relation from attributes and a tuple set.
191195 MakeStaticRelation Attributes RelationTupleSet |
192196 --- | Reference an existing relation in Haskell-space.
@@ -195,7 +199,7 @@ data RelationalExprBase a =
195199 --in Tutorial D, relational variables pick up the type of the first relation assigned to them
196200 --relational variables should also be able to be explicitly-typed like in Haskell
197201 --- | Reference a relation variable by its name.
198− RelationVariable RelVarName a |
202+ RelationVariable RelVarName a |
199203 --- | Create a projection over attribute names. (Note that the 'AttributeNames' structure allows for the names to be inverted.)
200204 Project (AttributeNamesBase a) (RelationalExprBase a) |
201205 --- | Create a union of two relational expressions. The expressions should have identical attributes.
@@ -215,12 +219,21 @@ data RelationalExprBase a =
215219 --- | Returns the true relation iff
216220 Equals (RelationalExprBase a) (RelationalExprBase a) |
217221 NotEquals (RelationalExprBase a) (RelationalExprBase a) |
218− Extend (ExtendTupleExprBase a) (RelationalExprBase a)
222+ Extend (ExtendTupleExprBase a) (RelationalExprBase a) |
219223 --Summarize :: AtomExpr -> AttributeName -> RelationalExpr -> RelationalExpr -> RelationalExpr -- a special case of Extend
220− deriving (Show, Eq, Generic, NFData)
221−
222−instance Binary RelationalExpr
223−
224+ --Evaluate relationalExpr with scoped views
225+ With [(WithNameExprBase a, RelationalExprBase a)] (RelationalExprBase a)
226+ deriving (Show, Read, Eq, Generic, NFData, Foldable, Functor, Traversable)
227+
228+instance Hashable RelationalExpr
229+
230+data WithNameExprBase a = WithNameExpr RelVarName a
231+ deriving (Show, Read, Eq, Generic, NFData, Foldable, Functor, Traversable, Hashable)
232+
233+type WithNameExpr = WithNameExprBase ()
234+
235+type GraphRefWithNameExpr = WithNameExprBase GraphRefTransactionMarker
236+
224237type NotificationName = StringType
225238type Notifications = M.Map NotificationName Notification
226239
@@ -230,20 +243,22 @@ data Notification = Notification {
230243 reportOldExpr :: RelationalExpr, --run the expression in the pre-change context
231244 reportNewExpr :: RelationalExpr --run the expression in the post-change context
232245 }
233− deriving (Show, Eq, Binary, Generic, NFData)
246+ deriving (Show, Eq, Generic, NFData)
234247
235248type TypeVarName = StringType
236249
237250-- | Metadata definition for type constructors such as @data Either a b@.
238251data TypeConstructorDef = ADTypeConstructorDef TypeConstructorName [TypeVarName] |
239252 PrimitiveTypeConstructorDef TypeConstructorName AtomType
240− deriving (Show, Generic, Binary, Eq, NFData)
253+ deriving (Show, Generic, Eq, NFData, Hashable, Read)
241254
242255-- | Found in data constructors and type declarations: Left (Either Int Text) | Right Int
243−data TypeConstructor = ADTypeConstructor TypeConstructorName [TypeConstructor] |
244− PrimitiveTypeConstructor TypeConstructorName AtomType |
245− TypeVariable TypeVarName
246− deriving (Show, Generic, Binary, Eq, NFData)
256+type TypeConstructor = TypeConstructorBase ()
257+data TypeConstructorBase a = ADTypeConstructor TypeConstructorName [TypeConstructor] |
258+ PrimitiveTypeConstructor TypeConstructorName AtomType |
259+ RelationAtomTypeConstructor [AttributeExprBase a] |
260+ TypeVariable TypeVarName
261+ deriving (Show, Generic, Eq, NFData, Hashable, Read)
247262
248263type TypeConstructorMapping = [(TypeConstructorDef, DataConstructorDefs)]
249264
@@ -253,16 +268,23 @@ type DataConstructorName = StringType
253268type AtomTypeName = StringType
254269
255270-- | Used to define a data constructor in a type constructor context such as @Left a | Right b@
256−data DataConstructorDef = DataConstructorDef DataConstructorName [DataConstructorDefArg] deriving (Eq, Show, Binary, Generic, NFData)
271+data DataConstructorDef = DataConstructorDef DataConstructorName [DataConstructorDefArg] deriving (Eq, Show, Generic, NFData, Hashable, Read)
257272
258273type DataConstructorDefs = [DataConstructorDef]
259274
260275data DataConstructorDefArg = DataConstructorDefTypeConstructorArg TypeConstructor |
261276 DataConstructorDefTypeVarNameArg TypeVarName
262− deriving (Show, Generic, Binary, Eq, NFData)
277+ deriving (Show, Generic, Eq, NFData, Hashable, Read)
263278
264279type InclusionDependencies = M.Map IncDepName InclusionDependency
265−type RelationVariables = M.Map RelVarName Relation
280+type RelationVariables = M.Map RelVarName GraphRefRelationalExpr
281+
282+data GraphRefTransactionMarker = TransactionMarker TransactionId |
283+ UncommittedContextMarker
284+ deriving (Eq, Show, Generic, NFData, Ord)
285+
286+-- a fundamental relational expr to which other relational expressions compile
287+type GraphRefRelationalExpr = RelationalExprBase GraphRefTransactionMarker
266288
267289type SchemaName = StringType
268290
@@ -270,17 +292,18 @@ type Subschemas = M.Map SchemaName Schema
270292
271293-- | Every transaction has one concrete database context and any number of isomorphic subschemas.
272294data Schemas = Schemas DatabaseContext Subschemas
295+ deriving (Generic)
273296
274297-- | The DatabaseContext is a snapshot of a database's evolving state and contains everything a database client can change over time.
275298-- 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.
276299newtype Schema = Schema SchemaIsomorphs
277− deriving (Generic, Binary)
300+ deriving (Generic)
278301
279302data SchemaIsomorph = IsoRestrict RelVarName RestrictionPredicateExpr (RelVarName, RelVarName) |
280303 IsoRename RelVarName RelVarName |
281304 IsoUnion (RelVarName, RelVarName) RestrictionPredicateExpr RelVarName --maps two relvars to one relvar
282305 -- IsoTypeConstructor in morphAttrExpr
283− deriving (Generic, Binary, Show)
306+ deriving (Generic, Show)
284307
285308type SchemaIsomorphs = [SchemaIsomorph]
286309
@@ -296,24 +319,28 @@ data DatabaseContext = DatabaseContext {
296319type IncDepName = StringType
297320
298321-- | Inclusion dependencies represent every possible database constraint. Constraints enforce specific, arbitrarily-complex rules to which the database context's relation variables must adhere unconditionally.
299−data InclusionDependency = InclusionDependency RelationalExpr RelationalExpr deriving (Show, Eq, Generic, NFData)
300−
301−instance Binary InclusionDependency
322+data InclusionDependency = InclusionDependency RelationalExpr RelationalExpr deriving (Show, Eq, Generic, NFData, Hashable, Read)
302323
303324type AttributeNameAtomExprMap = M.Map AttributeName AtomExpr
304325
305326--used for returning information about individual expressions
306327type DatabaseContextExprName = StringType
307328
329+type DatabaseContextExpr = DatabaseContextExprBase ()
330+
331+instance Hashable DatabaseContextExpr
332+
333+type GraphRefDatabaseContextExpr = DatabaseContextExprBase GraphRefTransactionMarker
334+
308335-- | Database context expressions modify the database context.
309−data DatabaseContextExpr =
336+data DatabaseContextExprBase a =
310337 NoOperation |
311− Define RelVarName [AttributeExpr] |
338+ Define RelVarName [AttributeExprBase a] |
312339 Undefine RelVarName | --forget existence of relvar X
313− Assign RelVarName RelationalExpr |
314− Insert RelVarName RelationalExpr |
315− Delete RelVarName RestrictionPredicateExpr |
316− Update RelVarName AttributeNameAtomExprMap RestrictionPredicateExpr |
340+ Assign RelVarName (RelationalExprBase a) |
341+ Insert RelVarName (RelationalExprBase a) |
342+ Delete RelVarName (RestrictionPredicateExprBase a) |
343+ Update RelVarName AttributeNameAtomExprMap (RestrictionPredicateExprBase a) |
317344
318345 AddInclusionDependency IncDepName InclusionDependency |
319346 RemoveInclusionDependency IncDepName |
@@ -329,19 +356,36 @@ data DatabaseContextExpr =
329356
330357 RemoveDatabaseContextFunction DatabaseContextFunctionName |
331358
332− ExecuteDatabaseContextFunction DatabaseContextFunctionName [AtomExpr] |
359+ ExecuteDatabaseContextFunction DatabaseContextFunctionName [AtomExprBase a] |
333360
334− MultipleExpr [DatabaseContextExpr]
335− deriving (Show, Eq, Binary, Generic)
361+ MultipleExpr [DatabaseContextExprBase a]
362+ deriving (Show, Read, Eq, Generic, NFData)
363+
364+instance Hashable (M.Map AttributeName AtomExpr) where
365+ hashWithSalt salt m = salt `hashWithSalt` M.toList m
336366
367+type ObjModuleName = StringType
368+type ObjFunctionName = StringType
369+type Range = (Int,Int)
337370-- | Adding an atom function should be nominally a DatabaseExpr except for the fact that it cannot be performed purely. Thus, we create the DatabaseContextIOExpr.
338−data DatabaseContextIOExpr = AddAtomFunction AtomFunctionName [TypeConstructor] AtomFunctionBodyScript |
339− AddDatabaseContextFunction DatabaseContextFunctionName [TypeConstructor] DatabaseContextFunctionBodyScript
340− deriving (Show, Eq, Generic, Binary)
371+data DatabaseContextIOExprBase a =
372+ AddAtomFunction AtomFunctionName [TypeConstructor] AtomFunctionBodyScript |
373+ LoadAtomFunctions ObjModuleName ObjFunctionName FilePath |
374+ AddDatabaseContextFunction DatabaseContextFunctionName [TypeConstructor] DatabaseContextFunctionBodyScript |
375+ LoadDatabaseContextFunctions ObjModuleName ObjFunctionName FilePath |
376+ CreateArbitraryRelation RelVarName [AttributeExprBase a] Range
377+ deriving (Show, Eq, Generic)
341378
379+type GraphRefDatabaseContextIOExpr = DatabaseContextIOExprBase GraphRefTransactionMarker
380+
381+type DatabaseContextIOExpr = DatabaseContextIOExprBase ()
342382
343383type RestrictionPredicateExpr = RestrictionPredicateExprBase ()
344384
385+instance Hashable RestrictionPredicateExpr
386+
387+type GraphRefRestrictionPredicateExpr = RestrictionPredicateExprBase GraphRefTransactionMarker
388+
345389-- | Restriction predicates are boolean algebra components which, when composed, indicate whether or not a tuple should be retained during a restriction (filtering) operation.
346390data RestrictionPredicateExprBase a =
347391 TruePredicate |
@@ -351,9 +395,7 @@ data RestrictionPredicateExprBase a =
351395 RelationalExprPredicate (RelationalExprBase a) | --type must be same as true and false relations (no attributes)
352396 AtomExprPredicate (AtomExprBase a) | --atom must evaluate to boolean
353397 AttributeEqualityPredicate AttributeName (AtomExprBase a) -- relationalexpr must result in relation with single tuple
354− deriving (Show, Eq, Generic, NFData)
355−
356−instance Binary RestrictionPredicateExpr
398+ deriving (Show, Read, Eq, Generic, NFData, Foldable, Functor, Traversable)
357399
358400-- child + parent links
359401-- | 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.
@@ -363,32 +405,42 @@ type TransactionHeads = M.Map HeadName Transaction
363405
364406-- | The transaction graph is the global database's state which references every committed transaction.
365407data TransactionGraph = TransactionGraph TransactionHeads (S.Set Transaction)
366−
367−transactionsForGraph :: TransactionGraph -> S.Set Transaction
368−transactionsForGraph (TransactionGraph _ t) = t
408+ deriving Generic
369409
370410transactionHeadsForGraph :: TransactionGraph -> TransactionHeads
371−transactionHeadsForGraph (TransactionGraph heads _) = heads
411+transactionHeadsForGraph (TransactionGraph hs _) = hs
412+
413+transactionsForGraph :: TransactionGraph -> S.Set Transaction
414+transactionsForGraph (TransactionGraph _ ts) = ts
372415
373416-- | Every transaction has context-specific information attached to it.
374−data TransactionInfo = TransactionInfo TransactionId (S.Set TransactionId) UTCTime | -- 1 parent + n children
375− MergeTransactionInfo TransactionId TransactionId (S.Set TransactionId) UTCTime -- 2 parents, n children
376− deriving(Show, Generic)
377−
378−instance Binary TransactionInfo
417+-- The `TransactionDiff`s represent child/edge relationships to previous transactions (branches or continuations of the same branch).
418+data TransactionInfo = TransactionInfo {
419+ parents :: TransactionParents,
420+ stamp :: UTCTime,
421+ merkleHash :: MerkleHash
422+ } deriving (Show, Generic)
423+
424+type TransactionParents = NE.NonEmpty TransactionId
425+{-
426+data TransactionInfo = TransactionInfo TransactionId TransactionDiffs UTCTime | -- 1 parent + n children
427+ MergeTransactionInfo TransactionId TransactionId TransactionDiffs UTCTime -- 2 parents, n children
428+ deriving (Show, Generic)
429+-}
379430
380431-- | Every set of modifications made to the database are atomically committed to the transaction graph as a transaction.
381432type TransactionId = UUID
382433
383434data Transaction = Transaction TransactionId TransactionInfo Schemas
435+ deriving Generic
384436
385−--instance Binary Transaction
386−
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.
438+data DisconnectedTransaction = DisconnectedTransaction TransactionId Schemas DirtyFlag
439+--the database context expression represents a difference between the disconnected transaction and its immutable parent transaction- is this diff expr used at all?
440+
387441type DirtyFlag = Bool
388442
389−-- | 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.
390−data DisconnectedTransaction = DisconnectedTransaction TransactionId Schemas DirtyFlag --parentID, context- the context here represents the singular concrete context from the schema
391−--the dirty flag indicates that the database context has diverged from its parent's context
443+type TransactionDiffExpr = DatabaseContextExpr
392444
393445transactionId :: Transaction -> TransactionId
394446transactionId (Transaction tid _ _) = tid
@@ -404,24 +456,28 @@ instance Ord Transaction where
404456
405457type AtomExpr = AtomExprBase ()
406458
459+instance Hashable AtomExpr
460+
461+type GraphRefAtomExpr = AtomExprBase GraphRefTransactionMarker
462+
407463-- | An atom expression represents an action to take when extending a relation or when statically defining a relation or a new tuple.
408464data AtomExprBase a = AttributeAtomExpr AttributeName |
409465 NakedAtomExpr Atom |
410466 FunctionAtomExpr AtomFunctionName [AtomExprBase a] a |
411467 RelationAtomExpr (RelationalExprBase a) |
412468 ConstructedAtomExpr DataConstructorName [AtomExprBase a] a
413− deriving (Eq,Show,Generic, NFData)
469+ deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable)
414470
415−instance Binary AtomExpr
416−
417471-- | Used in tuple creation when creating a relation.
418472data ExtendTupleExprBase a = AttributeExtendTupleExpr AttributeName (AtomExprBase a)
419− deriving (Show, Eq, Generic, NFData)
473+ deriving (Show, Read, Eq, Generic, NFData, Foldable, Functor, Traversable)
420474
421−type ExtendTupleExpr = ExtendTupleExprBase ()
475+type ExtendTupleExpr = ExtendTupleExprBase ()
476+
477+instance Hashable ExtendTupleExpr
478+
479+type GraphRefExtendTupleExpr = ExtendTupleExprBase GraphRefTransactionMarker
422480
423−instance Binary ExtendTupleExpr
424−
425481--enumerates the list of functions available to be run as part of tuple expressions
426482type AtomFunctions = HS.HashSet AtomFunction
427483
@@ -432,6 +488,7 @@ type AtomFunctionBodyScript = StringType
432488type AtomFunctionBodyType = [Atom] -> Either AtomFunctionError Atom
433489
434490data AtomFunctionBody = AtomFunctionBody (Maybe AtomFunctionBodyScript) AtomFunctionBodyType
491+ deriving Generic
435492
436493instance NFData AtomFunctionBody where
437494 rnf (AtomFunctionBody mScript _) = rnf mScript
@@ -466,11 +523,17 @@ data AttributeNamesBase a = AttributeNames (S.Set AttributeName) |
466523 UnionAttributeNames (AttributeNamesBase a) (AttributeNamesBase a) |
467524 IntersectAttributeNames (AttributeNamesBase a) (AttributeNamesBase a) |
468525 RelationalExprAttributeNames (RelationalExprBase a) -- use attribute names from the relational expression's type
469− deriving (Eq, Show, Generic, NFData)
526+ deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable)
527+
528+instance Hashable AttributeNames
529+
530+instance Hashable (S.Set AttributeName) where
531+ hashWithSalt salt s = salt `hashWithSalt` S.toList s
470532
471−type AttributeNames = AttributeNamesBase ()
472−instance Binary AttributeNames
473−
533+type AttributeNames = AttributeNamesBase ()
534+
535+type GraphRefAttributeNames = AttributeNamesBase GraphRefTransactionMarker
536+
474537-- | The persistence strategy is a global database option which represents how to persist the database in the filesystem, if at all.
475538data PersistenceStrategy = NoPersistence | -- ^ no filesystem persistence/memory-only database
476539 MinimalPersistence FilePath | -- ^ fsync off, not crash-safe
@@ -478,19 +541,31 @@ data PersistenceStrategy = NoPersistence | -- ^ no filesystem persistence/memory
478541 deriving (Show, Read)
479542
480543type AttributeExpr = AttributeExprBase ()
544+type GraphRefAttributeExpr = AttributeExprBase GraphRefTransactionMarker
481545
482546-- | Create attributes dynamically.
483547data AttributeExprBase a = AttributeAndTypeNameExpr AttributeName TypeConstructor a |
484548 NakedAttributeExpr Attribute
485− deriving (Eq, Show, Generic, Binary, NFData)
549+ deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable, Hashable)
486550
487551-- | Dynamically create a tuple from attribute names and 'AtomExpr's.
488552newtype TupleExprBase a = TupleExpr (M.Map AttributeName (AtomExprBase a))
489− deriving (Eq, Show, Generic, NFData)
490−
491−instance Binary TupleExpr
492−
493−type TupleExpr = TupleExprBase ()
553+ deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable)
554+
555+instance Hashable TupleExpr
556+
557+type TupleExpr = TupleExprBase ()
558+
559+type GraphRefTupleExpr = TupleExprBase GraphRefTransactionMarker
560+
561+data TupleExprsBase a = TupleExprs a [TupleExprBase a]
562+ deriving (Eq, Show, Read, Generic, NFData, Foldable, Functor, Traversable)
563+
564+instance Hashable TupleExprs
565+
566+type GraphRefTupleExprs = TupleExprsBase GraphRefTransactionMarker
567+
568+type TupleExprs = TupleExprsBase ()
494569
495570data MergeStrategy =
496571 -- | 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)
@@ -499,7 +574,7 @@ data MergeStrategy =
499574 UnionPreferMergeStrategy HeadName |
500575 -- | 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.
501576 SelectedBranchMergeStrategy HeadName
502− deriving (Eq, Show, Binary, Generic, NFData)
577+ deriving (Eq, Show, Generic, NFData)
503578
504579type DatabaseContextFunctionName = StringType
505580
@@ -525,3 +600,47 @@ instance Hashable DatabaseContextFunction where
525600
526601instance Eq DatabaseContextFunction where
527602 f1 == f2 = dbcFuncName f1 == dbcFuncName f2
603+
604+attrTypeVars :: Attribute -> S.Set TypeVarName
605+attrTypeVars (Attribute _ aType) = case aType of
606+ IntAtomType -> S.empty
607+ IntegerAtomType -> S.empty
608+ DoubleAtomType -> S.empty
609+ TextAtomType -> S.empty
610+ DayAtomType -> S.empty
611+ DateTimeAtomType -> S.empty
612+ ByteStringAtomType -> S.empty
613+ BoolAtomType -> S.empty
614+ RelationalExprAtomType -> S.empty
615+ (RelationAtomType attrs) -> S.unions (map attrTypeVars (V.toList (attributesVec attrs)))
616+ (ConstructedAtomType _ tvMap) -> M.keysSet tvMap
617+ (TypeVariableType nam) -> S.singleton nam
618+
619+typeVars :: TypeConstructor -> S.Set TypeVarName
620+typeVars (PrimitiveTypeConstructor _ _) = S.empty
621+typeVars (ADTypeConstructor _ args) = S.unions (map typeVars args)
622+typeVars (TypeVariable v) = S.singleton v
623+typeVars (RelationAtomTypeConstructor attrExprs) = S.unions (map attrExprTypeVars attrExprs)
624+
625+attrExprTypeVars :: AttributeExprBase a -> S.Set TypeVarName
626+attrExprTypeVars (AttributeAndTypeNameExpr _ tCons _) = typeVars tCons
627+attrExprTypeVars (NakedAttributeExpr attr) = attrTypeVars attr
628+
629+atomTypeVars :: AtomType -> S.Set TypeVarName
630+atomTypeVars IntAtomType = S.empty
631+atomTypeVars IntegerAtomType = S.empty
632+atomTypeVars DoubleAtomType = S.empty
633+atomTypeVars TextAtomType = S.empty
634+atomTypeVars DayAtomType = S.empty
635+atomTypeVars DateTimeAtomType = S.empty
636+atomTypeVars ByteStringAtomType = S.empty
637+atomTypeVars BoolAtomType = S.empty
638+atomTypeVars RelationalExprAtomType = S.empty
639+atomTypeVars (RelationAtomType attrs) = S.unions (map attrTypeVars (V.toList (attributesVec attrs)))
640+atomTypeVars (ConstructedAtomType _ tvMap) = M.keysSet tvMap
641+atomTypeVars (TypeVariableType nam) = S.singleton nam
642+
643+unimplemented :: HasCallStack => a
644+unimplemented = error "unimplemented"
645+
646+makeBaseFunctor ''RelationalExprBase
src/lib/ProjectM36/Client.hs+381−370
@@ -1,4 +1,4 @@
1−{-# LANGUAGE DeriveAnyClass, DeriveGeneric, ScopedTypeVariables, BangPatterns #-}
1+{-# LANGUAGE DeriveGeneric, ScopedTypeVariables, MonoLocalBinds, DerivingVia #-}
22{-|
33Module: ProjectM36.Client
44
@@ -9,6 +9,7 @@ module ProjectM36.Client
99 Connection(..),
1010 Port,
1111 Hostname,
12+ ServiceName,
1213 DatabaseName,
1314 ConnectionError(..),
1415 connectProjectM36,
@@ -16,7 +17,8 @@ module ProjectM36.Client
1617 closeRemote_,
1718 executeRelationalExpr,
1819 executeDatabaseContextExpr,
19− executeDatabaseContextIOExpr,
20+ executeDatabaseContextIOExpr,
21+ executeDataFrameExpr,
2022 executeGraphExpr,
2123 executeSchemaExpr,
2224 executeTransGraphRelationalExpr,
@@ -25,6 +27,7 @@ module ProjectM36.Client
2527 typeForRelationalExpr,
2628 inclusionDependencies,
2729 ProjectM36.Client.typeConstructorMapping,
30+ ProjectM36.Client.databaseContextFunctionsAsRelation,
2831 planForDatabaseContextExpr,
2932 currentSchemaName,
3033 SchemaName,
@@ -32,6 +35,7 @@ module ProjectM36.Client
3235 setCurrentSchemaName,
3336 transactionGraphAsRelation,
3437 relationVariablesAsRelation,
38+ ProjectM36.Client.atomFunctionsAsRelation,
3539 disconnectedTransactionIsDirty,
3640 headName,
3741 remoteDBLookupName,
@@ -40,19 +44,20 @@ module ProjectM36.Client
4044 defaultDatabaseName,
4145 defaultRemoteConnectionInfo,
4246 defaultHeadName,
47+ addClientNode,
4348 PersistenceStrategy(..),
4449 RelationalExpr,
4550 RelationalExprBase(..),
46− DatabaseContextExpr(..),
47− DatabaseContextIOExpr(..),
51+ DatabaseContextExprBase(..),
52+ DatabaseContextExpr,
53+ DatabaseContextIOExprBase(..),
54+ DatabaseContextIOExpr,
4855 Attribute(..),
4956 MergeStrategy(..),
5057 attributesFromList,
51− createNodeId,
5258 createSessionAtCommit,
5359 createSessionAtHead,
5460 closeSession,
55− addClientNode,
5661 callTestTimeout_,
5762 RelationCardinality(..),
5863 TransactionGraphOperator(..),
@@ -62,7 +67,6 @@ module ProjectM36.Client
6267 TransGraphRelationalExpr,
6368 TransactionIdLookup(..),
6469 TransactionIdHeadBacktrack(..),
65− NodeId(..),
6670 Atom(..),
6771 Session,
6872 SessionId,
@@ -75,8 +79,9 @@ module ProjectM36.Client
7579 databaseContextExprForUniqueKey,
7680 databaseContextExprForForeignKey,
7781 createScriptedAtomFunction,
82+ ProjectM36.Client.validateMerkleHashes,
7883 AttributeExprBase(..),
79− TypeConstructor(..),
84+ TypeConstructorBase(..),
8085 TypeConstructorDef(..),
8186 DataConstructorDef(..),
8287 AttributeNamesBase(..),
@@ -84,77 +89,85 @@ module ProjectM36.Client
8489 IncDepName,
8590 InclusionDependency(..),
8691 AttributeName,
92+ DF.DataFrame,
93+ DF.DataFrameExpr,
94+ DF.AttributeOrderExpr,
95+ DF.Order(..),
8796 RelationalError(..),
8897 RequestTimeoutException(..),
8998 RemoteProcessDiedException(..),
9099 AtomType(..),
91100 Atomable(..),
92101 TupleExprBase(..),
102+ TupleExprsBase(..),
93103 AtomExprBase(..),
94104 RestrictionPredicateExprBase(..),
95105 withTransaction
96106 ) where
97107import ProjectM36.Base hiding (inclusionDependencies) --defined in this module as well
98108import qualified ProjectM36.Base as B
109+import ProjectM36.Serialise.Error ()
99110import ProjectM36.Error
100111import ProjectM36.Atomable
101−import ProjectM36.AtomFunction
112+import ProjectM36.AtomFunction as AF
102113import ProjectM36.StaticOptimizer
103114import ProjectM36.Key
115+import qualified ProjectM36.DataFrame as DF
116+import ProjectM36.DatabaseContextFunction as DCF
104117import qualified ProjectM36.IsomorphicSchema as Schema
105118import Control.Monad.State
106−import Control.Monad.Trans.Reader
107119import qualified ProjectM36.RelationalExpression as RE
108120import ProjectM36.DatabaseContext (basicDatabaseContext)
109121import qualified ProjectM36.TransactionGraph as Graph
110−import ProjectM36.TransactionGraph
122+import ProjectM36.TransactionGraph as TG
111123import qualified ProjectM36.Transaction as Trans
112124import ProjectM36.TransactionGraph.Persist
113125import ProjectM36.Attribute
114−import ProjectM36.TransGraphRelationalExpression (TransGraphRelationalExpr, evalTransGraphRelationalExpr)
126+import ProjectM36.TransGraphRelationalExpression as TGRE (TransGraphRelationalExpr)
115127import ProjectM36.Persist (DiskSync(..))
116128import ProjectM36.FileLock
129+import ProjectM36.NormalizeExpr
117130import ProjectM36.Notifications
118131import ProjectM36.Server.RemoteCallTypes
119132import qualified ProjectM36.DisconnectedTransaction as Discon
120133import ProjectM36.Relation (typesAsRelation)
121134import ProjectM36.ScriptSession (initScriptSession, ScriptSession)
122135import qualified ProjectM36.Relation as R
123−import qualified ProjectM36.DatabaseContext as DBC
124136import Control.Exception.Base
125−import GHC.Conc.Sync
137+import Control.Concurrent.STM
138+import Control.Concurrent.Async
126139
127−import Network.Transport (Transport(closeTransport))
128−import Network.Transport.TCP (createTransport, defaultTCPParameters, encodeEndPointAddress)
129−import Control.Distributed.Process.Node (newLocalNode, initRemoteTable, runProcess, LocalNode, forkProcess, closeLocalNode)
130−import Control.Distributed.Process.Extras.Internal.Types (whereisRemote)
131−import Control.Distributed.Process.ManagedProcess.Client (call, safeCall)
132140import Data.Either (isRight)
133141import Data.UUID.V4 (nextRandom)
134142import Data.Word
135−import Control.Distributed.Process (ProcessId, Process, receiveWait, send, match, NodeId(..), reconnect)
143+import Data.Hashable
136144import Control.Exception (IOException, handle, AsyncException, throwIO, fromException, Exception)
137145import Control.Concurrent.MVar
146+import Codec.Winery hiding (Schema, schema)
138147import qualified Data.Map as M
139−import Control.Distributed.Process.Serializable (Serializable)
140−import qualified STMContainers.Map as STMMap
141−import qualified STMContainers.Set as STMSet
148+#if MIN_VERSION_stm_containers(1,0,0)
149+import qualified StmContainers.Map as StmMap
150+import qualified StmContainers.Set as StmSet
151+#else
152+import qualified STMContainers.Map as StmMap
153+import qualified STMContainers.Set as StmSet
154+#endif
142155import qualified ProjectM36.Session as Sess
143156import ProjectM36.Session
144157import ProjectM36.Sessions
145−import ListT
146−import Data.Binary (Binary)
147158import GHC.Generics (Generic)
148159import Control.DeepSeq (force)
149160import System.IO
150161import Data.Time.Clock
162+import qualified Network.RPC.Curryer.Client as RPC
163+import qualified Network.RPC.Curryer.Server as RPC
164+import Network.Socket (Socket, AddrInfo(..), getAddrInfo, defaultHints, AddrInfoFlag(..), SocketType(..), ServiceName, hostAddressToTuple, SockAddr(..))
165+import GHC.Conc (unsafeIOToSTM)
151166
152167type Hostname = String
153168
154169type Port = Word16
155170
156−type DatabaseName = String
157−
158171-- | 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.
159172type NotificationCallback = NotificationName -> EvaluatedNotification -> IO ()
160173
@@ -174,15 +187,16 @@ data RequestTimeoutException = RequestTimeoutException
174187
175188instance Exception RequestTimeoutException
176189
177−-- | 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.
178−data ConnectionInfo = InProcessConnectionInfo PersistenceStrategy NotificationCallback [GhcPkgPath]|
179− RemoteProcessConnectionInfo DatabaseName NodeId NotificationCallback
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.
191+data ConnectionInfo = InProcessConnectionInfo PersistenceStrategy NotificationCallback [GhcPkgPath] |
192+ RemoteConnectionInfo DatabaseName Hostname ServiceName NotificationCallback
180193
181194type EvaluatedNotifications = M.Map NotificationName EvaluatedNotification
182195
183196-- | Used for callbacks from the server when monitored changes have been made.
184197newtype NotificationMessage = NotificationMessage EvaluatedNotifications
185− deriving (Binary, Eq, Show, Generic)
198+ deriving (Eq, Show, Generic)
199+ deriving Serialise via WineryVariant NotificationMessage
186200
187201-- | 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.
188202data EvaluatedNotification = EvaluatedNotification {
@@ -190,13 +204,10 @@ data EvaluatedNotification = EvaluatedNotification {
190204 reportOldRelation :: Either RelationalError Relation,
191205 reportNewRelation :: Either RelationalError Relation
192206 }
193− deriving(Binary, Eq, Show, Generic)
207+ deriving (Eq, Show, Generic)
208+ deriving Serialise via WineryRecord EvaluatedNotification
194209
195210
196−-- | Create a 'NodeId' for use in connecting to a remote server using distributed-process.
197−createNodeId :: Hostname -> Port -> NodeId
198−createNodeId host port = NodeId $ encodeEndPointAddress host (show port) 1
199−
200211-- | Use this for connecting to remote servers on the default port.
201212defaultServerPort :: Port
202213defaultServerPort = 6543
@@ -211,127 +222,107 @@ defaultHeadName = "master"
211222
212223-- | 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.
213224defaultRemoteConnectionInfo :: ConnectionInfo
214−defaultRemoteConnectionInfo = RemoteProcessConnectionInfo defaultDatabaseName (createNodeId "127.0.0.1" defaultServerPort) emptyNotificationCallback
215−
216−-- | The 'Connection' represents either local or remote access to a database. All operations flow through the connection.
217−type ClientNodes = STMSet.Set ProcessId
225+defaultRemoteConnectionInfo =
226+ RemoteConnectionInfo defaultDatabaseName defaultServerHostname (show defaultServerPort) emptyNotificationCallback
218227
219−-- internal structure specific to in-process connections
220−data InProcessConnectionConf = InProcessConnectionConf {
221− ipPersistenceStrategy :: PersistenceStrategy,
222− ipClientNodes :: ClientNodes,
223− ipSessions :: Sessions,
224− ipTransactionGraph :: TVar TransactionGraph,
225− ipScriptSession :: Maybe ScriptSession,
226− ipLocalNode :: LocalNode,
227− ipTransport :: Transport, -- we hold onto this so that we can close it gracefully
228− ipLocks :: Maybe (LockFile, MVar LockFileHash) -- nothing when NoPersistence
229− }
228+defaultServerHostname :: Hostname
229+defaultServerHostname = "localhost"
230230
231−data RemoteProcessConnectionConf = RemoteProcessConnectionConf {
232− rLocalNode :: LocalNode,
233− rProcessId :: ProcessId, --remote processId
234− rTransport :: Transport --the TCP socket transport
235− }
231+newtype RemoteConnectionConf = RemoteConnectionConf RPC.Connection
236232
237233data Connection = InProcessConnection InProcessConnectionConf |
238− RemoteProcessConnection RemoteProcessConnectionConf
234+ RemoteConnection RemoteConnectionConf
239235
240236-- | There are several reasons why a connection can fail.
241237data ConnectionError = SetupDatabaseDirectoryError PersistenceError |
242238 IOExceptionError IOException |
243239 NoSuchDatabaseByNameError DatabaseName |
240+ DatabaseValidationError [MerkleValidationError] |
244241 LoginError
245242 deriving (Show, Eq, Generic)
246243
247244remoteDBLookupName :: DatabaseName -> String
248245remoteDBLookupName = (++) "db-"
249246
250−createLocalNode :: IO (LocalNode, Transport)
251−createLocalNode = do
252− eLocalTransport <- createTransport "127.0.0.1" "0" defaultTCPParameters
253− case eLocalTransport of
254− Left err -> error ("failed to create transport: " ++ show err)
255− Right localTransport -> do
256− localNode <- newLocalNode localTransport initRemoteTable
257− pure (localNode, localTransport)
258−
259−notificationListener :: NotificationCallback -> Process ()
260−notificationListener callback = do
261− --pid <- getSelfPid
262− --liftIO $ putStrLn $ "LISTENER THREAD START " ++ show pid
263− _ <- forever $
264− receiveWait [
265− match (\(NotificationMessage eNots) ->
266− --say $ "NOTIFICATION: " ++ show eNots
267− -- 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
268− liftIO $ mapM_ (uncurry callback) (M.toList eNots)
269− )
270− ]
271− --say "LISTENER THREAD EXIT"
272− pure ()
273−
274−startNotificationListener :: LocalNode -> NotificationCallback -> IO ProcessId
275−startNotificationListener localNode callback = forkProcess localNode (notificationListener callback)
276−
277247createScriptSession :: [String] -> IO (Maybe ScriptSession)
278248createScriptSession ghcPkgPaths = do
279249 eScriptSession <- initScriptSession ghcPkgPaths
280250 case eScriptSession of
281− Left err -> hPutStrLn stderr ("Failed to load scripting engine- scripting disabled: " ++ show err) >> pure Nothing --not a fatal error, but the scripting feature must be disabled
251+ Left err -> hPutStrLn stderr ("Warning: Haskell scripting disabled: " ++ show err) >> pure Nothing --not a fatal error, but the scripting feature must be disabled
282252 Right s -> pure (Just s)
283253
254+
284255-- | To create a 'Connection' to a remote or local database, create a 'ConnectionInfo' and call 'connectProjectM36'.
285256connectProjectM36 :: ConnectionInfo -> IO (Either ConnectionError Connection)
286257--create a new in-memory database/transaction graph
287258connectProjectM36 (InProcessConnectionInfo strat notificationCallback ghcPkgPaths) = do
288259 freshId <- nextRandom
289− stamp <- getCurrentTime
260+ tstamp <- getCurrentTime
290261 let bootstrapContext = basicDatabaseContext
291− freshGraph = bootstrapTransactionGraph stamp freshId bootstrapContext
262+ freshGraph = bootstrapTransactionGraph tstamp freshId bootstrapContext
292263 case strat of
293264 --create date examples graph for now- probably should be empty context in the future
294265 NoPersistence -> do
295266 graphTvar <- newTVarIO freshGraph
296− clientNodes <- STMSet.newIO
297− sessions <- STMMap.newIO
298− (localNode, transport) <- createLocalNode
299− notificationPid <- startNotificationListener localNode notificationCallback
267+ clientNodes <- StmSet.newIO
268+ sessions <- StmMap.newIO
300269 mScriptSession <- createScriptSession ghcPkgPaths
301−
270+ notifAsync <- startNotificationListener clientNodes notificationCallback
302271 let conn = InProcessConnection InProcessConnectionConf {
303272 ipPersistenceStrategy = strat,
304273 ipClientNodes = clientNodes,
305274 ipSessions = sessions,
306275 ipTransactionGraph = graphTvar,
307276 ipScriptSession = mScriptSession,
308− ipLocalNode = localNode,
309− ipTransport = transport,
310− ipLocks = Nothing}
311− addClientNode conn notificationPid
277+ ipLocks = Nothing,
278+ ipCallbackAsync = notifAsync
279+ }
312280 pure (Right conn)
313281 MinimalPersistence dbdir -> connectPersistentProjectM36 strat NoDiskSync dbdir freshGraph notificationCallback ghcPkgPaths
314282 CrashSafePersistence dbdir -> connectPersistentProjectM36 strat FsyncDiskSync dbdir freshGraph notificationCallback ghcPkgPaths
315283
316−connectProjectM36 (RemoteProcessConnectionInfo databaseName serverNodeId notificationCallback) = do
317− connStatus <- newEmptyMVar
318− (localNode, transport) <- createLocalNode
319− let dbName = remoteDBLookupName databaseName
320− --putStrLn $ "Connecting to " ++ show serverNodeId ++ " " ++ dbName
321− notificationListenerPid <- startNotificationListener localNode notificationCallback
322− runProcess localNode $ do
323− --even a failed connection retains an open socket!
324− mServerProcessId <- whereisRemote serverNodeId dbName
325− case mServerProcessId of
326− Nothing -> liftIO $ putMVar connStatus $ Left (NoSuchDatabaseByNameError databaseName)
327− Just serverProcessId -> do
328− loginConfirmation <- safeLogin (Login notificationListenerPid) serverProcessId
329− if not loginConfirmation then
330− liftIO $ putMVar connStatus (Left LoginError)
331− else
332− liftIO $ putMVar connStatus (Right $ RemoteProcessConnection RemoteProcessConnectionConf {rLocalNode = localNode, rProcessId = serverProcessId, rTransport = transport})
333− status <- takeMVar connStatus
334− pure status
284+connectProjectM36 (RemoteConnectionInfo dbName hostName servicePort notificationCallback) = do
285+ --TODO- add notification callback thread
286+ let resolutionHints = defaultHints { addrFlags = [AI_NUMERICHOST, AI_NUMERICSERV],
287+ addrSocketType = Stream
288+ }
289+ resolved <- getAddrInfo (Just resolutionHints) (Just hostName) (Just servicePort)
290+ case resolved of
291+ [] -> error ("DNS resolution failed for" <> hostName <> ":" <> servicePort)
292+ addrInfo:_ -> do
293+ --supports IPv4 only for now
294+ let (SockAddrInet port addr) = addrAddress addrInfo
295+ notificationHandlers =
296+ [RPC.ClientAsyncRequestHandler $
297+ \(NotificationMessage notifications') ->
298+ forM_ (M.toList notifications') (uncurry notificationCallback)
299+ ]
300+ let connectExcHandler (e :: IOException) = pure $ Left (IOExceptionError e)
301+ eConn <- (Right <$> RPC.connect notificationHandlers (hostAddressToTuple addr) port) `catch` connectExcHandler
302+ case eConn of
303+ Left err -> pure (Left err)
304+ Right conn -> do
305+ eRet <- RPC.call conn (Login dbName)
306+ case eRet of
307+ Left err -> error (show err)
308+ Right False -> error "wtf"
309+ Right True ->
310+ --TODO handle connection errors!
311+ pure (Right (RemoteConnection (RemoteConnectionConf conn)))
312+
313+--convert RPC errors into exceptions
314+convertRPCErrors :: RPC.ConnectionError -> IO a
315+convertRPCErrors err =
316+ case err of
317+ RPC.TimeoutError -> throw RequestTimeoutException
318+ RPC.CodecError msg -> error $ "decoding message failed on server: " <> msg
319+ RPC.ExceptionError msg -> error $ "server threw exception: " <> msg
320+
321+addClientNode :: Connection -> RPC.Locking Socket -> IO ()
322+addClientNode (RemoteConnection _) _ = error "addClientNode called on remote connection"
323+addClientNode (InProcessConnection conf) lockSock = atomically (StmSet.insert clientInfo (ipClientNodes conf))
324+ where
325+ clientInfo = RemoteClientInfo lockSock
335326
336327connectPersistentProjectM36 :: PersistenceStrategy ->
337328 DiskSync ->
@@ -350,49 +341,57 @@ connectPersistentProjectM36 strat sync dbdir freshGraph notificationCallback ghc
350341 case graph of
351342 Left err' -> return $ Left (SetupDatabaseDirectoryError err')
352343 Right graph' -> do
353− tvarGraph <- newTVarIO graph'
354− sessions <- STMMap.newIO
355− clientNodes <- STMSet.newIO
356− (localNode, transport) <- createLocalNode
357− lockMVar <- newMVar digest
358− let conn = InProcessConnection InProcessConnectionConf {
344+ case TG.validateMerkleHashes graph' of
345+ Left merkleErrs -> pure (Left (DatabaseValidationError merkleErrs))
346+ Right _ -> do
347+ tvarGraph <- newTVarIO graph'
348+ sessions <- StmMap.newIO
349+ clientNodes <- StmSet.newIO
350+ lockMVar <- newMVar digest
351+ notifAsync <- startNotificationListener clientNodes notificationCallback
352+ let conn = InProcessConnection InProcessConnectionConf {
359353 ipPersistenceStrategy = strat,
360354 ipClientNodes = clientNodes,
361355 ipSessions = sessions,
362356 ipTransactionGraph = tvarGraph,
363357 ipScriptSession = mScriptSession,
364− ipLocalNode = localNode,
365− ipTransport = transport,
366− ipLocks = Just (lockFileH, lockMVar)
358+ ipLocks = Just (lockFileH, lockMVar),
359+ ipCallbackAsync = notifAsync
367360 }
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
368371
369− notificationPid <- startNotificationListener localNode notificationCallback
370− addClientNode conn notificationPid
371− pure (Right conn)
372−
373372-- | Create a new session at the transaction id and return the session's Id.
374373createSessionAtCommit :: Connection -> TransactionId -> IO (Either RelationalError SessionId)
375374createSessionAtCommit conn@(InProcessConnection _) commitId = do
376375 newSessionId <- nextRandom
377376 atomically $ createSessionAtCommit_ commitId newSessionId conn
378−createSessionAtCommit conn@(RemoteProcessConnection _) uuid = remoteCall conn (CreateSessionAtCommit uuid)
377+createSessionAtCommit conn@(RemoteConnection _) uuid = remoteCall conn (CreateSessionAtCommit uuid)
379378
380379createSessionAtCommit_ :: TransactionId -> SessionId -> Connection -> STM (Either RelationalError SessionId)
381380createSessionAtCommit_ commitId newSessionId (InProcessConnection conf) = do
382381 let sessions = ipSessions conf
383382 graphTvar = ipTransactionGraph conf
384383 graph <- readTVar graphTvar
385− case transactionForId commitId graph of
384+ case RE.transactionForId commitId graph of
386385 Left err -> pure (Left err)
387386 Right transaction -> do
388387 let freshDiscon = DisconnectedTransaction commitId (Trans.schemas transaction) False
389− keyDuplication <- STMMap.lookup newSessionId sessions
388+ keyDuplication <- StmMap.lookup newSessionId sessions
390389 case keyDuplication of
391390 Just _ -> pure $ Left (SessionIdInUseError newSessionId)
392391 Nothing -> do
393− STMMap.insert (Session freshDiscon defaultSchemaName) newSessionId sessions
392+ StmMap.insert (Session freshDiscon defaultSchemaName) newSessionId sessions
394393 pure $ Right newSessionId
395−createSessionAtCommit_ _ _ (RemoteProcessConnection _) = error "createSessionAtCommit_ called on remote connection"
394+createSessionAtCommit_ _ _ (RemoteConnection _) = error "createSessionAtCommit_ called on remote connection"
396395
397396-- | 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.
398397createSessionAtHead :: Connection -> HeadName -> IO (Either RelationalError SessionId)
@@ -404,42 +403,38 @@ createSessionAtHead conn@(InProcessConnection conf) headn = do
404403 case transactionForHead headn graph of
405404 Nothing -> pure $ Left (NoSuchHeadNameError headn)
406405 Just trans -> createSessionAtCommit_ (transactionId trans) newSessionId conn
407−createSessionAtHead conn@(RemoteProcessConnection _) headn = remoteCall conn (CreateSessionAtHead headn)
408−
409−-- | Used internally for server connections to keep track of remote nodes for the purpose of sending notifications later.
410−addClientNode :: Connection -> ProcessId -> IO ()
411−addClientNode (RemoteProcessConnection _) _ = error "addClientNode called on remote connection"
412−addClientNode (InProcessConnection conf) newProcessId = atomically (STMSet.insert newProcessId (ipClientNodes conf))
406+createSessionAtHead conn@(RemoteConnection _) headn = remoteCall conn (CreateSessionAtHead headn)
413407
414408-- | Discards a session, eliminating any uncommitted changes present in the session.
415409closeSession :: SessionId -> Connection -> IO ()
416410closeSession sessionId (InProcessConnection conf) =
417− atomically $ STMMap.delete sessionId (ipSessions conf)
418−closeSession sessionId conn@(RemoteProcessConnection _) = remoteCall conn (CloseSession sessionId)
411+ atomically $ StmMap.delete sessionId (ipSessions conf)
412+closeSession sessionId conn@(RemoteConnection _) = remoteCall conn (CloseSession sessionId)
419413
420414-- | 'close' cleans up the database access connection and closes any relevant sockets.
421415close :: Connection -> IO ()
422416close (InProcessConnection conf) = do
417+ cancel (ipCallbackAsync conf)
423418 atomically $ do
424419 let sessions = ipSessions conf
425− STMMap.deleteAll sessions
420+#if MIN_VERSION_stm_containers(1,0,0)
421+ StmMap.reset sessions
422+#else
423+ StmMap.deleteAll sessions
424+#endif
426425 pure ()
427− closeLocalNode (ipLocalNode conf)
428− closeTransport (ipTransport conf)
429426 let mLocks = ipLocks conf
430427 case mLocks of
431428 Nothing -> pure ()
432429 Just (lockFileH, _) -> closeLockFile lockFileH
433430
434−close conn@(RemoteProcessConnection conf) = do
435− _ <- remoteCall conn Logout :: IO Bool
436− closeLocalNode (rLocalNode conf)
437− closeTransport (rTransport conf)
431+close (RemoteConnection (RemoteConnectionConf conn)) =
432+ RPC.close conn
438433
439434--used only by the server EntryPoints
440435closeRemote_ :: Connection -> IO ()
441436closeRemote_ (InProcessConnection _) = error "invalid call of closeRemote_ on InProcessConnection"
442−closeRemote_ (RemoteProcessConnection conf) = runProcess (rLocalNode conf) (reconnect (rProcessId conf))
437+closeRemote_ (RemoteConnection (RemoteConnectionConf conn)) = RPC.close conn
443438
444439 --we need to actually close the localNode's connection to the remote
445440--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
@@ -450,40 +445,19 @@ excEither = handle handler
450445 where
451446 handler exc | Just (_ :: AsyncException) <- fromException exc = throwIO exc
452447 | otherwise = pure (Left (UnhandledExceptionError (show exc)))
453−
454−runProcessResult :: LocalNode -> Process a -> IO a
455−runProcessResult localNode proc = do
456− ret <- newEmptyMVar
457− runProcess localNode $ do
458− val <- proc
459− liftIO $ putMVar ret val
460− takeMVar ret
461−
462−safeLogin :: Login -> ProcessId -> Process Bool
463−safeLogin login procId = do
464− ret <- call procId login
465− case ret of
466− Left (_ :: ServerError) -> pure False
467− Right val -> pure val
468448
469−remoteCall :: (Serializable a, Serializable b) => Connection -> a -> IO b
449+
450+remoteCall :: (Serialise a, Serialise b) => Connection -> a -> IO b
470451remoteCall (InProcessConnection _ ) _ = error "remoteCall called on local connection"
471−remoteCall (RemoteProcessConnection conf) arg = runProcessResult localNode $ do
472− ret <- safeCall serverProcessId arg
473− case ret of
474− Left err -> error ("server died: " ++ show err)
475− Right ret' -> case ret' of
476− Left RequestTimeoutError -> liftIO (throwIO RequestTimeoutException)
477− Left (ProcessDiedError _) -> liftIO (throwIO RemoteProcessDiedException)
478− Right val -> pure val
479− where
480− localNode = rLocalNode conf
481− serverProcessId = rProcessId conf
452+remoteCall (RemoteConnection (RemoteConnectionConf rpcConn)) arg = do
453+ eRet <- RPC.call rpcConn arg
454+ case eRet of
455+ Left err -> convertRPCErrors err
456+ Right val -> pure val
482457
483458sessionForSessionId :: SessionId -> Sessions -> STM (Either RelationalError Session)
484−sessionForSessionId sessionId sessions = do
485− maybeSession <- STMMap.lookup sessionId sessions
486− pure $ maybe (Left $ NoSuchSessionError sessionId) Right maybeSession
459+sessionForSessionId sessionId sessions =
460+ maybe (Left $ NoSuchSessionError sessionId) Right <$> StmMap.lookup sessionId sessions
487461
488462schemaForSessionId :: Session -> STM (Either RelationalError Schema)
489463schemaForSessionId session = do
@@ -514,7 +488,7 @@ currentSchemaName sessionId (InProcessConnection conf) = atomically $ do
514488 case eSession of
515489 Left err -> pure (Left err)
516490 Right session -> pure (Right (Sess.schemaName session))
517−currentSchemaName sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveCurrentSchemaName sessionId)
491+currentSchemaName sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveCurrentSchemaName sessionId)
518492
519493-- | Switch to the named isomorphic schema.
520494setCurrentSchemaName :: SessionId -> Connection -> SchemaName -> IO (Either RelationalError ())
@@ -525,8 +499,8 @@ setCurrentSchemaName sessionId (InProcessConnection conf) sname = atomically $ d
525499 Left err -> pure (Left err)
526500 Right session -> case Sess.setSchemaName sname session of
527501 Left err -> pure (Left err)
528− Right newSession -> STMMap.insert newSession sessionId sessions >> pure (Right ())
529−setCurrentSchemaName sessionId conn@(RemoteProcessConnection _) sname = remoteCall conn (ExecuteSetCurrentSchema sessionId sname)
502+ Right newSession -> StmMap.insert newSession sessionId sessions >> pure (Right ())
503+setCurrentSchemaName sessionId conn@(RemoteConnection _) sname = remoteCall conn (ExecuteSetCurrentSchema sessionId sname)
530504
531505-- | Execute a relational expression in the context of the session and connection. Relational expressions are queries and therefore cannot alter the database.
532506executeRelationalExpr :: SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)
@@ -542,14 +516,15 @@ executeRelationalExpr sessionId (InProcessConnection conf) expr = excEither $ at
542516 Right expr
543517 case expr' of
544518 Left err -> pure (Left err)
545− Right expr'' -> case optimizeRelationalExpr (Sess.concreteDatabaseContext session) expr'' of
546− Left err -> pure (Left err)
547− Right optExpr -> do
548− let evald = runReader (RE.evalRelationalExpr optExpr) (RE.mkRelationalExprState (Sess.concreteDatabaseContext session))
549− case evald of
550− Left err -> pure (Left err)
551− Right rel -> pure (force (Right rel)) -- this is necessary so that any undefined/error exceptions are spit out here
552−executeRelationalExpr sessionId conn@(RemoteProcessConnection _) relExpr = remoteCall conn (ExecuteRelationalExpr sessionId relExpr)
519+ Right expr'' -> do
520+ let graphTvar = ipTransactionGraph conf
521+ graph <- readTVar graphTvar
522+ let reEnv = RE.mkRelationalExprEnv (Sess.concreteDatabaseContext session) graph
523+ case optimizeAndEvalRelationalExpr reEnv expr'' of
524+ 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)
526+
527+executeRelationalExpr sessionId conn@(RemoteConnection _) relExpr = remoteCall conn (ExecuteRelationalExpr sessionId relExpr)
553528
554529-- | 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.
555530executeDatabaseContextExpr :: SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError ())
@@ -565,41 +540,54 @@ executeDatabaseContextExpr sessionId (InProcessConnection conf) expr = excEither
565540 Schema.processDatabaseContextExprInSchema schema expr
566541 case expr' of
567542 Left err -> pure (Left err)
568− Right expr'' -> case runState (do
569− eOptExpr <- applyStaticDatabaseOptimization expr''
570− case eOptExpr of
571− Left err -> pure (Left err)
572− Right optExpr ->
573− RE.evalDatabaseContextExpr optExpr) (RE.freshDatabaseState (Sess.concreteDatabaseContext session)) of
574− (Left err,_) -> pure (Left err)
575− (Right (), (_,_,False)) -> pure (Right ()) --optimization- if nothing was dirtied, nothing to do
576− (Right (), (!context',_,True)) -> do
577− let newDiscon = DisconnectedTransaction (Sess.parentId session) newSchemas True
578− newSubschemas = Schema.processDatabaseContextExprSchemasUpdate (Sess.subschemas session) expr
579− newSchemas = Schemas context' newSubschemas
580− newSession = Session newDiscon (Sess.schemaName session)
581− STMMap.insert newSession sessionId sessions
582− pure (Right ())
583−executeDatabaseContextExpr sessionId conn@(RemoteProcessConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextExpr sessionId dbExpr)
584−
585−-- | 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).
543+ Right expr'' -> do
544+ graph <- readTVar (ipTransactionGraph conf)
545+ let ctx = Sess.concreteDatabaseContext session
546+ env = RE.mkDatabaseContextEvalEnv transId graph
547+ transId = Sess.parentId session
548+ case RE.runDatabaseContextEvalMonad ctx env (optimizeAndEvalDatabaseContextExpr True expr'') of
549+ Left err -> pure (Left err)
550+ Right newState ->
551+ if not (RE.dbc_dirty newState) then --nothing dirtied, nothing to do
552+ pure (Right ())
553+ else do
554+ let newDiscon = DisconnectedTransaction (Sess.parentId session) newSchemas True
555+ context' = RE.dbc_context newState
556+ newSubschemas = Schema.processDatabaseContextExprSchemasUpdate (Sess.subschemas session) expr
557+ newSchemas = Schemas context' newSubschemas
558+ newSession = Session newDiscon (Sess.schemaName session)
559+ StmMap.insert newSession sessionId sessions
560+ pure (Right ())
561+executeDatabaseContextExpr sessionId conn@(RemoteConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextExpr sessionId dbExpr)
562+
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.
586564autoMergeToHead :: SessionId -> Connection -> MergeStrategy -> HeadName -> IO (Either RelationalError ())
587565autoMergeToHead sessionId (InProcessConnection conf) strat headName' = do
588566 let sessions = ipSessions conf
589567 id1 <- nextRandom
590568 id2 <- nextRandom
591569 id3 <- nextRandom
592− stamp <- getCurrentTime
570+ tstamp <- getCurrentTime
593571 commitLock_ sessionId conf $ \graph -> do
594572 eSession <- sessionForSessionId sessionId sessions
595573 case eSession of
596574 Left err -> pure (Left err)
597− Right session ->
598− case Graph.autoMergeToHead stamp (id1, id2, id3) (Sess.disconnectedTransaction session) headName' strat graph of
599− Left err -> pure (Left err)
600− Right (discon', graph') ->
601− pure (Right (discon', graph', [id1, id2, id3]))
602−autoMergeToHead sessionId conn@(RemoteProcessConnection _) strat headName' = remoteCall conn (ExecuteAutoMergeToHead sessionId strat headName')
575+ Right session ->
576+ case Graph.transactionForHead headName' graph of
577+ Nothing -> pure (Left (NoSuchHeadNameError headName'))
578+ Just headTrans -> do
579+ --attempt fast-forward commit, if possible
580+ let graphInfo = if Sess.parentId session == transactionId headTrans then do
581+ ret <- Graph.evalGraphOp tstamp id1 (Sess.disconnectedTransaction session) graph Commit
582+ pure (ret, [id1])
583+ else do
584+ ret <- Graph.autoMergeToHead tstamp (id1, id2, id3) (Sess.disconnectedTransaction session) headName' strat graph
585+ pure (ret, [id1,id2,id3])
586+ case graphInfo of
587+ Left err -> pure (Left err)
588+ Right ((discon', graph'), transactionIdsAdded) ->
589+ pure (Right (discon', graph', transactionIdsAdded))
590+autoMergeToHead sessionId conn@(RemoteConnection _) strat headName' = remoteCall conn (ExecuteAutoMergeToHead sessionId strat headName')
603591
604592-- | Execute a database context IO-monad-based expression for the given session and connection. `DatabaseContextIOExpr`s modify the DatabaseContext but cannot be purely implemented.
605593--this is almost completely identical to executeDatabaseContextExpr above
@@ -611,38 +599,35 @@ executeDatabaseContextIOExpr sessionId (InProcessConnection conf) expr = excEith
611599 case eSession of
612600 Left err -> pure (Left err)
613601 Right session -> do
614− res <- RE.evalDatabaseContextIOExpr scriptSession (Sess.concreteDatabaseContext session) expr
602+ graph <- readTVarIO (ipTransactionGraph conf)
603+ let env = RE.DatabaseContextIOEvalEnv transId graph scriptSession
604+ transId = Sess.parentId session
605+ context = Sess.concreteDatabaseContext session
606+ res <- RE.runDatabaseContextIOEvalMonad env context (optimizeAndEvalDatabaseContextIOExpr expr)
615607 case res of
616608 Left err -> pure (Left err)
617− Right context' -> do
618− let newDiscon = DisconnectedTransaction (Sess.parentId session) newSchemas True
609+ Right newState -> do
610+ let newDiscon = DisconnectedTransaction (Sess.parentId session) newSchemas False
619611 newSchemas = Schemas context' (Sess.subschemas session)
620612 newSession = Session newDiscon (Sess.schemaName session)
621− atomically $ STMMap.insert newSession sessionId sessions
613+ context' = RE.dbc_context newState
614+ atomically $ StmMap.insert newSession sessionId sessions
622615 pure (Right ())
623−executeDatabaseContextIOExpr sessionId conn@(RemoteProcessConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextIOExpr sessionId dbExpr)
616+executeDatabaseContextIOExpr sessionId conn@(RemoteConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextIOExpr sessionId dbExpr)
624617
625−{-
626−executeGraphExprSTM_ :: TransactionId -> SessionId -> Session -> Sessions -> TransactionGraphOperator -> TransactionGraph -> TVar TransactionGraph -> STM (Either RelationalError (TransactionGraph, DisconnectedTransaction)
627−executeGraphExprSTM_ freshId sessionId session sessions graphExpr graph graphTVar= do
628− case evalGraphOp freshId (Sess.disconnectedTransaction session) graph graphExpr of
629− Left err -> do
630− when updateGraphOnError (writeTVar graphTVar graph)
631− pure $ Left err
632− Right (discon', graph') -> do
633− writeTVar graphTVar graph'
634− let newSession = Session discon' (Sess.schemaName session)
635− STMMap.insert newSession sessionId sessions
636− pure $ Right graph'
637−-}
638−
639618-- process notifications for commits
640−executeCommitExprSTM_ :: DatabaseContext -> DatabaseContext -> ClientNodes -> STM (EvaluatedNotifications, ClientNodes)
641−executeCommitExprSTM_ oldContext newContext nodes = do
619+executeCommitExprSTM_
620+ :: TransactionGraph
621+ -> DatabaseContext
622+ -> DatabaseContext
623+ -> ClientNodes
624+ -> STM (EvaluatedNotifications, ClientNodes)
625+executeCommitExprSTM_ graph oldContext newContext nodes = do
642626 let nots = notifications oldContext
643− fireNots = notificationChanges nots oldContext newContext
627+ fireNots = notificationChanges nots graph oldContext newContext
644628 evaldNots = M.map mkEvaldNot fireNots
645− evalInContext expr ctx = runReader (RE.evalRelationalExpr expr) (RE.mkRelationalExprState ctx)
629+ evalInContext expr ctx = optimizeAndEvalRelationalExpr (RE.mkRelationalExprEnv ctx graph) expr
630+
646631 mkEvaldNot notif = EvaluatedNotification { notification = notif,
647632 reportOldRelation = evalInContext (reportOldExpr notif) oldContext,
648633 reportNewRelation = evalInContext (reportNewExpr notif) newContext}
@@ -657,103 +642,29 @@ executeGraphExpr :: SessionId -> Connection -> TransactionGraphOperator -> IO (E
657642executeGraphExpr sessionId (InProcessConnection conf) graphExpr = excEither $ do
658643 let sessions = ipSessions conf
659644 freshId <- nextRandom
660− stamp <- getCurrentTime
645+ tstamp <- getCurrentTime
661646 commitLock_ sessionId conf $ \updatedGraph -> do
662647 eSession <- sessionForSessionId sessionId sessions
663648 case eSession of
664649 Left err -> pure (Left err)
665650 Right session -> do
666651 let discon = Sess.disconnectedTransaction session
667− case evalGraphOp stamp freshId discon updatedGraph graphExpr of
652+ case evalGraphOp tstamp freshId discon updatedGraph graphExpr of
668653 Left err -> pure (Left err)
669654 Right (discon', graph') -> do
670655 --if freshId appears in the graph, then we need to pass it on
671− let transIds = [freshId | isRight (transactionForId freshId graph')]
656+ let transIds = [freshId | isRight (RE.transactionForId freshId graph')]
672657 pure (Right (discon', graph', transIds))
673−{-
674−executeGraphExpr sessionId (InProcessConnection conf) graphExpr = excEither $ do
675− let strat = ipPersistenceStrategy conf
676− clientNodes = ipClientNodes conf
677− sessions = ipSessions conf
678− graphTvar = ipTransactionGraph conf
679− mLockFileH = ipLocks conf
680− lockHandler body = case graphExpr of
681− Commit -> case mLockFileH of
682− Nothing -> body False
683− Just (lockFileH, lockMVar) -> let acquireLocks = do
684− lastWrittenDigest <- takeMVar lockMVar
685− lockFile lockFileH WriteLock
686− latestDigest <- readGraphTransactionIdDigest strat
687− pure (latestDigest /= lastWrittenDigest)
688−
689− releaseLocks _ = do
690− --still holding the lock- get the latest digest
691− gDigest <- readGraphTransactionIdDigest strat
692− unlockFile lockFileH
693− putMVar lockMVar gDigest
694− in bracket acquireLocks releaseLocks body
695− _ -> body False
696− freshId <- nextRandom
697− lockHandler $ \dbWrittenByOtherProcess -> do
698− --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
699− --read transaction data and compare to existing graph
700− --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)
701− manip <- atomically $ do
702− eSession <- sessionForSessionId sessionId sessions
703− --handle graph update by other process
704− oldGraph <- readTVar graphTvar
705− case eSession of
706− Left err -> pure (Left err)
707− Right session -> do
708− let mScriptSession = ipScriptSession conf
709− dbdir = case strat of
710− MinimalPersistence x -> x
711− CrashSafePersistence x -> x
712− _ -> error "accessing dbdir on non-persisted connection"
713− eRefreshedGraph <- if dbWrittenByOtherProcess then
714− unsafeIOToSTM (transactionGraphLoad dbdir oldGraph mScriptSession)
715− else
716− pure (Right oldGraph)
717− case eRefreshedGraph of
718− Left err -> pure (Left (DatabaseLoadError err))
719− Right refreshedGraph -> do
720− --snip it
721− eGraph <- executeGraphExprSTM_ dbWrittenByOtherProcess freshId sessionId session sessions graphExpr refreshedGraph graphTvar
722− --snip it
723− case eGraph of
724− Left err -> pure (Left err)
725− Right newGraph -> do
726− --handle commit
727− if isCommit graphExpr then do
728− case transactionForId (Sess.parentId session) oldGraph of
729− Left err -> pure $ Left err
730− Right previousTrans -> do
731− (evaldNots, nodes) <- executeCommitExprSTM_ (Trans.concreteDatabaseContext previousTrans) (Sess.concreteDatabaseContext session) clientNodes
732− nodesToNotify <- toList (STMSet.stream nodes)
733− pure $ Right (evaldNots, nodesToNotify, newGraph)
734− else
735− pure $ Right (M.empty, [], newGraph)
736− case manip of
737− Left err -> return $ Just err
738− Right (notsToFire, nodesToNotify, newGraph) -> do
739− --update filesystem database, if necessary
740− processTransactionGraphPersistence strat newGraph
741− sendNotifications nodesToNotify (ipLocalNode conf) notsToFire
742− pure Nothing
743−-}
744−executeGraphExpr sessionId conn@(RemoteProcessConnection _) graphExpr = remoteCall conn (ExecuteGraphExpr sessionId graphExpr)
658+
659+executeGraphExpr sessionId conn@(RemoteConnection _) graphExpr = remoteCall conn (ExecuteGraphExpr sessionId graphExpr)
745660
746661-- | A trans-graph expression is a relational query executed against the entirety of a transaction graph.
747662executeTransGraphRelationalExpr :: SessionId -> Connection -> TransGraphRelationalExpr -> IO (Either RelationalError Relation)
748663executeTransGraphRelationalExpr _ (InProcessConnection conf) tgraphExpr = excEither . atomically $ do
749664 let graphTvar = ipTransactionGraph conf
750665 graph <- readTVar graphTvar
751− case evalTransGraphRelationalExpr tgraphExpr graph of
752− Left err -> pure (Left err)
753− Right relExpr -> case runReader (RE.evalRelationalExpr relExpr) (RE.mkRelationalExprState DBC.empty) of
754− Left err -> pure (Left err)
755− Right rel -> pure (force (Right rel))
756−executeTransGraphRelationalExpr sessionId conn@(RemoteProcessConnection _) tgraphExpr = remoteCall conn (ExecuteTransGraphRelationalExpr sessionId tgraphExpr)
666+ pure $ force $ optimizeAndEvalTransGraphRelationalExpr graph tgraphExpr
667+executeTransGraphRelationalExpr sessionId conn@(RemoteConnection _) tgraphExpr = remoteCall conn (ExecuteTransGraphRelationalExpr sessionId tgraphExpr)
757668
758669-- | Schema expressions manipulate the isomorphic schemas for the current 'DatabaseContext'.
759670executeSchemaExpr :: SessionId -> Connection -> Schema.SchemaExpr -> IO (Either RelationalError ())
@@ -764,32 +675,36 @@ executeSchemaExpr sessionId (InProcessConnection conf) schemaExpr = atomically $
764675 Left err -> pure (Left err)
765676 Right (session, _) -> do
766677 let subschemas' = subschemas session
767− case Schema.evalSchemaExpr schemaExpr (Sess.concreteDatabaseContext session) subschemas' of
678+ transId = Sess.parentId session
679+ context = Sess.concreteDatabaseContext session
680+ graph <- readTVar (ipTransactionGraph conf)
681+ case Schema.evalSchemaExpr schemaExpr context transId graph subschemas' of
768682 Left err -> pure (Left err)
769683 Right (newSubschemas, newContext) -> do
770684 --hm- maybe we should start using lenses
771685 let discon = Sess.disconnectedTransaction session
772686 newSchemas = Schemas newContext newSubschemas
773− newSession = Session (DisconnectedTransaction (Discon.parentId discon) newSchemas True) (Sess.schemaName session)
774− STMMap.insert newSession sessionId sessions
687+ newSession = Session (DisconnectedTransaction (Discon.parentId discon) newSchemas False) (Sess.schemaName session)
688+ StmMap.insert newSession sessionId sessions
775689 pure (Right ())
776−executeSchemaExpr sessionId conn@(RemoteProcessConnection _) schemaExpr = remoteCall conn (ExecuteSchemaExpr sessionId schemaExpr)
690+executeSchemaExpr sessionId conn@(RemoteConnection _) schemaExpr = remoteCall conn (ExecuteSchemaExpr sessionId schemaExpr)
777691
778692-- | 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.
779693commit :: SessionId -> Connection -> IO (Either RelationalError ())
780694commit sessionId conn@(InProcessConnection _) = executeGraphExpr sessionId conn Commit
781−commit sessionId conn@(RemoteProcessConnection _) = remoteCall conn (ExecuteGraphExpr sessionId Commit)
782−
783−sendNotifications :: [ProcessId] -> LocalNode -> EvaluatedNotifications -> IO ()
784−sendNotifications pids localNode nots = mapM_ sendNots pids
785− where
786− sendNots remoteClientPid =
787− unless (M.null nots) $ runProcess localNode $ send remoteClientPid (NotificationMessage nots)
788−
695+commit sessionId conn@(RemoteConnection _) = remoteCall conn (ExecuteGraphExpr sessionId Commit)
696+
697+sendNotifications :: [ClientInfo] -> EvaluatedNotifications -> IO ()
698+sendNotifications clients notifs =
699+ unless (M.null notifs) $ forM_ clients sender
700+ where
701+ sender (RemoteClientInfo sock) = RPC.sendMessage sock (NotificationMessage notifs)
702+ sender (InProcessClientInfo tvar) = putMVar tvar notifs
703+
789704-- | 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.
790705rollback :: SessionId -> Connection -> IO (Either RelationalError ())
791706rollback sessionId conn@(InProcessConnection _) = executeGraphExpr sessionId conn Rollback
792−rollback sessionId conn@(RemoteProcessConnection _) = remoteCall conn (ExecuteGraphExpr sessionId Rollback)
707+rollback sessionId conn@(RemoteConnection _) = remoteCall conn (ExecuteGraphExpr sessionId Rollback)
793708
794709-- | Write the transaction graph to disk. This function can be used to incrementally write new transactions to disk.
795710processTransactionGraphPersistence :: PersistenceStrategy -> [TransactionId] -> TransactionGraph -> IO ()
@@ -805,7 +720,7 @@ readGraphTransactionIdDigest (CrashSafePersistence dbdir) = readGraphTransaction
805720-- | 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.
806721typeForRelationalExpr :: SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)
807722typeForRelationalExpr sessionId conn@(InProcessConnection _) relExpr = atomically $ typeForRelationalExprSTM sessionId conn relExpr
808−typeForRelationalExpr sessionId conn@(RemoteProcessConnection _) relExpr = remoteCall conn (ExecuteTypeForRelationalExpr sessionId relExpr)
723+typeForRelationalExpr sessionId conn@(RemoteConnection _) relExpr = remoteCall conn (ExecuteTypeForRelationalExpr sessionId relExpr)
809724
810725typeForRelationalExprSTM :: SessionId -> Connection -> RelationalExpr -> STM (Either RelationalError Relation)
811726typeForRelationalExprSTM sessionId (InProcessConnection conf) relExpr = do
@@ -820,7 +735,10 @@ typeForRelationalExprSTM sessionId (InProcessConnection conf) relExpr = do
820735 Schema.processRelationalExprInSchema schema relExpr
821736 case processed of
822737 Left err -> pure (Left err)
823− Right relExpr' -> pure $ runReader (RE.typeForRelationalExpr relExpr') (RE.mkRelationalExprState (Sess.concreteDatabaseContext session))
738+ Right relExpr' -> do
739+ graph <- readTVar (ipTransactionGraph conf)
740+ let reEnv = RE.mkRelationalExprEnv (Sess.concreteDatabaseContext session) graph
741+ pure $ RE.runRelationalExprM reEnv (RE.typeForRelationalExpr relExpr')
824742
825743typeForRelationalExprSTM _ _ _ = error "typeForRelationalExprSTM called on non-local connection"
826744
@@ -839,7 +757,7 @@ inclusionDependencies sessionId (InProcessConnection conf) = do
839757 else
840758 pure (Schema.inclusionDependenciesInSchema schema (B.inclusionDependencies context))
841759
842−inclusionDependencies sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveInclusionDependencies sessionId)
760+inclusionDependencies sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveInclusionDependencies sessionId)
843761
844762typeConstructorMapping :: SessionId -> Connection -> IO (Either RelationalError TypeConstructorMapping)
845763typeConstructorMapping sessionId (InProcessConnection conf) = do
@@ -850,22 +768,27 @@ typeConstructorMapping sessionId (InProcessConnection conf) = do
850768 Left err -> pure $ Left err
851769 Right (session, _) -> --warning, no schema support for typeconstructors
852770 pure (Right (B.typeConstructorMapping (Sess.concreteDatabaseContext session)))
853−typeConstructorMapping sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveTypeConstructorMapping sessionId)
771+typeConstructorMapping sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveTypeConstructorMapping sessionId)
854772
855773-- | 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.
856−planForDatabaseContextExpr :: SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError DatabaseContextExpr)
774+planForDatabaseContextExpr :: SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError GraphRefDatabaseContextExpr)
857775planForDatabaseContextExpr sessionId (InProcessConnection conf) dbExpr = do
858776 let sessions = ipSessions conf
859777 atomically $ do
778+ graph <- readTVar (ipTransactionGraph conf)
860779 eSession <- sessionAndSchema sessionId sessions
861780 case eSession of
862781 Left err -> pure $ Left err
863− Right (session, _) -> if schemaName session == defaultSchemaName then
864− pure $ evalState (applyStaticDatabaseOptimization dbExpr) (RE.freshDatabaseState (Sess.concreteDatabaseContext session))
865− 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
866− pure (Right dbExpr)
782+ Right (session, _) ->
783+ if schemaName session == defaultSchemaName then do
784+ let ctx = Sess.concreteDatabaseContext session
785+ transId = Sess.parentId session
786+ gfExpr = runProcessExprM UncommittedContextMarker (processDatabaseContextExpr dbExpr)
787+ pure $ runGraphRefSOptDatabaseContextExprM transId ctx graph (optimizeGraphRefDatabaseContextExpr gfExpr)
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-}
789+ pure (Left NonConcreteSchemaPlanError)
867790
868−planForDatabaseContextExpr sessionId conn@(RemoteProcessConnection _) dbExpr = remoteCall conn (RetrievePlanForDatabaseContextExpr sessionId dbExpr)
791+planForDatabaseContextExpr sessionId conn@(RemoteConnection _) dbExpr = remoteCall conn (RetrievePlanForDatabaseContextExpr sessionId dbExpr)
869792
870793-- | Return a relation which represents the current state of the global transaction graph. The attributes are
871794-- * current- boolean attribute representing whether or not the current session references this transaction
@@ -880,30 +803,57 @@ transactionGraphAsRelation sessionId (InProcessConnection conf) = do
880803 eSession <- sessionForSessionId sessionId sessions
881804 case eSession of
882805 Left err -> pure $ Left err
883− Right session -> do
884− graph <- readTVar tvar
885− pure $ graphAsRelation (Sess.disconnectedTransaction session) graph
806+ Right session ->
807+ graphAsRelation (Sess.disconnectedTransaction session) <$> readTVar tvar
886808
887−transactionGraphAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveTransactionGraph sessionId)
809+transactionGraphAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveTransactionGraph sessionId)
888810
889811-- | Returns the names and types of the relation variables in the current 'Session'.
890812relationVariablesAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)
891813relationVariablesAsRelation sessionId (InProcessConnection conf) = do
892814 let sessions = ipSessions conf
893815 atomically $ do
816+ graph <- readTVar (ipTransactionGraph conf)
894817 eSession <- sessionAndSchema sessionId sessions
895818 case eSession of
896819 Left err -> pure (Left err)
897820 Right (session, schema) -> do
898821 let context = Sess.concreteDatabaseContext session
899822 if Sess.schemaName session == defaultSchemaName then
900− pure $ R.relationVariablesAsRelation (relationVariables context)
823+ pure $ RE.relationVariablesAsRelation context graph
901824 else
902− case Schema.relationVariablesInSchema schema context of
825+ case Schema.relationVariablesInSchema schema of
903826 Left err -> pure (Left err)
904− Right relvars -> pure $ R.relationVariablesAsRelation relvars
827+ Right relvars -> do
828+ let schemaContext = context {relationVariables = relvars }
829+ pure $ RE.relationVariablesAsRelation schemaContext graph
905830
906−relationVariablesAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveRelationVariableSummary sessionId)
831+relationVariablesAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveRelationVariableSummary sessionId)
832+
833+-- | Returns the names and types of the atom functions in the current 'Session'.
834+atomFunctionsAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)
835+atomFunctionsAsRelation sessionId (InProcessConnection conf) = do
836+ let sessions = ipSessions conf
837+ atomically $ do
838+ eSession <- sessionAndSchema sessionId sessions
839+ case eSession of
840+ Left err -> pure (Left err)
841+ Right (session, _) ->
842+ pure (AF.atomFunctionsAsRelation (atomFunctions (concreteDatabaseContext session)))
843+
844+atomFunctionsAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveAtomFunctionSummary sessionId)
845+
846+databaseContextFunctionsAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)
847+databaseContextFunctionsAsRelation sessionId (InProcessConnection conf) = do
848+ let sessions = ipSessions conf
849+ atomically $ do
850+ eSession <- sessionAndSchema sessionId sessions
851+ case eSession of
852+ Left err -> pure (Left err)
853+ Right (session, _) ->
854+ pure (DCF.databaseContextFunctionsAsRelation (dbcFunctions (concreteDatabaseContext session)))
855+
856+databaseContextFunctionsAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveDatabaseContextFunctionSummary sessionId)
907857
908858-- | Returns the transaction id for the connection's disconnected transaction committed parent transaction.
909859headTransactionId :: SessionId -> Connection -> IO (Either RelationalError TransactionId)
@@ -914,7 +864,7 @@ headTransactionId sessionId (InProcessConnection conf) = do
914864 case eSession of
915865 Left err -> pure (Left err)
916866 Right session -> pure $ Right (Sess.parentId session)
917−headTransactionId sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveHeadTransactionId sessionId)
867+headTransactionId sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveHeadTransactionId sessionId)
918868
919869headNameSTM_ :: SessionId -> Sessions -> TVar TransactionGraph -> STM (Either RelationalError HeadName)
920870headNameSTM_ sessionId sessions graphTvar = do
@@ -922,7 +872,7 @@ headNameSTM_ sessionId sessions graphTvar = do
922872 eSession <- sessionForSessionId sessionId sessions
923873 case eSession of
924874 Left err -> pure (Left err)
925− Right session -> case transactionForId (Sess.parentId session) graph of
875+ Right session -> case RE.transactionForId (Sess.parentId session) graph of
926876 Left err -> pure (Left err)
927877 Right parentTrans -> case headNameForTransaction parentTrans graph of
928878 Nothing -> pure (Left UnknownHeadError)
@@ -934,7 +884,7 @@ headName sessionId (InProcessConnection conf) = do
934884 let sessions = ipSessions conf
935885 graphTvar = ipTransactionGraph conf
936886 atomically (headNameSTM_ sessionId sessions graphTvar)
937−headName sessionId conn@(RemoteProcessConnection _) = remoteCall conn (ExecuteHeadName sessionId)
887+headName sessionId conn@(RemoteConnection _) = remoteCall conn (ExecuteHeadName sessionId)
938888
939889-- | Returns a listing of all available atom types.
940890atomTypesAsRelation :: SessionId -> Connection -> IO (Either RelationalError Relation)
@@ -948,7 +898,7 @@ atomTypesAsRelation sessionId (InProcessConnection conf) = do
948898 case typesAsRelation (B.typeConstructorMapping (Sess.concreteDatabaseContext session)) of
949899 Left err -> pure (Left err)
950900 Right rel -> pure (Right rel)
951−atomTypesAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveAtomTypesAsRelation sessionId)
901+atomTypesAsRelation sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveAtomTypesAsRelation sessionId)
952902
953903disconnectedTransactionIsDirty :: SessionId -> Connection -> IO (Either RelationalError Bool)
954904disconnectedTransactionIsDirty sessionId (InProcessConnection conf) = do
@@ -959,23 +909,23 @@ disconnectedTransactionIsDirty sessionId (InProcessConnection conf) = do
959909 Left err -> pure (Left err)
960910 Right session ->
961911 pure (Right (isDirty session))
962−disconnectedTransactionIsDirty sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveSessionIsDirty sessionId)
912+disconnectedTransactionIsDirty sessionId conn@(RemoteConnection _) = remoteCall conn (RetrieveSessionIsDirty sessionId)
963913
964914--used only for testing- we expect this to throw an exception
965915callTestTimeout_ :: SessionId -> Connection -> IO Bool
966916callTestTimeout_ _ (InProcessConnection _) = error "bad testing call"
967−callTestTimeout_ sessionId conn@(RemoteProcessConnection _) = remoteCall conn (TestTimeout sessionId)
917+callTestTimeout_ sessionId conn@(RemoteConnection _) = remoteCall conn (TestTimeout sessionId)
968918
969919--used in tests only
970920transactionGraph_ :: Connection -> IO TransactionGraph
971−transactionGraph_ (InProcessConnection conf) = atomically $ readTVar (ipTransactionGraph conf)
921+transactionGraph_ (InProcessConnection conf) = readTVarIO (ipTransactionGraph conf)
972922transactionGraph_ _ = error "remote connection used"
973923
974924--used in tests only
975925disconnectedTransaction_ :: SessionId -> Connection -> IO DisconnectedTransaction
976926disconnectedTransaction_ sessionId (InProcessConnection conf) = do
977927 let sessions = ipSessions conf
978− mSession <- atomically $ STMMap.lookup sessionId sessions
928+ mSession <- atomically $ StmMap.lookup sessionId sessions
979929 case mSession of
980930 Nothing -> error "No such session"
981931 Just (Sess.Session discon _) -> pure discon
@@ -1033,13 +983,13 @@ commitLock_ sessionId conf stmBlock = do
1033983 Right (discon', graph', transactionIdsToPersist) -> do
1034984 writeTVar graphTvar graph'
1035985 let newSession = Session discon' (Sess.schemaName session)
1036− STMMap.insert newSession sessionId sessions
1037− case transactionForId (Sess.parentId session) oldGraph of
986+ StmMap.insert newSession sessionId sessions
987+ case RE.transactionForId (Sess.parentId session) oldGraph of
1038988 Left err -> pure $ Left err
1039989 Right previousTrans ->
1040990 if not (Prelude.null transactionIdsToPersist) then do
1041− (evaldNots, nodes) <- executeCommitExprSTM_ (Trans.concreteDatabaseContext previousTrans) (Sess.concreteDatabaseContext session) clientNodes
1042− nodesToNotify <- toList (STMSet.stream nodes)
991+ (evaldNots, nodes) <- executeCommitExprSTM_ graph' (Trans.concreteDatabaseContext previousTrans) (Sess.concreteDatabaseContext session) clientNodes
992+ nodesToNotify <- stmSetToList nodes
1043993 pure $ Right (evaldNots, nodesToNotify, graph', transactionIdsToPersist)
1044994 else pure (Right (M.empty, [], graph', []))
1045995
@@ -1049,15 +999,8 @@ commitLock_ sessionId conf stmBlock = do
1049999 Right (notsToFire, nodesToNotify, newGraph, transactionIdsToPersist) -> do
10501000 --update filesystem database, if necessary
10511001 processTransactionGraphPersistence strat transactionIdsToPersist newGraph
1052− sendNotifications nodesToNotify (ipLocalNode conf) notsToFire
1002+ sendNotifications nodesToNotify notsToFire
10531003 pure (Right ())
1054−{-
1055−writeDisconAndGraph_ :: TVar TransactionGraph -> SessionId -> Session -> Sessions -> DisconnectedTransaction -> TransactionGraph -> STM ()
1056−writeDisconAndGraph_ graphTvar sessionId session sessions discon graph = do
1057− writeTVar graphTvar graph
1058− let newSession = Session discon (Sess.schemaName session)
1059− STMMap.insert newSession sessionId sessions
1060−-}
10611004
10621005-- | Runs an IO monad, commits the result when the monad returns no errors, otherwise, rolls back the changes and the error.
10631006withTransaction :: SessionId -> Connection -> IO (Either RelationalError a) -> IO (Either RelationalError ()) -> IO (Either RelationalError a)
@@ -1082,3 +1025,71 @@ withTransaction sessionId conn io successFunc = bracketOnError (pure ()) (const
10821025 Right _ -> pure (Right val)
10831026 else -- no updates executed, so don't create a commit
10841027 pure (Right val)
1028+
1029+executeDataFrameExpr :: SessionId -> Connection -> DF.DataFrameExpr -> IO (Either RelationalError DF.DataFrame)
1030+executeDataFrameExpr sessionId conn@(InProcessConnection _) dfExpr = do
1031+ eRel <- executeRelationalExpr sessionId conn (DF.convertExpr dfExpr)
1032+ case eRel of
1033+ Left err -> pure (Left err)
1034+ Right rel -> do
1035+ let relAttrs = R.attributes rel
1036+ attrName (DF.AttributeOrderExpr name _) = name
1037+ order (DF.AttributeOrderExpr _ ord) = ord
1038+ orders = map order (DF.orderExprs dfExpr)
1039+ attributeForName' = flip attributeForName relAttrs
1040+ attrNames = map attrName (DF.orderExprs dfExpr)
1041+ verified = forM attrNames attributeForName'
1042+ case verified of
1043+ Left err -> pure (Left err)
1044+ Right attrs -> do
1045+ let attrOrders = zipWith
1046+ (DF.AttributeOrder . attributeName)
1047+ attrs
1048+ orders
1049+ case DF.sortDataFrameBy attrOrders . DF.toDataFrame $ rel of
1050+ Left err -> pure (Left err)
1051+ Right dFrame -> do
1052+ let dFrame' = maybe dFrame (`DF.drop'` dFrame) (DF.offset dfExpr)
1053+ dFrame'' = maybe dFrame' (`DF.take'` dFrame') (DF.limit dfExpr)
1054+ pure (Right dFrame'')
1055+executeDataFrameExpr sessionId conn@(RemoteConnection _) dfExpr = remoteCall conn (ExecuteDataFrameExpr sessionId dfExpr)
1056+
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/Client/Simple.hs+3−2
@@ -25,7 +25,8 @@ module ProjectM36.Client.Simple (
2525 C.PersistenceStrategy(..),
2626 C.NotificationCallback,
2727 C.emptyNotificationCallback,
28− C.DatabaseContextExpr(..),
28+ C.DatabaseContextExprBase(..),
29+ C.DatabaseContextExpr,
2930 C.RelationalExprBase(..)
3031 ) where
3132
@@ -72,7 +73,7 @@ close (_ , conn) = C.close conn
7273withTransaction :: DbConn -> Db a -> IO (Either DbError a)
7374withTransaction sessconn = withTransactionUsing sessconn UnionMergeStrategy
7475
75−-- | Same a 'withTransaction' except that the merge strategy can be specified.
76+-- | Same as 'withTransaction' except that the merge strategy can be specified.
7677withTransactionUsing :: DbConn -> MergeStrategy -> Db a -> IO (Either DbError a)
7778withTransactionUsing (sess, conn) strat dbm = do
7879 eHeadName <- C.headName sess conn
src/lib/ProjectM36/DataConstructorDef.hs+2−3
@@ -1,6 +1,5 @@
11module ProjectM36.DataConstructorDef where
2−import ProjectM36.Base
3−import qualified ProjectM36.TypeConstructor as TC
2+import ProjectM36.Base as B
43import qualified Data.Set as S
54
65emptyDataConstructor :: DataConstructorName -> DataConstructorDef
@@ -16,6 +15,6 @@ typeVars :: DataConstructorDef -> S.Set TypeVarName
1615typeVars (DataConstructorDef _ tConsArgs) = S.unions $ map typeVarsInDefArg tConsArgs
1716
1817typeVarsInDefArg :: DataConstructorDefArg -> S.Set TypeVarName
19−typeVarsInDefArg (DataConstructorDefTypeConstructorArg tCons) = TC.typeVars tCons
18+typeVarsInDefArg (DataConstructorDefTypeConstructorArg tCons) = B.typeVars tCons
2019typeVarsInDefArg (DataConstructorDefTypeVarNameArg pVarName) = S.singleton pVarName
2120
src/lib/ProjectM36/DataFrame.hsnew file+183
@@ -0,0 +1,183 @@
1+{-# LANGUAGE DeriveGeneric, DerivingVia #-}
2+{- A dataframe is a strongly-typed, ordered list of named tuples. A dataframe differs from a relation in that its tuples are ordered.-}
3+module ProjectM36.DataFrame where
4+import ProjectM36.Base
5+import ProjectM36.Attribute as A hiding (drop)
6+import ProjectM36.Error
7+import qualified ProjectM36.Relation as R
8+import ProjectM36.Relation.Show.Term
9+import qualified ProjectM36.Relation.Show.HTML as RelHTML
10+import ProjectM36.DataTypes.Sorting
11+import ProjectM36.AtomType
12+import ProjectM36.Atom
13+import qualified Data.Vector as V
14+import GHC.Generics
15+import qualified Data.List as L
16+import qualified Data.Set as S
17+import Data.Maybe
18+import qualified Data.Text as T
19+import Control.Arrow
20+#if __GLASGOW_HASKELL__ < 804
21+import Data.Monoid
22+#endif
23+
24+data AttributeOrderExpr = AttributeOrderExpr AttributeName Order
25+ deriving (Show, Generic)
26+
27+data AttributeOrder = AttributeOrder AttributeName Order
28+ deriving (Show, Generic)
29+
30+data Order = AscendingOrder | DescendingOrder
31+ deriving (Eq, Show, Generic)
32+
33+ascending :: T.Text
34+ascending = "⬆"
35+
36+descending :: T.Text
37+descending = "⬇"
38+
39+arbitrary :: T.Text
40+arbitrary = "↕"
41+
42+data DataFrame = DataFrame {
43+ orders :: [AttributeOrder],
44+ attributes :: Attributes,
45+ tuples :: [DataFrameTuple]
46+ }
47+ deriving (Show, Generic)
48+
49+data DataFrameTuple = DataFrameTuple Attributes (V.Vector Atom)
50+ deriving (Eq, Show, Generic)
51+
52+sortDataFrameBy :: [AttributeOrder] -> DataFrame -> Either RelationalError DataFrame
53+sortDataFrameBy attrOrders frame = do
54+ attrs <- mapM (\(AttributeOrder nam _) -> A.attributeForName nam (attributes frame)) attrOrders
55+ mapM_ (\attr -> if not (isSortableAtomType (atomType attr)) then
56+ Left (AttributeNotSortableError attr)
57+ else
58+ pure ()) attrs
59+ pure $ DataFrame attrOrders (attributes frame) (sortTuplesBy (compareTupleByAttributeOrders attrOrders) (tuples frame))
60+
61+sortTuplesBy :: (DataFrameTuple -> DataFrameTuple -> Ordering) -> [DataFrameTuple] -> [DataFrameTuple]
62+sortTuplesBy = L.sortBy
63+
64+compareTupleByAttributeOrders :: [AttributeOrder] -> DataFrameTuple -> DataFrameTuple -> Ordering
65+compareTupleByAttributeOrders attributeOrders tup1 tup2 =
66+ let compare' (AttributeOrder attr order) = if order == DescendingOrder
67+ then compareTupleByOneAttributeName attr tup2 tup1
68+ else compareTupleByOneAttributeName attr tup1 tup2
69+ res = map compare' attributeOrders in
70+ fromMaybe EQ (L.find (/= EQ) res)
71+
72+compareTupleByOneAttributeName :: AttributeName -> DataFrameTuple -> DataFrameTuple -> Ordering
73+compareTupleByOneAttributeName attr tuple1 tuple2 =
74+ let eAtom1 = atomForAttributeName attr tuple1
75+ eAtom2 = atomForAttributeName attr tuple2 in
76+ case eAtom1 of
77+ Left err -> error (show err)
78+ Right atom1 ->
79+ case eAtom2 of
80+ Left err -> error (show err)
81+ Right atom2 -> compareAtoms atom1 atom2
82+
83+atomForAttributeName :: AttributeName -> DataFrameTuple -> Either RelationalError Atom
84+atomForAttributeName attrName (DataFrameTuple tupAttrs tupVec) = case V.findIndex (\attr -> attributeName attr == attrName) (attributesVec tupAttrs) of
85+ Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
86+ Just index -> case tupVec V.!? index of
87+ Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
88+ Just atom -> Right atom
89+
90+take' :: Integer -> DataFrame -> DataFrame
91+take' n df = df { tuples = take (fromInteger n) (tuples df) }
92+
93+drop' :: Integer -> DataFrame -> DataFrame
94+drop' n df = df { tuples = drop (fromInteger n) (tuples df) }
95+
96+toDataFrame :: Relation -> DataFrame
97+toDataFrame (Relation attrs (RelationTupleSet tuples')) = DataFrame [] attrs (map (\(RelationTuple tupAttrs tupVec) -> DataFrameTuple tupAttrs tupVec) tuples')
98+
99+fromDataFrame :: DataFrame -> Either RelationalError Relation
100+fromDataFrame df = R.mkRelation (attributes df) (RelationTupleSet tuples')
101+ where
102+ tuples' = map (\(DataFrameTuple attrs' tupVec) -> RelationTuple attrs' tupVec) (tuples df)
103+
104+showDataFrame :: DataFrame -> T.Text
105+showDataFrame = renderTable . dataFrameAsTable
106+
107+--terminal display
108+dataFrameAsTable :: DataFrame -> Table
109+dataFrameAsTable df = (header, body)
110+ where
111+ oAttrNames = orderedAttributeNames (attributes df)
112+ oAttrs = orderedAttributes (attributes df)
113+ header = "DF" : map dfPrettyAttribute oAttrs
114+ dfPrettyAttribute attr = prettyAttribute attr <> case L.find (\(AttributeOrder nam _) -> nam == attributeName attr) (orders df) of
115+ Nothing -> arbitrary
116+ Just (AttributeOrder _ AscendingOrder) -> ascending
117+ Just (AttributeOrder _ DescendingOrder) -> descending
118+ body = snd (L.foldl' tupleFolder (1 :: Int,[]) (tuples df))
119+ tupleFolder (count, acc) tuple = (count + 1,
120+ acc ++ [T.pack (show count) : map (\attrName -> case atomForAttributeName attrName tuple of
121+ Left _ -> "?"
122+ Right atom -> showAtom 0 atom
123+ ) oAttrNames])
124+
125+-- | A Relation can be converted to a DataFrame for sorting, limits, and offsets.
126+data DataFrameExpr = DataFrameExpr {
127+ convertExpr :: RelationalExpr,
128+ orderExprs :: [AttributeOrderExpr],
129+ offset :: Maybe Integer,
130+ limit :: Maybe Integer
131+ }
132+ deriving (Show, Generic)
133+
134+dataFrameAsHTML :: 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
136+dataFrameAsHTML df
137+ | length (tuples df) == 1 && A.null (attributes df) = style <>
138+ tablestart <>
139+ "<tr><th></th></tr>" <>
140+ "<tr><td></td></tr>" <>
141+ tablefooter <> "</table>"
142+ | L.null (tuples df) && A.null (attributes df) = style <>
143+ tablestart <>
144+ "<tr><th></th></tr>" <>
145+ tablefooter <>
146+ "</table>"
147+ | otherwise = style <>
148+ tablestart <>
149+ attributesAsHTML (attributes df) (orders df) <>
150+ tuplesAsHTML (tuples df) <>
151+ tablefooter <>
152+ "</table>"
153+ where
154+ cardinality = T.pack (show (length (tuples df)))
155+ style = "<style>.pm36dataframe {empty-cells: show;} .pm36dataframe tbody td, .pm36relation th { border: 1px solid black;}</style>"
156+ tablefooter = "<tfoot><tr><td colspan=\"100%\">" <> cardinality <> " tuples</td></tr></tfoot>"
157+ tablestart = "<table class=\"pm36dataframe\"\">"
158+
159+tuplesAsHTML :: [DataFrameTuple] -> T.Text
160+tuplesAsHTML = foldr folder ""
161+ where
162+ folder tuple acc = acc <> tupleAsHTML tuple
163+
164+tupleAssocs :: DataFrameTuple -> [(AttributeName, Atom)]
165+tupleAssocs (DataFrameTuple attrs tupVec) = V.toList $ V.map (first attributeName) (V.zip (attributesVec attrs) tupVec)
166+
167+
168+tupleAsHTML :: DataFrameTuple -> T.Text
169+tupleAsHTML tuple = "<tr>" <> T.concat (L.map tupleFrag (tupleAssocs tuple)) <> "</tr>"
170+ where
171+ tupleFrag tup = "<td>" <> atomAsHTML (snd tup) <> "</td>"
172+ atomAsHTML (RelationAtom rel) = RelHTML.relationAsHTML rel
173+ atomAsHTML (TextAtom t) = "&quot;" <> t <> "&quot;"
174+ atomAsHTML atom = atomToText atom
175+
176+attributesAsHTML :: Attributes -> [AttributeOrder] -> T.Text
177+attributesAsHTML attrs orders' = "<tr>" <> T.concat (map oneAttrHTML (A.toList attrs)) <> "</tr>"
178+ where
179+ oneAttrHTML attr = "<th>" <> prettyAttribute attr <> ordering (attributeName attr) <> "</th>"
180+ ordering attrName = " " <> case L.find (\(AttributeOrder nam _) -> nam == attrName) orders' of
181+ Nothing -> "(arb)"
182+ Just (AttributeOrder _ AscendingOrder) -> "(asc)"
183+ Just (AttributeOrder _ DescendingOrder) -> "(desc)"
src/lib/ProjectM36/DataTypes/Basic.hs+4−2
@@ -1,10 +1,11 @@
11-- wraps up primitives plus other basic data types
22module ProjectM36.DataTypes.Basic where
33import ProjectM36.DataTypes.Primitive
4−import ProjectM36.DataTypes.Day
54import ProjectM36.DataTypes.Either
65import ProjectM36.DataTypes.Maybe
76import ProjectM36.DataTypes.List
7+import ProjectM36.DataTypes.NonEmptyList
8+import ProjectM36.DataTypes.Interval
89import ProjectM36.Base
910
1011basicTypeConstructorMapping :: TypeConstructorMapping
@@ -12,6 +13,7 @@ basicTypeConstructorMapping = primitiveTypeConstructorMapping ++
1213 maybeTypeConstructorMapping ++
1314 eitherTypeConstructorMapping ++
1415 listTypeConstructorMapping ++
15− dayTypeConstructorMapping
16+ nonEmptyListTypeConstructorMapping ++
17+ intervalTypeConstructorMapping
1618
1719
src/lib/ProjectM36/DataTypes/Day.hs+2−5
@@ -7,14 +7,11 @@ import Data.Time.Calendar
77dayAtomFunctions :: AtomFunctions
88dayAtomFunctions = HS.fromList [
99 AtomFunction { atomFuncName = "fromGregorian",
10− atomFuncType = [IntAtomType, IntAtomType, IntAtomType, DayAtomType],
11− atomFuncBody = compiledAtomFunctionBody $ \(IntAtom year:IntAtom month:IntAtom day:_) -> pure $ DayAtom (fromGregorian (fromIntegral year) (fromIntegral month) (fromIntegral day))
10+ atomFuncType = [IntegerAtomType, IntegerAtomType, IntegerAtomType, DayAtomType],
11+ atomFuncBody = compiledAtomFunctionBody $ \(IntegerAtom year:IntegerAtom month:IntegerAtom day:_) -> pure $ DayAtom (fromGregorian (fromIntegral year) (fromIntegral month) (fromIntegral day))
1212 },
1313 AtomFunction { atomFuncName = "dayEarlierThan",
1414 atomFuncType = [DayAtomType, DayAtomType, BoolAtomType],
1515 atomFuncBody = compiledAtomFunctionBody $ \(ConstructedAtom _ _ (IntAtom dayA:_):ConstructedAtom _ _ (IntAtom dayB:_):_) -> pure (BoolAtom (dayA < dayB))
1616 }
1717 ]
18−
19−dayTypeConstructorMapping :: TypeConstructorMapping
20−dayTypeConstructorMapping = [] -- use fromGregorian
src/lib/ProjectM36/DataTypes/Interval.hs+57−19
@@ -6,7 +6,24 @@ import ProjectM36.AtomType
66import ProjectM36.DataTypes.Primitive
77import ProjectM36.AtomFunctionError
88import qualified Data.HashSet as HS
9+import qualified Data.Map as M
10+import Control.Monad (when)
11+import Data.Maybe
912
13+type OpenInterval = Bool
14+
15+intervalSubType :: AtomType -> AtomType
16+intervalSubType typ = if isIntervalAtomType typ then
17+ case typ of
18+ ConstructedAtomType _ tvMap ->
19+ fromMaybe err (M.lookup "a" tvMap)
20+ _ -> err
21+ else
22+ err
23+ where
24+ err = error "intervalSubType on non-interval type"
25+
26+
1027-- in lieu of typeclass support, we just hard-code the types which can be part of an interval
1128supportsInterval :: AtomType -> Bool
1229supportsInterval typ = case typ of
@@ -18,9 +35,9 @@ supportsInterval typ = case typ of
1835 DateTimeAtomType -> True
1936 ByteStringAtomType -> False
2037 BoolAtomType -> False
21− IntervalAtomType _ -> False
2238 RelationAtomType _ -> False
2339 ConstructedAtomType _ _ -> False --once we support an interval-style typeclass, we might enable this
40+ RelationalExprAtomType -> False
2441 TypeVariableType _ -> False
2542
2643supportsOrdering :: AtomType -> Bool
@@ -33,8 +50,8 @@ supportsOrdering typ = case typ of
3350 DateTimeAtomType -> True
3451 ByteStringAtomType -> False
3552 BoolAtomType -> False
36− IntervalAtomType _ -> False
3753 RelationAtomType _ -> False
54+ RelationalExprAtomType -> False
3855 ConstructedAtomType _ _ -> False --once we support an interval-style typeclass, we might enable this
3956 TypeVariableType _ -> False
4057
@@ -67,7 +84,11 @@ createInterval atom1 atom2 bopen eopen = do
6784 else
6885 Right valid
6986 LT -> Right valid
70− where valid = IntervalAtom atom1 atom2 bopen eopen
87+ where valid = ConstructedAtom "Interval" iType [atom1, atom2, BoolAtom bopen, BoolAtom eopen]
88+ iType = intervalAtomType (atomTypeForAtom atom1)
89+
90+intervalAtomType :: AtomType -> AtomType
91+intervalAtomType typ = ConstructedAtomType "Interval" (M.singleton "a" typ)
7192
7293intervalAtomFunctions :: AtomFunctions
7394intervalAtomFunctions = HS.fromList [
@@ -76,7 +97,7 @@ intervalAtomFunctions = HS.fromList [
7697 TypeVariableType "a",
7798 BoolAtomType,
7899 BoolAtomType,
79− IntervalAtomType (TypeVariableType "a")],
100+ intervalAtomType (TypeVariableType "a")],
80101 atomFuncBody = compiledAtomFunctionBody $ \(atom1:atom2:BoolAtom bopen:BoolAtom eopen:_) -> do
81102 let aType = atomTypeForAtom atom1
82103 if supportsInterval aType then
@@ -86,23 +107,40 @@ intervalAtomFunctions = HS.fromList [
86107 },
87108 AtomFunction {
88109 atomFuncName = "interval_overlaps",
89− atomFuncType = [IntervalAtomType (TypeVariableType "a"),
90− IntervalAtomType (TypeVariableType "a"),
110+ atomFuncType = [intervalAtomType (TypeVariableType "a"),
111+ intervalAtomType (TypeVariableType "a"),
91112 BoolAtomType],
92− atomFuncBody = compiledAtomFunctionBody $ \(i1@IntervalAtom{}:i2@IntervalAtom{}:_) -> do
93− res <- intervalOverlaps i1 i2
94− pure (BoolAtom res)
113+ atomFuncBody = compiledAtomFunctionBody $ \(i1@ConstructedAtom{}:i2@ConstructedAtom{}:_) ->
114+ BoolAtom <$> intervalOverlaps i1 i2
95115 }]
96−
97−
116+
117+isIntervalAtomType :: AtomType -> Bool
118+isIntervalAtomType (ConstructedAtomType nam tvMap) =
119+ nam == "Interval" && M.keys tvMap == ["a"] && case M.lookup "a" tvMap of
120+ Nothing -> False
121+ Just subType -> supportsInterval subType || subType == TypeVariableType "a"
122+isIntervalAtomType _ = False
123+
98124intervalOverlaps :: Atom -> Atom -> Either AtomFunctionError Bool
99−intervalOverlaps (IntervalAtom i1start i1end i1startopen i1endopen) (IntervalAtom i2start i2end i2startopen i2endopen) = do
100− cmp1 <- atomCompare i1start i2end
101− cmp2 <- atomCompare i2start i1end
102− let startcmp = if i1startopen || i2endopen then oplt else oplte
103− endcmp = if i2startopen || i1endopen then oplt else oplte
104− oplte op = op == LT || op == EQ
105− oplt op = op == LT
106− pure (startcmp cmp1 && endcmp cmp2)
125+intervalOverlaps (ConstructedAtom dCons1 typ1 [i1start,
126+ i1end,
127+ BoolAtom i1startopen,
128+ BoolAtom i1endopen]) (ConstructedAtom dCons2 typ2
129+ [i2start,
130+ i2end,
131+ BoolAtom i2startopen,
132+ BoolAtom i2endopen]) = do
133+ when (dCons1 /= "Interval" || dCons2 /= "Interval" || not (isIntervalAtomType typ1) || not (isIntervalAtomType typ2)) (Left AtomFunctionTypeMismatchError)
134+ cmp1 <- atomCompare i1start i2end
135+ cmp2 <- atomCompare i2start i1end
136+ let startcmp = if i1startopen || i2endopen then oplt else oplte
137+ endcmp = if i2startopen || i1endopen then oplt else oplte
138+ oplte op = op == LT || op == EQ
139+ oplt op = op == LT
140+ pure (startcmp cmp1 && endcmp cmp2)
107141intervalOverlaps _ _ = Left AtomFunctionTypeMismatchError
108142
143+intervalTypeConstructorMapping :: TypeConstructorMapping
144+intervalTypeConstructorMapping = [(ADTypeConstructorDef "Interval" ["a"], [])]
145+
146+
src/lib/ProjectM36/DataTypes/List.hs+2−3
@@ -37,9 +37,8 @@ listAtomFunctions = HS.fromList [
3737 AtomFunction {
3838 atomFuncName = "length",
3939 atomFuncType = [listAtomType (TypeVariableType "a"), IntAtomType],
40− atomFuncBody = AtomFunctionBody Nothing (\(listAtom:_) -> do
41− c <- listLength listAtom
42− pure (IntAtom (fromIntegral c)))
40+ atomFuncBody = AtomFunctionBody Nothing (\(listAtom:_) ->
41+ IntAtom . fromIntegral <$> listLength listAtom)
4342 },
4443 AtomFunction {
4544 atomFuncName = "maybeHead",
src/lib/ProjectM36/DataTypes/NonEmptyList.hsnew file+53
@@ -0,0 +1,53 @@
1+module ProjectM36.DataTypes.NonEmptyList where
2+import ProjectM36.Base
3+import qualified Data.Map as M
4+import qualified Data.HashSet as HS
5+import ProjectM36.AtomFunctionError
6+import ProjectM36.DataTypes.List
7+
8+nonEmptyListAtomType :: AtomType -> AtomType
9+nonEmptyListAtomType arg = ConstructedAtomType "NonEmptyList" (M.singleton "a" arg)
10+
11+-- data NonEmptyList = NECons a (Cons a)
12+nonEmptyListTypeConstructorMapping :: TypeConstructorMapping
13+nonEmptyListTypeConstructorMapping = [(ADTypeConstructorDef "NonEmptyList" ["a"],
14+ [DataConstructorDef "NECons" [DataConstructorDefTypeVarNameArg "a",
15+ DataConstructorDefTypeConstructorArg (ADTypeConstructor "List" [TypeVariable "a"])]])]
16+
17+nonEmptyListLength :: Atom -> Either AtomFunctionError Int
18+nonEmptyListLength (ConstructedAtom "NECons" _ (_:nextCons:_)) = do
19+ c <- listLength nextCons
20+ pure (c + 1)
21+nonEmptyListLength (ConstructedAtom "NECons" _ _) = pure 1
22+nonEmptyListLength _ = Left AtomFunctionTypeMismatchError
23+
24+nonEmptyListHead :: Atom -> Either AtomFunctionError Atom
25+nonEmptyListHead (ConstructedAtom "NECons" _ (val:_)) = pure val
26+nonEmptyListHead _ = Left AtomFunctionTypeMismatchError
27+
28+{-
29+listMaybeHead :: Atom -> Either AtomFunctionError Atom
30+listMaybeHead (ConstructedAtom "Cons" _ (val:_)) = pure (ConstructedAtom "Just" aType [val])
31+ where
32+ aType = maybeAtomType (atomTypeForAtom val)
33+listMaybeHead (ConstructedAtom "Empty" (ConstructedAtomType _ tvMap) _) =
34+ case M.lookup "a" tvMap of
35+ Nothing -> Left AtomFunctionTypeMismatchError
36+ Just aType -> pure (ConstructedAtom "Nothing" aType [])
37+listMaybeHead _ = Left AtomFunctionTypeMismatchError
38+-}
39+
40+nonEmptyListAtomFunctions :: AtomFunctions
41+nonEmptyListAtomFunctions = HS.fromList [
42+ AtomFunction {
43+ atomFuncName = "nonEmptyListLength",
44+ atomFuncType = [nonEmptyListAtomType (TypeVariableType "a"), IntAtomType],
45+ atomFuncBody = AtomFunctionBody Nothing (\(nonEmptyListAtom:_) ->
46+ IntAtom . fromIntegral <$> nonEmptyListLength nonEmptyListAtom)
47+ },
48+ AtomFunction {
49+ atomFuncName = "nonEmptyListHead",
50+ atomFuncType = [nonEmptyListAtomType (TypeVariableType "a"), TypeVariableType "a"],
51+ atomFuncBody = AtomFunctionBody Nothing (\(nonEmptyListAtom:_) -> nonEmptyListHead nonEmptyListAtom)
52+ }
53+ ]
src/lib/ProjectM36/DataTypes/Primitive.hs+7−2
@@ -10,7 +10,9 @@ primitiveTypeConstructorMapping = map (\(name, aType) ->
1010 ("Text", TextAtomType),
1111 ("Double", DoubleAtomType),
1212 ("Bool", BoolAtomType),
13− ("ByteString", ByteStringAtomType)
13+ ("ByteString", ByteStringAtomType),
14+ ("DateTime", DateTimeAtomType),
15+ ("Day", DayAtomType)
1416 ]
1517
1618intTypeConstructor :: TypeConstructor
@@ -25,6 +27,9 @@ textTypeConstructor = PrimitiveTypeConstructor "Text" TextAtomType
2527dayTypeConstructor :: TypeConstructor
2628dayTypeConstructor = PrimitiveTypeConstructor "Day" DayAtomType
2729
30+dateTimeTypeConstructor :: TypeConstructor
31+dateTimeTypeConstructor = PrimitiveTypeConstructor "DateTime" DayAtomType
32+
2833-- | Return the type of an 'Atom'.
2934atomTypeForAtom :: Atom -> AtomType
3035atomTypeForAtom (IntAtom _) = IntAtomType
@@ -35,6 +40,6 @@ atomTypeForAtom (DayAtom _) = DayAtomType
3540atomTypeForAtom (DateTimeAtom _) = DateTimeAtomType
3641atomTypeForAtom (ByteStringAtom _) = ByteStringAtomType
3742atomTypeForAtom (BoolAtom _) = BoolAtomType
38−atomTypeForAtom (IntervalAtom a _ _ _) = IntervalAtomType (atomTypeForAtom a)
3943atomTypeForAtom (RelationAtom (Relation attrs _)) = RelationAtomType attrs
4044atomTypeForAtom (ConstructedAtom _ aType _) = aType
45+atomTypeForAtom (RelationalExprAtom _) = RelationalExprAtomType
src/lib/ProjectM36/DataTypes/Sorting.hsnew file+31
@@ -0,0 +1,31 @@
1+module ProjectM36.DataTypes.Sorting where
2+import ProjectM36.Base
3+
4+compareAtoms :: Atom -> Atom -> Ordering
5+compareAtoms (IntegerAtom i1) (IntegerAtom i2) = compare i1 i2
6+compareAtoms (IntAtom i1) (IntAtom i2) = compare i1 i2
7+compareAtoms (DoubleAtom d1) (DoubleAtom d2) = compare d1 d2
8+compareAtoms (TextAtom t1) (TextAtom t2) = compare t1 t2
9+compareAtoms (DayAtom d1) (DayAtom d2) = compare d1 d2
10+compareAtoms (DateTimeAtom d1) (DateTimeAtom d2) = compare d1 d2
11+compareAtoms (ByteStringAtom b1) (ByteStringAtom b2) = compare b1 b2
12+compareAtoms (BoolAtom b1) (BoolAtom b2) = compare b1 b2
13+compareAtoms (RelationAtom _) _ = EQ
14+compareAtoms ConstructedAtom{} _ = EQ
15+compareAtoms _ _ = EQ
16+
17+isSortableAtomType :: AtomType -> Bool
18+isSortableAtomType typ = case typ of
19+ IntAtomType -> True
20+ IntegerAtomType -> True
21+ DoubleAtomType -> True
22+ TextAtomType -> True
23+ DayAtomType -> True
24+ DateTimeAtomType -> True
25+ ByteStringAtomType -> False
26+ BoolAtomType -> True
27+ RelationalExprAtomType -> False
28+ RelationAtomType _ -> False
29+ ConstructedAtomType _ _ -> False
30+ TypeVariableType _ -> False
31+
src/lib/ProjectM36/DatabaseContext.hs+24−5
@@ -1,11 +1,15 @@
11module ProjectM36.DatabaseContext where
22import ProjectM36.Base
3+import Control.Monad (void)
34import qualified Data.Map as M
45import qualified Data.HashSet as HS
56import ProjectM36.DataTypes.Basic
67import ProjectM36.AtomFunctions.Basic
7−import ProjectM36.DatabaseContextFunction
88import 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
913
1014empty :: DatabaseContext
1115empty = DatabaseContext { inclusionDependencies = M.empty,
@@ -14,22 +18,37 @@ empty = DatabaseContext { inclusionDependencies = M.empty,
1418 atomFunctions = HS.empty,
1519 dbcFunctions = HS.empty,
1620 typeConstructorMapping = [] }
21+
22+-- | Remove TransactionId markers on GraphRefRelationalExpr
23+stripGraphRefRelationalExpr :: GraphRefRelationalExpr -> RelationalExpr
24+stripGraphRefRelationalExpr = void
1725
1826-- | convert an existing database context into its constituent expression.
1927databaseContextAsDatabaseContextExpr :: DatabaseContext -> DatabaseContextExpr
2028databaseContextAsDatabaseContextExpr context = MultipleExpr $ relVarsExprs ++ incDepsExprs ++ funcsExprs
2129 where
22− relVarsExprs = map (\(name, rel) -> Assign name (ExistingRelation rel)) (M.toList (relationVariables context))
30+ relVarsExprs = map (\(name, rel) -> Assign name (stripGraphRefRelationalExpr rel)) (M.toList (relationVariables context))
2331 incDepsExprs :: [DatabaseContextExpr]
2432 incDepsExprs = map (uncurry AddInclusionDependency) (M.toList (inclusionDependencies context))
25− funcsExprs = [] -- map (\func -> ) (HS.toList funcs) -- there are no databaseExprs to add atom functions yet
33+ funcsExprs = [] -- map (\func -> ) (HS.toList funcs) -- there are no databaseExprs to add atom functions yet-}
2634
2735basicDatabaseContext :: DatabaseContext
2836basicDatabaseContext = DatabaseContext { inclusionDependencies = M.empty,
29− relationVariables = M.fromList [("true", relationTrue),
30− ("false", relationFalse)],
37+ relationVariables = M.fromList [("true", ExistingRelation relationTrue),
38+ ("false", ExistingRelation relationFalse)],
3139 atomFunctions = basicAtomFunctions,
3240 dbcFunctions = basicDatabaseContextFunctions,
3341 notifications = M.empty,
3442 typeConstructorMapping = basicTypeConstructorMapping
3543 }
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+36−1
@@ -1,9 +1,18 @@
1+{-# LANGUAGE CPP #-}
12module ProjectM36.DatabaseContextFunction where
23--implements functions which operate as: [Atom] -> DatabaseContextExpr -> Either RelationalError DatabaseContextExpr
34import ProjectM36.Base
45import ProjectM36.Error
6+import ProjectM36.Serialise.Base ()
7+import ProjectM36.Attribute as A
8+import ProjectM36.Relation
9+import ProjectM36.AtomType
510import qualified Data.HashSet as HS
611import qualified Data.Map as M
12+import ProjectM36.ScriptSession
13+import qualified Data.Text as T
14+import qualified Data.ByteString.Lazy as BL
15+import Codec.Winery
716
817emptyDatabaseContextFunction :: DatabaseContextFunctionName -> DatabaseContextFunction
918emptyDatabaseContextFunction name = DatabaseContextFunction {
@@ -53,4 +62,30 @@ databaseContextFunctionReturnType tCons = ADTypeConstructor "Either" [
5362 tCons]
5463
5564createScriptedDatabaseContextFunction :: DatabaseContextFunctionName -> [TypeConstructor] -> TypeConstructor -> DatabaseContextFunctionBodyScript -> DatabaseContextIOExpr
56−createScriptedDatabaseContextFunction funcName argsIn retArg = AddDatabaseContextFunction funcName (argsIn ++ [databaseContextFunctionReturnType retArg])
65+createScriptedDatabaseContextFunction funcName argsIn retArg = AddDatabaseContextFunction funcName (argsIn ++ [databaseContextFunctionReturnType retArg])
66+
67+loadDatabaseContextFunctions :: ModName -> FuncName -> FilePath -> IO (Either LoadSymbolError [DatabaseContextFunction])
68+#ifdef PM36_HASKELL_SCRIPTING
69+loadDatabaseContextFunctions = loadFunction
70+#else
71+loadDatabaseContextFunctions _ _ _ = pure (Left LoadSymbolError)
72+#endif
73+
74+databaseContextFunctionsAsRelation :: DatabaseContextFunctions -> Either RelationalError Relation
75+databaseContextFunctionsAsRelation dbcFuncs = mkRelationFromList attrs tups
76+ where
77+ attrs = A.attributesFromList [Attribute "name" TextAtomType,
78+ Attribute "arguments" TextAtomType]
79+ tups = map dbcFuncToTuple (HS.toList dbcFuncs)
80+ dbcFuncToTuple func = [TextAtom (dbcFuncName func),
81+ TextAtom (dbcTextType (dbcFuncType func))]
82+ dbcTextType typ = T.intercalate " -> " (map prettyAtomType typ ++ ["DatabaseContext", "DatabaseContext"])
83+
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+1−2
@@ -1,9 +1,8 @@
11{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}
22module ProjectM36.DatabaseContextFunctionError where
33import GHC.Generics
4−import Data.Binary
54import Control.DeepSeq
65
76{-# ANN module ("HLint: ignore Use newtype instead of data" :: String) #-}
87data DatabaseContextFunctionError = DatabaseContextFunctionUserError String
9− deriving (Generic, Eq, Show, Binary, NFData)
8+ deriving (Generic, Eq, Show, NFData)
src/lib/ProjectM36/DatabaseContextFunctionUtils.hs+15−8
@@ -3,13 +3,20 @@ import ProjectM36.RelationalExpression
33import ProjectM36.Base
44import ProjectM36.DatabaseContextFunctionError
55import ProjectM36.Error
6−import Control.Monad.State
7−import Control.Monad.Trans.Reader
6+import ProjectM36.StaticOptimizer
87
9−executeDatabaseContextExpr :: DatabaseContextExpr -> DatabaseContext -> Either DatabaseContextFunctionError DatabaseContext
10−executeDatabaseContextExpr expr context = case runState (evalDatabaseContextExpr expr) (freshDatabaseState context) of
11− (Right (), (context', _, _)) -> pure context'
12− (Left err, _) -> error (show err)
8+executeDatabaseContextExpr :: DatabaseContextExpr -> TransactionId -> TransactionGraph -> DatabaseContext -> Either DatabaseContextFunctionError DatabaseContext
9+executeDatabaseContextExpr expr transId graph context' =
10+ case run of
11+ Right st -> pure (dbc_context st)
12+ Left err -> error (show err)
13+ where
14+ env = mkDatabaseContextEvalEnv transId graph
15+ run = runDatabaseContextEvalMonad context' env (optimizeAndEvalDatabaseContextExpr True expr)
1316
14−executeRelationalExpr :: RelationalExpr -> DatabaseContext -> Either RelationalError Relation
15−executeRelationalExpr expr context = runReader (evalRelationalExpr expr) (mkRelationalExprState context)
17+executeRelationalExpr :: RelationalExpr -> DatabaseContext -> TransactionGraph -> Either RelationalError Relation
18+executeRelationalExpr expr context graph =
19+ run
20+ where
21+ env = mkRelationalExprEnv context graph
22+ run = optimizeAndEvalRelationalExpr env expr
src/lib/ProjectM36/DateExamples.hs+3−3
@@ -16,9 +16,9 @@ dateExamples = empty { inclusionDependencies = dateIncDeps,
1616 atomFunctions = basicAtomFunctions,
1717 typeConstructorMapping = basicTypeConstructorMapping }
1818 where -- these must be lower case now that data constructors are in play
19− dateRelVars = M.fromList [("s", suppliers),
20− ("p", products),
21− ("sp", supplierProducts)]
19+ dateRelVars = M.fromList [("s", ExistingRelation suppliers),
20+ ("p", ExistingRelation products),
21+ ("sp", ExistingRelation supplierProducts)]
2222 suppliers = suppliersRel
2323 products = productsRel
2424 supplierProducts = supplierProductsRel
src/lib/ProjectM36/DisconnectedTransaction.hs+7−1
@@ -8,4 +8,10 @@ schemas :: DisconnectedTransaction -> Schemas
88schemas (DisconnectedTransaction _ s _) = s
99
1010parentId :: DisconnectedTransaction -> TransactionId
11−parentId (DisconnectedTransaction pid _ _) = pid
11+parentId (DisconnectedTransaction pid _ _) = pid
12+
13+isDirty :: DisconnectedTransaction -> Bool
14+isDirty (DisconnectedTransaction _ _ flag) = flag
15+
16+freshTransaction :: TransactionId -> Schemas -> DisconnectedTransaction
17+freshTransaction tid schemas' = DisconnectedTransaction tid schemas' False
src/lib/ProjectM36/Error.hs+28−15
@@ -1,6 +1,7 @@
11{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}
22module ProjectM36.Error where
33import ProjectM36.Base
4+import ProjectM36.MerkleHash
45import ProjectM36.DatabaseContextFunctionError
56import ProjectM36.AtomFunctionError
67import qualified Data.Set as S
@@ -8,12 +9,12 @@ import Control.DeepSeq (NFData, rnf)
89import Control.DeepSeq.Generics (genericRnf)
910import GHC.Generics (Generic)
1011import qualified Data.Text as T
11−import Data.Binary
1212import Data.Typeable
1313import Control.Exception
1414
1515data RelationalError = NoSuchAttributeNamesError (S.Set AttributeName)
1616 | TupleAttributeCountMismatchError Int --attribute name
17+ | EmptyAttributesError
1718 | DuplicateAttributeNamesError (S.Set AttributeName)
1819 | TupleAttributeTypeMismatchError Attributes
1920 | AttributeCountMismatchError Int
@@ -23,7 +24,7 @@ data RelationalError = NoSuchAttributeNamesError (S.Set AttributeName)
2324 | CouldNotInferAttributes
2425 | RelVarNotDefinedError RelVarName
2526 | RelVarAlreadyDefinedError RelVarName
26− | RelVarAssignmentTypeMismatchError Attributes Attributes --expected, found
27+ | RelationTypeMismatchError Attributes Attributes --expected, found
2728 | InclusionDependencyCheckError IncDepName
2829 | InclusionDependencyNameInUseError IncDepName
2930 | InclusionDependencyNameNotInUseError IncDepName
@@ -61,6 +62,7 @@ data RelationalError = NoSuchAttributeNamesError (S.Set AttributeName)
6162 | AtomTypeNameInUseError AtomTypeName
6263 | IncompletelyDefinedAtomTypeWithConstructorError
6364 | AtomTypeNameNotInUseError AtomTypeName
65+ | AttributeNotSortableError Attribute
6466 | FunctionNameInUseError AtomFunctionName
6567 | FunctionNameNotInUseError AtomFunctionName
6668 | EmptyCommitError
@@ -79,11 +81,12 @@ data RelationalError = NoSuchAttributeNamesError (S.Set AttributeName)
7981 | RelationValuedAttributesNotSupportedError [AttributeName]
8082 | NotificationNameInUseError NotificationName
8183 | NotificationNameNotInUseError NotificationName
82− | ImportError T.Text -- really? This should be broken out into some other error type- this has nothing to do with relational algebra
84+ | ImportError ImportError'
8385 | ExportError T.Text
8486 | UnhandledExceptionError String
8587 | MergeTransactionError MergeError
8688 | ScriptError ScriptCompilationError
89+ | LoadFunctionError
8790 | DatabaseContextFunctionUserError DatabaseContextFunctionError
8891 | DatabaseLoadError PersistenceError
8992
@@ -93,14 +96,21 @@ data RelationalError = NoSuchAttributeNamesError (S.Set AttributeName)
9396 | SchemaCreationError SchemaError
9497
9598 | ImproperDatabaseStateError
96−
99+
100+ | NonConcreteSchemaPlanError
101+
102+ | NoUncommittedContextInEvalError
103+ | TupleExprsReferenceMultipleMarkersError
104+
105+ | MerkleHashValidationError TransactionId MerkleHash MerkleHash
106+
97107 | MultipleErrors [RelationalError]
98− deriving (Show,Eq,Generic,Binary,Typeable, NFData)
108+ deriving (Show,Eq,Generic,Typeable, NFData)
99109
100110data PersistenceError = InvalidDirectoryError FilePath |
101111 MissingTransactionError TransactionId |
102112 WrongDatabaseFormatVersionError String String
103− deriving (Show, Eq, Generic, Binary, NFData)
113+ deriving (Show, Eq, Generic, NFData)
104114
105115--collapse list of errors into normal error- if there is just one, just return one
106116someErrors :: [RelationalError] -> RelationalError
@@ -118,7 +128,7 @@ data MergeError = SelectedHeadMismatchMergeError |
118128 StrategyViolatesComponentMergeError | --failed merge in inc deps, relvars, etc.
119129 StrategyViolatesRelationVariableMergeError |
120130 StrategyViolatesTypeConstructorMergeError
121− deriving (Show, Eq, Generic, Binary, Typeable)
131+ deriving (Show, Eq, Generic, Typeable)
122132
123133instance NFData MergeError where rnf = genericRnf
124134
@@ -126,17 +136,20 @@ data ScriptCompilationError = TypeCheckCompilationError String String | --expect
126136 SyntaxErrorCompilationError String |
127137 ScriptCompilationDisabledError |
128138 OtherScriptCompilationError String
129− deriving (Show, Eq, Generic, Binary, Typeable, NFData)
139+ deriving (Show, Eq, Generic, Typeable, NFData)
130140
131141instance Exception ScriptCompilationError
132142
133143data SchemaError = RelVarReferencesMissing (S.Set RelVarName) |
134144 RelVarInReferencedMoreThanOnce RelVarName |
135145 RelVarOutReferencedMoreThanOnce RelVarName
136− deriving (Show, Eq, Generic, Binary, Typeable, NFData)
137−
138−
139−-- errors returned from the distributed-process call handlers
140−data ServerError = RequestTimeoutError |
141− ProcessDiedError String
142− deriving (Generic, Binary, Eq)
146+ deriving (Show, Eq, Generic, Typeable, NFData)
147+
148+
149+data ImportError' = InvalidSHA256Error T.Text
150+ | SHA256MismatchError T.Text T.Text
151+ | InvalidFileURIError T.Text
152+ | ImportFileDecodeError T.Text
153+ | ImportFileError T.Text
154+ | ImportDownloadError T.Text
155+ deriving (Show, Eq, Generic, Typeable, NFData)
src/lib/ProjectM36/FSType.hs+4
@@ -45,6 +45,10 @@ fsTypeSupportsJournaling path = do
4545 pure (fsFlags .&. FILE_SUPPORTS_USN_JOURNAL /= 0)
4646
4747#elif darwin_HOST_OS
48+import Foreign.C.Error
49+import Foreign.C.String
50+import Foreign.C.Types
51+
4852--Darwin reports journaling directly in the fs flags
4953
5054type CStatFS = ()
src/lib/ProjectM36/FileLock.hs+5−15
@@ -1,4 +1,4 @@
1−{-# LANGUAGE CPP, NamedFieldPuns #-}
1+{-# LANGUAGE CPP #-}
22--cross-platform file locking utilizing POSIX file locking on Unix/Linux and Windows file locking
33--hackage's System.FileLock doesn't support POSIX advisory locks nor locking file based on file descriptors, hence this needless rewrite
44module ProjectM36.FileLock where
@@ -35,7 +35,6 @@ openLockFile path = createFile path
3535
3636closeLockFile :: LockFile -> IO ()
3737closeLockFile file = do
38− unlockFile file
3938 closeHandle file
4039
4140--swiped from System.FileLock package
@@ -49,22 +48,14 @@ lockFile winHandle lock = do
4948
5049 allocaBytes sizeof_OVERLAPPED $ \op -> do
5150 zeroMemory op $ fromIntegral sizeof_OVERLAPPED
52− res <- c_lockFileEx winHandle (exFlag .|. blockFlag) 0 1 0 op
53− if res then
54− pure ()
55− else
56− error "failed to wait for database lock"
51+ failIfFalse_ "LockFileEx" $ c_lockFileEx winHandle (exFlag .|. blockFlag) 0 1 0 op
5752
5853unlockFile :: HANDLE -> IO ()
5954unlockFile winHandle = do
6055 let sizeof_OVERLAPPED = 32
6156 allocaBytes sizeof_OVERLAPPED $ \op -> do
6257 zeroMemory op $ fromIntegral sizeof_OVERLAPPED
63− res <- c_unlockFileEx winHandle 0 1 0 op
64− if res then
65− pure ()
66− else
67− error ("failed to unlock database lock: " ++ show res)
58+ failIfFalse_ "UnlockFileEx" $ c_unlockFileEx winHandle 0 1 0 op
6859
6960#else
7061--all of this complicated nonsense is fixed if we switch to GHC 8.2 which includes native flock support on handles
@@ -84,8 +75,7 @@ openLockFile path =
8475 LockFile <$> P.createFile path ownerWriteMode
8576
8677closeLockFile :: LockFile -> IO ()
87−closeLockFile l@(LockFile fd) = do
88− unlockFile l
78+closeLockFile (LockFile fd) =
8979 P.closeFd fd
9080
9181--blocks on lock, if necessary
@@ -101,6 +91,6 @@ unlockFile (LockFile fd) =
10191 P.waitToSetLock fd (lockStruct P.Unlock)
10292#endif
10393
104−data LockType = ReadLock | WriteLock
94+data LockType = ReadLock | WriteLock deriving (Show)
10595
10696
src/lib/ProjectM36/GraphRefRelationalExpr.hsnew file+45
@@ -0,0 +1,45 @@
1+module ProjectM36.GraphRefRelationalExpr where
2+--evaluate relational expressions across the entire transaction graph to support cross-transaction referencing
3+import ProjectM36.Base
4+import qualified Data.Set as S
5+
6+--import Debug.Trace
7+
8+data SingularTransactionRef = SingularTransactionRef GraphRefTransactionMarker |
9+ MultipleTransactionsRef |
10+ NoTransactionsRef
11+ deriving (Eq, Show)
12+
13+instance Semigroup SingularTransactionRef where
14+ NoTransactionsRef <> x = x
15+ MultipleTransactionsRef <> _ = MultipleTransactionsRef
16+ SingularTransactionRef tidA <> s@(SingularTransactionRef tidB) =
17+ if tidA == tidB then
18+ s
19+ else
20+ MultipleTransactionsRef
21+ s@SingularTransactionRef{} <> NoTransactionsRef = s
22+ _ <> MultipleTransactionsRef = MultipleTransactionsRef
23+
24+instance Monoid SingularTransactionRef where
25+ mempty = NoTransactionsRef
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.
28+singularTransaction :: Foldable t => t GraphRefTransactionMarker -> SingularTransactionRef
29+singularTransaction expr
30+ | S.null transSet = NoTransactionsRef
31+ | S.size transSet == 1 = SingularTransactionRef (head (S.toList transSet))
32+ | otherwise = MultipleTransactionsRef
33+ where
34+ transSet = foldr S.insert S.empty expr
35+
36+-- | Return True if two 'GraphRefRelationalExpr's both refer exclusively to the same transaction (or none at all).
37+inSameTransaction :: GraphRefRelationalExpr -> GraphRefRelationalExpr -> Maybe GraphRefTransactionMarker
38+inSameTransaction exprA exprB = case (stA, stB) of
39+ (SingularTransactionRef tA, SingularTransactionRef tB) | tA == tB -> Just tA
40+ _ -> Nothing
41+ where stA = singularTransaction exprA
42+ stB = singularTransaction exprB
43+
44+singularTransactions :: (Foldable f, Foldable t) => f (t GraphRefTransactionMarker) -> SingularTransactionRef
45+singularTransactions = foldMap singularTransaction
src/lib/ProjectM36/InclusionDependency.hs+5−6
@@ -4,17 +4,16 @@ import ProjectM36.Attribute
44import ProjectM36.Error
55import ProjectM36.Relation
66import qualified Data.Map as M
7−import qualified Data.Text as T
87
98inclusionDependenciesAsRelation :: InclusionDependencies -> Either RelationalError Relation
109inclusionDependenciesAsRelation incDeps =
1110 mkRelationFromList attrs (map incDepAsAtoms (M.toList incDeps))
1211 where
1312 attrs = attributesFromList [Attribute "name" TextAtomType,
14− Attribute "sub" TextAtomType,
15− Attribute "super" TextAtomType
13+ Attribute "sub" RelationalExprAtomType,
14+ Attribute "super" RelationalExprAtomType
1615 ]
1716 incDepAsAtoms (name, InclusionDependency exprA exprB) = [TextAtom name,
18− TextAtom (T.pack (show exprA)),
19− TextAtom (T.pack (show exprB))]
20−
17+ RelationalExprAtom exprA,
18+ RelationalExprAtom exprB]
19+
src/lib/ProjectM36/IsomorphicSchema.hs+30−33
@@ -1,22 +1,20 @@
1−{-# LANGUAGE DeriveGeneric, DeriveAnyClass, LambdaCase #-}
1+{-# LANGUAGE DeriveGeneric, LambdaCase, DerivingVia #-}
22module ProjectM36.IsomorphicSchema where
33import ProjectM36.Base
44import ProjectM36.Error
55import ProjectM36.MiscUtils
6−import ProjectM36.RelationalExpression
76import ProjectM36.Relation
7+import ProjectM36.NormalizeExpr
8+import ProjectM36.RelationalExpression
89import qualified ProjectM36.AttributeNames as AN
910import Control.Monad
10−import Control.Monad.State
11−import Control.Monad.Trans.Reader
1211import GHC.Generics
13−import Data.Binary
1412import qualified Data.Map as M
1513import qualified Data.Set as S
1614import qualified Data.List as L
17−import qualified Data.Text as T
15+#if __GLASGOW_HASKELL__ < 804
1816import Data.Monoid
19−--import Debug.Trace
17+#endif
2018-- isomorphic schemas offer bi-directional functors between two schemas
2119
2220--TODO: note that renaming a relvar should alter any stored isomorphisms as well
@@ -29,8 +27,7 @@ import Data.Monoid
2927
3028data SchemaExpr = AddSubschema SchemaName SchemaIsomorphs |
3129 RemoveSubschema SchemaName
32− deriving (Generic, Binary, Show)
33−
30+ deriving (Generic, Show)
3431
3532isomorphs :: Schema -> SchemaIsomorphs
3633isomorphs (Schema i) = i
@@ -256,15 +253,15 @@ inclusionDependencyInSchema schema (InclusionDependency rexprA rexprB) = do
256253inclusionDependenciesInSchema :: Schema -> InclusionDependencies -> Either RelationalError InclusionDependencies
257254inclusionDependenciesInSchema schema incDeps = M.fromList <$> mapM (\(depName, dep) -> inclusionDependencyInSchema schema dep >>= \newDep -> pure (depName, newDep)) (M.toList incDeps)
258255
259−relationVariablesInSchema :: Schema -> DatabaseContext -> Either RelationalError RelationVariables
260−relationVariablesInSchema schema@(Schema morphs) context = foldM transform M.empty morphs
256+relationVariablesInSchema :: Schema -> Either RelationalError RelationVariables
257+relationVariablesInSchema schema@(Schema morphs) = foldM transform M.empty morphs
261258 where
262259 transform newRvMap morph = do
263260 let rvNames = isomorphInRelVarNames morph
264261 rvAssocs <- mapM (\rv -> do
265262 expr' <- processRelationalExprInSchema schema (RelationVariable rv ())
266− rel <- runReader (evalRelationalExpr expr') (RelationalExprStateElems context)
267− pure (rv, rel)) rvNames
263+ let gfExpr = runProcessExprM UncommittedContextMarker (processRelationalExpr expr')
264+ pure (rv, gfExpr)) rvNames
268265 pure (M.union newRvMap (M.fromList rvAssocs))
269266
270267
@@ -304,32 +301,32 @@ validate morph underlyingRvNames = if S.size invalidRvNames > 0 then
304301
305302-- | Create inclusion dependencies mainly for IsoRestrict because the predicate should hold in the base schema.
306303createIncDepsForIsomorph :: SchemaName -> SchemaIsomorph -> InclusionDependencies
307−createIncDepsForIsomorph sname (IsoRestrict _ predi (rvTrue, rvFalse)) = let
304+createIncDepsForIsomorph sname (IsoRestrict origRv predi (rvTrue, rvFalse)) = let
308305 newIncDep predicate rv = InclusionDependency (Project AN.empty (Restrict predicate (RelationVariable rv ()))) (ExistingRelation relationTrue)
309− incDepName b = "schema" <> "_" <> sname <> "_" <> T.pack (show b) in
310− M.fromList [(incDepName True, newIncDep predi rvTrue),
311− (incDepName False, newIncDep (NotPredicate predi) rvFalse)]
306+ incDepName b = "schema" <> "_" <> sname <> "_" <> b in
307+ M.fromList [(incDepName (origRv <> "_true"), newIncDep predi rvTrue),
308+ (incDepName (origRv <> "_false"), newIncDep (NotPredicate predi) rvFalse)]
312309createIncDepsForIsomorph _ _ = M.empty
313310
314311-- in the case of IsoRestrict, the database context should be updated with the restriction so that if the restriction does not hold, then the schema cannot be created
315−evalSchemaExpr :: SchemaExpr -> DatabaseContext -> Subschemas -> Either RelationalError (Subschemas, DatabaseContext)
316−evalSchemaExpr (AddSubschema sname morphs) context sschemas =
312+evalSchemaExpr :: SchemaExpr -> DatabaseContext -> TransactionId -> TransactionGraph -> Subschemas -> Either RelationalError (Subschemas, DatabaseContext)
313+evalSchemaExpr (AddSubschema sname morphs) context transId graph sschemas =
317314 if M.member sname sschemas then
318315 Left (SubschemaNameInUseError sname)
319− else case valid of
320− Just err -> Left (SchemaCreationError err)
321− Nothing ->
322− let newSchemas = M.insert sname newSchema sschemas
323− moreIncDeps = foldr (\morph acc -> M.union acc (createIncDepsForIsomorph sname morph)) M.empty morphs
324− incDepExprs = MultipleExpr (map (uncurry AddInclusionDependency) (M.toList moreIncDeps))
325− in
326− case runState (evalDatabaseContextExpr incDepExprs) (context, M.empty, False) of
327− (Left err, _) -> Left err
328− (Right (), (newContext,_,_)) -> pure (newSchemas, newContext) --need to propagate dirty flag here
329− where
330− newSchema = Schema morphs
331− valid = validateSchema newSchema context
332−evalSchemaExpr (RemoveSubschema sname) context sschemas = if M.member sname sschemas then
316+ else
317+ case validateSchema (Schema morphs) context of
318+ Just err -> Left (SchemaCreationError err)
319+ Nothing -> do
320+ let newSchemas = M.insert sname newSchema sschemas
321+ newSchema = Schema morphs
322+ moreIncDeps = foldr (\morph acc -> M.union acc (createIncDepsForIsomorph sname morph)) M.empty morphs
323+ incDepExprs = MultipleExpr (map (uncurry AddInclusionDependency) (M.toList moreIncDeps))
324+ dbenv = mkDatabaseContextEvalEnv transId graph
325+ dbstate <- runDatabaseContextEvalMonad context dbenv (evalGraphRefDatabaseContextExpr incDepExprs)
326+ pure (newSchemas, dbc_context dbstate)
327+--need to propagate dirty flag here
328+
329+evalSchemaExpr (RemoveSubschema sname) context _ _ sschemas = if M.member sname sschemas then
333330 pure (M.delete sname sschemas, context)
334331 else
335332 Left (SubschemaNameNotInUseError sname)
src/lib/ProjectM36/Key.hs+2
@@ -2,7 +2,9 @@ module ProjectM36.Key where
22import ProjectM36.Base
33import ProjectM36.Relation
44import qualified Data.Set as S
5+#if __GLASGOW_HASKELL__ < 804
56import Data.Monoid
7+#endif
68
79{-
810keys can be implemented using inclusion dependencies as well: the count of the projection of the keys' attributes must be equal to the count of the tuples- p. 120 Database in Depth
src/lib/ProjectM36/MerkleHash.hsnew file+9
@@ -0,0 +1,9 @@
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.hsnew file+132
@@ -0,0 +1,132 @@
1+-- | Functions to convert all types of expresions into their GraphRef- equivalents.
2+module ProjectM36.NormalizeExpr where
3+import ProjectM36.Base
4+import Control.Monad.Trans.Reader as R
5+import qualified Data.Map as M
6+
7+--used to process/normalize exprs to their respective graph ref forms
8+type ProcessExprM a = Reader GraphRefTransactionMarker a
9+
10+type CurrentTransactionId = TransactionId
11+
12+runProcessExprM :: GraphRefTransactionMarker -> ProcessExprM a -> a
13+runProcessExprM mtid m = runReader m mtid
14+
15+askMarker :: ProcessExprM GraphRefTransactionMarker
16+askMarker = R.ask
17+
18+-- convert a RelationalExpr into a GraphRefRelationalExpr using the current trans Id
19+processRelationalExpr :: RelationalExpr -> ProcessExprM GraphRefRelationalExpr
20+processRelationalExpr (MakeRelationFromExprs mAttrs tupleExprs) = do
21+ mAttrs' <- case mAttrs of
22+ Nothing -> pure Nothing
23+ Just mAttrs'' -> Just <$> mapM processAttributeExpr mAttrs''
24+ MakeRelationFromExprs mAttrs' <$> processTupleExprs tupleExprs
25+processRelationalExpr (MakeStaticRelation attrs tupSet) = pure (MakeStaticRelation attrs tupSet)
26+processRelationalExpr (ExistingRelation rel) = pure (ExistingRelation rel)
27+--requires current trans id and graph
28+processRelationalExpr (RelationVariable rv ()) = RelationVariable rv <$> askMarker
29+processRelationalExpr (Project attrNames expr) = Project <$> processAttributeNames attrNames <*> processRelationalExpr expr
30+processRelationalExpr (Union exprA exprB) = Union <$> processRelationalExpr exprA <*> processRelationalExpr exprB
31+processRelationalExpr (Join exprA exprB) = Join <$> processRelationalExpr exprA <*> processRelationalExpr exprB
32+processRelationalExpr (Rename attrA attrB expr) =
33+ Rename attrA attrB <$> processRelationalExpr expr
34+processRelationalExpr (Difference exprA exprB) = Difference <$> processRelationalExpr exprA <*> processRelationalExpr exprB
35+processRelationalExpr (Group attrNames attrName expr) = Group <$> processAttributeNames attrNames <*> pure attrName <*> processRelationalExpr expr
36+processRelationalExpr (Ungroup attrName expr) = Ungroup attrName <$> processRelationalExpr expr
37+processRelationalExpr (Restrict pred' expr) = Restrict <$> processRestrictionPredicateExpr pred' <*> processRelationalExpr expr
38+processRelationalExpr (Equals exprA exprB) =
39+ Equals <$> processRelationalExpr exprA <*> processRelationalExpr exprB
40+processRelationalExpr (NotEquals exprA exprB) =
41+ NotEquals <$> processRelationalExpr exprA <*> processRelationalExpr exprB
42+processRelationalExpr (Extend extendExpr expr) =
43+ Extend <$> processExtendTupleExpr extendExpr <*> processRelationalExpr expr
44+processRelationalExpr (With macros expr) =
45+ With <$> mapM (\(wnexpr, macroExpr) -> (,) <$> processWithNameExpr wnexpr <*> processRelationalExpr macroExpr) macros <*> processRelationalExpr expr
46+
47+processWithNameExpr :: WithNameExpr -> ProcessExprM GraphRefWithNameExpr
48+processWithNameExpr (WithNameExpr rvname ()) =
49+ WithNameExpr rvname <$> askMarker
50+
51+processAttributeNames :: AttributeNames -> ProcessExprM GraphRefAttributeNames
52+processAttributeNames (AttributeNames nameSet) = pure $ AttributeNames nameSet
53+processAttributeNames (InvertedAttributeNames attrNameSet) =
54+ pure $ InvertedAttributeNames attrNameSet
55+processAttributeNames (UnionAttributeNames attrNamesA attrNamesB) = UnionAttributeNames <$> processAttributeNames attrNamesA <*> processAttributeNames attrNamesB
56+processAttributeNames (IntersectAttributeNames attrNamesA attrNamesB) = IntersectAttributeNames <$> processAttributeNames attrNamesA <*> processAttributeNames attrNamesB
57+processAttributeNames (RelationalExprAttributeNames expr) = RelationalExprAttributeNames <$> processRelationalExpr expr
58+
59+processDatabaseContextExpr :: DatabaseContextExpr -> ProcessExprM GraphRefDatabaseContextExpr
60+processDatabaseContextExpr expr =
61+ case expr of
62+ NoOperation -> pure NoOperation
63+ Define nam attrExprs -> Define nam <$> mapM processAttributeExpr attrExprs
64+ Undefine nam -> pure (Undefine nam)
65+ Assign nam rexpr -> Assign nam <$> processRelationalExpr rexpr
66+ Insert nam rexpr -> Insert nam <$> processRelationalExpr rexpr
67+ Delete nam pred' -> Delete nam <$> processRestrictionPredicateExpr pred'
68+ Update nam attrMap pred' -> Update nam attrMap <$> processRestrictionPredicateExpr pred'
69+
70+ AddInclusionDependency nam dep -> pure (AddInclusionDependency nam dep)
71+ RemoveInclusionDependency nam -> pure (RemoveInclusionDependency nam)
72+ AddNotification nam exprA exprB exprC -> pure (AddNotification nam exprA exprB exprC)
73+ RemoveNotification nam -> pure (RemoveNotification nam)
74+ AddTypeConstructor tyDef consDefs -> pure (AddTypeConstructor tyDef consDefs)
75+ RemoveTypeConstructor tyName -> pure (RemoveTypeConstructor tyName)
76+
77+ RemoveAtomFunction aFuncName -> pure (RemoveAtomFunction aFuncName)
78+ RemoveDatabaseContextFunction funcName -> pure (RemoveDatabaseContextFunction funcName)
79+ ExecuteDatabaseContextFunction funcName atomExprs -> ExecuteDatabaseContextFunction funcName <$> mapM processAtomExpr atomExprs
80+ MultipleExpr exprs -> MultipleExpr <$> mapM processDatabaseContextExpr exprs
81+
82+processDatabaseContextIOExpr :: DatabaseContextIOExpr -> ProcessExprM GraphRefDatabaseContextIOExpr
83+processDatabaseContextIOExpr (AddAtomFunction f tcs sc) =
84+ pure (AddAtomFunction f tcs sc)
85+processDatabaseContextIOExpr (LoadAtomFunctions mod' fun file) =
86+ pure (LoadAtomFunctions mod' fun file)
87+processDatabaseContextIOExpr (AddDatabaseContextFunction mod' fun path) =
88+ pure (AddDatabaseContextFunction mod' fun path)
89+processDatabaseContextIOExpr (LoadDatabaseContextFunctions mod' fun path) =
90+ pure (LoadDatabaseContextFunctions mod' fun path)
91+processDatabaseContextIOExpr (CreateArbitraryRelation rvName attrExprs range) =
92+ CreateArbitraryRelation rvName <$> mapM processAttributeExpr attrExprs <*> pure range
93+
94+processRestrictionPredicateExpr :: RestrictionPredicateExpr -> ProcessExprM GraphRefRestrictionPredicateExpr
95+processRestrictionPredicateExpr TruePredicate = pure TruePredicate
96+processRestrictionPredicateExpr (AndPredicate a b) = AndPredicate <$> processRestrictionPredicateExpr a <*> processRestrictionPredicateExpr b
97+processRestrictionPredicateExpr (OrPredicate a b) = OrPredicate <$> processRestrictionPredicateExpr a <*> processRestrictionPredicateExpr b
98+processRestrictionPredicateExpr (NotPredicate a) = NotPredicate <$> processRestrictionPredicateExpr a
99+processRestrictionPredicateExpr (RelationalExprPredicate expr) =
100+ RelationalExprPredicate <$> processRelationalExpr expr
101+processRestrictionPredicateExpr (AtomExprPredicate expr) =
102+ AtomExprPredicate <$> processAtomExpr expr
103+processRestrictionPredicateExpr (AttributeEqualityPredicate nam expr) =
104+ AttributeEqualityPredicate nam <$> processAtomExpr expr
105+
106+processExtendTupleExpr :: ExtendTupleExpr -> ProcessExprM GraphRefExtendTupleExpr
107+processExtendTupleExpr (AttributeExtendTupleExpr nam atomExpr) =
108+ AttributeExtendTupleExpr nam <$> processAtomExpr atomExpr
109+
110+processAtomExpr :: AtomExpr -> ProcessExprM GraphRefAtomExpr
111+processAtomExpr (AttributeAtomExpr nam) = pure $ AttributeAtomExpr nam
112+processAtomExpr (NakedAtomExpr atom) = pure $ NakedAtomExpr atom
113+processAtomExpr (FunctionAtomExpr fName atomExprs ()) =
114+ FunctionAtomExpr fName <$> mapM processAtomExpr atomExprs <*> askMarker
115+processAtomExpr (RelationAtomExpr expr) = RelationAtomExpr <$> processRelationalExpr expr
116+processAtomExpr (ConstructedAtomExpr dConsName atomExprs ()) = ConstructedAtomExpr dConsName <$> mapM processAtomExpr atomExprs <*> askMarker
117+
118+processTupleExprs :: TupleExprs -> ProcessExprM GraphRefTupleExprs
119+processTupleExprs (TupleExprs () tupleExprs) = do
120+ marker <- askMarker
121+ TupleExprs marker <$> mapM processTupleExpr tupleExprs
122+
123+processTupleExpr :: TupleExpr -> ProcessExprM GraphRefTupleExpr
124+processTupleExpr (TupleExpr tMap) =
125+ TupleExpr . M.fromList <$> mapM (\(k,v) -> (,) k <$> processAtomExpr v) (M.toList tMap)
126+
127+--convert AttributeExpr to GraphRefAttributeExpr
128+processAttributeExpr :: AttributeExpr -> ProcessExprM GraphRefAttributeExpr
129+processAttributeExpr (AttributeAndTypeNameExpr nam tCons ()) =
130+ AttributeAndTypeNameExpr nam tCons <$> askMarker
131+processAttributeExpr (NakedAttributeExpr attr) = pure $ NakedAttributeExpr attr
132+
src/lib/ProjectM36/Notifications.hs+12−7
@@ -1,17 +1,22 @@
11module ProjectM36.Notifications where
22import ProjectM36.Base
3+import ProjectM36.Error
34import ProjectM36.RelationalExpression
4−import Control.Monad.Trans.Reader
5+import ProjectM36.StaticOptimizer
56import qualified Data.Map as M
67import Data.Either (isRight)
78
89-- | Returns the notifications which should be triggered based on the transition from the first 'DatabaseContext' to the second 'DatabaseContext'.
9−notificationChanges :: Notifications -> DatabaseContext -> DatabaseContext -> Notifications
10−notificationChanges nots context1 context2 = M.filter notificationFilter nots
10+notificationChanges :: Notifications -> TransactionGraph -> DatabaseContext -> DatabaseContext -> Notifications
11+notificationChanges nots graph context1 context2 = M.filter notificationFilter nots
1112 where
12− notificationFilter (Notification chExpr _ _) = let oldChangeEval = evalChangeExpr chExpr (RelationalExprStateElems context1)
13− newChangeEval = evalChangeExpr chExpr (RelationalExprStateElems context2) in
14− oldChangeEval /= newChangeEval && isRight oldChangeEval
15− evalChangeExpr chExpr = runReader (evalRelationalExpr chExpr)
13+ notificationFilter (Notification chExpr _ _) = oldChangeEval /= newChangeEval && isRight oldChangeEval
14+ where
15+ oldChangeEval = evalChangeExpr chExpr (mkRelationalExprEnv context1 graph)
16+ newChangeEval = evalChangeExpr chExpr (mkRelationalExprEnv context2 graph)
17+
18+ evalChangeExpr :: RelationalExpr -> RelationalExprEnv -> Either RelationalError Relation
19+ evalChangeExpr chExpr env =
20+ optimizeAndEvalRelationalExpr env chExpr
1621
1722
src/lib/ProjectM36/Persist.hs+61−13
@@ -2,11 +2,26 @@
22--this module is related to persisting Project:M36 structures to disk and not related to the persistent library
33module ProjectM36.Persist (writeFileSync,
44 writeBSFileSync,
5− renameSync,
5+ renameSync,
6+ printFdCount,
67 DiskSync(..)) where
78-- on Windows, use FlushFileBuffers and MoveFileEx
8−import qualified Data.Text.IO as TIO
9−import Data.Text
9+import qualified Data.Text as T
10+
11+#if defined(linux_HOST_OS)
12+# define FDCOUNTSUPPORTED 1
13+# define FDDIR "/proc/self/fd"
14+#elif defined(darwin_HOST_OS)
15+# define FDCOUNTSUPPORTED 1
16+# define FDDIR "/dev/fd"
17+#else
18+# define FDCOUNTSUPPORTED 0
19+#endif
20+
21+#if FDCOUNTSUPPORTED
22+import System.Directory
23+#endif
24+
1025#if defined(mingw32_HOST_OS)
1126import qualified System.Win32 as Win32
1227#else
@@ -16,12 +31,13 @@ import System.Posix.Unistd (fileSynchroniseDataOnly)
1631#else
1732import System.Posix.Unistd (fileSynchronise)
1833#endif
19−import System.Posix.IO (handleToFd)
34+import System.Posix.IO (handleToFd, closeFd)
2035import Foreign.C
2136#endif
2237
2338import System.IO (withFile, IOMode(WriteMode), Handle)
24−import qualified Data.ByteString.Lazy as BS
39+import qualified Data.ByteString as BS'
40+import qualified Data.Text.Encoding as TE
2541
2642#if defined(mingw32_HOST_OS)
2743import ProjectM36.Win32Handle
@@ -32,11 +48,11 @@ foreign import ccall unsafe "cDirectoryFsync" cHSDirectoryFsync :: CString -> IO
3248data DiskSync = NoDiskSync | FsyncDiskSync
3349
3450--using withFile here is OK because we use a WORM strategy- the file is written but not read until after the handle is synced, closed, and unhidden (moved from ".X" to "X") at the top level in the transaction directory
35−writeFileSync :: DiskSync -> FilePath -> Text -> IO()
51+writeFileSync :: DiskSync -> FilePath -> T.Text -> IO()
3652writeFileSync sync path strOut = withFile path WriteMode handler
3753 where
3854 handler handle = do
39− TIO.hPutStr handle strOut
55+ BS'.hPut handle (TE.encodeUtf8 strOut)
4056 syncHandle sync handle
4157
4258renameSync :: DiskSync -> FilePath -> FilePath -> IO ()
@@ -49,7 +65,13 @@ renameSync sync srcPath dstPath = do
4965atomicRename :: FilePath -> FilePath -> IO ()
5066atomicRename srcPath dstPath =
5167#if defined(mingw32_HOST_OS)
52− Win32.moveFileEx srcPath dstPath Win32.mOVEFILE_REPLACE_EXISTING
68+#if MIN_VERSION_Win32(2,6,0)
69+ let dst = Just dstPath
70+#else
71+ let dst = dstPath
72+#endif
73+ in
74+ Win32.moveFileEx srcPath dst Win32.mOVEFILE_REPLACE_EXISTING
5375#else
5476 Posix.rename srcPath dstPath
5577#endif
@@ -59,21 +81,28 @@ syncHandle FsyncDiskSync handle =
5981#if defined(mingw32_HOST_OS)
6082 withHandleToHANDLE handle (\h -> Win32.flushFileBuffers h)
6183#elif defined(linux_HOST_OS)
84+ do
6285 --fdatasync doesn't exist on macOS
63− handleToFd handle >>= fileSynchroniseDataOnly
64−#else
65− handleToFd handle >>= fileSynchronise
86+ fd <- handleToFd handle
87+ fileSynchroniseDataOnly fd
88+ closeFd fd
89+#else
90+ do
91+ fd <- handleToFd handle
92+ fileSynchronise fd
93+ closeFd fd
6694#endif
95+
6796syncHandle NoDiskSync _ = pure ()
6897
6998syncDirectory :: DiskSync -> FilePath -> IO ()
7099syncDirectory FsyncDiskSync path = directoryFsync path
71100syncDirectory NoDiskSync _ = pure ()
72101
73−writeBSFileSync :: DiskSync -> FilePath -> BS.ByteString -> IO ()
102+writeBSFileSync :: DiskSync -> FilePath -> BS'.ByteString -> IO ()
74103writeBSFileSync sync path bstring =
75104 withFile path WriteMode $ \handle -> do
76− BS.hPut handle bstring
105+ BS'.hPut handle bstring
77106 syncHandle sync handle
78107
79108directoryFsync :: FilePath -> IO ()
@@ -83,3 +112,22 @@ directoryFsync _ = pure () -- on Windows directory metadata cannot be synchroniz
83112directoryFsync path = throwErrnoIfMinus1Retry_ "directoryFsync" (withCString path $ \cpath -> cHSDirectoryFsync cpath)
84113#endif
85114
115+--prints out number of consumed file descriptors
116+printFdCount :: IO ()
117+printFdCount =
118+#if FDCOUNTSUPPORTED
119+ do
120+ fdc <- fdCount
121+ putStrLn ("Fd count: " ++ show fdc)
122+ --getLine >> pure ()
123+#else
124+ putStrLn "Fd count not supported on this OS."
125+#endif
126+
127+#if FDCOUNTSUPPORTED
128+fdCount :: IO Int
129+fdCount = do
130+ fds <- getDirectoryContents FDDIR
131+ pure ((length fds) - 2)
132+--not supported on non-linux
133+#endif
src/lib/ProjectM36/Relation.hs+31−49
@@ -4,14 +4,11 @@ import qualified Data.Set as S
44import qualified Data.HashSet as HS
55import Control.Monad
66import qualified Data.Vector as V
7−import qualified Data.Map as M
8−import ProjectM36.AtomType
97import ProjectM36.Base
108import ProjectM36.Tuple
119import qualified ProjectM36.Attribute as A
1210import ProjectM36.TupleSet
1311import ProjectM36.Error
14−import ProjectM36.MiscUtils
1512--import qualified Control.Parallel.Strategies as P
1613import qualified ProjectM36.TypeConstructorDef as TCD
1714import qualified ProjectM36.DataConstructorDef as DCD
@@ -19,7 +16,6 @@ import qualified Data.Text as T
1916import Data.Either (isRight)
2017import System.Random.Shuffle
2118import Control.Monad.Random
22−import Data.List (sort)
2319
2420attributes :: Relation -> Attributes
2521attributes (Relation attrs _ ) = attrs
@@ -38,19 +34,13 @@ atomTypeForName attrName (Relation attrs _) = A.atomTypeForAttributeName attrNam
3834
3935mkRelationFromList :: Attributes -> [[Atom]] -> Either RelationalError Relation
4036mkRelationFromList attrs atomMatrix = do
41− tupSet <- mkTupleSetFromList attrs atomMatrix
42− return $ Relation attrs tupSet
37+ Relation attrs <$> mkTupleSetFromList attrs atomMatrix
4338
4439emptyRelationWithAttrs :: Attributes -> Relation
4540emptyRelationWithAttrs attrs = Relation attrs emptyTupleSet
4641
4742mkRelation :: Attributes -> RelationTupleSet -> Either RelationalError Relation
4843mkRelation attrs tupleSet =
49− --check that all attributes are unique- this cannot be done when creating attributes because the check can become expensive
50− let duplicateAttrNames = dupes (sort (map A.attributeName (V.toList attrs))) in
51− if not (null duplicateAttrNames) then
52− Left (DuplicateAttributeNamesError (S.fromList duplicateAttrNames))
53− else
5444 --check that all tuples have the same keys
5545 --check that all tuples have keys (1-N) where N is the attribute count
5646 case verifyTupleSet attrs tupleSet of
@@ -65,6 +55,10 @@ mkRelationDeferVerify :: Attributes -> RelationTupleSet -> Either RelationalErro
6555mkRelationDeferVerify attrs tupleSet = return $ Relation attrs (RelationTupleSet (filter tupleFilter (asList tupleSet)))
6656 where
6757 tupleFilter tuple = isRight (verifyTuple attrs tuple)
58+
59+--return a relation of the same type except without any tuples
60+relationWithEmptyTupleSet :: Relation -> Relation
61+relationWithEmptyTupleSet (Relation attrs _) = emptyRelationWithAttrs attrs
6862
6963mkRelationFromTuples :: Attributes -> [RelationTuple] -> Either RelationalError Relation
7064mkRelationFromTuples attrs tupleSetList = do
@@ -84,6 +78,7 @@ singletonTuple rel@(Relation _ tupleSet) = if cardinality rel == Finite 1 then
8478 else
8579 Nothing
8680
81+-- this is still unncessarily expensive for (bigx union bigx) because each tuple is hashed and compared for equality (when the hashes match), but the major expense is attributesEqual, but we already know that all tuple attributes are equal (it's a precondition)
8782union :: Relation -> Relation -> Either RelationalError Relation
8883union (Relation attrs1 tupSet1) (Relation attrs2 tupSet2) =
8984 if not (A.attributesEqual attrs1 attrs2)
@@ -91,16 +86,13 @@ union (Relation attrs1 tupSet1) (Relation attrs2 tupSet2) =
9186 else
9287 Right $ Relation attrs1 newtuples
9388 where
94− newtuples = RelationTupleSet $ HS.toList . HS.fromList $ asList tupSet1 ++ map (reorderTuple attrs1) (asList tupSet2)
89+ newtuples = tupleSetUnion attrs1 tupSet1 tupSet2
9590
9691project :: S.Set AttributeName -> Relation -> Either RelationalError Relation
97−project attrNames rel = do
98− newAttrs <- A.projectionAttributesForNames attrNames (attributes rel)
99− relFold (folder newAttrs) (Right $ Relation newAttrs emptyTupleSet) rel
100− where
101− folder newAttrs tupleToProject acc = case acc of
102− Left err -> Left err
103− Right acc2 -> acc2 `union` Relation newAttrs (RelationTupleSet [tupleProject (A.attributeNameSet newAttrs) tupleToProject])
92+project attrNames rel@(Relation _ tupSet) = do
93+ newAttrs <- A.projectionAttributesForNames attrNames (attributes rel)
94+ newTupleList <- mapM (tupleProject newAttrs) (asList tupSet)
95+ pure (Relation newAttrs (RelationTupleSet (HS.toList (HS.fromList newTupleList))))
10496
10597rename :: AttributeName -> AttributeName -> Relation -> Either RelationalError Relation
10698rename oldAttrName newAttrName rel@(Relation oldAttrs oldTupSet)
@@ -154,7 +146,7 @@ group groupAttrNames newAttrName rel = do
154146 groupProjectionAttributes <- A.projectionAttributesForNames groupAttrNames (attributes rel)
155147 let groupAttr = Attribute newAttrName (RelationAtomType groupProjectionAttributes)
156148 matchingRelTuple tupIn = case imageRelationFor tupIn rel of
157− Right rel2 -> RelationTuple (V.singleton groupAttr) (V.singleton (RelationAtom rel2))
149+ Right rel2 -> RelationTuple (A.singleton groupAttr) (V.singleton (RelationAtom rel2))
158150 Left _ -> undefined
159151 mogrifier tupIn = pure (tupleExtend tupIn (matchingRelTuple tupIn))
160152 newAttrs = A.addAttribute groupAttr nonGroupProjectionAttributes
@@ -168,7 +160,8 @@ restrictEq :: RelationTuple -> Relation -> Either RelationalError Relation
168160restrictEq tuple = restrict rfilter
169161 where
170162 rfilter :: RelationTuple -> Either RelationalError Bool
171− rfilter tupleIn = pure (tupleIntersection tuple tupleIn == tuple)
163+ rfilter tupleIn = do
164+ pure (tupleIntersection tuple tupleIn == tuple)
172165
173166-- unwrap relation-valued attribute
174167-- return error if relval attrs and nongroup attrs overlap
@@ -190,13 +183,13 @@ ungroup relvalAttrName rel = case attributesForRelval relvalAttrName rel of
190183tupleUngroup :: AttributeName -> Attributes -> RelationTuple -> Either RelationalError Relation
191184tupleUngroup relvalAttrName newAttrs tuple = do
192185 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])
193192 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])
200193
201194attributesForRelval :: AttributeName -> Relation -> Either RelationalError Attributes
202195attributesForRelval relvalAttrName (Relation attrs _) = do
@@ -221,8 +214,7 @@ join (Relation attrs1 tupSet1) (Relation attrs2 tupSet2) = do
221214 joinedTupSet <- singleTupleSetJoin newAttrs tuple1 tupSet2
222215 return $ joinedTupSet ++ accumulator
223216 newTupSetList <- foldM tupleSetJoiner [] (asList tupSet1)
224− newTupSet <- mkTupleSet newAttrs newTupSetList
225− return $ Relation newAttrs newTupSet
217+ Relation newAttrs <$> mkTupleSet newAttrs newTupSetList
226218
227219-- | Difference takes two relations of the same type and returns a new relation which contains only tuples which appear in the first relation but not the second.
228220difference :: Relation -> Relation -> Either RelationalError Relation
@@ -252,7 +244,8 @@ relMap mapper (Relation attrs tupleSet) =
252244
253245relMogrify :: (RelationTuple -> Either RelationalError RelationTuple) -> Attributes -> Relation -> Either RelationalError Relation
254246relMogrify mapper newAttributes (Relation _ tupSet) = do
255− newTuples <- mapM mapper (asList tupSet)
247+ newTuples <- mapM (fmap (reorderTuple newAttributes) . mapper) (asList tupSet)
248+
256249 mkRelationFromTuples newAttributes newTuples
257250
258251relFold :: (RelationTuple -> a -> a) -> a -> Relation -> a
@@ -298,33 +291,22 @@ typesAsRelation types = mkRelationFromTuples attrs tuples
298291 dConsType = RelationAtomType subAttrs
299292 tuples = map mkTypeConsDescription types
300293
301− mkTypeConsDescription (tCons, dConsList) = RelationTuple attrs (V.fromList [TextAtom (TCD.name tCons), mkDataConsRelation dConsList])
294+ mkTypeConsDescription (tCons, dConsList) =
295+ RelationTuple attrs (V.fromList [TextAtom (TCD.name tCons), mkDataConsRelation dConsList])
302296
303297 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
304298 Left err -> error ("mkRelationFromTuples pooped " ++ show err)
305299 Right rel -> RelationAtom rel
306−
307−-- | Return a Relation describing the relation variables.
308−relationVariablesAsRelation :: M.Map RelVarName Relation -> Either RelationalError Relation
309−relationVariablesAsRelation relVarMap = mkRelationFromList attrs tups
310− where
311− subrelAttrs = A.attributesFromList [Attribute "attribute" TextAtomType, Attribute "type" TextAtomType]
312− attrs = A.attributesFromList [Attribute "name" TextAtomType,
313− Attribute "attributes" (RelationAtomType subrelAttrs)]
314− tups = map relVarToAtomList (M.toList relVarMap)
315− relVarToAtomList (rvName, rel) = [TextAtom rvName, attributesToRel (attributes rel)]
316− attributesToRel attrl = case mkRelationFromList subrelAttrs (map attrAtoms (V.toList attrl)) of
317− Left err -> error ("relationVariablesAsRelation pooped " ++ show err)
318− Right rel -> RelationAtom rel
319− attrAtoms a = [TextAtom (A.attributeName a), TextAtom (prettyAtomType (A.atomType a))]
320300
321301-- | Randomly resort the tuples. This is useful for emphasizing that two relations are equal even when they are printed to the console in different orders.
322302randomizeTupleOrder :: MonadRandom m => Relation -> m Relation
323−randomizeTupleOrder (Relation attrs tupSet) = do
324− newTupSet <- shuffleM (asList tupSet)
325− pure (Relation attrs (RelationTupleSet newTupSet))
303+randomizeTupleOrder (Relation attrs tupSet) =
304+ Relation attrs . RelationTupleSet <$> shuffleM (asList tupSet)
326305
327306-- returns a tuple from the tupleset- this is useful for priming folds over the tuples
328307oneTuple :: Relation -> Maybe RelationTuple
329308oneTuple (Relation _ (RelationTupleSet [])) = Nothing
330−oneTuple (Relation _ (RelationTupleSet (x:_))) = Just x
309+oneTuple (Relation _ (RelationTupleSet (x:_))) = Just x
310+
311+tuplesList :: Relation -> [RelationTuple]
312+tuplesList (Relation _ tupleSet) = asList tupleSet
src/lib/ProjectM36/Relation/Parse/CSV.hs+47−39
@@ -4,6 +4,7 @@ import ProjectM36.Base
44import ProjectM36.Error
55import ProjectM36.Relation
66import ProjectM36.AtomType
7+import ProjectM36.DataTypes.Interval
78import qualified ProjectM36.Attribute as A
89
910import Data.Csv.Parser
@@ -37,8 +38,7 @@ csvAsRelation attrs tConsMap inString = case APBL.parse (csvWithHeader csvDecode
3738 let strHeader = V.map decodeUtf8 headerRaw
3839 strMapRecords = V.map convertMap vecMapsRaw
3940 convertMap hmap = HM.fromList $ L.map (decodeUtf8 *** (T.unpack . decodeUtf8)) (HM.toList hmap)
40− attrNames = V.map A.attributeName attrs
41− attrNameSet = S.fromList (V.toList attrNames)
41+ attrNameSet = A.attributeNameSet attrs
4242 headerSet = S.fromList (V.toList strHeader)
4343 parseAtom attrName aType textIn = case APT.parseOnly (parseCSVAtomP attrName tConsMap aType <* APT.endOfInput) textIn of
4444 Left err -> Left (ParseError (T.pack err))
@@ -46,7 +46,7 @@ csvAsRelation attrs tConsMap inString = case APBL.parse (csvWithHeader csvDecode
4646 makeTupleList :: HM.HashMap AttributeName String -> [Either CsvImportError Atom]
4747 makeTupleList tupMap = V.toList $ V.map (\attr ->
4848 either (Left . AttributeMappingError) Right $
49− parseAtom (A.attributeName attr) (A.atomType attr) (T.pack $ tupMap HM.! A.attributeName attr)) attrs
49+ parseAtom (A.attributeName attr) (A.atomType attr) (T.pack $ tupMap HM.! A.attributeName attr)) (attributesVec attrs)
5050 if attrNameSet == headerSet then do
5151 tupleList <- mapM sequence $ V.toList (V.map makeTupleList strMapRecords)
5252 case mkRelationFromList attrs tupleList of
@@ -57,12 +57,11 @@ csvAsRelation attrs tConsMap inString = case APBL.parse (csvWithHeader csvDecode
5757
5858
5959parseCSVAtomP :: AttributeName -> TypeConstructorMapping -> AtomType -> APT.Parser (Either RelationalError Atom)
60−parseCSVAtomP _ _ IntegerAtomType = (Right . IntegerAtom) <$> APT.decimal
60+parseCSVAtomP _ _ IntegerAtomType = Right . IntegerAtom <$> APT.decimal
6161parseCSVAtomP _ _ IntAtomType = Right . IntAtom <$> APT.decimal
6262parseCSVAtomP _ _ DoubleAtomType = Right . DoubleAtom <$> APT.double
63−parseCSVAtomP _ _ TextAtomType = do
64− s <- quotedString <|> takeToEndOfData
65− pure (Right (TextAtom s))
63+parseCSVAtomP _ _ TextAtomType =
64+ Right . TextAtom <$> (quotedString <|> takeToEndOfData)
6665parseCSVAtomP _ _ DayAtomType = do
6766 dString <- T.unpack <$> takeToEndOfData
6867 case readMaybe dString of
@@ -83,41 +82,50 @@ parseCSVAtomP _ _ BoolAtomType = do
8382 case readMaybe bString of
8483 Nothing -> fail ("invalid BoolAtom string: " ++ bString)
8584 Just b -> pure (Right (BoolAtom b))
86−parseCSVAtomP attrName tConsMap (IntervalAtomType iType) = do
87− begin <- (APT.char '[' >> pure False) <|> (APT.char '(' >> pure True)
88− eBeginv <- parseCSVAtomP attrName tConsMap iType
89− case eBeginv of
90− Left err -> pure (Left err)
91− Right beginv -> do
92− _ <- APT.char ','
93− eEndv <- parseCSVAtomP attrName tConsMap iType
94− case eEndv of
95− Left err -> pure (Left err)
96− Right endv -> do
97− end <- (APT.char ']' >> pure False) <|> (APT.char ')' >> pure True)
98− pure (Right (IntervalAtom beginv endv begin end))
99−parseCSVAtomP attrName tConsMap typ@(ConstructedAtomType _ tvmap) = do
100− dConsName <- capitalizedIdentifier
101− APT.skipSpace
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))
90+parseCSVAtomP attrName tConsMap typ@(ConstructedAtomType _ tvmap)
91+ | isIntervalAtomType typ = do
92+ begin <- (APT.char '[' >> pure False) <|> (APT.char '(' >> pure True)
93+ let iType = intervalSubType typ
94+ eBeginv <- parseCSVAtomP attrName tConsMap iType
95+ case eBeginv of
96+ Left err -> pure (Left err)
97+ Right beginv -> do
98+ _ <- APT.char ','
99+ eEndv <- parseCSVAtomP attrName tConsMap iType
100+ case eEndv of
101+ Left err -> pure (Left err)
102+ Right endv -> do
103+ end <- (APT.char ']' >> pure False) <|>
104+ (APT.char ')' >> pure True)
105+ pure (Right (ConstructedAtom "Interval" typ [beginv, endv,
106+ BoolAtom begin, BoolAtom end]))
107+ | otherwise = do
108+ dConsName <- capitalizedIdentifier
109+ APT.skipSpace
102110 --we need to look up the name right away in order to determine the types of the following arguments
103111 -- grab the data constructor
104− case findDataConstructor dConsName tConsMap of
105− Nothing -> pure (Left (NoSuchDataConstructorError dConsName))
106− Just (_, dConsDef) ->
112+ case findDataConstructor dConsName tConsMap of
113+ Nothing -> pure (Left (NoSuchDataConstructorError dConsName))
114+ Just (_, dConsDef) ->
107115 -- identify the data constructor's expected atom type args
108− case resolvedAtomTypesForDataConstructorDefArgs tConsMap tvmap dConsDef of
109− Left err -> pure (Left err)
110− Right argAtomTypes -> do
111− atomArgs <- mapM (\argTyp -> let parseNextAtom = parseCSVAtomP attrName tConsMap argTyp <* APT.skipSpace in
112− case argTyp of
113− ConstructedAtomType _ _ ->
114− parens parseNextAtom <|>
115− parseNextAtom
116− _ -> parseNextAtom
117− ) argAtomTypes
118− case lefts atomArgs of
119− [] -> pure (Right (ConstructedAtom dConsName typ (rights atomArgs)))
120− errs -> pure (Left (someErrors errs))
116+ case resolvedAtomTypesForDataConstructorDefArgs tConsMap tvmap dConsDef of
117+ Left err -> pure (Left err)
118+ Right argAtomTypes -> do
119+ atomArgs <- mapM (\argTyp -> let parseNextAtom = parseCSVAtomP attrName tConsMap argTyp <* APT.skipSpace in
120+ case argTyp of
121+ ConstructedAtomType _ _ ->
122+ parens parseNextAtom <|>
123+ parseNextAtom
124+ _ -> parseNextAtom
125+ ) argAtomTypes
126+ case lefts atomArgs of
127+ [] -> pure (Right (ConstructedAtom dConsName typ (rights atomArgs)))
128+ errs -> pure (Left (someErrors errs))
121129parseCSVAtomP attrName _ (RelationAtomType _) = pure (Left (RelationValuedAttributesNotSupportedError [attrName]))
122130parseCSVAtomP _ _ (TypeVariableType x) = pure (Left (TypeConstructorTypeVarMissing x))
123131
src/lib/ProjectM36/Relation/Show/CSV.hs+6−6
@@ -1,7 +1,7 @@
11{-# OPTIONS_GHC -fno-warn-orphans #-}
22module ProjectM36.Relation.Show.CSV where
33import ProjectM36.Base
4−import ProjectM36.Attribute
4+import ProjectM36.Attribute as A
55import Data.Csv
66import ProjectM36.Tuple
77import qualified Data.ByteString.Lazy as BS
@@ -17,13 +17,13 @@ relationAsCSV (Relation attrs tupleSet)
1717 | relValAttrs /= [] =
1818 Left $ RelationValuedAttributesNotSupportedError (map attributeName relValAttrs)
1919 --check that there is at least one attribute
20− | V.null attrs =
20+ | A.null attrs =
2121 Left $ TupleAttributeCountMismatchError 0
2222 | otherwise =
2323 Right $ encodeByName bsAttrNames $ map RecordRelationTuple (asList tupleSet)
2424 where
25− relValAttrs = V.toList $ V.filter (isRelationAtomType . atomType) attrs
26− bsAttrNames = V.map (TE.encodeUtf8 . attributeName) attrs
25+ relValAttrs = V.toList $ V.filter (isRelationAtomType . atomType) (attributesVec attrs)
26+ bsAttrNames = V.map (TE.encodeUtf8 . attributeName) (attributesVec attrs)
2727
2828{-
2929instance ToRecord RelationTuple where
@@ -36,12 +36,12 @@ instance ToNamedRecord RecordRelationTuple where
3636 toNamedRecord rTuple = namedRecord $ map (\(k,v) -> TE.encodeUtf8 k .= RecordAtom v) (tupleAssocs $ unTuple rTuple)
3737
3838instance DefaultOrdered RecordRelationTuple where
39− headerOrder (RecordRelationTuple tuple) = V.map (TE.encodeUtf8 . attributeName) (tupleAttributes tuple)
39+ headerOrder (RecordRelationTuple tuple) = V.map (TE.encodeUtf8 . attributeName) (attributesVec (tupleAttributes tuple))
4040
4141newtype RecordAtom = RecordAtom {unAtom :: Atom}
4242
4343instance ToField RecordAtom where
44− toField (RecordAtom (TextAtom atomVal)) = TE.encodeUtf8 atomVal --squelch extraneous quotes for text type- the CSV library will add them if necessary
44+ toField (RecordAtom (TextAtom atomVal)) = TE.encodeUtf8 atomVal --without this, CSV text atoms are doubly quoted
4545 toField (RecordAtom atomVal) = (TE.encodeUtf8 . atomToText) atomVal
4646
4747
src/lib/ProjectM36/Relation/Show/HTML.hs+5−2
@@ -3,16 +3,18 @@ import ProjectM36.Base
33import ProjectM36.Relation
44import ProjectM36.Tuple
55import ProjectM36.Atom
6+import ProjectM36.Attribute as A
67import ProjectM36.AtomType
78import qualified Data.List as L
89import Data.Text (Text, pack)
910import qualified Data.Text as T
1011import qualified Data.Text.IO as TIO
12+#if __GLASGOW_HASKELL__ < 804
1113import Data.Monoid
12−import qualified Data.Vector as V
14+#endif
1315
1416attributesAsHTML :: Attributes -> Text
15−attributesAsHTML attrs = "<tr>" <> T.concat (map oneAttrHTML (V.toList attrs)) <> "</tr>"
17+attributesAsHTML attrs = "<tr>" <> T.concat (map oneAttrHTML (A.toList attrs)) <> "</tr>"
1618 where
1719 oneAttrHTML attr = "<th>" <> prettyAttribute attr <> "</th>"
1820
@@ -51,6 +53,7 @@ tupleAsHTML tuple = "<tr>" <> T.concat (L.map tupleFrag (tupleAssocs tuple)) <>
5153 where
5254 tupleFrag tup = "<td>" <> atomAsHTML (snd tup) <> "</td>"
5355 atomAsHTML (RelationAtom rel) = relationAsHTML rel
56+ atomAsHTML (TextAtom t) = "&quot;" <> t <> "&quot;"
5457 atomAsHTML atom = atomToText atom
5558
5659tupleSetAsHTML :: RelationTupleSet -> Text
src/lib/ProjectM36/Relation/Show/Term.hs+22−12
@@ -9,6 +9,12 @@ import ProjectM36.Attribute hiding (null)
99import qualified Data.List as L
1010import qualified Data.Text as T
1111import Control.Arrow hiding (left)
12+import Data.ByteString.Base64 as B64
13+import qualified Data.Text.Encoding as TE
14+#if __GLASGOW_HASKELL__ < 804
15+import Data.Monoid
16+#endif
17+import ProjectM36.WCWidth --guess the width that the character will appear as in the terminal
1218
1319boxV :: StringType
1420boxV = "│"
@@ -36,16 +42,6 @@ boxBB = "┴"
3642boxC :: StringType
3743boxC = "┼"
3844
39−dboxH :: StringType
40−dboxH = "═"
41−dboxL :: StringType
42−dboxL = "╞"
43−dboxR :: StringType
44−dboxR = "╡"
45−
46−class TermSize a where
47− termLength :: a -> Int
48−
4945--represent a relation as a table similar to those drawn by Date
5046type Cell = StringType
5147type Table = ([Cell], [[Cell]]) --header, body
@@ -77,7 +73,7 @@ cellSizes (header, body) = map (map maxRowWidth &&& map (length . breakLines)) a
7773 0
7874 else
7975 L.maximum (lengths row)
80− lengths row = map T.length (breakLines row)
76+ lengths row = map stringDisplayLength (breakLines row)
8177 allRows = header : body
8278
8379relationAsTable :: Relation -> Table
@@ -102,6 +98,8 @@ showParens predicate f = if predicate then
10298showAtom :: Int -> Atom -> StringType
10399showAtom _ (RelationAtom rel) = renderTable $ relationAsTable rel
104100showAtom level (ConstructedAtom dConsName _ atoms) = showParens (level >= 1 && not (null atoms)) $ T.concat (L.intersperse " " (dConsName : map (showAtom 1) atoms))
101+showAtom _ (TextAtom t) = "\"" <> t <> "\""
102+showAtom _ (ByteStringAtom bs) = TE.decodeUtf8 (B64.encode bs)
105103showAtom _ atom = atomToText atom
106104
107105renderTable :: Table -> StringType
@@ -120,13 +118,14 @@ renderHeader (header, body) columnLocations = renderTopBar `T.append` renderHead
120118renderHBar :: StringType -> StringType -> StringType -> [Int] -> StringType
121119renderHBar left middle end columnLocations = left `T.append` T.concat (L.intersperse middle (map (`repeatString` boxH) columnLocations)) `T.append` end
122120
121+--pad a block of potentially multi-lined text
123122leftPaddedString :: Int -> Int -> StringType -> StringType
124123leftPaddedString lineNum size str = if lineNum > length paddedLines -1 then
125124 repeatString size " "
126125 else
127126 paddedLines !! lineNum
128127 where
129− paddedLines = map (\line -> line `T.append` repeatString (size - T.length line) " ") (breakLines str)
128+ paddedLines = map (\line -> line `T.append` repeatString (size - stringDisplayLength line) " ") (breakLines str)
130129
131130renderRow :: [Cell] -> [Int] -> Int -> StringType -> StringType
132131renderRow cells columnLocations rowHeight interspersed = T.unlines $ map renderOneLine [0..rowHeight-1]
@@ -147,3 +146,14 @@ repeatString c s = T.concat (replicate c s)
147146
148147showRelation :: Relation -> StringType
149148showRelation rel = renderTable (relationAsTable rel)
149+
150+--use wcwidth to guess the string width in the terminal- many CJK characters can take multiple columns in a fixed width font
151+stringDisplayLength :: StringType -> Int
152+stringDisplayLength = T.foldr charSize 0
153+ where
154+ charSize char accum = let w = wcwidth char in
155+ accum + if w < 0 then
156+ 1
157+ else
158+ w
159+
src/lib/ProjectM36/RelationalExpression.hs+1079−618
@@ -1,33 +1,53 @@
11{-# LANGUAGE ScopedTypeVariables #-}
2+{-# LANGUAGE FlexibleInstances #-}
3+{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE OverloadedStrings #-}
25module ProjectM36.RelationalExpression where
36import ProjectM36.Relation
47import ProjectM36.Tuple
58import ProjectM36.TupleSet
69import ProjectM36.Base
10+import qualified Data.UUID as U
711import ProjectM36.Error
812import ProjectM36.AtomType
9−import ProjectM36.Attribute (emptyAttributes)
13+import ProjectM36.Attribute (emptyAttributes, attributesFromList)
1014import ProjectM36.ScriptSession
1115import ProjectM36.DataTypes.Primitive
1216import ProjectM36.AtomFunction
1317import ProjectM36.DatabaseContextFunction
18+import ProjectM36.Arbitrary
19+import ProjectM36.GraphRefRelationalExpr
20+import ProjectM36.Transaction
1421import qualified ProjectM36.Attribute as A
1522import qualified Data.Map as M
1623import qualified Data.HashSet as HS
1724import qualified Data.Set as S
1825import Control.Monad.State hiding (join)
19−import Control.Exception
26+import Data.Bifunctor (second)
2027import Data.Maybe
2128import Data.Either
2229import Data.Char (isUpper)
30+import Data.Time
31+import qualified Data.List.NonEmpty as NE
32+import Data.Functor.Identity
2333import qualified Data.Text as T
2434import qualified Data.Vector as V
2535import qualified ProjectM36.TypeConstructorDef as TCD
26−import Control.Monad.Trans.Except
27−import Control.Monad.Trans.Reader
28−
29−import GHC
36+import qualified Control.Monad.RWS.Strict as RWS
37+import Control.Monad.RWS.Strict (RWST, execRWST, runRWST)
38+import Control.Monad.Except hiding (join)
39+import Control.Monad.Trans.Except (except)
40+import Control.Monad.Reader as R hiding (join)
41+import ProjectM36.NormalizeExpr
42+import ProjectM36.WithNameExpr
43+import Test.QuickCheck
44+import qualified Data.Functor.Foldable as Fold
45+import Control.Applicative
46+#ifdef PM36_HASKELL_SCRIPTING
47+import GHC hiding (getContext)
48+import Control.Exception
3049import GHC.Paths
50+#endif
3151
3252data DatabaseContextExprDetails = CountUpdatedTuples
3353
@@ -44,32 +64,63 @@ databaseContextExprDetailsFunc CountUpdatedTuples _ relIn = Relation attrs newTu
4464 Right ts -> ts
4565
4666-- | Used to start a fresh database state for a new database context expression.
47−freshDatabaseState :: DatabaseContext -> DatabaseStateElems
48−freshDatabaseState ctx = (ctx, M.empty, False) --future work: propagate return accumulator
67+mkDatabaseContextEvalState :: DatabaseContext -> DatabaseContextEvalState
68+mkDatabaseContextEvalState context = DatabaseContextEvalState {
69+ dbc_context = context,
70+ dbc_accum = M.empty,
71+ dbc_dirty = False
72+ } --future work: propagate return accumulator
4973
5074-- we need to pass around a higher level RelationTuple and Attributes in order to solve #52
51−data RelationalExprStateElems = RelationalExprStateTupleElems DatabaseContext RelationTuple | -- used when fully evaluating a relexpr
52− RelationalExprStateAttrsElems DatabaseContext Attributes | --used when evaluating the type of a relexpr
53− RelationalExprStateElems DatabaseContext --used by default at the top level of evaluation
54−
55−instance Show RelationalExprStateElems where
56− show (RelationalExprStateTupleElems _ tup) = "RelationalExprStateTupleElems " ++ show tup
57− show (RelationalExprStateAttrsElems _ attrs) = "RelationalExprStateAttrsElems" ++ show attrs
58− show (RelationalExprStateElems _) = "RelationalExprStateElems"
59−
60−mkRelationalExprState :: DatabaseContext -> RelationalExprStateElems
61−mkRelationalExprState = RelationalExprStateElems
62−
63−mergeTuplesIntoRelationalExprState :: RelationTuple -> RelationalExprStateElems -> RelationalExprStateElems
64−mergeTuplesIntoRelationalExprState tupIn (RelationalExprStateElems ctx) = RelationalExprStateTupleElems ctx tupIn
65−mergeTuplesIntoRelationalExprState _ st@(RelationalExprStateAttrsElems _ _) = st
66−mergeTuplesIntoRelationalExprState tupIn (RelationalExprStateTupleElems ctx existingTuple) = let mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap existingTuple) in
67− RelationalExprStateTupleElems ctx (mkRelationTupleFromMap mergedTupMap)
75+data RelationalExprEnv = RelationalExprEnv {
76+ re_context :: DatabaseContext,
77+ re_graph :: TransactionGraph,
78+ re_extra :: Maybe (Either RelationTuple Attributes)
79+ }
80+
81+envTuple :: GraphRefRelationalExprEnv -> RelationTuple
82+envTuple e = fromLeft emptyTuple (fromMaybe (Left emptyTuple) (gre_extra e))
83+
84+envAttributes :: GraphRefRelationalExprEnv -> Attributes
85+envAttributes e = fromRight emptyAttributes (fromMaybe (Right emptyAttributes) (gre_extra e))
6886
69−mergeAttributesIntoRelationalExprState :: Attributes -> RelationalExprStateElems -> RelationalExprStateElems
70−mergeAttributesIntoRelationalExprState attrs (RelationalExprStateElems ctx) = RelationalExprStateAttrsElems ctx attrs
71−mergeAttributesIntoRelationalExprState _ st@(RelationalExprStateTupleElems _ _) = st
72−mergeAttributesIntoRelationalExprState attrsIn (RelationalExprStateAttrsElems ctx attrs) = RelationalExprStateAttrsElems ctx (A.union attrsIn attrs)
87+instance Show RelationalExprEnv where
88+ show e@RelationalExprEnv{} = "RelationalExprEnv " ++ show (re_extra e)
89+
90+--used to eval relationalexpr
91+type RelationalExprM a = ReaderT RelationalExprEnv (ExceptT RelationalError Identity) a
92+
93+runRelationalExprM :: RelationalExprEnv -> RelationalExprM a -> Either RelationalError a
94+runRelationalExprM env m = runIdentity (runExceptT (runReaderT m env))
95+
96+reGraph :: RelationalExprM TransactionGraph
97+reGraph = asks re_graph
98+
99+reContext :: RelationalExprM DatabaseContext
100+reContext = asks re_context
101+
102+mkRelationalExprEnv :: DatabaseContext -> TransactionGraph -> RelationalExprEnv
103+mkRelationalExprEnv ctx graph =
104+ RelationalExprEnv
105+ { re_context = ctx,
106+ re_graph = graph,
107+ re_extra = Nothing }
108+
109+askEnv :: GraphRefRelationalExprM GraphRefRelationalExprEnv
110+askEnv = R.ask
111+
112+mergeTuplesIntoGraphRefRelationalExprEnv :: RelationTuple -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
113+mergeTuplesIntoGraphRefRelationalExprEnv tupIn env =
114+ env { gre_extra = new_elems }
115+ where
116+ new_elems = Just (Left newTuple)
117+ mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (envTuple env))
118+ newTuple = mkRelationTupleFromMap mergedTupMap
119+
120+mergeAttributesIntoGraphRefRelationalExprEnv :: Attributes -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
121+mergeAttributesIntoGraphRefRelationalExprEnv attrsIn e = e { gre_extra = newattrs }
122+ where
123+ newattrs = Just (Right (A.union attrsIn (envAttributes e)))
73124
74125type ResultAccumName = StringType
75126
@@ -79,423 +130,403 @@ data ResultAccum = ResultAccum { resultAccumFunc :: ResultAccumFunc,
79130 resultAccumResult :: Relation
80131 }
81132
82−type DatabaseStateElems = (DatabaseContext, M.Map ResultAccumName ResultAccum, DirtyFlag)
133+data DatabaseContextEvalState = DatabaseContextEvalState {
134+ dbc_context :: DatabaseContext, --new, alterable context for a new transaction
135+ dbc_accum :: M.Map ResultAccumName ResultAccum,
136+ dbc_dirty :: DirtyFlag
137+ }
83138
84−type DatabaseState a = State DatabaseStateElems a
139+data DatabaseContextEvalEnv = DatabaseContextEvalEnv
140+ { dce_transId :: TransactionId,
141+ dce_graph :: TransactionGraph
142+ }
85143
86−getStateContext :: DatabaseState DatabaseContext
87−getStateContext = do
88− (ctx,_, _) <- get
89− pure ctx
90−
91−putStateContext :: DatabaseContext -> DatabaseState ()
92−putStateContext ctx = do
93− (_, accum, _) <- get
94− put (ctx, accum, True)
95−
96−type RelationalExprState a = Reader RelationalExprStateElems a
97−
98−stateElemsContext :: RelationalExprStateElems -> DatabaseContext
99−stateElemsContext (RelationalExprStateTupleElems ctx _) = ctx
100−stateElemsContext (RelationalExprStateElems ctx) = ctx
101−stateElemsContext (RelationalExprStateAttrsElems ctx _) = ctx
102−
103−setStateElemsContext :: RelationalExprStateElems -> DatabaseContext -> RelationalExprStateElems
104−setStateElemsContext (RelationalExprStateTupleElems _ tup) ctx = RelationalExprStateTupleElems ctx tup
105−setStateElemsContext (RelationalExprStateElems _) ctx = RelationalExprStateElems ctx
106−setStateElemsContext (RelationalExprStateAttrsElems _ attrs) ctx = RelationalExprStateAttrsElems ctx attrs
107−
108−--relvar state is needed in evaluation of relational expression but only as read-only in order to extract current relvar values
109−evalRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError Relation)
110−evalRelationalExpr (RelationVariable name _) = do
111− relvarTable <- fmap (relationVariables . stateElemsContext) ask
112− return $ case M.lookup name relvarTable of
113− Just res -> Right res
114− Nothing -> Left $ RelVarNotDefinedError name
115−
116−evalRelationalExpr (Project attrNames expr) = do
117− eAttrNameSet <- evalAttributeNames attrNames expr
118− case eAttrNameSet of
119− Left err -> pure (Left err)
120− Right attrNameSet -> do
121− rel <- evalRelationalExpr expr
122− case rel of
123− Right rel2 -> pure $ project attrNameSet rel2
124− Left err -> pure $ Left err
125−
126−evalRelationalExpr (Union exprA exprB) = do
127− relA <- evalRelationalExpr exprA
128− relB <- evalRelationalExpr exprB
129− case relA of
130− Left err -> return $ Left err
131− Right relA2 -> case relB of
132− Left err -> return $ Left err
133− Right relB2 -> return $ union relA2 relB2
134−
135−evalRelationalExpr (Join exprA exprB) = do
136− relA <- evalRelationalExpr exprA
137− relB <- evalRelationalExpr exprB
138− case relA of
139− Left err -> return $ Left err
140− Right relA2 -> case relB of
141− Left err -> return $ Left err
142− Right relB2 -> return $ join relA2 relB2
143−
144−evalRelationalExpr (Difference exprA exprB) = do
145− relA <- evalRelationalExpr exprA
146− relB <- evalRelationalExpr exprB
147− case relA of
148− Left err -> return $ Left err
149− Right relA2 -> case relB of
150− Left err -> return $ Left err
151− Right relB2 -> return $ difference relA2 relB2
152−
153−evalRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
154− case mkRelation attributeSet tupleSet of
155− Right rel -> return $ Right rel
156− Left err -> return $ Left err
144+mkDatabaseContextEvalEnv :: TransactionId -> TransactionGraph -> DatabaseContextEvalEnv
145+mkDatabaseContextEvalEnv = DatabaseContextEvalEnv
146+
147+type DatabaseContextEvalMonad a = RWST DatabaseContextEvalEnv () DatabaseContextEvalState (ExceptT RelationalError Identity) a
148+
149+runDatabaseContextEvalMonad :: DatabaseContext -> DatabaseContextEvalEnv -> DatabaseContextEvalMonad () -> Either RelationalError DatabaseContextEvalState
150+runDatabaseContextEvalMonad ctx env m = runIdentity (runExceptT (fst <$> execRWST m env freshEnv))
151+ where
152+ freshEnv = mkDatabaseContextEvalState ctx
157153
158−evalRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
159− currentContext <- fmap stateElemsContext ask
160− let tConss = typeConstructorMapping currentContext
161− -- 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
162− runExceptT $ do
163− mAttrs <- case mAttrExprs of
164− Just _ -> do
165− attrs <- mapM (either throwE pure . evalAttrExpr tConss) (fromMaybe [] mAttrExprs)
166− pure (Just (A.attributesFromList attrs))
167− Nothing -> pure Nothing
168− tuples <- mapM (liftE . evalTupleExpr mAttrs) tupleExprs
169− let attrs = fromMaybe firstTupleAttrs mAttrs
170− firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
171− either throwE pure (mkRelation attrs (RelationTupleSet tuples))
154+
155+dbcTransId :: DatabaseContextEvalMonad TransactionId
156+dbcTransId = dce_transId <$> RWS.ask
157+
158+dbcGraph :: DatabaseContextEvalMonad TransactionGraph
159+dbcGraph = dce_graph <$> RWS.ask
160+
161+dbcRelationalExprEnv :: DatabaseContextEvalMonad RelationalExprEnv
162+dbcRelationalExprEnv =
163+ mkRelationalExprEnv <$> getStateContext <*> dbcGraph
164+
165+getStateContext :: DatabaseContextEvalMonad DatabaseContext
166+getStateContext = gets dbc_context
167+
168+putStateContext :: DatabaseContext -> DatabaseContextEvalMonad ()
169+putStateContext ctx' = do
170+ s <- get
171+ put (s {dbc_context = ctx', dbc_dirty = True})
172+
173+-- | The context is optionally passed down along in cases where the current context is uncommitted.
174+data GraphRefRelationalExprEnv =
175+ GraphRefRelationalExprEnv {
176+ gre_context :: Maybe DatabaseContext,
177+ gre_graph :: TransactionGraph,
178+ gre_extra :: Maybe (Either RelationTuple Attributes)
179+ }
172180
173−evalRelationalExpr (ExistingRelation rel) = pure (Right rel)
181+type GraphRefRelationalExprM a = ReaderT GraphRefRelationalExprEnv (ExceptT RelationalError Identity) a
174182
175−evalRelationalExpr (Rename oldAttrName newAttrName relExpr) = do
176− evald <- evalRelationalExpr relExpr
177− case evald of
178− Right rel -> return $ rename oldAttrName newAttrName rel
179− Left err -> return $ Left err
183+gfTransForId :: TransactionId -> GraphRefRelationalExprM Transaction
184+gfTransForId tid = do
185+ graph <- gfGraph
186+ lift $ except $ transactionForId tid graph
180187
181−evalRelationalExpr (Group oldAttrNames newAttrName relExpr) = do
182− eOldAttrNameSet <- evalAttributeNames oldAttrNames relExpr
183− case eOldAttrNameSet of
184− Left err -> pure (Left err)
185− Right oldAttrNameSet -> do
186− evald <- evalRelationalExpr relExpr
187− case evald of
188− Right rel -> return $ group oldAttrNameSet newAttrName rel
189− Left err -> return $ Left err
190−
191−evalRelationalExpr (Ungroup attrName relExpr) = do
192− evald <- evalRelationalExpr relExpr
193− case evald of
194− Right rel -> return $ ungroup attrName rel
195− Left err -> return $ Left err
196−
197−evalRelationalExpr (Restrict predicateExpr relExpr) = do
198− evald <- evalRelationalExpr relExpr
199− case evald of
200− Left err -> return $ Left err
201− Right rel -> do
202− eFilterFunc <- predicateRestrictionFilter (attributes rel) predicateExpr
203− case eFilterFunc of
204− Left err -> return $ Left err
205− Right filterfunc ->
206− pure (restrict filterfunc rel)
207−
208−evalRelationalExpr (Equals relExprA relExprB) = do
209− evaldA <- evalRelationalExpr relExprA
210− evaldB <- evalRelationalExpr relExprB
211− case evaldA of
212− Left err -> return $ Left err
213− Right relA -> case evaldB of
214− Left err -> return $ Left err
215− Right relB -> return $ Right $ if relA == relB then relationTrue else relationFalse
216−
217−--warning: copy-pasta from above- refactor
218−evalRelationalExpr (NotEquals relExprA relExprB) = do
219− evaldA <- evalRelationalExpr relExprA
220− evaldB <- evalRelationalExpr relExprB
221− case evaldA of
222− Left err -> return $ Left err
223− Right relA -> case evaldB of
224− Left err -> return $ Left err
225− Right relB -> return $ Right $ if relA /= relB then relationTrue else relationFalse
226−
227−-- extending a relation adds a single attribute with the results of the per-tuple expression evaluated
228−evalRelationalExpr (Extend tupleExpression relExpr) = do
229− rstate <- ask
230− let evald = runReader (evalRelationalExpr relExpr) rstate
231− case evald of
232− Left err -> pure (Left err)
233− Right rel -> do
234− tupProc <- extendTupleExpressionProcessor rel tupleExpression
235− case tupProc of
236− Left err -> pure (Left err)
237− Right (newAttrs, tupProc') -> pure $ relMogrify tupProc' newAttrs rel
188+gfDatabaseContextForMarker :: GraphRefTransactionMarker -> GraphRefRelationalExprM DatabaseContext
189+gfDatabaseContextForMarker (TransactionMarker transId) = concreteDatabaseContext <$> gfTransForId transId
190+gfDatabaseContextForMarker UncommittedContextMarker = do
191+ mctx <- gre_context <$> askEnv
192+ case mctx of
193+ Nothing -> throwError NoUncommittedContextInEvalError
194+ Just ctx -> pure ctx
195+
196+runGraphRefRelationalExprM :: GraphRefRelationalExprEnv -> GraphRefRelationalExprM a -> Either RelationalError a
197+runGraphRefRelationalExprM env m = runIdentity (runExceptT (runReaderT m env))
198+
199+freshGraphRefRelationalExprEnv :: Maybe DatabaseContext -> TransactionGraph -> GraphRefRelationalExprEnv
200+freshGraphRefRelationalExprEnv mctx graph = GraphRefRelationalExprEnv {
201+ gre_context = mctx,
202+ gre_graph = graph,
203+ gre_extra = Nothing
204+ }
205+
206+gfGraph :: GraphRefRelationalExprM TransactionGraph
207+gfGraph = asks gre_graph
208+
209+envContext :: RelationalExprEnv -> DatabaseContext
210+envContext = re_context
211+
212+setEnvContext :: RelationalExprEnv -> DatabaseContext -> RelationalExprEnv
213+setEnvContext e ctx = e { re_context = ctx }
238214
239215--helper function to process relation variable creation/assignment
240−setRelVar :: RelVarName -> Relation -> DatabaseState (Either RelationalError ())
241−setRelVar relVarName rel = do
216+setRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
217+setRelVar relVarName relExpr = do
242218 currentContext <- getStateContext
243− let newRelVars = M.insert relVarName rel $ relationVariables currentContext
219+ --prevent recursive relvar definition by resolving references to relvars in previous states
220+ relExpr' <- resolve relExpr
221+ let newRelVars = M.insert relVarName relExpr' $ relationVariables currentContext
244222 potentialContext = currentContext { relationVariables = newRelVars }
245−
246− case checkConstraints potentialContext of
247− Just err -> pure (Left err)
248− Nothing -> do
249− putStateContext potentialContext
250− return (Right ())
223+ --optimization: if the relexpr is unchanged, skip the update
224+ if M.lookup relVarName (relationVariables currentContext) == Just relExpr then
225+ pure ()
226+ else do
227+ --determine when to check constraints
228+ graph <- dbcGraph
229+ tid <- dbcTransId
230+ case checkConstraints potentialContext tid graph of
231+ Left err -> dbErr err
232+ Right _ -> putStateContext potentialContext
233+
234+--fast-path insertion- we already know that the previous relvar validated correctly, so we can validate just the relation that is being inserted for attribute matches- without this, even a single tuple relation inserted causes the entire relation to be re-validated unnecessarily
235+--insertIntoRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
251236
252237-- 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
253−deleteRelVar :: RelVarName -> DatabaseState (Either RelationalError ())
238+deleteRelVar :: RelVarName -> DatabaseContextEvalMonad ()
254239deleteRelVar relVarName = do
255240 currContext <- getStateContext
256241 let relVars = relationVariables currContext
257242 if M.notMember relVarName relVars then
258− pure (Right ())
243+ pure ()
259244 else do
260245 let newRelVars = M.delete relVarName relVars
261246 newContext = currContext { relationVariables = newRelVars }
262247 putStateContext newContext
263− pure (Right ())
248+ pure ()
264249
265−evalDatabaseContextExpr :: DatabaseContextExpr -> DatabaseState (Either RelationalError ())
266−evalDatabaseContextExpr NoOperation = pure (Right ())
250+evalGraphRefDatabaseContextExpr :: GraphRefDatabaseContextExpr -> DatabaseContextEvalMonad ()
251+evalGraphRefDatabaseContextExpr NoOperation = pure ()
267252
268−evalDatabaseContextExpr (Define relVarName attrExprs) = do
253+evalGraphRefDatabaseContextExpr (Define relVarName attrExprs) = do
254+ context <- getStateContext
269255 relvars <- fmap relationVariables getStateContext
270256 tConss <- fmap typeConstructorMapping getStateContext
271− let eAttrs = map (evalAttrExpr tConss) attrExprs
272− case lefts eAttrs of
273− err:_ -> pure (Left err)
274− [] -> case M.member relVarName relvars of
275− True -> pure (Left (RelVarAlreadyDefinedError relVarName))
276− False -> setRelVar relVarName emptyRelation >> pure (Right ())
277− where
278− attrs = A.attributesFromList (rights eAttrs)
279− emptyRelation = Relation attrs emptyTupleSet
280−
281−evalDatabaseContextExpr (Undefine relVarName) = deleteRelVar relVarName
282−
283−evalDatabaseContextExpr (Assign relVarName expr) = do
284− -- in the future, it would be nice to get types from the RelationalExpr instead of needing to evaluate it
285− context <- getStateContext
286− let existingRelVar = M.lookup relVarName relVarTable
287− relVarTable = relationVariables context
288− value = runReader (evalRelationalExpr expr) (RelationalExprStateElems context)
289− case value of
290− Left err -> pure (Left err)
291− Right rel -> case existingRelVar of
292− Nothing -> setRelVar relVarName rel
293− Just existingRel -> let expectedAttributes = attributes existingRel
294− foundAttributes = attributes rel in
295− if A.attributesEqual expectedAttributes foundAttributes then
296− setRelVar relVarName rel
297− else
298− pure (Left (RelVarAssignmentTypeMismatchError expectedAttributes foundAttributes))
299−
300−evalDatabaseContextExpr (Insert relVarName relExpr) = do
301− context <- getStateContext
302− let unionexp = Union relExpr rv
303− rv = RelationVariable relVarName ()
304− unioned = runReader (evalRelationalExpr unionexp) (RelationalExprStateElems context)
305− origRel = runReader (evalRelationalExpr rv) (RelationalExprStateElems context)
306− case unioned of
307− Left err -> pure (Left err)
308− Right unioned' -> case origRel of
309− Left err -> pure (Left err)
310− Right origRel' -> if cardinality unioned' == cardinality origRel' then --no tuples actually inserted
311− pure (Right ())
312− else
313− evalDatabaseContextExpr $ Assign relVarName (ExistingRelation unioned')
314−
315−evalDatabaseContextExpr (Delete relVarName predicate) = do
257+ graph <- dbcGraph
258+ let eAttrs = runGraphRefRelationalExprM gfEnv (mapM evalGraphRefAttrExpr attrExprs)
259+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
260+ case eAttrs of
261+ Left err -> dbErr err
262+ Right attrsList -> do
263+ lift $ except $ validateAttributes tConss (A.attributesFromList attrsList)
264+ case M.member relVarName relvars of
265+ True -> dbErr (RelVarAlreadyDefinedError relVarName)
266+ False -> setRelVar relVarName (ExistingRelation emptyRelation)
267+ where
268+ attrs = A.attributesFromList attrsList
269+ emptyRelation = Relation attrs emptyTupleSet
270+
271+evalGraphRefDatabaseContextExpr (Undefine relVarName) = deleteRelVar relVarName
272+
273+evalGraphRefDatabaseContextExpr (Assign relVarName expr) = do
274+ graph <- re_graph <$> dbcRelationalExprEnv
316275 context <- getStateContext
317− let rv = RelationVariable relVarName ()
318− let updatedRel = runReader (evalRelationalExpr (Restrict (NotPredicate predicate) rv)) (RelationalExprStateElems context)
319− origRel = runReader (evalRelationalExpr rv) (RelationalExprStateElems context)
320− case updatedRel of
321− Left err -> pure (Left err)
322− Right updatedRel' -> case origRel of
323− Left err -> pure (Left err)
324− Right origRel' -> if cardinality origRel' == cardinality updatedRel' then
325− pure (Right ())
326− else
327− setRelVar relVarName updatedRel'
276+ let existingRelVar = M.lookup relVarName (relationVariables context)
277+ reEnv = freshGraphRefRelationalExprEnv (Just context) graph
278+ eNewExprType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr expr)
279+ case existingRelVar of
280+ Nothing -> do
281+ case runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr expr) of
282+ Left err -> dbErr err
283+ Right reltype -> do
284+ lift $ except $ validateAttributes (typeConstructorMapping context) (attributes reltype)
285+ setRelVar relVarName expr
286+ Just existingRel -> do
287+ let eExpectedType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr existingRel)
288+ case eExpectedType of
289+ Left err -> dbErr err
290+ Right expectedType ->
291+ case eNewExprType of
292+ Left err -> dbErr err
293+ Right newExprType -> do
294+ if newExprType == expectedType then do
295+ lift $ except $ validateAttributes (typeConstructorMapping context) (attributes newExprType)
296+ setRelVar relVarName expr
297+ else
298+ dbErr (RelationTypeMismatchError (attributes expectedType) (attributes newExprType))
328299
300+evalGraphRefDatabaseContextExpr (Insert relVarName relExpr) = do
301+ gfExpr <- relVarByName relVarName
302+ let optExpr = applyUnionCollapse (Union
303+ relExpr
304+ gfExpr)
305+ evalGraphRefDatabaseContextExpr (Assign relVarName optExpr)
306+
307+evalGraphRefDatabaseContextExpr (Delete relVarName predicate) = do
308+ gfExpr <- relVarByName relVarName
309+ let optExpr = applyRestrictionCollapse (Restrict (NotPredicate predicate) gfExpr)
310+ setRelVar relVarName optExpr
311+
329312--union of restricted+updated portion and the unrestricted+unupdated portion
330−evalDatabaseContextExpr (Update relVarName atomExprMap restrictionPredicateExpr) = do
313+evalGraphRefDatabaseContextExpr (Update relVarName atomExprMap pred') = do
314+ rvExpr <- relVarByName relVarName
315+ graph <- re_graph <$> dbcRelationalExprEnv
331316 context <- getStateContext
332− let relVarTable = relationVariables context
333− case M.lookup relVarName relVarTable of
334− Nothing -> pure (Left (RelVarNotDefinedError relVarName))
335− Just rel ->
336− case runReader (predicateRestrictionFilter (attributes rel) restrictionPredicateExpr) (RelationalExprStateElems context) of
337− Left err -> pure (Left err)
338− Right predicateFunc -> do
339− let ret = do
340− restrictedPortion <- restrict predicateFunc rel
341− if cardinality restrictedPortion == Finite 0 then
342− pure Nothing
343− else do
344− unrestrictedPortion <- restrict (predicateFunc >=> (pure . not)) rel
345− updatedPortion <- relMap (updateTupleWithAtomExprs atomExprMap context) restrictedPortion
346− updatedRel <- updatedPortion `union` unrestrictedPortion
347− pure (Just updatedRel)
348− case ret of
349− Left err -> pure (Left err)
350− Right Nothing -> pure (Right ())
351− Right (Just updatedRel) -> setRelVar relVarName updatedRel
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
324+ tmpAttr = tmpAttrC 1
325+ tmpAttrC :: Int -> AttributeName -> AttributeName
326+ tmpAttrC c attr =
327+ let tmpAttrName = "_tmp_" <> T.pack (show c) <> attr in
328+ if tmpAttrName `S.member` A.attributeNameSet (attributes exprType') then
329+ tmpAttrC (c+1) attr
330+ else
331+ tmpAttrName
332+ updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)
333+ projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)
334+ restrictedPortion = Restrict pred' rvExpr
335+ updated = foldr (\(oldname, atomExpr) accum ->
336+ let procAtomExpr = runProcessExprM UncommittedContextMarker (processAtomExpr atomExpr) in
337+ updateAttr oldname procAtomExpr accum
338+ ) restrictedPortion (M.toList atomExprMap)
339+ -- the atomExprMap could reference other attributes, so we must perform multi-pass folds
340+ updatedPortion = foldr projectAndRename updated (M.keys atomExprMap)
341+ setRelVar relVarName (Union unrestrictedPortion updatedPortion)
352342
353−evalDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do
343+evalGraphRefDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do
354344 currContext <- getStateContext
345+ transId <- dbcTransId
346+ graph <- dbcGraph
355347 let currDeps = inclusionDependencies currContext
356348 newDeps = M.insert newDepName newDep currDeps
357349 if M.member newDepName currDeps then
358− pure (Left (InclusionDependencyNameInUseError newDepName))
350+ dbErr (InclusionDependencyNameInUseError newDepName)
359351 else do
360352 let potentialContext = currContext { inclusionDependencies = newDeps }
361− case checkConstraints potentialContext of
362− Just err -> pure (Left err)
363− Nothing -> do
353+ -- if the potential context passes all constraints, then save it
354+ -- potential optimization: validate only the new constraint- all old constraints must already hold
355+ case checkConstraints potentialContext transId graph of
356+ Left err -> dbErr err
357+ Right _ ->
364358 putStateContext potentialContext
365− return (Right ())
366359
367−evalDatabaseContextExpr (RemoveInclusionDependency depName) = do
360+evalGraphRefDatabaseContextExpr (RemoveInclusionDependency depName) = do
368361 currContext <- getStateContext
369362 let currDeps = inclusionDependencies currContext
370363 newDeps = M.delete depName currDeps
371364 if M.notMember depName currDeps then
372− pure (Left (InclusionDependencyNameNotInUseError depName))
373− else do
365+ dbErr (InclusionDependencyNameNotInUseError depName)
366+ else
374367 putStateContext $ currContext {inclusionDependencies = newDeps }
375− return (Right ())
376368
377369-- | Add a notification which will send the resultExpr when triggerExpr changes between commits.
378−evalDatabaseContextExpr (AddNotification notName triggerExpr resultOldExpr resultNewExpr) = do
370+evalGraphRefDatabaseContextExpr (AddNotification notName triggerExpr resultOldExpr resultNewExpr) = do
379371 currentContext <- getStateContext
380372 let nots = notifications currentContext
381373 if M.member notName nots then
382− pure (Left (NotificationNameInUseError notName))
374+ dbErr (NotificationNameInUseError notName)
383375 else do
384376 let newNotifications = M.insert notName newNotification nots
385377 newNotification = Notification { changeExpr = triggerExpr,
386378 reportOldExpr = resultOldExpr,
387379 reportNewExpr = resultNewExpr}
388380 putStateContext $ currentContext { notifications = newNotifications }
389− return (Right ())
390381
391−evalDatabaseContextExpr (RemoveNotification notName) = do
382+evalGraphRefDatabaseContextExpr (RemoveNotification notName) = do
392383 currentContext <- getStateContext
393384 let nots = notifications currentContext
394385 if M.notMember notName nots then
395− pure (Left (NotificationNameNotInUseError notName))
386+ dbErr (NotificationNameNotInUseError notName)
396387 else do
397388 let newNotifications = M.delete notName nots
398389 putStateContext $ currentContext { notifications = newNotifications }
399− pure (Right ())
390+
400391
401392-- | Adds type and data constructors to the database context.
402393-- validate that the type *and* constructor names are unique! not yet implemented!
403−evalDatabaseContextExpr (AddTypeConstructor tConsDef dConsDefList) = do
394+evalGraphRefDatabaseContextExpr (AddTypeConstructor tConsDef dConsDefList) = do
404395 currentContext <- getStateContext
405396 let oldTypes = typeConstructorMapping currentContext
406397 tConsName = TCD.name tConsDef
407398 -- validate that the constructor's types exist
408− case validateTypeConstructorDef tConsDef dConsDefList of
409− errs@(_:_) -> pure (Left (someErrors errs))
410− [] | T.null tConsName || not (isUpper (T.head tConsName)) -> pure (Left (InvalidAtomTypeName tConsName))
411− | isJust (findTypeConstructor tConsName oldTypes) -> pure (Left (AtomTypeNameInUseError tConsName))
399+ case validateTypeConstructorDef tConsDef dConsDefList oldTypes of
400+ Left err -> throwError err
401+ Right () | T.null tConsName || not (isUpper (T.head tConsName)) -> dbErr (InvalidAtomTypeName tConsName)
402+ | isJust (findTypeConstructor tConsName oldTypes) -> dbErr (AtomTypeNameInUseError tConsName)
412403 | otherwise -> do
413404 let newTypes = oldTypes ++ [(tConsDef, dConsDefList)]
414405 putStateContext $ currentContext { typeConstructorMapping = newTypes }
415− pure (Right ())
416406
417407-- | Removing the atom constructor prevents new atoms of the type from being created. Existing atoms of the type remain. Thus, the atomTypes list in the DatabaseContext need not be all-inclusive.
418−evalDatabaseContextExpr (RemoveTypeConstructor tConsName) = do
408+evalGraphRefDatabaseContextExpr (RemoveTypeConstructor tConsName) = do
419409 currentContext <- getStateContext
420410 let oldTypes = typeConstructorMapping currentContext
421411 if isNothing (findTypeConstructor tConsName oldTypes) then
422− pure (Left (AtomTypeNameNotInUseError tConsName))
412+ dbErr (AtomTypeNameNotInUseError tConsName)
423413 else do
424414 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes
425415 putStateContext $ currentContext { typeConstructorMapping = newTypes }
426− pure (Right ())
427416
428−evalDatabaseContextExpr (MultipleExpr exprs) = do
417+evalGraphRefDatabaseContextExpr (MultipleExpr exprs) =
429418 --the multiple expressions must pass the same context around- not the old unmodified context
430− evald <- forM exprs evalDatabaseContextExpr
431− --some lifting magic needed here
432− case lefts evald of
433− [] -> pure (Right ())
434− errs -> pure (Left (someErrors errs))
435−
436−evalDatabaseContextExpr (RemoveAtomFunction funcName) = do
419+ mapM_ evalGraphRefDatabaseContextExpr exprs
420+
421+evalGraphRefDatabaseContextExpr (RemoveAtomFunction funcName) = do
437422 currentContext <- getStateContext
438423 let atomFuncs = atomFunctions currentContext
439424 case atomFunctionForName funcName atomFuncs of
440− Left err -> pure (Left err)
441− Right realFunc -> if isScriptedAtomFunction realFunc then do
442− let updatedFuncs = HS.delete realFunc atomFuncs
443− putStateContext (currentContext {atomFunctions = updatedFuncs })
444− pure (Right ())
445− else
446− pure (Left (PrecompiledFunctionRemoveError funcName))
425+ Left err -> dbErr err
426+ Right realFunc ->
427+ if isScriptedAtomFunction realFunc then do
428+ let updatedFuncs = HS.delete realFunc atomFuncs
429+ putStateContext (currentContext {atomFunctions = updatedFuncs })
430+ else
431+ dbErr (PrecompiledFunctionRemoveError funcName)
447432
448−evalDatabaseContextExpr (RemoveDatabaseContextFunction funcName) = do
433+evalGraphRefDatabaseContextExpr (RemoveDatabaseContextFunction funcName) = do
449434 context <- getStateContext
450435 let dbcFuncs = dbcFunctions context
451436 case databaseContextFunctionForName funcName dbcFuncs of
452− Left err -> pure (Left err)
453− Right realFunc -> if isScriptedDatabaseContextFunction realFunc then do
454− let updatedFuncs = HS.delete realFunc dbcFuncs
455− putStateContext (context { dbcFunctions = updatedFuncs })
456− pure (Right ())
457− else
458− pure (Left (PrecompiledFunctionRemoveError funcName))
437+ Left err -> dbErr err
438+ Right realFunc ->
439+ if isScriptedDatabaseContextFunction realFunc then do
440+ let updatedFuncs = HS.delete realFunc dbcFuncs
441+ putStateContext (context { dbcFunctions = updatedFuncs })
442+ else
443+ dbErr (PrecompiledFunctionRemoveError funcName)
459444
460−evalDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) = do
445+evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) = do
461446 context <- getStateContext
447+ graph <- dbcGraph
462448 --resolve atom arguments
463− let relExprState = mkRelationalExprState context
464− eAtomTypes = map (\atomExpr -> runReader (typeFromAtomExpr emptyAttributes atomExpr) relExprState) atomArgExprs
449+ let eAtomTypes = mapM (runGraphRefRelationalExprM gfEnv . typeForGraphRefAtomExpr emptyAttributes) atomArgExprs
465450 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)
451+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
466452 case eFunc of
467− Left err -> pure (Left err)
453+ Left err -> dbErr err
468454 Right func -> do
469455 let expectedArgCount = length (dbcFuncType func)
470456 actualArgCount = length atomArgExprs
471457 if expectedArgCount /= actualArgCount then
472− pure (Left (FunctionArgumentCountMismatchError expectedArgCount actualArgCount))
458+ dbErr (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
473459 else
474460 --check that the atom types are valid
475− case lefts eAtomTypes of
476− _:_ -> pure (Left (someErrors (lefts eAtomTypes)))
477− [] -> do
478− let atomTypes = rights eAtomTypes
479− let mValidTypes = map (\(expType, actType) -> case atomTypeVerify expType actType of
480− Left err -> Just err
481− Right _ -> Nothing) (zip (dbcFuncType func) atomTypes)
482− typeErrors = catMaybes mValidTypes
483− eAtomArgs = map (\arg -> runReader (evalAtomExpr emptyTuple arg) relExprState) atomArgExprs
461+ case eAtomTypes of
462+ Left err -> dbErr err
463+ Right atomTypes -> do
464+ let mValidTypes = zipWith (\ expType actType
465+ -> case atomTypeVerify expType actType of
466+ Left err -> Just err
467+ Right _ -> Nothing)
468+ (dbcFuncType func) atomTypes
469+ typeErrors = catMaybes mValidTypes
470+ eAtomArgs = map (runGraphRefRelationalExprM gfEnv . evalGraphRefAtomExpr emptyTuple) atomArgExprs
484471 if length (lefts eAtomArgs) > 1 then
485− pure (Left (someErrors (lefts eAtomArgs)))
472+ dbErr (someErrors (lefts eAtomArgs))
486473 else if not (null typeErrors) then
487− pure (Left (someErrors typeErrors))
474+ dbErr (someErrors typeErrors)
488475 else
489476 case evalDatabaseContextFunction func (rights eAtomArgs) context of
490− Left err -> pure (Left err)
491− Right newContext -> putStateContext newContext >> pure (Right ())
492−
493−evalDatabaseContextIOExpr :: Maybe ScriptSession -> DatabaseContext -> DatabaseContextIOExpr -> IO (Either RelationalError DatabaseContext)
494−evalDatabaseContextIOExpr mScriptSession currentContext (AddAtomFunction funcName funcType script) =
495− case mScriptSession of
496− Nothing -> pure (Left (ScriptError ScriptCompilationDisabledError))
497− Just scriptSession -> do
498− res <- try $ runGhc (Just libdir) $ do
477+ Left err -> dbErr err
478+ Right newContext -> putStateContext newContext
479+data DatabaseContextIOEvalEnv = DatabaseContextIOEvalEnv
480+ { dbcio_transId :: TransactionId,
481+ dbcio_graph :: TransactionGraph,
482+ dbcio_mScriptSession :: Maybe ScriptSession
483+ }
484+
485+type DatabaseContextIOEvalMonad a = RWST DatabaseContextIOEvalEnv () DatabaseContextEvalState IO a
486+
487+runDatabaseContextIOEvalMonad :: DatabaseContextIOEvalEnv -> DatabaseContext -> DatabaseContextIOEvalMonad (Either RelationalError ()) -> IO (Either RelationalError DatabaseContextEvalState)
488+runDatabaseContextIOEvalMonad env ctx m = do
489+ res <- runRWST m env freshState
490+ case res of
491+ (Left err,_,_) -> pure (Left err)
492+ (Right (),s,_) -> pure (Right s)
493+ where
494+ freshState = mkDatabaseContextEvalState ctx
495+
496+requireScriptSession :: DatabaseContextIOEvalMonad (Either RelationalError ScriptSession)
497+requireScriptSession = do
498+ env <- RWS.ask
499+ case dbcio_mScriptSession env of
500+ Nothing -> pure $ Left $ ScriptError ScriptCompilationDisabledError
501+ Just ss -> pure (Right ss)
502+
503+putDBCIOContext :: DatabaseContext -> DatabaseContextIOEvalMonad (Either RelationalError ())
504+putDBCIOContext ctx = do
505+ RWS.modify (\dbstate -> dbstate { dbc_context = ctx})
506+ pure (Right ())
507+
508+getDBCIOContext :: DatabaseContextIOEvalMonad DatabaseContext
509+getDBCIOContext = dbc_context <$> RWS.get
510+
511+getDBCIORelationalExprEnv :: DatabaseContextIOEvalMonad RelationalExprEnv
512+getDBCIORelationalExprEnv = do
513+ context <- getDBCIOContext
514+ mkRelationalExprEnv context . dbcio_graph <$> RWS.ask
515+
516+evalGraphRefDatabaseContextIOExpr :: GraphRefDatabaseContextIOExpr -> DatabaseContextIOEvalMonad (Either RelationalError ())
517+#if !defined(PM36_HASKELL_SCRIPTING)
518+evalGraphRefDatabaseContextIOExpr AddAtomFunction{} = pure (Left (ScriptError ScriptCompilationDisabledError))
519+evalGraphRefDatabaseContextIOExpr AddDatabaseContextFunction{} = pure (Left (ScriptError ScriptCompilationDisabledError))
520+evalGraphRefDatabaseContextIOExpr LoadAtomFunctions{} = pure (Left (ScriptError ScriptCompilationDisabledError))
521+evalGraphRefDatabaseContextIOExpr LoadDatabaseContextFunctions{} = pure (Left (ScriptError ScriptCompilationDisabledError))
522+#else
523+evalGraphRefDatabaseContextIOExpr (AddAtomFunction funcName funcType script) = do
524+ eScriptSession <- requireScriptSession
525+ currentContext <- getDBCIOContext
526+ case eScriptSession of
527+ Left err -> pure (Left err)
528+ Right scriptSession -> do
529+ res <- liftIO $ try $ runGhc (Just libdir) $ do
499530 setSession (hscEnv scriptSession)
500531 let atomFuncs = atomFunctions currentContext
501532 case extractAtomFunctionType funcType of
@@ -506,7 +537,7 @@ evalDatabaseContextIOExpr mScriptSession currentContext (AddAtomFunction funcNam
506537 pure $ case eCompiledFunc of
507538 Left err -> Left (ScriptError err)
508539 Right compiledFunc -> do
509− funcAtomType <- mapM (\funcTypeArg -> atomTypeForTypeConstructor funcTypeArg (typeConstructorMapping currentContext) M.empty) adjustedAtomTypeCons
540+ funcAtomType <- mapM (\funcTypeArg -> atomTypeForTypeConstructorValidate False funcTypeArg (typeConstructorMapping currentContext) M.empty) adjustedAtomTypeCons
510541 let updatedFuncs = HS.insert newAtomFunc atomFuncs
511542 newContext = currentContext { atomFunctions = updatedFuncs }
512543 newAtomFunc = AtomFunction { atomFuncName = funcName,
@@ -521,12 +552,13 @@ evalDatabaseContextIOExpr mScriptSession currentContext (AddAtomFunction funcNam
521552 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
522553 Right eContext -> case eContext of
523554 Left err -> pure (Left err)
524− Right context' -> pure (Right context')
525−
526−evalDatabaseContextIOExpr mScriptSession currentContext (AddDatabaseContextFunction funcName funcType script) =
527− case mScriptSession of
528− Nothing -> pure (Left (ScriptError ScriptCompilationDisabledError))
529− Just scriptSession -> do
555+ Right context' -> putDBCIOContext context'
556+evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType script) = do
557+ eScriptSession <- requireScriptSession
558+ currentContext <- getDBCIOContext
559+ case eScriptSession of
560+ Left err -> pure (Left err)
561+ Right scriptSession -> do
530562 --validate that the function signature is of the form x -> y -> ... -> DatabaseContext -> DatabaseContext
531563 let last2Args = reverse (take 2 (reverse funcType))
532564 atomArgs = take (length funcType - 2) funcType
@@ -536,7 +568,7 @@ evalDatabaseContextIOExpr mScriptSession currentContext (AddDatabaseContextFunct
536568 if last2Args /= [ADTypeConstructor "DatabaseContext" [], dbContextTypeCons] then
537569 pure (Left (ScriptError (TypeCheckCompilationError expectedType actualType)))
538570 else do
539− res <- try $ runGhc (Just libdir) $ do
571+ res <- liftIO $ try $ runGhc (Just libdir) $ do
540572 setSession (hscEnv scriptSession)
541573 eCompiledFunc <- compileScript (dbcFunctionBodyType scriptSession) script
542574 pure $ case eCompiledFunc of
@@ -561,123 +593,170 @@ evalDatabaseContextIOExpr mScriptSession currentContext (AddDatabaseContextFunct
561593 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
562594 Right eContext -> case eContext of
563595 Left err -> pure (Left err)
564− Right context' -> pure (Right context')
565−
566−
567−updateTupleWithAtomExprs :: M.Map AttributeName AtomExpr -> DatabaseContext -> RelationTuple -> Either RelationalError RelationTuple
568−updateTupleWithAtomExprs exprMap context tupIn = do
569− --resolve all atom exprs
570− atomsAssoc <- mapM (\(attrName, atomExpr) -> do
571− atom <- runReader (evalAtomExpr tupIn atomExpr) (RelationalExprStateElems context)
572− pure (attrName, atom)
573− ) (M.toList exprMap)
574− pure (updateTupleWithAtoms (M.fromList atomsAssoc) tupIn)
596+ Right context' -> putDBCIOContext context'
597+evalGraphRefDatabaseContextIOExpr (LoadAtomFunctions modName funcName modPath) = do
598+ currentContext <- getDBCIOContext
599+ eLoadFunc <- liftIO $ loadAtomFunctions (T.unpack modName) (T.unpack funcName) modPath
600+ case eLoadFunc of
601+ Left LoadSymbolError -> pure (Left LoadFunctionError)
602+ Right atomFunctionListFunc -> let newContext = currentContext { atomFunctions = mergedFuncs }
603+ mergedFuncs = HS.union (atomFunctions currentContext) (HS.fromList atomFunctionListFunc)
604+ in putDBCIOContext newContext
605+evalGraphRefDatabaseContextIOExpr (LoadDatabaseContextFunctions modName funcName modPath) = do
606+ currentContext <- getDBCIOContext
607+ eLoadFunc <- liftIO $ loadDatabaseContextFunctions (T.unpack modName) (T.unpack funcName) modPath
608+ case eLoadFunc of
609+ Left LoadSymbolError -> pure (Left LoadFunctionError)
610+ Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }
611+ mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)
612+ in putDBCIOContext newContext
613+#endif
614+evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs range) = do
615+ --Define
616+ currentContext <- getDBCIOContext
617+ env <- RWS.ask
618+ --create graph ref expr
619+ let gfExpr = Define relVarName attrExprs
620+ evalEnv = mkDatabaseContextEvalEnv (dbcio_transId env) (dbcio_graph env)
621+ graph = dbcio_graph env
622+ case runDatabaseContextEvalMonad currentContext evalEnv (evalGraphRefDatabaseContextExpr gfExpr) of
623+ Left err -> pure (Left err)
624+ Right dbstate -> do
625+ --Assign
626+ let existingRelVar = M.lookup relVarName relVarTable
627+ relVarTable = relationVariables (dbc_context dbstate)
628+ case existingRelVar of
629+ Nothing -> pure $ Left (RelVarNotDefinedError relVarName)
630+ Just existingRel -> do
631+ let gfEnv = freshGraphRefRelationalExprEnv (Just currentContext) graph
632+ case runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr existingRel) of
633+ Left err -> pure (Left err)
634+ Right relType -> do
635+ let expectedAttributes = attributes relType
636+ tcMap = typeConstructorMapping (dbc_context dbstate)
637+ eitherRel <- liftIO $ generate $ runReaderT (arbitraryRelation expectedAttributes range) tcMap
638+ case eitherRel of
639+ Left err -> pure $ Left err
640+ Right rel ->
641+ case runDatabaseContextEvalMonad currentContext evalEnv (setRelVar relVarName (ExistingRelation rel)) of
642+ Left err -> pure (Left err)
643+ Right dbstate' -> putDBCIOContext (dbc_context dbstate')
575644
576645--run verification on all constraints
577−checkConstraints :: DatabaseContext -> Maybe RelationalError
578−checkConstraints context = case failures of
579− [] -> Nothing
580− l:_ -> Just l
646+checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()
647+checkConstraints context transId graph@(TransactionGraph graphHeads transSet) = do
648+ mapM_ (uncurry checkIncDep) (M.toList deps)
581649 where
582− failures = M.elems $ M.mapMaybeWithKey checkIncDep deps
650+ potentialGraph = TransactionGraph graphHeads (S.insert tempTrans transSet)
651+ tempStamp = UTCTime { utctDay = fromGregorian 2000 1 1,
652+ utctDayTime = secondsToDiffTime 0 }
653+ tempSchemas = Schemas context M.empty
654+ tempTrans = Transaction U.nil tempTransInfo tempSchemas
655+ tempTransInfo = TransactionInfo { parents = transId NE.:| [],
656+ stamp = tempStamp,
657+ merkleHash = mempty
658+ }
659+
583660 deps = inclusionDependencies context
584− eval expr = runReader (evalRelationalExpr expr) (RelationalExprStateElems 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
585662 checkIncDep depName (InclusionDependency subsetExpr supersetExpr) = do
586− let checkExpr = Equals supersetExpr (Union subsetExpr supersetExpr)
587− case eval checkExpr of
588− Left err -> Just err
663+ let process = runProcessExprM UncommittedContextMarker
664+ gfSubsetExpr = process (processRelationalExpr subsetExpr)
665+ gfSupersetExpr = process (processRelationalExpr supersetExpr)
666+ --if both expressions are of a single-attribute (such as with a simple foreign key), the names of the attributes are irrelevant (they need not match) because the expression is unambiguous, but special-casing this to rename the attribute automatically would not be orthogonal behavior and probably cause confusion. Instead, special case the error to make it clear.
667+ let gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
668+ runGfRel = runGraphRefRelationalExprM gfEnv
669+ typeSub <- runGfRel (typeForGraphRefRelationalExpr gfSubsetExpr)
670+ typeSuper <- runGfRel (typeForGraphRefRelationalExpr gfSupersetExpr)
671+ when (typeSub /= typeSuper) (Left (RelationTypeMismatchError (attributes typeSub) (attributes typeSuper)))
672+ let checkExpr = Equals gfSupersetExpr (Union gfSubsetExpr gfSupersetExpr)
673+ gfEvald = runGraphRefRelationalExprM gfEnv' (evalGraphRefRelationalExpr checkExpr)
674+ gfEnv' = freshGraphRefRelationalExprEnv (Just context) potentialGraph
675+ case gfEvald of
676+ Left err -> Left err
589677 Right resultRel -> if resultRel == relationTrue then
590− Nothing
678+ pure ()
591679 else
592− Just $ InclusionDependencyCheckError depName
680+ Left (InclusionDependencyCheckError depName)
593681
594682-- the type of a relational expression is equal to the relation attribute set returned from executing the relational expression; therefore, the type can be cheaply derived by evaluating a relational expression and ignoring and tuple processing
595683-- furthermore, the type of a relational expression is the resultant header of the evaluated empty-tupled relation
596684
597−typeForRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError Relation)
685+typeForRelationalExpr :: RelationalExpr -> RelationalExprM Relation
598686typeForRelationalExpr expr = do
599− rstate <- ask
600− let context = stateElemsContext rstate
601687 --replace the relationVariables context element with a cloned set of relation devoid of tuples
602− let context' = contextWithEmptyTupleSets context
603− rstate' = setStateElemsContext rstate context'
604− pure (runReader (evalRelationalExpr expr) rstate')
605−
606−--returns a database context with all tuples removed
607−--this is useful for type checking and optimization
608−contextWithEmptyTupleSets :: DatabaseContext -> DatabaseContext
609−contextWithEmptyTupleSets contextIn = contextIn { relationVariables = relVars }
610− where
611− relVars = M.map (\rel -> Relation (attributes rel) emptyTupleSet) (relationVariables contextIn)
688+ --evalRelationalExpr could still return an existing relation with tuples, so strip them
689+ graph <- reGraph
690+ context <- reContext
691+ let gfExpr = runProcessExprM UncommittedContextMarker (processRelationalExpr expr)
692+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
693+ runGf = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
694+ lift $ except runGf
612695
613696liftE :: (Monad m) => m (Either a b) -> ExceptT a m b
614697liftE v = do
615698 y <- lift v
616699 case y of
617− Left err -> throwE err
700+ Left err -> throwError err
618701 Right val -> pure val
619702
620703{- used for restrictions- take the restrictionpredicate and return the corresponding filter function -}
621−predicateRestrictionFilter :: Attributes -> RestrictionPredicateExpr -> RelationalExprState (Either RelationalError RestrictionFilter)
622−predicateRestrictionFilter attrs (AndPredicate expr1 expr2) =
623− runExceptT $ do
624− expr1v <- liftE (predicateRestrictionFilter attrs expr1)
625− expr2v <- liftE (predicateRestrictionFilter attrs expr2)
626− pure (\x -> do
627− ev1 <- expr1v x
628− ev2 <- expr2v x
629− pure (ev1 && ev2))
704+predicateRestrictionFilter :: Attributes -> GraphRefRestrictionPredicateExpr -> GraphRefRelationalExprM RestrictionFilter
705+predicateRestrictionFilter attrs (AndPredicate expr1 expr2) = do
706+ expr1v <- predicateRestrictionFilter attrs expr1
707+ expr2v <- predicateRestrictionFilter attrs expr2
708+ pure (\x -> do
709+ ev1 <- expr1v x
710+ ev2 <- expr2v x
711+ pure (ev1 && ev2))
630712
631−predicateRestrictionFilter attrs (OrPredicate expr1 expr2) =
632− runExceptT $ do
633− expr1v <- liftE (predicateRestrictionFilter attrs expr1)
634− expr2v <- liftE (predicateRestrictionFilter attrs expr2)
713+predicateRestrictionFilter attrs (OrPredicate expr1 expr2) = do
714+ expr1v <- predicateRestrictionFilter attrs expr1
715+ expr2v <- predicateRestrictionFilter attrs expr2
635716 pure (\x -> do
636717 ev1 <- expr1v x
637718 ev2 <- expr2v x
638719 pure (ev1 || ev2))
639720
640−predicateRestrictionFilter _ TruePredicate = pure (Right (\_ -> pure True))
721+predicateRestrictionFilter _ TruePredicate = pure (\_ -> pure True)
641722
642−predicateRestrictionFilter attrs (NotPredicate expr) =
643− runExceptT $ do
644− exprv <- liftE (predicateRestrictionFilter attrs expr)
645− pure (\x -> do
646− ev <- exprv x
647− pure (not ev))
723+predicateRestrictionFilter attrs (NotPredicate expr) = do
724+ exprv <- predicateRestrictionFilter attrs expr
725+ pure (fmap not . exprv)
648726
649727--optimization opportunity: if the subexpression does not reference attributes in the top-level expression, then it need only be evaluated once, statically, outside the tuple filter- see historical implementation here
650728predicateRestrictionFilter _ (RelationalExprPredicate relExpr) = do
651− rstate <- ask
652− pure (Right (\tup -> case runReader (evalRelationalExpr relExpr) (mergeTuplesIntoRelationalExprState tup rstate) of
729+ renv <- askEnv
730+ let eval :: RelationTuple -> Either RelationalError Relation
731+ eval tup =
732+ let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tup renv in
733+ runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr relExpr)
734+ pure (\tup -> case eval tup of
653735 Left err -> Left err
654736 Right rel -> if arity rel /= 0 then
655737 Left (PredicateExpressionError "Relational restriction filter must evaluate to 'true' or 'false'")
656738 else
657− pure (rel == relationTrue)))
739+ pure (rel == relationTrue))
658740
659741predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr) = do
660− rstate <- ask
661− let (attrs', ctxtup') = case rstate of
662− RelationalExprStateElems _ -> (attrs, emptyTuple)
663− RelationalExprStateAttrsElems _ _ -> (attrs, emptyTuple)
664− RelationalExprStateTupleElems _ ctxtup -> (A.union attrs (tupleAttributes ctxtup), ctxtup)
665− runExceptT $ do
666− atomExprType <- liftE (typeFromAtomExpr attrs' atomExpr)
667− attr <- either throwE pure $ case A.attributeForName attrName attrs of
742+ env <- askEnv
743+ let attrs' = A.union attrs (envAttributes env)
744+ ctxtup' = envTuple env
745+ atomExprType <- typeForGraphRefAtomExpr attrs' atomExpr
746+ attr <- lift $ except $ case A.attributeForName attrName attrs of
668747 Right attr -> Right attr
669748 Left (NoSuchAttributeNamesError _) -> case A.attributeForName attrName (tupleAttributes ctxtup') of
670749 Right ctxattr -> Right ctxattr
671750 Left err2@(NoSuchAttributeNamesError _) -> Left err2
672751 Left err -> Left err
673752 Left err -> Left err
674− if atomExprType /= A.atomType attr then
675− throwE (TupleAttributeTypeMismatchError (A.attributesFromList [attr]))
676− else
753+ if atomExprType /= A.atomType attr then
754+ throwError (TupleAttributeTypeMismatchError (A.attributesFromList [attr]))
755+ else
677756 pure $ \tupleIn -> let evalAndCmp atomIn = case atomEvald of
678757 Right atomCmp -> atomCmp == atomIn
679758 Left _ -> False
680− atomEvald = runReader (evalAtomExpr tupleIn atomExpr) rstate
759+ atomEvald = runGraphRefRelationalExprM env (evalGraphRefAtomExpr tupleIn atomExpr)
681760 in
682761 pure $ case atomForAttributeName attrName tupleIn of
683762 Left (NoSuchAttributeNamesError _) -> case atomForAttributeName attrName ctxtup' of
@@ -688,244 +767,626 @@ predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr)
688767-- in the future, it would be useful to do typechecking on the attribute and atom expr filters in advance
689768predicateRestrictionFilter attrs (AtomExprPredicate atomExpr) = do
690769 --merge attrs into the state attributes
691− rstate <- ask
692− runExceptT $ do
693− aType <- liftE (typeFromAtomExpr attrs atomExpr)
694− if aType /= BoolAtomType then
695− throwE (AtomTypeMismatchError aType BoolAtomType)
696− else
770+ renv <- askEnv
771+ aType <- typeForGraphRefAtomExpr attrs atomExpr
772+ if aType /= BoolAtomType then
773+ throwError (AtomTypeMismatchError aType BoolAtomType)
774+ else
697775 pure (\tupleIn ->
698− pure $ case runReader (evalAtomExpr tupleIn atomExpr) rstate of
699− Left _ -> False
700− Right boolAtomValue -> boolAtomValue == BoolAtom True)
776+ case runGraphRefRelationalExprM renv (evalGraphRefAtomExpr tupleIn atomExpr) of
777+ Left err -> Left err
778+ Right boolAtomValue -> pure (boolAtomValue == BoolAtom True))
701779
702780tupleExprCheckNewAttrName :: AttributeName -> Relation -> Either RelationalError Relation
703781tupleExprCheckNewAttrName attrName rel = if isRight (attributeForName attrName rel) then
704− Left (error "SPAMMIT" $ AttributeNameInUseError attrName)
782+ Left (AttributeNameInUseError attrName)
705783 else
706784 Right rel
707785
708−extendTupleExpressionProcessor :: Relation -> ExtendTupleExpr -> RelationalExprState (Either RelationalError (Attributes, RelationTuple -> Either RelationalError RelationTuple))
709−extendTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) = do
710− rstate <- ask
786+extendGraphRefTupleExpressionProcessor :: Relation -> GraphRefExtendTupleExpr -> GraphRefRelationalExprM (Attributes, RelationTuple -> Either RelationalError RelationTuple)
787+extendGraphRefTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) =
788+-- renv <- askEnv
711789 -- check that the attribute name is not in use
712790 case tupleExprCheckNewAttrName newAttrName relIn of
713− Left err -> pure (Left err)
714− Right _ -> runExceptT $ do
715− atomExprType <- liftE (typeFromAtomExpr (attributes relIn) atomExpr)
716− atomExprType' <- liftE (verifyAtomExprTypes relIn atomExpr atomExprType)
791+ Left err -> throwError err
792+ Right _ -> do
793+ atomExprType <- typeForGraphRefAtomExpr (attributes relIn) atomExpr
794+ atomExprType' <- verifyGraphRefAtomExprTypes relIn atomExpr atomExprType
717795 let newAttrs = A.attributesFromList [Attribute newAttrName atomExprType']
718796 newAndOldAttrs = A.addAttributes (attributes relIn) newAttrs
719− pure (newAndOldAttrs, \tup -> let substate = mergeTuplesIntoRelationalExprState tup rstate in case runReader (evalAtomExpr tup atomExpr) substate of
720− Left err -> Left err
721− Right atom -> Right (tupleAtomExtend newAttrName atom tup)
797+ env <- ask
798+ pure (newAndOldAttrs, \tup -> do
799+ let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tup env
800+ atom <- runGraphRefRelationalExprM gfEnv (evalGraphRefAtomExpr tup atomExpr)
801+ Right (tupleAtomExtend newAttrName atom tup)
722802 )
723803
724−evalAtomExpr :: RelationTuple -> AtomExpr -> RelationalExprState (Either RelationalError Atom)
725−evalAtomExpr tupIn (AttributeAtomExpr attrName) = case atomForAttributeName attrName tupIn of
726− Right atom -> pure (Right atom)
727− err@(Left (NoSuchAttributeNamesError _)) -> do
728− rstate <- ask
729− case rstate of
730− RelationalExprStateElems _ -> pure err
731− RelationalExprStateAttrsElems _ _ -> pure err
732− RelationalExprStateTupleElems _ ctxtup -> pure (atomForAttributeName attrName ctxtup)
733− Left err -> pure (Left err)
734−evalAtomExpr _ (NakedAtomExpr atom) = pure (Right atom)
735−evalAtomExpr tupIn (FunctionAtomExpr funcName arguments ()) = do
736− argTypes <- mapM (typeFromAtomExpr (tupleAttributes tupIn)) arguments
737− context <- fmap stateElemsContext ask
738− runExceptT $ do
739− let functions = atomFunctions context
740− func <- either throwE pure (atomFunctionForName funcName functions)
741− let expectedArgCount = length (atomFuncType func) - 1
742− actualArgCount = length argTypes
743− safeInit [_] = []
744− safeInit [] = [] -- different behavior from normal init
745− safeInit (_:xs) = safeInit xs
746− if expectedArgCount /= actualArgCount then
747− throwE (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
748− else do
749− mapM_ (\(expType, actType) -> either throwE pure (atomTypeVerify expType actType)) (safeInit (zip (atomFuncType func) argTypes))
750− evaldArgs <- mapM (liftE . evalAtomExpr tupIn) arguments
804+evalGraphRefAtomExpr :: RelationTuple -> GraphRefAtomExpr -> GraphRefRelationalExprM Atom
805+evalGraphRefAtomExpr tupIn (AttributeAtomExpr attrName) =
806+ case atomForAttributeName attrName tupIn of
807+ Right atom -> pure atom
808+ Left err@(NoSuchAttributeNamesError _) -> do
809+ env <- askEnv
810+ case gre_extra env of
811+ Nothing -> throwError err
812+ Just (Left ctxtup) -> lift $ except $ atomForAttributeName attrName ctxtup
813+ Just (Right _) -> throwError err
814+ Left err -> throwError err
815+evalGraphRefAtomExpr _ (NakedAtomExpr atom) = pure atom
816+evalGraphRefAtomExpr tupIn (FunctionAtomExpr funcName arguments tid) = do
817+ argTypes <- mapM (typeForGraphRefAtomExpr (tupleAttributes tupIn)) arguments
818+ context <- gfDatabaseContextForMarker tid
819+ let functions = atomFunctions context
820+ func <- lift $ except (atomFunctionForName funcName functions)
821+ let expectedArgCount = length (atomFuncType func) - 1
822+ actualArgCount = length argTypes
823+ safeInit [] = [] -- different behavior from normal init
824+ safeInit xs = init xs
825+ if expectedArgCount /= actualArgCount then
826+ throwError (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
827+ else do
828+ let zippedArgs = zip (safeInit (atomFuncType func)) argTypes
829+ mapM_ (\(expType, actType) ->
830+ lift $ except (atomTypeVerify expType actType)) zippedArgs
831+ evaldArgs <- mapM (evalGraphRefAtomExpr tupIn) arguments
751832 case evalAtomFunction func evaldArgs of
752− Left err -> throwE (AtomFunctionUserError err)
833+ Left err -> throwError (AtomFunctionUserError err)
753834 Right result -> do
754835 --validate that the result matches the expected type
755− _ <- either throwE pure (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
836+ _ <- lift $ except (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
756837 pure result
757−evalAtomExpr tupIn (RelationAtomExpr relExpr) = do
838+evalGraphRefAtomExpr tupIn (RelationAtomExpr relExpr) = do
758839 --merge existing state tuple context into new state tuple context to support an arbitrary number of levels, but new attributes trounce old attributes
759− rstate <- ask
760− runExceptT $ do
761− let newState = mergeTuplesIntoRelationalExprState tupIn rstate
762− relAtom <- either throwE pure (runReader (evalRelationalExpr relExpr) newState)
763− pure (RelationAtom relAtom)
764−evalAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs ()) = runExceptT $ do
765− rstate <- lift ask
766− let newState = mergeTuplesIntoRelationalExprState tupIn rstate
767− aType <- either throwE pure (runReader (typeFromAtomExpr (tupleAttributes tupIn) cons) newState)
768− argAtoms <- mapM (\arg -> either throwE pure (runReader (evalAtomExpr tupIn arg) newState)) dConsArgs
840+ env <- ask
841+ let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tupIn env
842+ relAtom <- lift $ except $ runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr relExpr)
843+ pure (RelationAtom relAtom)
844+evalGraphRefAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs _) = do --why is the tid unused here? suspicious
845+ let mergeEnv = mergeTuplesIntoGraphRefRelationalExprEnv tupIn
846+ aType <- local mergeEnv (typeForGraphRefAtomExpr (tupleAttributes tupIn) cons)
847+ argAtoms <- local mergeEnv $
848+ mapM (evalGraphRefAtomExpr tupIn) dConsArgs
769849 pure (ConstructedAtom dConsName aType argAtoms)
770850
771−typeFromAtomExpr :: Attributes -> AtomExpr -> RelationalExprState (Either RelationalError AtomType)
772−typeFromAtomExpr attrs (AttributeAtomExpr attrName) = do
773− rstate <- ask
851+typeForGraphRefAtomExpr :: Attributes -> GraphRefAtomExpr -> GraphRefRelationalExprM AtomType
852+typeForGraphRefAtomExpr attrs (AttributeAtomExpr attrName) = do
853+ renv <- askEnv
774854 case A.atomTypeForAttributeName attrName attrs of
775− Right aType -> pure (Right aType)
776− Left err@(NoSuchAttributeNamesError _) -> case rstate of
777− RelationalExprStateAttrsElems _ attrs' -> case A.attributeForName attrName attrs' of
778− Left err' -> pure (Left err')
779− Right attr -> pure (Right (A.atomType attr))
780− RelationalExprStateElems _ -> pure (Left err)
781− RelationalExprStateTupleElems _ tup -> case atomForAttributeName attrName tup of
782− Left err' -> pure (Left err')
783− Right atom -> pure (Right (atomTypeForAtom atom))
784− Left err -> pure (Left err)
785−typeFromAtomExpr _ (NakedAtomExpr atom) = pure (Right (atomTypeForAtom atom))
786−typeFromAtomExpr attrs (FunctionAtomExpr funcName atomArgs _) = do
787− context <- fmap stateElemsContext ask
788− let funcs = atomFunctions context
855+ Right aType -> pure aType
856+ Left err@(NoSuchAttributeNamesError _) ->
857+ let envTup = envTuple renv
858+ envAttrs = envAttributes renv in
859+ case A.attributeForName attrName envAttrs of
860+ Right attr -> pure (A.atomType attr)
861+ Left _ -> case atomForAttributeName attrName envTup of
862+ Right atom -> pure (atomTypeForAtom atom)
863+ Left _ -> --throwError (traceStack (show ("typeForGRAtomExpr", attrs, envTup)) err)
864+ throwError err
865+ Left err -> throwError err
866+
867+typeForGraphRefAtomExpr _ (NakedAtomExpr atom) = pure (atomTypeForAtom atom)
868+typeForGraphRefAtomExpr attrs (FunctionAtomExpr funcName atomArgs transId) = do
869+ funcs <- atomFunctions <$> gfDatabaseContextForMarker transId
789870 case atomFunctionForName funcName funcs of
790− Left err -> pure (Left err)
871+ Left err -> throwError err
791872 Right func -> do
792873 let funcRetType = last (atomFuncType func)
793874 funcArgTypes = init (atomFuncType func)
794− eArgTypes <- mapM (typeFromAtomExpr attrs) atomArgs
795− case lefts eArgTypes of
796− errs@(_:_) -> pure (Left (someErrors errs))
797− [] -> do
798− let eTvMap = resolveTypeVariables funcArgTypes argTypes
799− argTypes = rights eArgTypes
800− case eTvMap of
801− Left err -> pure (Left err)
802− Right tvMap -> pure (resolveFunctionReturnValue funcName tvMap funcRetType)
803−typeFromAtomExpr attrs (RelationAtomExpr relExpr) = runExceptT $ do
804− rstate <- lift ask
805− relType <- either throwE pure (runReader (typeForRelationalExpr relExpr) (mergeAttributesIntoRelationalExprState attrs rstate))
875+ argTypes <- mapM (typeForGraphRefAtomExpr attrs) atomArgs
876+ let eTvMap = resolveTypeVariables funcArgTypes argTypes
877+ case eTvMap of
878+ Left err -> throwError err
879+ Right tvMap -> lift $ except $ resolveFunctionReturnValue funcName tvMap funcRetType
880+typeForGraphRefAtomExpr attrs (RelationAtomExpr relExpr) = do
881+ relType <- R.local (mergeAttributesIntoGraphRefRelationalExprEnv attrs) (typeForGraphRefRelationalExpr relExpr)
806882 pure (RelationAtomType (attributes relType))
807883-- grab the type of the data constructor, then validate that the args match the expected types
808−typeFromAtomExpr attrs (ConstructedAtomExpr dConsName dConsArgs _) =
809− runExceptT $ do
810− argsTypes <- mapM (liftE . typeFromAtomExpr attrs) dConsArgs
811− context <- fmap stateElemsContext (lift ask)
812− aType <- either throwE pure (atomTypeForDataConstructor (typeConstructorMapping context) dConsName argsTypes)
813− pure aType
884+typeForGraphRefAtomExpr attrs (ConstructedAtomExpr dConsName dConsArgs tid) =
885+ do
886+ argsTypes <- mapM (typeForGraphRefAtomExpr attrs) dConsArgs
887+ tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker tid
888+ lift $ except $ atomTypeForDataConstructor tConsMap dConsName argsTypes
814889
815890-- | Validate that the type of the AtomExpr matches the expected type.
816−verifyAtomExprTypes :: Relation -> AtomExpr -> AtomType -> RelationalExprState (Either RelationalError AtomType)
817−verifyAtomExprTypes relIn (AttributeAtomExpr attrName) expectedType = runExceptT $ do
818− rstate <- lift ask
891+verifyGraphRefAtomExprTypes :: Relation -> GraphRefAtomExpr -> AtomType -> GraphRefRelationalExprM AtomType
892+verifyGraphRefAtomExprTypes relIn (AttributeAtomExpr attrName) expectedType = do
893+ env <- askEnv
819894 case A.atomTypeForAttributeName attrName (attributes relIn) of
820− Right aType -> either throwE pure (atomTypeVerify expectedType aType)
821− (Left err@(NoSuchAttributeNamesError _)) -> case rstate of
822− RelationalExprStateTupleElems _ _ -> throwE err
823− RelationalExprStateElems _ -> throwE err
824− RelationalExprStateAttrsElems _ attrs -> case A.attributeForName attrName attrs of
825− Left err' -> throwE err'
826− Right attrType -> either throwE pure (atomTypeVerify expectedType (A.atomType attrType))
827− Left err -> throwE err
828−verifyAtomExprTypes _ (NakedAtomExpr atom) expectedType = pure (atomTypeVerify expectedType (atomTypeForAtom atom))
829−verifyAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs _) expectedType = do
830− rstate <- ask
895+ Right aType -> lift $ except $ atomTypeVerify expectedType aType
896+ (Left err@(NoSuchAttributeNamesError _)) ->
897+ let attrs' = envAttributes env in
898+ if attrs' == emptyAttributes then
899+ throwError err
900+ else
901+ case A.attributeForName attrName attrs' of
902+ Left err' -> throwError err'
903+ Right attrType -> lift $ except $ atomTypeVerify expectedType (A.atomType attrType)
904+ Left err -> throwError err
905+
906+verifyGraphRefAtomExprTypes _ (NakedAtomExpr atom) expectedType =
907+ lift $ except $ atomTypeVerify expectedType (atomTypeForAtom atom)
908+verifyGraphRefAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs tid) expectedType = do
909+ context <- gfDatabaseContextForMarker tid
831910 let functions = atomFunctions context
832− context = stateElemsContext rstate
833− runExceptT $ do
834− func <- either throwE pure (atomFunctionForName funcName functions)
835− let expectedArgTypes = atomFuncType func
836− funcArgTypes <- mapM (\(atomExpr,expectedType2,argCount) -> case runReader (verifyAtomExprTypes relIn atomExpr expectedType2) rstate of
837− Left (AtomTypeMismatchError expSubType actSubType) -> throwE (AtomFunctionTypeError funcName argCount expSubType actSubType)
838− Left err -> throwE err
839− Right x -> pure x
840− ) $ zip3 funcArgExprs expectedArgTypes [1..]
841− if length funcArgTypes /= length expectedArgTypes - 1 then
842− throwE (AtomTypeCountError funcArgTypes expectedArgTypes)
911+ func <- lift $ except $ atomFunctionForName funcName functions
912+ let expectedArgTypes = atomFuncType func
913+ funcArgVerifier (atomExpr, expectedType2, argCount) = do
914+ let handler :: RelationalError -> GraphRefRelationalExprM AtomType
915+ handler (AtomTypeMismatchError expSubType actSubType) = throwError (AtomFunctionTypeError funcName argCount expSubType actSubType)
916+ handler err = throwError err
917+ verifyGraphRefAtomExprTypes relIn atomExpr expectedType2 `catchError` handler
918+ funcArgTypes <- mapM funcArgVerifier $ zip3 funcArgExprs expectedArgTypes [1..]
919+ if length funcArgTypes /= length expectedArgTypes - 1 then
920+ throwError (AtomTypeCountError funcArgTypes expectedArgTypes)
843921 else
844− either throwE pure (atomTypeVerify expectedType (last expectedArgTypes))
845−verifyAtomExprTypes relIn (RelationAtomExpr relationExpr) expectedType = runExceptT $ do
846− rstate <- lift ask
847− relType <- either throwE pure (runReader (typeForRelationalExpr relationExpr) (mergeAttributesIntoRelationalExprState (attributes relIn) rstate))
848− either throwE pure (atomTypeVerify expectedType (RelationAtomType (attributes relType)))
849−verifyAtomExprTypes rel cons@ConstructedAtomExpr{} expectedType = runExceptT $ do
850− cType <- liftE (typeFromAtomExpr (attributes rel) cons)
851− either throwE pure (atomTypeVerify expectedType cType)
922+ lift $ except $ atomTypeVerify expectedType (last expectedArgTypes)
923+verifyGraphRefAtomExprTypes relIn (RelationAtomExpr relationExpr) expectedType =
924+ do
925+ let mergedAttrsEnv e = mergeAttributesIntoGraphRefRelationalExprEnv (attributes relIn) e
926+ relType <- R.local mergedAttrsEnv (typeForGraphRefRelationalExpr relationExpr)
927+ lift $ except $ atomTypeVerify expectedType (RelationAtomType (attributes relType))
928+verifyGraphRefAtomExprTypes rel cons@ConstructedAtomExpr{} expectedType = do
929+ cType <- typeForGraphRefAtomExpr (attributes rel) cons
930+ lift $ except $ atomTypeVerify expectedType cType
852931
853932-- | Look up the type's name and create a new attribute.
854−evalAttrExpr :: TypeConstructorMapping -> AttributeExpr -> Either RelationalError Attribute
855−evalAttrExpr aTypes (AttributeAndTypeNameExpr attrName tCons ()) = do
856− aType <- atomTypeForTypeConstructor tCons aTypes M.empty
857− Right (Attribute attrName aType)
858−
859−evalAttrExpr _ (NakedAttributeExpr attr) = Right attr
933+evalGraphRefAttrExpr :: GraphRefAttributeExpr -> GraphRefRelationalExprM Attribute
934+evalGraphRefAttrExpr (AttributeAndTypeNameExpr attrName tCons transId) = do
935+ tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker transId
936+ aType <- lift $ except $ atomTypeForTypeConstructorValidate True tCons tConsMap M.empty
937+ lift $ except $ validateAtomType aType tConsMap
938+ pure $ Attribute attrName aType
860939
861−evalTupleExpr :: Maybe Attributes -> TupleExpr -> RelationalExprState (Either RelationalError RelationTuple)
862−evalTupleExpr attrs (TupleExpr tupMap) = do
863− context <- fmap stateElemsContext ask
864− runExceptT $ do
940+evalGraphRefAttrExpr (NakedAttributeExpr attr) = pure attr
941+
942+-- for tuple type concrete resolution (Nothing ==> Maybe Int) when the attributes hint is Nothing, we need to first process all the tuples, then extract the concrete types on a per-attribute basis, then reprocess the tuples to include the concrete types
943+evalGraphRefTupleExprs :: Maybe Attributes -> GraphRefTupleExprs -> GraphRefRelationalExprM [RelationTuple]
944+evalGraphRefTupleExprs _ (TupleExprs _ []) = pure []
945+evalGraphRefTupleExprs mAttrs (TupleExprs fixedMarker tupleExprL) = do
946+ tuples <- mapM (evalGraphRefTupleExpr mAttrs) tupleExprL
947+ finalAttrs <- case mAttrs of
948+ Just attrs -> pure attrs
949+ Nothing ->
950+ case tuples of
951+ [] -> pure emptyAttributes
952+ (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])
954+ let
955+ processTupleAttrs (tupAttr, accAttr) =
956+ --if the attribute is a constructedatomtype, we can recurse into it to potentially resolve type variables
957+ if isResolvedAttribute accAttr && tupAttr == accAttr then
958+ pure accAttr
959+ else
960+ lift $ except $ resolveAttributes accAttr tupAttr
961+ mostResolvedTypes <-
962+ foldM (\acc tup -> do
963+ let zipped = zip (V.toList . attributesVec $ tupleAttributes tup) acc
964+ accNames = S.fromList $ map A.attributeName acc
965+ tupNames = A.attributeNameSet (tupleAttributes tup)
966+ attrNamesDiff = S.union (S.difference accNames tupNames) (S.difference tupNames accNames)
967+ unless (null attrNamesDiff) (throwError (AttributeNamesMismatchError attrNamesDiff))
968+ nextTupleAttrs <- mapM processTupleAttrs zipped
969+ let diff = A.attributesDifference (A.attributesFromList nextTupleAttrs) (A.attributesFromList acc)
970+ if diff == A.emptyAttributes then
971+ pure nextTupleAttrs
972+ else
973+ throwError (TupleAttributeTypeMismatchError diff)
974+ ) (V.toList . attributesVec $ tupleAttributes headTuple) tailTuples
975+ 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
977+ tConsMap <- case singularTransactions tupleExprL of
978+ SingularTransactionRef commonTransId ->
979+ typeConstructorMapping <$> gfDatabaseContextForMarker commonTransId
980+ NoTransactionsRef ->
981+ 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
983+ _ -> throwError TupleExprsReferenceMultipleMarkersError
984+ lift $ except $ validateAttributes tConsMap finalAttrs
985+ mapM (lift . except . resolveTypesInTuple finalAttrs tConsMap) tuples
986+
987+
988+--resolveAttributes (Attribute "gonk" (ConstructedAtomType "Either" (fromList [("a",IntegerAtomType),("b",TypeVariableType "b")]))) (Attribute "gonk" (ConstructedAtomType "Either" (fromList [("a",TypeVariableType "a"),("b",TextAtomType)])))
989+
990+evalGraphRefTupleExpr :: Maybe Attributes -> GraphRefTupleExpr -> GraphRefRelationalExprM RelationTuple
991+evalGraphRefTupleExpr mAttrs (TupleExpr tupMap) = do
865992 -- it's not possible for AtomExprs in tuple constructors to reference other Attributes' atoms due to the necessary order-of-operations (need a tuple to pass to evalAtomExpr)- it may be possible with some refactoring of type usage or delayed evaluation- needs more thought, but not a priority
866993 -- I could adjust this logic so that when the attributes are not specified (Nothing), then I can attempt to extract the attributes from the tuple- the type resolution will blow up if an ambiguous data constructor is used (Left 4) and this should allow simple cases to "relation{tuple{a 4}}" to be processed
867− attrAtoms <- mapM (\(attrName, aExpr) -> do
868− newAtomType <- liftE (typeFromAtomExpr A.emptyAttributes aExpr)
869− newAtom <- liftE (evalAtomExpr emptyTuple aExpr)
870− pure (attrName, newAtom, newAtomType)
871− ) (M.toList tupMap)
872− let tupAttrs = A.attributesFromList $ map (\(attrName, _, aType) -> Attribute attrName aType) attrAtoms
873− atoms = V.fromList $ map (\(_, atom, _) -> atom) attrAtoms
874− tup = mkRelationTuple tupAttrs atoms
875− tConss = typeConstructorMapping context
876− finalAttrs = fromMaybe tupAttrs attrs
994+ let attrs = fromMaybe A.emptyAttributes mAttrs
995+ resolveOneAtom (attrName, aExpr) =
996+ do
997+ --provided when the relation header is available
998+ let eExpectedAtomType = A.atomTypeForAttributeName attrName attrs
999+ unresolvedType <- typeForGraphRefAtomExpr attrs aExpr
1000+ resolvedType <- case eExpectedAtomType of
1001+ Left _ -> pure unresolvedType
1002+ Right typeHint -> lift $ except $ resolveAtomType typeHint unresolvedType
1003+ --resolve atom typevars based on resolvedType?
1004+ newAtom <- evalGraphRefAtomExpr emptyTuple aExpr
1005+ pure (attrName, newAtom, resolvedType)
1006+ attrAtoms <- mapM resolveOneAtom (M.toList tupMap)
1007+ let tupAttrs = A.attributesFromList $ map (\(attrName, _, aType) -> Attribute attrName aType) attrAtoms
1008+ atoms = V.fromList $ map (\(_, atom, _) -> atom) attrAtoms
1009+ tup = mkRelationTuple tupAttrs atoms
1010+ finalAttrs = fromMaybe tupAttrs mAttrs
8771011 --verify that the attributes match
878− when (A.attributeNameSet finalAttrs /= A.attributeNameSet tupAttrs) $ throwE (TupleAttributeTypeMismatchError tupAttrs)
879− tup' <- either throwE pure (resolveTypesInTuple finalAttrs (reorderTuple finalAttrs tup))
880− _ <- either throwE pure (validateTuple tup' tConss)
881− pure tup'
882−
883−evalAttributeNames :: AttributeNames -> RelationalExpr -> RelationalExprState (Either RelationalError (S.Set AttributeName))
884−evalAttributeNames attrNames expr = do
885− eExprType <- typeForRelationalExpr expr
886− case eExprType of
887− Left err -> pure (Left err)
888− Right exprTyp -> do
889− let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))
890− case attrNames of
891− AttributeNames names ->
892− case A.projectionAttributesForNames names (attributes exprTyp) of
893− Left err -> pure (Left err)
894− Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))
1012+ when (A.attributeNameSet finalAttrs /= A.attributeNameSet tupAttrs) $ throwError (TupleAttributeTypeMismatchError tupAttrs)
1013+ --we can't resolve types here- they have to be resolved at the atom level where the graph ref is held
1014+ --tup' <- lift $ except (resolveTypesInTuple finalAttrs tConss (reorderTuple finalAttrs tup))
1015+ let tup' = reorderTuple finalAttrs tup
1016+ --TODO: restore type resolution
1017+-- _ <- lift $ except (validateTuple tup' tConss)
1018+ pure tup'
1019+
1020+--temporary implementation until we have a proper planner+executor
1021+evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
1022+evalGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
1023+ mAttrs <- case mAttrExprs of
1024+ Just _ ->
1025+ Just . A.attributesFromList <$> mapM evalGraphRefAttrExpr (fromMaybe [] mAttrExprs)
1026+ Nothing -> pure Nothing
1027+ tuples <- evalGraphRefTupleExprs mAttrs tupleExprs
1028+ let attrs = fromMaybe firstTupleAttrs mAttrs
1029+ firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
1030+ lift $ except $ mkRelation attrs (RelationTupleSet tuples)
1031+evalGraphRefRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
1032+ lift $ except $ mkRelation attributeSet tupleSet
1033+evalGraphRefRelationalExpr (ExistingRelation rel) = pure rel
1034+evalGraphRefRelationalExpr (RelationVariable name tid) = do
1035+ ctx <- gfDatabaseContextForMarker tid
1036+ case M.lookup name (relationVariables ctx) of
1037+ Nothing -> throwError (RelVarNotDefinedError name)
1038+ Just rv -> evalGraphRefRelationalExpr rv
1039+evalGraphRefRelationalExpr (Project attrNames expr) = do
1040+ attrNameSet <- evalGraphRefAttributeNames attrNames expr
1041+ rel <- evalGraphRefRelationalExpr expr
1042+ lift $ except $ project attrNameSet rel
1043+evalGraphRefRelationalExpr (Union exprA exprB) = do
1044+ relA <- evalGraphRefRelationalExpr exprA
1045+ relB <- evalGraphRefRelationalExpr exprB
1046+ lift $ except $ union relA relB
1047+evalGraphRefRelationalExpr (Join exprA exprB) = do
1048+ relA <- evalGraphRefRelationalExpr exprA
1049+ relB <- evalGraphRefRelationalExpr exprB
1050+ lift $ except $ join relA relB
1051+evalGraphRefRelationalExpr (Rename oldName newName expr) = do
1052+ rel <- evalGraphRefRelationalExpr expr
1053+ lift $ except $ rename oldName newName rel
1054+evalGraphRefRelationalExpr (Difference exprA exprB) = do
1055+ relA <- evalGraphRefRelationalExpr exprA
1056+ relB <- evalGraphRefRelationalExpr exprB
1057+ lift $ except $ difference relA relB
1058+evalGraphRefRelationalExpr (Group groupAttrNames newAttrName expr) = do
1059+ groupNames <- evalGraphRefAttributeNames groupAttrNames expr
1060+ rel <- evalGraphRefRelationalExpr expr
1061+ lift $ except $ group groupNames newAttrName rel
1062+evalGraphRefRelationalExpr (Ungroup groupAttrName expr) = do
1063+ rel <- evalGraphRefRelationalExpr expr
1064+ lift $ except $ ungroup groupAttrName rel
1065+evalGraphRefRelationalExpr (Restrict predExpr expr) = do
1066+ rel <- evalGraphRefRelationalExpr expr
1067+ filt <- predicateRestrictionFilter (attributes rel) predExpr
1068+ lift $ except $ restrict filt rel
1069+evalGraphRefRelationalExpr (Equals exprA exprB) = do
1070+ relA <- evalGraphRefRelationalExpr exprA
1071+ relB <- evalGraphRefRelationalExpr exprB
1072+ pure $ if relA == relB then relationTrue else relationFalse
1073+evalGraphRefRelationalExpr (NotEquals exprA exprB) = do
1074+ relA <- evalGraphRefRelationalExpr exprA
1075+ relB <- evalGraphRefRelationalExpr exprB
1076+ pure $ if relA == relB then relationFalse else relationTrue
1077+evalGraphRefRelationalExpr (Extend extendTupleExpr expr) = do
1078+ rel <- evalGraphRefRelationalExpr expr
1079+ (newAttrs, tupProc) <- extendGraphRefTupleExpressionProcessor rel extendTupleExpr
1080+ lift $ except $ relMogrify tupProc newAttrs rel
1081+evalGraphRefRelationalExpr expr@With{} =
1082+ --strategy A: add relation variables to the contexts in the graph
1083+ --strategy B: drop in macros in place (easier programmatically)
1084+ --strategy B implementation
1085+ evalGraphRefRelationalExpr (substituteWithNameMacros [] expr)
1086+
1087+dbContextForTransId :: TransactionId -> TransactionGraph -> Either RelationalError DatabaseContext
1088+dbContextForTransId tid graph = do
1089+ trans <- transactionForId tid graph
1090+ pure (concreteDatabaseContext trans)
1091+
1092+transactionForId :: TransactionId -> TransactionGraph -> Either RelationalError Transaction
1093+transactionForId tid graph
1094+ | tid == U.nil =
1095+ Left RootTransactionTraversalError
1096+ | S.null matchingTrans =
1097+ Left $ NoSuchTransactionError tid
1098+ | otherwise =
1099+ Right $ head (S.toList matchingTrans)
1100+ where
1101+ matchingTrans = S.filter (\(Transaction idMatch _ _) -> idMatch == tid) (transactionsForGraph graph)
1102+
1103+typeForGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
1104+typeForGraphRefRelationalExpr (MakeStaticRelation attrs _) = lift $ except $ mkRelation attrs emptyTupleSet
1105+typeForGraphRefRelationalExpr (ExistingRelation rel) = pure (emptyRelationWithAttrs (attributes rel))
1106+typeForGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
1107+ mAttrs <- case mAttrExprs of
1108+ Just attrExprs -> do
1109+ attrs <- mapM evalGraphRefAttributeExpr attrExprs
1110+ pure (Just (attributesFromList attrs))
1111+ Nothing -> pure Nothing
1112+ tuples <- evalGraphRefTupleExprs mAttrs tupleExprs
1113+ let retAttrs = case tuples of
1114+ (tup:_) -> tupleAttributes tup
1115+ [] -> fromMaybe A.emptyAttributes mAttrs
1116+ pure $ emptyRelationWithAttrs retAttrs
1117+
1118+typeForGraphRefRelationalExpr (RelationVariable rvName tid) = do
1119+ relVars <- relationVariables <$> gfDatabaseContextForMarker tid
1120+ case M.lookup rvName relVars of
1121+ Nothing -> throwError (RelVarNotDefinedError rvName)
1122+ Just rvExpr ->
1123+ typeForGraphRefRelationalExpr rvExpr
1124+typeForGraphRefRelationalExpr (Project attrNames expr) = do
1125+ exprType' <- typeForGraphRefRelationalExpr expr
1126+ projectionAttrs <- evalGraphRefAttributeNames attrNames expr
1127+ lift $ except $ project projectionAttrs exprType'
1128+typeForGraphRefRelationalExpr (Union exprA exprB) = do
1129+ exprA' <- typeForGraphRefRelationalExpr exprA
1130+ exprB' <- typeForGraphRefRelationalExpr exprB
1131+ lift $ except $ union exprA' exprB'
1132+typeForGraphRefRelationalExpr (Join exprA exprB) = do
1133+ exprA' <- typeForGraphRefRelationalExpr exprA
1134+ exprB' <- typeForGraphRefRelationalExpr exprB
1135+ lift $ except $ join exprA' exprB'
1136+typeForGraphRefRelationalExpr (Rename oldAttr newAttr expr) = do
1137+ expr' <- typeForGraphRefRelationalExpr expr
1138+ lift $ except $ rename oldAttr newAttr expr'
1139+typeForGraphRefRelationalExpr (Difference exprA exprB) = do
1140+ exprA' <- typeForGraphRefRelationalExpr exprA
1141+ exprB' <- typeForGraphRefRelationalExpr exprB
1142+ lift $ except $ difference exprA' exprB'
1143+typeForGraphRefRelationalExpr (Group groupNames attrName expr) = do
1144+ expr' <- typeForGraphRefRelationalExpr expr
1145+ groupNames' <- evalGraphRefAttributeNames groupNames expr
1146+ lift $ except $ group groupNames' attrName expr'
1147+typeForGraphRefRelationalExpr (Ungroup groupAttrName expr) = do
1148+ expr' <- typeForGraphRefRelationalExpr expr
1149+ lift $ except $ ungroup groupAttrName expr'
1150+typeForGraphRefRelationalExpr (Restrict pred' expr) = do
1151+ expr' <- typeForGraphRefRelationalExpr expr
1152+ filt <- predicateRestrictionFilter (attributes expr') pred'
1153+ lift $ except $ restrict filt expr'
1154+typeForGraphRefRelationalExpr Equals{} =
1155+ pure relationFalse
1156+typeForGraphRefRelationalExpr NotEquals{} =
1157+ pure relationFalse
1158+typeForGraphRefRelationalExpr (Extend extendTupleExpr expr) = do
1159+ rel <- typeForGraphRefRelationalExpr expr
1160+ evalGraphRefRelationalExpr (Extend extendTupleExpr (ExistingRelation rel))
1161+typeForGraphRefRelationalExpr expr@(With withs _) = do
1162+ let expr' = substituteWithNameMacros [] expr
1163+ checkMacroName (WithNameExpr macroName tid) = do
1164+ rvs <- relationVariables <$> gfDatabaseContextForMarker tid
1165+ 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
1167+ Nothing -> pure ()
1168+ mapM_ (checkMacroName . fst) withs
1169+ typeForGraphRefRelationalExpr expr'
1170+
1171+evalGraphRefAttributeNames :: GraphRefAttributeNames -> GraphRefRelationalExpr -> GraphRefRelationalExprM (S.Set AttributeName)
1172+evalGraphRefAttributeNames attrNames expr = do
1173+ exprType' <- typeForGraphRefRelationalExpr expr
1174+ let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprType')))
1175+ case attrNames of
1176+ AttributeNames names ->
1177+ case A.projectionAttributesForNames names (attributes exprType') of
1178+ Left err -> throwError err
1179+ Right attrs -> pure (S.fromList (V.toList (A.attributeNames attrs)))
8951180
896− InvertedAttributeNames names -> do
1181+ InvertedAttributeNames names -> do
8971182 let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
8981183 if not (S.null nonExistentAttributeNames) then
899− pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))
1184+ throwError $ AttributeNamesMismatchError nonExistentAttributeNames
9001185 else
901− pure (Right (A.nonMatchingAttributeNameSet names typeNameSet))
1186+ pure (A.nonMatchingAttributeNameSet names typeNameSet)
9021187
903− UnionAttributeNames namesA namesB -> do
904− eNameSetA <- evalAttributeNames namesA expr
905− case eNameSetA of
906− Left err -> pure (Left err)
907− Right nameSetA -> do
908− eNameSetB <- evalAttributeNames namesB expr
909− case eNameSetB of
910− Left err -> pure (Left err)
911− Right nameSetB ->
912− pure (Right (S.union nameSetA nameSetB))
1188+ UnionAttributeNames namesA namesB -> do
1189+ nameSetA <- evalGraphRefAttributeNames namesA expr
1190+ nameSetB <- evalGraphRefAttributeNames namesB expr
1191+ pure (S.union nameSetA nameSetB)
9131192
914− IntersectAttributeNames namesA namesB -> do
915− eNameSetA <- evalAttributeNames namesA expr
916− case eNameSetA of
917− Left err -> pure (Left err)
918− Right nameSetA -> do
919− eNameSetB <- evalAttributeNames namesB expr
920− case eNameSetB of
921− Left err -> pure (Left err)
922− Right nameSetB ->
923− pure (Right (S.intersection nameSetA nameSetB))
1193+ IntersectAttributeNames namesA namesB -> do
1194+ nameSetA <- evalGraphRefAttributeNames namesA expr
1195+ nameSetB <- evalGraphRefAttributeNames namesB expr
1196+ pure (S.intersection nameSetA nameSetB)
9241197
925− RelationalExprAttributeNames attrExpr -> do
926− eAttrExprType <- typeForRelationalExpr attrExpr
927− case eAttrExprType of
928− Left err -> pure (Left err)
929− Right attrExprType -> pure (Right (A.attributeNameSet (attributes attrExprType)))
930−
1198+ RelationalExprAttributeNames attrExpr -> do
1199+ attrExprType <- typeForGraphRefRelationalExpr attrExpr
1200+ pure (A.attributeNameSet (attributes attrExprType))
1201+
1202+evalGraphRefAttributeExpr :: GraphRefAttributeExpr -> GraphRefRelationalExprM Attribute
1203+evalGraphRefAttributeExpr (AttributeAndTypeNameExpr attrName tCons tid) = do
1204+ tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker tid
1205+ case atomTypeForTypeConstructorValidate True tCons tConsMap M.empty of
1206+ Left err -> throwError err
1207+ Right aType -> do
1208+ case validateAtomType aType tConsMap of
1209+ Left err -> throwError err
1210+ Right _ -> pure (Attribute attrName aType)
1211+evalGraphRefAttributeExpr (NakedAttributeExpr attr) = pure attr
1212+
1213+mkEmptyRelVars :: RelationVariables -> RelationVariables
1214+mkEmptyRelVars = M.map mkEmptyRelVar
1215+ where
1216+ 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
1218+ mkEmptyRelVar (ExistingRelation rel) = ExistingRelation (emptyRelationWithAttrs (attributes rel))
1219+ mkEmptyRelVar rv@RelationVariable{} = Restrict (NotPredicate TruePredicate) rv
1220+ mkEmptyRelVar (Project attrNames expr) = Project attrNames (mkEmptyRelVar expr)
1221+ mkEmptyRelVar (Union exprA exprB) = Union (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1222+ mkEmptyRelVar (Join exprA exprB) = Join (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1223+ mkEmptyRelVar (Rename nameA nameB expr) = Rename nameA nameB (mkEmptyRelVar expr)
1224+ mkEmptyRelVar (Difference exprA exprB) = Difference (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1225+ mkEmptyRelVar (Group attrNames attrName expr) = Group attrNames attrName (mkEmptyRelVar expr)
1226+ mkEmptyRelVar (Ungroup attrName expr) = Ungroup attrName (mkEmptyRelVar expr)
1227+ mkEmptyRelVar (Restrict pred' expr) = Restrict pred' (mkEmptyRelVar expr)
1228+ mkEmptyRelVar (Equals exprA exprB) = Equals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1229+ mkEmptyRelVar (NotEquals exprA exprB) = NotEquals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1230+ mkEmptyRelVar (Extend extTuple expr) = Extend extTuple (mkEmptyRelVar expr)
1231+ mkEmptyRelVar (With macros expr) = With (map (second mkEmptyRelVar) macros) (mkEmptyRelVar expr)
1232+
1233+
1234+dbErr :: RelationalError -> DatabaseContextEvalMonad ()
1235+dbErr err = lift (except (Left err))
1236+
1237+-- | Return a Relation describing the relation variables.
1238+relationVariablesAsRelation :: DatabaseContext -> TransactionGraph -> Either RelationalError Relation
1239+relationVariablesAsRelation ctx graph = do
1240+ let subrelAttrs = A.attributesFromList [Attribute "attribute" TextAtomType, Attribute "type" TextAtomType]
1241+ attrs = A.attributesFromList [Attribute "name" TextAtomType,
1242+ Attribute "attributes" (RelationAtomType subrelAttrs)]
1243+ relVars = relationVariables ctx
1244+ mkRvDesc (rvName, gfExpr) = do
1245+ let gfEnv = freshGraphRefRelationalExprEnv (Just ctx) graph
1246+ gfType <- runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
1247+ pure (rvName, gfType)
1248+ relVarToAtomList (rvName, rel) = [TextAtom rvName, attributesToRel (attributesVec (attributes rel))]
1249+ attrAtoms a = [TextAtom (A.attributeName a), TextAtom (prettyAtomType (A.atomType a))]
1250+ attributesToRel attrl = case mkRelationFromList subrelAttrs (map attrAtoms (V.toList attrl)) of
1251+ Left err -> error ("relationVariablesAsRelation pooped " ++ show err)
1252+ Right rel -> RelationAtom rel
1253+ rvs <- mapM mkRvDesc (M.toList relVars)
1254+ let tups = map relVarToAtomList rvs
1255+ mkRelationFromList attrs tups
1256+
1257+-- | An unoptimized variant of evalGraphRefRelationalExpr for testing.
1258+evalRelationalExpr :: RelationalExpr -> RelationalExprM Relation
1259+evalRelationalExpr expr = do
1260+ graph <- reGraph
1261+ context <- reContext
1262+ let expr' = runProcessExprM UncommittedContextMarker (processRelationalExpr expr)
1263+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
1264+ case runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr expr') of
1265+ Left err -> throwError err
1266+ Right rel -> pure rel
1267+
1268+class (MonadError RelationalError m, Monad m) => DatabaseContextM m where
1269+ getContext :: m DatabaseContext
1270+
1271+instance DatabaseContextM (ReaderT GraphRefRelationalExprEnv (ExceptT RelationalError Identity)) where
1272+ getContext = gfDatabaseContextForMarker UncommittedContextMarker
1273+
1274+instance DatabaseContextM (RWST DatabaseContextEvalEnv () DatabaseContextEvalState (ExceptT RelationalError Identity)) where
1275+ getContext = getStateContext
1276+
1277+relVarByName :: DatabaseContextM m => RelVarName -> m GraphRefRelationalExpr
1278+relVarByName rvName = do
1279+ relvars <- relationVariables <$> getContext
1280+ case M.lookup rvName relvars of
1281+ Nothing -> throwError (RelVarNotDefinedError rvName)
1282+ Just gfexpr -> pure gfexpr
1283+
1284+-- | resolve UncommittedTransactionMarker whenever possible- this is important in the DatabaseContext in order to mitigate self-referencing loops for updates
1285+class ResolveGraphRefTransactionMarker a where
1286+ resolve :: a -> DatabaseContextEvalMonad a
9311287
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+132−31
@@ -1,7 +1,12 @@
1+{-# LANGUAGE UnboxedTuples, KindSignatures, DataKinds #-}
2+#ifdef PM36_HASKELL_SCRIPTING
3+{-# LANGUAGE MagicHash #-}
4+#endif
15module ProjectM36.ScriptSession where
26
7+#ifdef PM36_HASKELL_SCRIPTING
38import ProjectM36.Error
4−
9+import GHC
510import Control.Exception
611import Control.Monad
712import System.IO.Error
@@ -9,32 +14,63 @@ import System.Directory
914import Control.Monad.IO.Class
1015import System.FilePath.Glob
1116import System.FilePath
17+import System.Info (os, arch)
1218import Data.Text (Text, unpack)
1319import Data.Maybe
14−
15−import GHC
1620import GHC.Paths (libdir)
21+import System.Environment
1722#if __GLASGOW_HASKELL__ >= 800
1823import GHC.LanguageExtensions
24+import GHCi.ObjLink
25+#else
26+import ObjLink
27+#endif
28+#if __GLASGOW_HASKELL__ >= 802
29+import BasicTypes
1930#endif
2031import DynFlags
2132import Panic
2233import Outputable --hiding ((<>))
2334import PprTyThing
2435import Unsafe.Coerce
36+#if __GLASGOW_HASKELL__ >= 802
2537import Type
38+#elif __GLASGOW_HASKELL__ >= 710
39+import Type hiding (pprTyThing)
40+#else
41+#endif
42+import GHC.Exts (addrToAny#)
43+import GHC.Ptr (Ptr(..))
44+import Encoding
45+#endif
46+
2647
2748data ScriptSession = ScriptSession {
28− hscEnv :: HscEnv,
49+#ifdef PM36_HASKELL_SCRIPTING
50+ hscEnv :: HscEnv,
2951 atomFunctionBodyType :: Type,
3052 dbcFunctionBodyType :: Type
53+#endif
3154 }
32−
33−newtype ScriptSessionError = ScriptSessionLoadError GhcException
55+
56+#ifdef PM36_HASKELL_SCRIPTING
57+data ScriptSessionError = ScriptSessionLoadError GhcException
58+ | ScriptingDisabled
3459 deriving (Show)
60+#else
61+data ScriptSessionError = ScriptingDisabled
62+ deriving (Show)
63+#endif
64+
65+data LoadSymbolError = LoadSymbolError
66+type ModName = String
67+type FuncName = String
3568
3669-- | Configure a GHC environment/session which we will use for all script compilation.
3770initScriptSession :: [String] -> IO (Either ScriptSessionError ScriptSession)
71+#if !defined(PM36_HASKELL_SCRIPTING)
72+initScriptSession _ = pure (Left ScriptingDisabled)
73+#else
3874initScriptSession ghcPkgPaths = do
3975 --for the sake of convenience, for developers' builds, include the local cabal sandbox package database and the cabal new-build package database
4076 eHomeDir <- tryJust (guard . isDoesNotExistError) getHomeDirectory
@@ -43,36 +79,47 @@ initScriptSession ghcPkgPaths = do
4379 handleGhcException excHandler $ runGhc (Just libdir) $ do
4480 dflags <- getSessionDynFlags
4581 let ghcVersion = projectVersion dflags
82+ -- get nix packages dir, if available
83+ mNixLibDir <- liftIO $ lookupEnv "NIX_GHC_LIBDIR"
4684
4785 sandboxPkgPaths <- liftIO $ concat <$> mapM glob [
48− "./dist-newstyle/packagedb/ghc-" ++ ghcVersion,
49− ".cabal-sandbox/*ghc-" ++ ghcVersion ++ "-packages.conf.d",
50− homeDir </> ".cabal/store/ghc-" ++ ghcVersion ++ "/package.db"
86+ --"./dist-newstyle/packagedb/ghc-" ++ ghcVersion, --rely on cabal 3's ghc.environment install: "cabal install --lib project-m36"
87+ ".cabal-sandbox/*ghc-" ++ ghcVersion ++ "-packages.conf.d",
88+ ".stack-work/install/*/*/" ++ ghcVersion ++ "/pkgdb",
89+ ".stack-work/install/*/pkgdb/", --windows stack build
90+ "C:/sr/snapshots/b201cfe6/pkgdb", --windows stack build- ideally, we could run `stack path --snapshot-pkg-db, but this is sufficient to pass CI
91+ homeDir </> ".stack/snapshots/*/*/" ++ ghcVersion ++ "/pkgdb"
92+ --homeDir </> ".cabal/store/ghc-" ++ ghcVersion ++ "/package.db"
5193 ]
52−
53− let localPkgPaths = map PkgConfFile (ghcPkgPaths ++ sandboxPkgPaths)
54−
55− let dflags' = applyGopts . applyXopts $ dflags { hscTarget = HscInterpreted ,
56− ghcLink = LinkInMemory,
94+
95+ let localPkgPaths = map PkgConfFile (ghcPkgPaths ++ sandboxPkgPaths ++ maybeToList mNixLibDir)
96+
97+ let dflags' = applyGopts . applyXopts $ dflags { hscTarget = HscInterpreted ,
98+ ghcLink = LinkInMemory,
5799 safeHaskell = Sf_Trustworthy,
58100 safeInfer = True,
59101 safeInferred = True,
60102 --verbosity = 3,
61−#if __GLASGOW_HASKELL__ >= 800
103+#if __GLASGOW_HASKELL__ >= 800
62104 trustFlags = map TrustPackage required_packages,
63−#endif
105+#endif
64106 packageFlags = packageFlags dflags ++ packages,
107+#if __GLASGOW_HASKELL__ >= 802
108+ packageDBFlags = map PackageDB localPkgPaths
109+#else
65110 extraPkgConfs = const (localPkgPaths ++ [UserPkgConf, GlobalPkgConf])
111+#endif
112+
66113 }
67114 applyGopts flags = foldl gopt_set flags gopts
68115 applyXopts flags = foldl xopt_set flags xopts
69116#if __GLASGOW_HASKELL__ >= 800
70117 xopts = [OverloadedStrings, ExtendedDefaultRules, ImplicitPrelude, ScopedTypeVariables]
71−#else
118+#else
72119 xopts = [Opt_OverloadedStrings, Opt_ExtendedDefaultRules, Opt_ImplicitPrelude, Opt_ScopedTypeVariables]
73120#endif
74121 gopts = [] --[Opt_DistrustAllPackages, Opt_PackageTrust]
75− required_packages = ["base",
122+ required_packages = ["base",
76123 "containers",
77124 "Glob",
78125 "directory",
@@ -81,8 +128,6 @@ initScriptSession ghcPkgPaths = do
81128 "uuid",
82129 "vector",
83130 "text",
84− "binary",
85− "vector-binary-instances",
86131 "time",
87132 "project-m36",
88133 "bytestring"]
@@ -94,16 +139,33 @@ initScriptSession ghcPkgPaths = do
94139 --liftIO $ traceShowM (showSDoc dflags' (ppr packages))
95140 _ <- setSessionDynFlags dflags'
96141 let safeImportDecl mn mQual = ImportDecl {
142+#if __GLASGOW_HASKELL__ >= 802
143+ ideclSourceSrc = NoSourceText,
144+#else
97145 ideclSourceSrc = Nothing,
146+#endif
147+
148+#if __GLASGOW_HASKELL__ >= 810
149+ ideclExt = noExtField,
150+#elif __GLASGOW_HASKELL__ >= 806
151+ ideclExt = NoExt,
152+#endif
98153 ideclName = noLoc mn,
99154 ideclPkgQual = Nothing,
100155 ideclSource = False,
101156 ideclSafe = True,
102157 ideclImplicit = False,
158+#if __GLASGOW_HASKELL__ >= 810
159+ ideclQualified = if isJust mQual then QualifiedPre else NotQualified,
160+#else
103161 ideclQualified = isJust mQual,
162+#endif
104163 ideclAs = mQual,
105164 ideclHiding = Nothing
106165 }
166+#if __GLASGOW_HASKELL__ >= 806
167+ :: ImportDecl (GhcPass (c :: Pass))
168+#endif
107169 unqualifiedModules = map (\modn -> IIDecl $ safeImportDecl (mkModuleName modn) Nothing) [
108170 "Prelude",
109171 "Data.Map",
@@ -116,7 +178,12 @@ initScriptSession ghcPkgPaths = do
116178 "ProjectM36.DatabaseContextFunctionError",
117179 "ProjectM36.DatabaseContextFunctionUtils",
118180 "ProjectM36.RelationalExpression"]
119− qualifiedModules = map (\(modn, qualNam) -> IIDecl $ safeImportDecl (mkModuleName modn) (Just (mkModuleName qualNam))) [
181+#if __GLASGOW_HASKELL__ >= 802
182+ mkModName = noLoc . mkModuleName
183+#else
184+ mkModName = mkModuleName
185+#endif
186+ qualifiedModules = map (\(modn, qualNam) -> IIDecl $ safeImportDecl (mkModuleName modn) (Just (mkModName qualNam))) [
120187 ("Data.Text", "T")
121188 ]
122189 setContext (unqualifiedModules ++ qualifiedModules)
@@ -128,8 +195,8 @@ initScriptSession ghcPkgPaths = do
128195addImport :: String -> Ghc ()
129196addImport moduleNam = do
130197 ctx <- getContext
131− setContext ( (IIDecl $ simpleImportDecl (mkModuleName moduleNam)) : ctx )
132−
198+ setContext (IIDecl (simpleImportDecl (mkModuleName moduleNam)) : ctx)
199+
133200showType :: DynFlags -> Type -> String
134201showType dflags ty = showSDocForUser dflags alwaysQualify (pprTypeForUser ty)
135202
@@ -154,21 +221,55 @@ compileScript funcType script = do
154221 mErr <- typeCheckScript funcType script
155222 case mErr of
156223 Just err -> pure (Left err)
157− Nothing -> do
224+ Nothing ->
158225 --catch exception here
159226 --we could potentially wrap the script with Atom pattern matching so that the script doesn't have to do it, but the change to an Atom ADT should make it easier. Still, it would be nice if the script didn't have to handle a list of arguments, for example.
160227 -- we can't use dynCompileExpr here because
161− func <- compileExpr sScript
162− pure $ Right (unsafeCoerce func)
163−
164−typeCheckScript :: Type -> Text -> Ghc (Maybe ScriptCompilationError)
228+ Right . unsafeCoerce <$> compileExpr sScript
229+
230+typeCheckScript :: Type -> Text -> Ghc (Maybe ScriptCompilationError)
165231typeCheckScript expectedType inp = do
166− dflags <- getSessionDynFlags
232+ dflags <- getSessionDynFlags
167233 --catch exception for SyntaxError
234+#if __GLASGOW_HASKELL__ >= 802
235+ funcType <- GHC.exprType TM_Inst (unpack inp)
236+#else
168237 funcType <- GHC.exprType (unpack inp)
169− --liftIO $ putStrLn $ showType dflags expectedType ++ ":::" ++ showType dflags funcType
238+#endif
239+ --liftIO $ putStrLn $ showType dflags expectedType ++ ":::" ++ showType dflags funcType
170240 if eqType funcType expectedType then
171241 pure Nothing
172242 else
173243 pure (Just (TypeCheckCompilationError (showType dflags expectedType) (showType dflags funcType)))
174−
244+
245+mangleSymbol :: Maybe String -> String -> String -> String
246+mangleSymbol pkg module' valsym =
247+ prefixUnderscore ++
248+ maybe "" (\p -> zEncodeString p ++ "_") pkg ++
249+ zEncodeString module' ++ "_" ++ zEncodeString valsym ++ "_closure"
250+
251+loadFunction :: ModName -> FuncName -> FilePath -> IO (Either LoadSymbolError a)
252+loadFunction modName funcName objPath = do
253+#if __GLASGOW_HASKELL__ >= 802
254+ initObjLinker RetainCAFs
255+#else
256+ initObjLinker
257+#endif
258+ loadObj objPath
259+ _ <- resolveObjs
260+ ptr <- lookupSymbol (mangleSymbol Nothing modName funcName)
261+ case ptr of
262+ Nothing -> pure (Left LoadSymbolError)
263+ Just (Ptr addr) -> case addrToAny# addr of
264+ (# hval #) -> pure (Right hval)
265+
266+prefixUnderscore :: String
267+prefixUnderscore =
268+ case (os,arch) of
269+ ("mingw32","x86_64") -> ""
270+ ("cygwin","x86_64") -> ""
271+ ("mingw32",_) -> "_"
272+ ("darwin",_) -> "_"
273+ ("cygwin",_) -> "_"
274+ _ -> ""
275+#endif
src/lib/ProjectM36/Serialise/AtomFunctionError.hsnew file+7
@@ -0,0 +1,7 @@
1+{-# LANGUAGE DerivingVia, StandaloneDeriving #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+module ProjectM36.Serialise.AtomFunctionError where
4+import Codec.Winery
5+import ProjectM36.AtomFunctionError
6+
7+deriving via WineryVariant AtomFunctionError instance Serialise AtomFunctionError
src/lib/ProjectM36/Serialise/Base.hsnew file+85
@@ -0,0 +1,85 @@
1+{-# LANGUAGE StandaloneDeriving, DerivingVia, TypeApplications, TypeSynonymInstances, ScopedTypeVariables #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+--Serialise instances for ProjectM36.Base data types- orphan instance city
4+module ProjectM36.Serialise.Base where
5+import Codec.Winery hiding (Schema)
6+import Codec.Winery.Internal
7+import Control.Monad
8+import ProjectM36.Base
9+import ProjectM36.MerkleHash
10+import Data.UUID
11+import Data.Proxy
12+import Data.Word
13+import ProjectM36.Attribute as A
14+import qualified Data.List.NonEmpty as NE
15+import qualified Data.Vector as V
16+import Data.Time.Calendar (Day,toGregorian,fromGregorian)
17+
18+deriving via WineryVariant Atom instance Serialise Atom
19+deriving via WineryVariant AtomType instance Serialise AtomType
20+deriving via WineryVariant Attribute instance Serialise Attribute
21+deriving via WineryVariant RelationTupleSet instance Serialise RelationTupleSet
22+deriving via WineryVariant RelationTuple instance Serialise RelationTuple
23+deriving via WineryVariant Relation instance Serialise Relation
24+deriving via WineryVariant RelationCardinality instance Serialise RelationCardinality
25+deriving via WineryVariant (RelationalExprBase a) instance Serialise a => Serialise (RelationalExprBase a)
26+deriving via WineryVariant (WithNameExprBase a) instance Serialise a => Serialise (WithNameExprBase a)
27+deriving via WineryVariant Notification instance Serialise Notification
28+deriving via WineryVariant TypeConstructorDef instance Serialise TypeConstructorDef
29+deriving via WineryVariant (TypeConstructorBase a) instance Serialise a => Serialise (TypeConstructorBase a)
30+deriving via WineryVariant DataConstructorDef instance Serialise DataConstructorDef
31+deriving via WineryVariant DataConstructorDefArg instance Serialise DataConstructorDefArg
32+deriving via WineryVariant GraphRefTransactionMarker instance Serialise GraphRefTransactionMarker
33+deriving via WineryVariant SchemaIsomorph instance Serialise SchemaIsomorph
34+deriving via WineryVariant InclusionDependency instance Serialise InclusionDependency
35+deriving via WineryVariant (DatabaseContextExprBase a) instance Serialise a => Serialise (DatabaseContextExprBase a)
36+deriving via WineryVariant (DatabaseContextIOExprBase a) instance Serialise a => Serialise (DatabaseContextIOExprBase a)
37+deriving via WineryVariant (RestrictionPredicateExprBase a) instance Serialise a => Serialise (RestrictionPredicateExprBase a)
38+deriving via WineryVariant TransactionInfo instance Serialise TransactionInfo
39+deriving via WineryVariant (AtomExprBase a) instance Serialise a => Serialise (AtomExprBase a)
40+deriving via WineryVariant MerkleHash instance Serialise MerkleHash
41+deriving via WineryVariant (AttributeExprBase a) instance Serialise a => Serialise (AttributeExprBase a)
42+deriving via WineryVariant (TupleExprsBase a) instance Serialise a => Serialise (TupleExprsBase a)
43+deriving via WineryVariant (TupleExprBase a) instance Serialise a => Serialise (TupleExprBase a)
44+deriving via WineryVariant (AttributeNamesBase a) instance Serialise a => Serialise (AttributeNamesBase a)
45+deriving via WineryVariant (ExtendTupleExprBase a) instance Serialise a => Serialise (ExtendTupleExprBase a)
46+deriving via WineryVariant Schema instance Serialise Schema
47+deriving via WineryVariant MergeStrategy instance Serialise MergeStrategy
48+
49+fromWordsTup :: (Word32, Word32, Word32, Word32) -> TransactionId
50+fromWordsTup (a,b,c,d) = fromWords a b c d
51+
52+instance Serialise TransactionId where
53+ schemaGen _ = getSchema (Proxy @(Word32, Word32, Word32, Word32))
54+ toBuilder uuid = toBuilder (toWords uuid)
55+ extractor = fromWordsTup <$> extractor
56+ decodeCurrent = fromWordsTup <$> decodeCurrent
57+
58+instance Serialise a => Serialise (NE.NonEmpty a) where
59+ schemaGen _ = SVector <$> getSchema (Proxy @a)
60+ toBuilder xs = varInt (length xs) <> foldMap toBuilder xs
61+ extractor = NE.fromList . V.toList <$> extractListBy extractor --use nonempty instead to replace error with winery error
62+ decodeCurrent = do
63+ n <- decodeVarInt
64+ l <- replicateM n decodeCurrent
65+ pure (NE.fromList l)
66+
67+fromGregorianTup :: (Integer, Int, Int) -> Day
68+fromGregorianTup (a, b, c) = fromGregorian a b c
69+
70+instance Serialise Day where
71+ schemaGen _ = getSchema (Proxy @(Integer, Int, Int))
72+ toBuilder day = toBuilder (toGregorian day)
73+ extractor = fromGregorianTup <$> extractor
74+ decodeCurrent = fromGregorianTup <$> decodeCurrent
75+
76+instance Serialise Attributes where
77+ schemaGen _ = SVector <$> getSchema (Proxy @Attribute)
78+ toBuilder attrs = varInt (V.length (attributesVec attrs)) <> foldMap toBuilder (V.toList (attributesVec attrs))
79+ extractor =
80+ attributesFromList . V.toList <$> extractListBy extractor
81+
82+ decodeCurrent = do
83+ n <- decodeVarInt
84+ l <- replicateM n decodeCurrent
85+ pure (A.attributesFromList l)
src/lib/ProjectM36/Serialise/DataFrame.hsnew file+13
@@ -0,0 +1,13 @@
1+{-# LANGUAGE DerivingVia, StandaloneDeriving #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+module ProjectM36.Serialise.DataFrame where
4+import Codec.Winery
5+import ProjectM36.DataFrame
6+import ProjectM36.Serialise.Base ()
7+
8+deriving via WineryVariant AttributeOrderExpr instance Serialise AttributeOrderExpr
9+deriving via WineryVariant AttributeOrder instance Serialise AttributeOrder
10+deriving via WineryVariant Order instance Serialise Order
11+deriving via WineryRecord DataFrame instance Serialise DataFrame
12+deriving via WineryVariant DataFrameTuple instance Serialise DataFrameTuple
13+deriving via WineryRecord DataFrameExpr instance Serialise DataFrameExpr
src/lib/ProjectM36/Serialise/DatabaseContextFunctionError.hsnew file+7
@@ -0,0 +1,7 @@
1+{-# LANGUAGE DerivingVia, StandaloneDeriving #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+module ProjectM36.Serialise.DatabaseContextFunctionError where
4+import Codec.Winery
5+import ProjectM36.DatabaseContextFunctionError
6+
7+deriving via WineryVariant DatabaseContextFunctionError instance Serialise DatabaseContextFunctionError
src/lib/ProjectM36/Serialise/Error.hsnew file+15
@@ -0,0 +1,15 @@
1+{-# LANGUAGE DerivingVia, StandaloneDeriving #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+module ProjectM36.Serialise.Error where
4+import ProjectM36.Error
5+import Codec.Winery
6+import ProjectM36.Serialise.Base ()
7+import ProjectM36.Serialise.AtomFunctionError ()
8+import ProjectM36.Serialise.DatabaseContextFunctionError ()
9+
10+deriving via WineryVariant RelationalError instance Serialise RelationalError
11+deriving via WineryVariant MergeError instance Serialise MergeError
12+deriving via WineryVariant ScriptCompilationError instance Serialise ScriptCompilationError
13+deriving via WineryVariant PersistenceError instance Serialise PersistenceError
14+deriving via WineryVariant SchemaError instance Serialise SchemaError
15+deriving via WineryVariant ImportError' instance Serialise ImportError'
src/lib/ProjectM36/Serialise/IsomorphicSchema.hsnew file+7
@@ -0,0 +1,7 @@
1+{-# LANGUAGE StandaloneDeriving, DerivingVia, TypeSynonymInstances, ScopedTypeVariables #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
3+module ProjectM36.Serialise.IsomorphicSchema where
4+import Codec.Winery
5+import ProjectM36.IsomorphicSchema
6+
7+deriving via WineryVariant SchemaExpr instance Serialise SchemaExpr
src/lib/ProjectM36/Serialise/MergeError.hsnew file+1
@@ -0,0 +1 @@
1+
src/lib/ProjectM36/Server.hs+166−82
@@ -7,73 +7,119 @@ import ProjectM36.Server.RemoteCallTypes
77import ProjectM36.Server.Config (ServerConfig(..))
88import ProjectM36.FSType
99
10−import Control.Monad.IO.Class (liftIO)
11−import Network.Transport.TCP (createTransport, defaultTCPParameters)
12−import Network.Transport (EndPointAddress(..), newEndPoint, address)
13−import Control.Distributed.Process.Node (initRemoteTable, runProcess, newLocalNode, initRemoteTable)
14−import Control.Distributed.Process.Extras.Time (Delay(..))
15−import Control.Distributed.Process (Process, register, getSelfPid)
16−import Control.Distributed.Process.ManagedProcess (defaultProcess, UnhandledMessagePolicy(..), ProcessDefinition(..), handleCall, serve, InitHandler, InitResult(..))
17−import Control.Concurrent.MVar (putMVar, MVar)
10+import Control.Concurrent.MVar (MVar)
1811import System.IO (stderr, hPutStrLn)
1912import System.FilePath (takeDirectory)
2013import 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
2118
22−-- 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
23−--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
24−serverDefinition :: Bool -> Timeout -> ProcessDefinition Connection
25−serverDefinition testBool ti = defaultProcess {
26− apiHandlers = [
27− handleCall (\conn (ExecuteHeadName sessionId) -> handleExecuteHeadName ti sessionId conn),
28− handleCall (\conn (ExecuteRelationalExpr sessionId expr) -> handleExecuteRelationalExpr ti sessionId conn expr),
29− handleCall (\conn (ExecuteDatabaseContextExpr sessionId expr) -> handleExecuteDatabaseContextExpr ti sessionId conn expr),
30− handleCall (\conn (ExecuteDatabaseContextIOExpr sessionId expr) -> handleExecuteDatabaseContextIOExpr ti sessionId conn expr),
31− handleCall (\conn (ExecuteGraphExpr sessionId expr) -> handleExecuteGraphExpr ti sessionId conn expr),
32− handleCall (\conn (ExecuteTransGraphRelationalExpr sessionId expr) -> handleExecuteTransGraphRelationalExpr ti sessionId conn expr),
33− handleCall (\conn (ExecuteTypeForRelationalExpr sessionId expr) -> handleExecuteTypeForRelationalExpr ti sessionId conn expr),
34− handleCall (\conn (RetrieveInclusionDependencies sessionId) -> handleRetrieveInclusionDependencies ti sessionId conn),
35− handleCall (\conn (RetrievePlanForDatabaseContextExpr sessionId dbExpr) -> handleRetrievePlanForDatabaseContextExpr ti sessionId conn dbExpr),
36− handleCall (\conn (RetrieveHeadTransactionId sessionId) -> handleRetrieveHeadTransactionId ti sessionId conn),
37− handleCall (\conn (RetrieveTransactionGraph sessionId) -> handleRetrieveTransactionGraph ti sessionId conn),
38− handleCall (\conn (Login procId) -> handleLogin ti conn procId),
39− handleCall (\conn (CreateSessionAtHead headn) -> handleCreateSessionAtHead ti conn headn),
40− handleCall (\conn (CreateSessionAtCommit commitId) -> handleCreateSessionAtCommit ti conn commitId),
41− handleCall (\conn (CloseSession sessionId) -> handleCloseSession ti sessionId conn),
42− handleCall (\conn (RetrieveAtomTypesAsRelation sessionId) -> handleRetrieveAtomTypesAsRelation ti sessionId conn),
43− handleCall (\conn (RetrieveRelationVariableSummary sessionId) -> handleRetrieveRelationVariableSummary ti sessionId conn),
44− handleCall (\conn (RetrieveCurrentSchemaName sessionId) -> handleRetrieveCurrentSchemaName ti sessionId conn),
45− handleCall (\conn (ExecuteSchemaExpr sessionId schemaExpr) -> handleExecuteSchemaExpr ti sessionId conn schemaExpr),
46− handleCall (\conn (RetrieveSessionIsDirty sessionId) -> handleRetrieveSessionIsDirty ti sessionId conn),
47− handleCall (\conn (ExecuteAutoMergeToHead sessionId strat headName') -> handleExecuteAutoMergeToHead ti sessionId conn strat headName'),
48− handleCall (\conn (RetrieveTypeConstructorMapping sessionId) -> handleRetrieveTypeConstructorMapping ti sessionId conn),
49− handleCall (\conn Logout -> handleLogout ti conn)
50− ] ++ testModeHandlers,
51− unhandledMessagePolicy = Terminate
52− --unhandledMessagePolicy = Log
53− }
54− where
55− testModeHandlers = if not testBool then
56− []
57− else
58− [handleCall (\conn (TestTimeout sessionId) -> handleTestTimeout ti sessionId conn)]
59−
60−
61−initServer :: InitHandler (Connection, DatabaseName, Maybe (MVar EndPointAddress), EndPointAddress) Connection
62−initServer (conn, dbname, mAddressMVar, saddress) = do
63− registerDB dbname
64− case mAddressMVar of
65− Nothing -> pure ()
66− Just addressMVar -> liftIO $ putMVar addressMVar saddress
67− --traceShowM ("server started on " ++ show saddress)
68− pure $ InitOk conn Infinity
19+type TestMode = Bool
6920
70−registerDB :: DatabaseName -> Process ()
71−registerDB dbname = do
72− self <- getSelfPid
73− let dbname' = remoteDBLookupName dbname
74− register dbname' self
75− --liftIO $ putStrLn $ "registered " ++ (show self) ++ " " ++ dbname'
76−
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+
122+
77123-- | A notification callback which logs the notification to stderr and does nothing else.
78124loggingNotificationCallback :: NotificationCallback
79125loggingNotificationCallback notName evaldNot = hPutStrLn stderr $ "Notification received \"" ++ show notName ++ "\": " ++ show evaldNot
@@ -98,9 +144,47 @@ checkFSType performCheck strat =
98144checkFSErrorMsg :: String
99145checkFSErrorMsg = "The filesystem does not support journaling so writes may not be crash-safe. Use --disable-fscheck to disable this fatal error."
100146
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 })
101185-- | 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.
102−launchServer :: ServerConfig -> Maybe (MVar EndPointAddress) -> IO Bool
103−launchServer daemonConfig mAddressMVar = do
186+launchServer :: ServerConfig -> Maybe (MVar SockAddr) -> IO Bool
187+launchServer daemonConfig mAddr = do
104188 checkFSResult <- checkFSType (checkFS daemonConfig) (persistenceStrategy daemonConfig)
105189 if not checkFSResult then do
106190 hPutStrLn stderr checkFSErrorMsg
@@ -113,21 +197,21 @@ launchServer daemonConfig mAddressMVar = do
113197 pure False
114198 Right conn -> do
115199 let hostname = bindHost daemonConfig
116− port = bindPort daemonConfig
117− etransport <- createTransport hostname (show port) defaultTCPParameters
118− case etransport of
119− Left err -> error ("failed to create transport: " ++ show err)
120− Right transport -> do
121− eEndpoint <- newEndPoint transport
122− case eEndpoint of
123− Left err -> hPutStrLn stderr ("Failed to create transport: " ++ show err) >> pure False
124− Right endpoint -> do
125− localTCPNode <- newLocalNode transport initRemoteTable
126− --traceShowM ("newLocalNode in Server " ++ show (localNodeId localTCPNode))
127− runProcess localTCPNode $ do
128− let testBool = testMode daemonConfig
129− reqTimeout = perRequestTimeout daemonConfig
130− serve (conn, databaseName daemonConfig, mAddressMVar, address endpoint) initServer (serverDefinition testBool reqTimeout)
131− liftIO $ putStrLn "serve returned"
132− pure True
133−
200+ port = fromIntegral (bindPort daemonConfig)
201+
202+
203+ --curryer only supports IPv4 for now
204+ let addrHints = defaultHints { addrSocketType = Stream, addrFamily = AF_INET }
205+ hostAddrs <- getAddrInfo (Just addrHints) (Just hostname) Nothing
206+ case hostAddrs of
207+ [] -> hPutStrLn stderr ("Failed to resolve: " <> hostname) >> pure False
208+ (AddrInfo _ _ _ _ (SockAddrInet _ addr32) _):_ -> do
209+ let hostAddr = hostAddressToTuple addr32
210+ mTimeout = fromIntegral <$> case perRequestTimeout daemonConfig of
211+ 0 -> Nothing
212+ v -> Just v
213+
214+ sState <- initialServerState (databaseName daemonConfig) conn
215+ serve (requestHandlers (testMode daemonConfig) mTimeout) sState hostAddr port mAddr
216+ _ -> error "unsupported socket addressing mode (IPv4 only currently)"
217+
src/lib/ProjectM36/Server/Config.hs+6
@@ -12,6 +12,12 @@ data ServerConfig = ServerConfig { persistenceStrategy :: PersistenceStrategy,
1212 }
1313 deriving (Show)
1414
15+data WebsocketServerConfig = WebsocketServerConfig { wsServerConfig :: ServerConfig,
16+ tlsCertificatePath :: Maybe String,
17+ tlsKeyPath :: Maybe String
18+ }
19+ deriving (Show)
20+
1521defaultServerConfig :: ServerConfig
1622defaultServerConfig = ServerConfig { persistenceStrategy = NoPersistence,
1723 checkFS = True,
src/lib/ProjectM36/Server/EntryPoints.hs+127−138
@@ -1,157 +1,146 @@
1+{-# LANGUAGE MonoLocalBinds #-}
12module ProjectM36.Server.EntryPoints where
23import ProjectM36.Base hiding (inclusionDependencies)
34import ProjectM36.IsomorphicSchema
45import ProjectM36.Client as C
5−import ProjectM36.Error
6−import Control.Distributed.Process (Process, ProcessId)
7−import Control.Distributed.Process.ManagedProcess (ProcessReply)
8−import Control.Distributed.Process.ManagedProcess.Server (reply)
9−import Control.Distributed.Process.Async (async, task, waitCancelTimeout, AsyncResult(..))
10−import Control.Distributed.Process.Serializable (Serializable)
11−import Control.Monad.IO.Class (liftIO)
126import Data.Map
137import Control.Concurrent (threadDelay)
8+import Network.RPC.Curryer.Server
9+import System.Timeout hiding (Timeout)
10+import Network.Socket
11+import Control.Exception
1412
15−timeoutOrDie :: Serializable a => Timeout -> IO a -> Process (Either ServerError a)
16−timeoutOrDie micros act =
17− if micros == 0 then
18− liftIO act >>= \x -> pure (Right x)
19− else do
20− asyncUnit <- async (task (liftIO act))
21− asyncRes <- waitCancelTimeout micros asyncUnit
22− case asyncRes of
23− AsyncDone x -> pure (Right x)
24− AsyncCancelled -> pure (Left RequestTimeoutError)
25− AsyncFailed reason -> pure (Left (ProcessDiedError (show reason)))
26− AsyncLinkFailed reason -> pure (Left (ProcessDiedError (show reason)))
27− AsyncPending -> pure (Left (ProcessDiedError "process pending"))
28−
29−type Timeout = Int
13+timeoutOrDie :: Maybe Timeout -> IO a -> IO (Maybe a)
14+timeoutOrDie mMicros act =
15+ case mMicros of
16+ Nothing -> Just <$> act
17+ Just micros ->
18+ timeout (fromIntegral micros) act
3019
31−type Reply a = Process (ProcessReply (Either ServerError a) Connection)
32−
33−handleExecuteRelationalExpr :: Timeout -> SessionId -> Connection -> RelationalExpr -> Reply (Either RelationalError Relation)
34−handleExecuteRelationalExpr ti sessionId conn expr = do
35− ret <- timeoutOrDie ti (executeRelationalExpr sessionId conn expr)
36− reply ret conn
37−
38−handleExecuteDatabaseContextExpr :: Timeout -> SessionId -> Connection -> DatabaseContextExpr -> Reply (Either RelationalError ())
39−handleExecuteDatabaseContextExpr ti sessionId conn dbexpr = do
40− ret <- timeoutOrDie ti (executeDatabaseContextExpr sessionId conn dbexpr)
41− reply ret conn
42−
43−handleExecuteDatabaseContextIOExpr :: Timeout -> SessionId -> Connection -> DatabaseContextIOExpr -> Reply (Either RelationalError ())
44−handleExecuteDatabaseContextIOExpr ti sessionId conn dbexpr = do
45− ret <- timeoutOrDie ti (executeDatabaseContextIOExpr sessionId conn dbexpr)
46− reply ret conn
47−
48−handleExecuteHeadName :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError HeadName)
49−handleExecuteHeadName ti sessionId conn = do
50− ret <- timeoutOrDie ti (headName sessionId conn)
51− reply ret conn
52−
53−handleLogin :: Timeout -> Connection -> ProcessId -> Reply Bool
54−handleLogin ti conn newClientProcessId = do
55− ret <- timeoutOrDie ti (addClientNode conn newClientProcessId)
20+timeoutRelErr :: Maybe Timeout -> IO (Either RelationalError a) -> IO (Either RelationalError a)
21+timeoutRelErr mMicros act = do
22+ ret <- timeoutOrDie mMicros act
5623 case ret of
57− Right () -> reply (Right True) conn
58− Left err -> reply (Left err) conn
59−
60−handleExecuteGraphExpr :: Timeout -> SessionId -> Connection -> TransactionGraphOperator -> Reply (Either RelationalError ())
61−handleExecuteGraphExpr ti sessionId conn graphExpr = do
62− ret <- timeoutOrDie ti (executeGraphExpr sessionId conn graphExpr)
63− reply ret conn
64−
65−handleExecuteTransGraphRelationalExpr :: Timeout -> SessionId -> Connection -> TransGraphRelationalExpr -> Reply (Either RelationalError Relation)
66−handleExecuteTransGraphRelationalExpr ti sessionId conn graphExpr = do
67− ret <- timeoutOrDie ti (executeTransGraphRelationalExpr sessionId conn graphExpr)
68− reply ret conn
24+ Nothing -> throw TimeoutException
25+ Just v -> pure v
26+
6927
70−handleExecuteTypeForRelationalExpr :: Timeout -> SessionId -> Connection -> RelationalExpr -> Reply (Either RelationalError Relation)
71−handleExecuteTypeForRelationalExpr ti sessionId conn relExpr = do
72− ret <- timeoutOrDie ti (typeForRelationalExpr sessionId conn relExpr)
73− reply ret conn
74−
75−handleRetrieveInclusionDependencies :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError (Map IncDepName InclusionDependency))
76−handleRetrieveInclusionDependencies ti sessionId conn = do
77− ret <- timeoutOrDie ti (inclusionDependencies sessionId conn)
78− reply ret conn
79−
80−handleRetrievePlanForDatabaseContextExpr :: Timeout -> SessionId -> Connection -> DatabaseContextExpr -> Reply (Either RelationalError DatabaseContextExpr)
81−handleRetrievePlanForDatabaseContextExpr ti sessionId conn dbExpr = do
82− ret <- timeoutOrDie ti (planForDatabaseContextExpr sessionId conn dbExpr)
83− reply ret conn
84−
85−handleRetrieveTransactionGraph :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)
86−handleRetrieveTransactionGraph ti sessionId conn = do
87− ret <- timeoutOrDie ti (transactionGraphAsRelation sessionId conn)
88− reply ret conn
89−
90−handleRetrieveHeadTransactionId :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError TransactionId)
91−handleRetrieveHeadTransactionId ti sessionId conn = do
92− ret <- timeoutOrDie ti (headTransactionId sessionId conn)
93− reply ret conn
94−
95−handleCreateSessionAtCommit :: Timeout -> Connection -> TransactionId -> Reply (Either RelationalError SessionId)
96−handleCreateSessionAtCommit ti conn commitId = do
97− ret <- timeoutOrDie ti (createSessionAtCommit conn commitId)
98− reply ret conn
99−
100−handleCreateSessionAtHead :: Timeout -> Connection -> HeadName -> Reply (Either RelationalError SessionId)
101−handleCreateSessionAtHead ti conn headn = do
102− ret <- timeoutOrDie ti (createSessionAtHead conn headn)
103− reply ret conn
104−
105−handleCloseSession :: Timeout -> SessionId -> Connection -> Reply ()
106−handleCloseSession ti sessionId conn = do
107− ret <- timeoutOrDie ti (closeSession sessionId conn)
108− case ret of
109− Right () -> reply (Right ()) conn
110− Left err -> reply (Left err) conn
28+handleExecuteRelationalExpr :: Maybe Timeout -> SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)
29+handleExecuteRelationalExpr ti sessionId conn expr =
30+ timeoutRelErr ti (executeRelationalExpr sessionId conn expr)
31+
32+handleExecuteDataFrameExpr :: Maybe Timeout -> SessionId -> Connection -> DataFrameExpr -> IO (Either RelationalError DataFrame)
33+handleExecuteDataFrameExpr ti sessionId conn expr =
34+ timeoutRelErr ti (executeDataFrameExpr sessionId conn expr)
35+
36+handleExecuteDatabaseContextExpr :: Maybe Timeout -> SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError ())
37+handleExecuteDatabaseContextExpr ti sessionId conn dbexpr =
38+ timeoutRelErr ti (executeDatabaseContextExpr sessionId conn dbexpr)
39+
40+handleExecuteDatabaseContextIOExpr :: Maybe Timeout -> SessionId -> Connection -> DatabaseContextIOExpr -> IO (Either RelationalError ())
41+handleExecuteDatabaseContextIOExpr ti sessionId conn dbexpr =
42+ timeoutRelErr ti (executeDatabaseContextIOExpr sessionId conn dbexpr)
43+
44+handleExecuteHeadName :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError HeadName)
45+handleExecuteHeadName ti sessionId conn =
46+ timeoutRelErr ti (headName sessionId conn)
47+
48+handleLogin :: Connection -> Locking Socket -> IO Bool
49+handleLogin conn lockSock = do
50+ addClientNode conn lockSock
51+ pure True
52+
53+handleExecuteGraphExpr :: Maybe Timeout -> SessionId -> Connection -> TransactionGraphOperator -> IO (Either RelationalError ())
54+handleExecuteGraphExpr ti sessionId conn graphExpr =
55+ timeoutRelErr ti (executeGraphExpr sessionId conn graphExpr)
56+
57+handleExecuteTransGraphRelationalExpr :: Maybe Timeout -> SessionId -> Connection -> TransGraphRelationalExpr -> IO (Either RelationalError Relation)
58+handleExecuteTransGraphRelationalExpr ti sessionId conn graphExpr =
59+ timeoutRelErr ti (executeTransGraphRelationalExpr sessionId conn graphExpr)
60+
61+handleExecuteTypeForRelationalExpr :: Maybe Timeout -> SessionId -> Connection -> RelationalExpr -> IO (Either RelationalError Relation)
62+handleExecuteTypeForRelationalExpr ti sessionId conn relExpr =
63+ timeoutRelErr ti (typeForRelationalExpr sessionId conn relExpr)
64+
65+handleRetrieveInclusionDependencies :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError (Map IncDepName InclusionDependency))
66+handleRetrieveInclusionDependencies ti sessionId conn =
67+ timeoutRelErr ti (inclusionDependencies sessionId conn)
68+
69+handleRetrievePlanForDatabaseContextExpr :: Maybe Timeout -> SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError GraphRefDatabaseContextExpr)
70+handleRetrievePlanForDatabaseContextExpr ti sessionId conn dbExpr =
71+ timeoutRelErr ti (planForDatabaseContextExpr sessionId conn dbExpr)
72+
73+handleRetrieveTransactionGraph :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)
74+handleRetrieveTransactionGraph ti sessionId conn =
75+ timeoutRelErr ti (transactionGraphAsRelation sessionId conn)
76+
77+handleRetrieveHeadTransactionId :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError TransactionId)
78+handleRetrieveHeadTransactionId ti sessionId conn =
79+ timeoutRelErr ti (headTransactionId sessionId conn)
11180
112−handleRetrieveAtomTypesAsRelation :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)
113−handleRetrieveAtomTypesAsRelation ti sessionId conn = do
114− ret <- timeoutOrDie ti (atomTypesAsRelation sessionId conn)
115− reply ret conn
81+handleCreateSessionAtCommit :: Maybe Timeout -> Connection -> TransactionId -> IO (Either RelationalError SessionId)
82+handleCreateSessionAtCommit ti conn commitId =
83+ timeoutRelErr ti (createSessionAtCommit conn commitId)
84+
85+handleCreateSessionAtHead :: Maybe Timeout -> Connection -> HeadName -> IO (Either RelationalError SessionId)
86+handleCreateSessionAtHead ti conn headn =
87+ timeoutRelErr ti (createSessionAtHead conn headn)
88+
89+handleCloseSession :: SessionId -> Connection -> IO ()
90+handleCloseSession =
91+ closeSession
92+
93+handleRetrieveAtomTypesAsRelation :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)
94+handleRetrieveAtomTypesAsRelation ti sessionId conn =
95+ timeoutRelErr ti (atomTypesAsRelation sessionId conn)
11696
11797-- | Returns a relation which lists the names of relvars in the current session as well as its types.
118−handleRetrieveRelationVariableSummary :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Relation)
119−handleRetrieveRelationVariableSummary ti sessionId conn = do
120− ret <- timeoutOrDie ti (relationVariablesAsRelation sessionId conn)
121− reply ret conn
122−
123−handleRetrieveCurrentSchemaName :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError SchemaName)
124−handleRetrieveCurrentSchemaName ti sessionId conn = do
125− ret <- timeoutOrDie ti (currentSchemaName sessionId conn)
126− reply ret conn
98+handleRetrieveRelationVariableSummary :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)
99+handleRetrieveRelationVariableSummary ti sessionId conn =
100+ timeoutRelErr ti (relationVariablesAsRelation sessionId conn)
101+
102+handleRetrieveAtomFunctionSummary :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)
103+handleRetrieveAtomFunctionSummary ti sessionId conn =
104+ timeoutRelErr ti (atomFunctionsAsRelation sessionId conn)
105+
106+handleRetrieveDatabaseContextFunctionSummary :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Relation)
107+handleRetrieveDatabaseContextFunctionSummary ti sessionId conn =
108+ timeoutRelErr ti (databaseContextFunctionsAsRelation sessionId conn)
109+
110+handleRetrieveCurrentSchemaName :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError SchemaName)
111+handleRetrieveCurrentSchemaName ti sessionId conn =
112+ timeoutRelErr ti (currentSchemaName sessionId conn)
127113
128−handleExecuteSchemaExpr :: Timeout -> SessionId -> Connection -> SchemaExpr -> Reply (Either RelationalError ())
129−handleExecuteSchemaExpr ti sessionId conn schemaExpr = do
130− ret <- timeoutOrDie ti (executeSchemaExpr sessionId conn schemaExpr)
131− reply ret conn
114+handleExecuteSchemaExpr :: Maybe Timeout -> SessionId -> Connection -> SchemaExpr -> IO (Either RelationalError ())
115+handleExecuteSchemaExpr ti sessionId conn schemaExpr =
116+ timeoutRelErr ti (executeSchemaExpr sessionId conn schemaExpr)
132117
133−handleLogout :: Timeout -> Connection -> Reply Bool
134−handleLogout _ =
118+handleLogout :: Maybe Timeout -> Connection -> IO Bool
119+handleLogout _ _ =
135120 --liftIO $ closeRemote_ conn
136− reply (pure True)
121+ pure True
137122
138−handleTestTimeout :: Timeout -> SessionId -> Connection -> Reply Bool
139−handleTestTimeout ti _ conn = do
140− ret <- timeoutOrDie ti (threadDelay 100000 >> pure True)
141− reply ret conn
123+handleTestTimeout :: Maybe Timeout -> SessionId -> Connection -> IO Bool
124+handleTestTimeout ti _ _ = do
125+ ret <- timeoutRelErr ti (threadDelay 100000 >> pure (Right ()))
126+ case ret of
127+ Right () -> pure True
128+ Left _ -> pure False
142129
143−handleRetrieveSessionIsDirty :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError Bool)
144−handleRetrieveSessionIsDirty ti sessionId conn = do
145− ret <- timeoutOrDie ti (disconnectedTransactionIsDirty sessionId conn)
146− reply ret conn
147−
148−handleExecuteAutoMergeToHead :: Timeout -> SessionId -> Connection -> MergeStrategy -> HeadName -> Reply (Either RelationalError ())
149−handleExecuteAutoMergeToHead ti sessionId conn strat headName' = do
150− ret <- timeoutOrDie ti (autoMergeToHead sessionId conn strat headName')
151− reply ret conn
130+
131+
132+handleRetrieveSessionIsDirty :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError Bool)
133+handleRetrieveSessionIsDirty ti sessionId conn =
134+ timeoutRelErr ti (disconnectedTransactionIsDirty sessionId conn)
135+
136+handleExecuteAutoMergeToHead :: Maybe Timeout -> SessionId -> Connection -> MergeStrategy -> HeadName -> IO (Either RelationalError ())
137+handleExecuteAutoMergeToHead ti sessionId conn strat headName' =
138+ timeoutRelErr ti (autoMergeToHead sessionId conn strat headName')
152139
153−handleRetrieveTypeConstructorMapping :: Timeout -> SessionId -> Connection -> Reply (Either RelationalError TypeConstructorMapping)
154−handleRetrieveTypeConstructorMapping ti sessionId conn = do
155− ret <- timeoutOrDie ti (C.typeConstructorMapping sessionId conn)
156− reply ret conn
157−
140+handleRetrieveTypeConstructorMapping :: Maybe Timeout -> SessionId -> Connection -> IO (Either RelationalError TypeConstructorMapping)
141+handleRetrieveTypeConstructorMapping ti sessionId conn =
142+ timeoutRelErr ti (C.typeConstructorMapping sessionId conn)
143+
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+60−25
@@ -3,65 +3,100 @@ import ProjectM36.Base
33import ProjectM36.Client
44import Options.Applicative
55import ProjectM36.Server.Config
6+#if __GLASGOW_HASKELL__ < 804
67import Data.Monoid
8+#endif
79
810parseArgsWithDefaults :: ServerConfig -> Parser ServerConfig
9−parseArgsWithDefaults defaults = ServerConfig <$>
10− parsePersistenceStrategy <*>
11− parseCheckFS <*>
12− parseDatabaseName <*>
13− parseHostname (bindHost defaults) <*>
14− parsePort (bindPort defaults) <*>
15− many parseGhcPkgPath <*>
16− parseTimeout (perRequestTimeout defaults) <*>
17− pure False
18−
11+parseArgsWithDefaults defaults = ServerConfig <$>
12+ parsePersistenceStrategy <*>
13+ parseCheckFS <*>
14+ parseDatabaseName <*>
15+ parseHostname (bindHost defaults) <*>
16+ parsePort (bindPort defaults) <*>
17+ many parseGhcPkgPath <*>
18+ parseTimeout (perRequestTimeout defaults) <*>
19+ parseTestMode
20+
1921parsePersistenceStrategy :: Parser PersistenceStrategy
2022parsePersistenceStrategy = CrashSafePersistence <$> (dbdirOpt <* fsyncOpt) <|>
2123 MinimalPersistence <$> dbdirOpt <|>
2224 pure NoPersistence
23− where
24− dbdirOpt = strOption (short 'd' <>
25− long "database-directory" <>
25+ where
26+ dbdirOpt = strOption (short 'd' <>
27+ long "database-directory" <>
2628 metavar "DIRECTORY" <>
2729 showDefaultWith show
2830 )
2931 fsyncOpt = switch (short 'f' <>
3032 long "fsync" <>
3133 help "Fsync all new transactions.")
32−
33−parseCheckFS :: Parser Bool
34+
35+parseTestMode :: Parser Bool
36+parseTestMode = flag True False (long "test-mode" <> hidden)
37+
38+parseCheckFS :: Parser Bool
3439parseCheckFS = flag True False (long "disable-fscheck" <>
3540 help "Disable filesystem check for journaling.")
36−
41+
3742parseDatabaseName :: Parser DatabaseName
3843parseDatabaseName = strOption (short 'n' <>
3944 long "database" <>
4045 metavar "DATABASE_NAME")
41−
42−parseHostname :: Hostname -> Parser Hostname
46+
47+parseHostname :: Hostname -> Parser Hostname
4348parseHostname defHostname = strOption (short 'h' <>
4449 long "hostname" <>
4550 metavar "HOST_NAME" <>
4651 value defHostname)
47−
48−parsePort :: Port -> Parser Port
52+
53+parsePort :: Port -> Parser Port
4954parsePort defPort = option auto (short 'p' <>
5055 long "port" <>
5156 metavar "PORT_NUMBER" <>
5257 value defPort)
53−
58+
5459parseGhcPkgPath :: Parser String
5560parseGhcPkgPath = strOption (long "ghc-pkg-dir" <>
5661 metavar "GHC_PACKAGE_DIRECTORY")
57−
58−parseTimeout :: Int -> Parser Int
62+
63+parseTimeout :: Int -> Parser Int
5964parseTimeout defTimeout = option auto (long "timeout" <>
6065 metavar "MICROSECONDS" <>
6166 value defTimeout)
6267
6368parseConfig :: IO ServerConfig
6469parseConfig = parseConfigWithDefaults defaultServerConfig
65−
70+
6671parseConfigWithDefaults :: ServerConfig -> IO ServerConfig
67−parseConfigWithDefaults defaults = execParser (info (parseArgsWithDefaults defaults) idm)
72+parseConfigWithDefaults 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+
92+helpOption :: Parser (a -> a)
93+helpOption = abortOption helpText $ mconcat
94+ [ long "help"
95+ , help "Show this help text"
96+ , hidden ]
97+ where
98+#if MIN_VERSION_optparse_applicative(0,16,0)
99+ helpText = ShowHelpText Nothing
100+#else
101+ helpText = ShowHelpText
102+#endif
src/lib/ProjectM36/Server/RemoteCallTypes.hs+71−32
@@ -1,64 +1,103 @@
1−{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}
1+{-# LANGUAGE DeriveGeneric, DerivingVia, CPP #-}
22module ProjectM36.Server.RemoteCallTypes where
33import ProjectM36.Base
44import ProjectM36.IsomorphicSchema
55import ProjectM36.TransactionGraph
6+import ProjectM36.DataFrame
67import ProjectM36.TransGraphRelationalExpression
78import ProjectM36.Session
9+import ProjectM36.Serialise.DataFrame ()
10+import ProjectM36.Serialise.IsomorphicSchema ()
811import GHC.Generics
9−import Data.Binary
10−import Control.Distributed.Process (ProcessId)
12+import Codec.Winery
13+
14+#define RPCData(typeName) deriving Generic \
15+ deriving Serialise via WineryVariant typeName
1116
1217{-# ANN module ("HLint: ignore Use newtype instead of data" :: String) #-}
1318-- | The initial login message. The argument should be the process id of the initiating client. This ProcessId will receive notification callbacks.
14−data Login = Login ProcessId
15− deriving (Binary, Generic)
19+data Login = Login DatabaseName
20+ RPCData(Login)
1621
1722data Logout = Logout
18− deriving (Binary, Generic)
19−data ExecuteRelationalExpr = ExecuteRelationalExpr SessionId RelationalExpr
20− deriving (Binary, Generic)
23+ RPCData(Logout)
24+
25+data ExecuteRelationalExpr = ExecuteRelationalExpr SessionId RelationalExpr
26+ RPCData(ExecuteRelationalExpr)
27+
28+data ExecuteDataFrameExpr = ExecuteDataFrameExpr SessionId DataFrameExpr
29+ RPCData(ExecuteDataFrameExpr)
30+
2131data ExecuteDatabaseContextExpr = ExecuteDatabaseContextExpr SessionId DatabaseContextExpr
22− deriving (Binary, Generic)
32+ RPCData(ExecuteDatabaseContextExpr)
33+
2334data ExecuteDatabaseContextIOExpr = ExecuteDatabaseContextIOExpr SessionId DatabaseContextIOExpr
24− deriving (Binary, Generic)
35+ RPCData(ExecuteDatabaseContextIOExpr)
36+
2537data ExecuteGraphExpr = ExecuteGraphExpr SessionId TransactionGraphOperator
26− deriving (Binary, Generic)
38+ RPCData(ExecuteGraphExpr)
39+
2740data ExecuteTransGraphRelationalExpr = ExecuteTransGraphRelationalExpr SessionId TransGraphRelationalExpr
28− deriving (Binary, Generic)
41+ RPCData(ExecuteTransGraphRelationalExpr)
42+
2943data ExecuteHeadName = ExecuteHeadName SessionId
30− deriving (Binary, Generic)
44+ RPCData(ExecuteHeadName)
45+
3146data ExecuteTypeForRelationalExpr = ExecuteTypeForRelationalExpr SessionId RelationalExpr
32− deriving (Binary, Generic)
33−data ExecuteSchemaExpr = ExecuteSchemaExpr SessionId SchemaExpr
34− deriving (Binary, Generic)
47+ RPCData(ExecuteTypeForRelationalExpr)
48+
49+data ExecuteSchemaExpr = ExecuteSchemaExpr SessionId SchemaExpr RPCData(ExecuteSchemaExpr)
50+
3551data ExecuteSetCurrentSchema = ExecuteSetCurrentSchema SessionId SchemaName
36− deriving (Binary, Generic)
52+ RPCData(ExecuteSetCurrentSchema)
53+
3754data RetrieveInclusionDependencies = RetrieveInclusionDependencies SessionId
38− deriving (Binary, Generic)
55+ RPCData(RetrieveInclusionDependencies)
56+
3957data RetrievePlanForDatabaseContextExpr = RetrievePlanForDatabaseContextExpr SessionId DatabaseContextExpr
40− deriving (Binary, Generic)
58+ RPCData(RetrievePlanForDatabaseContextExpr)
59+
4160data RetrieveTransactionGraph = RetrieveTransactionGraph SessionId
42− deriving (Binary, Generic)
61+ RPCData(RetrieveTransactionGraph)
62+
4363data RetrieveHeadTransactionId = RetrieveHeadTransactionId SessionId
44− deriving (Binary, Generic)
64+ RPCData(RetrieveHeadTransactionId)
65+
4566data CreateSessionAtCommit = CreateSessionAtCommit TransactionId
46− deriving (Binary, Generic)
67+ RPCData(CreateSessionAtCommit)
68+
4769data CreateSessionAtHead = CreateSessionAtHead HeadName
48− deriving (Binary, Generic)
70+ RPCData(CreateSessionAtHead)
71+
4972data CloseSession = CloseSession SessionId
50− deriving (Binary, Generic)
73+ RPCData(CloseSession)
74+
5175data RetrieveAtomTypesAsRelation = RetrieveAtomTypesAsRelation SessionId
52− deriving (Binary, Generic)
76+ RPCData(RetrieveAtomTypesAsRelation)
77+
5378data RetrieveRelationVariableSummary = RetrieveRelationVariableSummary SessionId
54− deriving (Binary, Generic)
79+ RPCData(RetrieveRelationVariableSummary)
80+
81+data RetrieveAtomFunctionSummary = RetrieveAtomFunctionSummary SessionId
82+ RPCData(RetrieveAtomFunctionSummary)
83+
84+data RetrieveDatabaseContextFunctionSummary = RetrieveDatabaseContextFunctionSummary SessionId
85+ RPCData(RetrieveDatabaseContextFunctionSummary)
86+
5587data RetrieveCurrentSchemaName = RetrieveCurrentSchemaName SessionId
56− deriving (Binary, Generic)
88+ RPCData(RetrieveCurrentSchemaName)
89+
5790data TestTimeout = TestTimeout SessionId
58− deriving (Binary, Generic)
59−data RetrieveSessionIsDirty = RetrieveSessionIsDirty SessionId
60− deriving (Binary, Generic)
91+ RPCData(TestTimeout)
92+
93+data RetrieveSessionIsDirty = RetrieveSessionIsDirty SessionId
94+ RPCData(RetrieveSessionIsDirty)
95+
6196data ExecuteAutoMergeToHead = ExecuteAutoMergeToHead SessionId MergeStrategy HeadName
62− deriving (Binary, Generic)
97+ RPCData(ExecuteAutoMergeToHead)
98+
6399data RetrieveTypeConstructorMapping = RetrieveTypeConstructorMapping SessionId
64− deriving (Binary, Generic)
100+ RPCData(RetrieveTypeConstructorMapping)
101+
102+data ExecuteValidateMerkleHashes = ExecuteValidateMerkleHashes SessionId
103+ RPCData(ExecuteValidateMerkleHashes)
src/lib/ProjectM36/Session.hs+3−2
@@ -3,6 +3,7 @@ import ProjectM36.Base
33import Data.UUID
44import qualified Data.Map as M
55import ProjectM36.Error
6+import qualified ProjectM36.DisconnectedTransaction as Discon
67
78type SessionId = UUID
89
@@ -18,7 +19,7 @@ disconnectedTransaction :: Session -> DisconnectedTransaction
1819disconnectedTransaction (Session discon _) = discon
1920
2021isDirty :: Session -> DirtyFlag
21−isDirty (Session (DisconnectedTransaction _ _ dirtyFlag) _) = dirtyFlag
22+isDirty (Session discon _) = Discon.isDirty discon
2223
2324concreteDatabaseContext :: Session -> DatabaseContext
2425concreteDatabaseContext (Session (DisconnectedTransaction _ (Schemas context _) _) _) = context
@@ -40,4 +41,4 @@ setSchemaName sname session = if sname == defaultSchemaName || M.member sname (s
4041 pure (Session (disconnectedTransaction session) sname)
4142 else
4243 Left (SubschemaNameNotInUseError sname)
43−
44+
src/lib/ProjectM36/Sessions.hs+29−7
@@ -1,18 +1,42 @@
1+{-# LANGUAGE PackageImports #-}
12module ProjectM36.Sessions where
23import Control.Concurrent.STM
3−import qualified STMContainers.Map as STMMap
4−import ListT
4+#if MIN_VERSION_stm_containers(1,0,0)
5+import qualified StmContainers.Map as StmMap
6+import qualified StmContainers.Set as StmSet
7+#else
8+import qualified STMContainers.Map as StmMap
9+import qualified STMContainers.Set as StmSet
10+#endif
511import ProjectM36.Attribute
612import ProjectM36.Base
713import ProjectM36.Session
814import ProjectM36.Relation
915import ProjectM36.Error
1016import qualified Data.UUID as U
17+#if MIN_VERSION_stm_containers(1,0,0)
18+import qualified Control.Foldl as Foldl
19+import qualified DeferredFolds.UnfoldlM as UF
20+#else
21+import "list-t" ListT
22+#endif
1123
12−type Sessions = STMMap.Map SessionId Session
24+type Sessions = StmMap.Map SessionId Session
1325
14−stmMapToList :: STMMap.Map k v -> STM [(k, v)]
15−stmMapToList = ListT.fold (\l -> return . (:l)) [] . STMMap.stream
26+--from https://github.com/nikita-volkov/stm-containers/blob/master/test/Main/MapTests.hs
27+stmMapToList :: StmMap.Map k v -> STM [(k, v)]
28+#if MIN_VERSION_stm_containers(1,0,0)
29+stmMapToList = UF.foldM (Foldl.generalize Foldl.list) . StmMap.unfoldlM
30+#else
31+stmMapToList = ListT.fold (\l -> return . (:l)) [] . StmMap.stream
32+#endif
33+
34+stmSetToList :: StmSet.Set v -> STM [v]
35+#if MIN_VERSION_stm_containers(1,0,0)
36+stmSetToList = UF.foldM (Foldl.generalize Foldl.list) . StmSet.unfoldlM
37+#else
38+stmSetToList = ListT.fold (\l -> return . (:l)) [] . StmSet.stream
39+#endif
1640
1741uuidAtom :: U.UUID -> Atom
1842uuidAtom = TextAtom . U.toText
@@ -23,5 +47,3 @@ sessionsAsRelation sessions = do
2347 let atomMatrix = map (\(sessionId, session) -> [uuidAtom sessionId, uuidAtom (parentId session)]) sessionAssocs
2448 pure $ mkRelationFromList (attributesFromList [Attribute "sessionid" TextAtomType,
2549 Attribute "parentCommit" TextAtomType]) atomMatrix
26−
27−
src/lib/ProjectM36/Shortcuts.hsnew file+247
@@ -0,0 +1,247 @@
1+{-# OPTIONS_GHC -fno-warn-orphans #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+{-# LANGUAGE TypeApplications #-}
4+{-# LANGUAGE FlexibleInstances #-}
5+{-# LANGUAGE MultiParamTypeClasses #-}
6+{-# LANGUAGE TypeFamilies #-}
7+{-# LANGUAGE ExtendedDefaultRules #-}
8+{-# LANGUAGE ExistentialQuantification #-}
9+{-# LANGUAGE FlexibleContexts #-}
10+{-# LANGUAGE GADTs #-}
11+{-# LANGUAGE UndecidableInstances #-}
12+module ProjectM36.Shortcuts where
13+-- users need OverloadedLabels, OverloadedLists, and default(Int,Text) to use these shortcuts.
14+import Data.Text hiding (foldl, map)
15+import ProjectM36.Base
16+import ProjectM36.Relation
17+import ProjectM36.Atomable
18+import Prelude hiding ((!!))
19+import Data.Proxy
20+import GHC.OverloadedLabels
21+import GHC.TypeLits hiding (Text)
22+import qualified Data.Text as T
23+import qualified Data.Map as M
24+import qualified Data.Set as S
25+import GHC.Exts (IsList(..))
26+import Data.Convertible
27+
28+default (Text)
29+
30+instance IsList (AttributeNamesBase ()) where
31+ type Item (AttributeNamesBase ()) = AttributeName
32+ fromList = AttributeNames . S.fromList
33+ toList (AttributeNames ns) = S.toList ns
34+ toList _ = error "needs AttributeNames"
35+
36+instance IsList (TupleExprsBase ()) where
37+ type Item TupleExprs = TupleExpr
38+ fromList ts = TupleExprs () ts
39+ toList (TupleExprs _ ts) = ts
40+
41+instance IsList TupleExpr where
42+ type Item TupleExpr = (AttributeName, AtomExpr)
43+ fromList attributeValues = TupleExpr (M.fromList attributeValues)
44+ toList (TupleExpr attributeValues) = M.toList attributeValues
45+
46+
47+-- #xxx :: Text
48+instance KnownSymbol x => IsLabel x Text where
49+ fromLabel = T.pack $ symbolVal @x Proxy
50+
51+-- #relvarName :: RelationalExpr
52+instance KnownSymbol x => IsLabel x RelationalExpr where
53+ fromLabel = RelationVariable (T.pack $ symbolVal @x Proxy) ()
54+
55+-- *Main> #a Int :: AttributeExpr
56+-- NakedAttributeExpr (Attribute "a" IntAtomType)
57+-- *Main> #a (Attr @[Int]) :: AttributeExpr
58+-- NakedAttributeExpr (Attribute "a" (ConstructedAtomType "List" (fromList [("a",IntAtomType)])))
59+-- can't offer a Relation atomtype -- don't know how to express a Relation type in haskell type. Maybe something a HList of (Text, a) ?
60+--
61+-- ps. I don't understand the usage of "AttributeAndTypeNameExpr AttributeName TypeConstructor a"
62+instance (KnownSymbol x, Atomable a)=> IsLabel x (HaskAtomType a -> AttributeExpr) where
63+ fromLabel = (NakedAttributeExpr . Attribute name) . toAtomType''
64+ where name = T.pack $ symbolVal @x Proxy
65+
66+-- (#a 1) :: ExtendTupleExpr
67+-- no need for :=
68+instance (Convertible a AtomExpr, KnownSymbol x) => IsLabel x (a -> ExtendTupleExpr) where
69+ fromLabel x = AttributeExtendTupleExpr name (convert x)
70+ where name = T.pack $ symbolVal @x Proxy
71+
72+-- #name AtomExpr
73+-- ex. tuple [ #name 3 ]
74+-- default(Text) is needed in client code to avoid `no Atomable Char`
75+instance (Convertible a AtomExpr, KnownSymbol x) => IsLabel x (a -> (AttributeName, AtomExpr)) where
76+ fromLabel = \x -> (name, convert x)
77+ where name = T.pack $ symbolVal @x Proxy
78+
79+-- *Main> #a [1] :: AtomExpr
80+-- FunctionAtomExpr "a" [NakedAtomExpr (IntegerAtom 1)] ()
81+--
82+-- This usage is not working in RestrictionPredicateExpr and AttributeExtendTupleExpr. Use f "a" [1] instead.
83+instance (KnownSymbol x, Convertible a AtomExpr) => IsLabel x ([a] -> AtomExpr) where
84+ fromLabel = \as' -> FunctionAtomExpr name (map convert as') ()
85+ where name = T.pack $ symbolVal @x Proxy
86+
87+instance (KnownSymbol x) => IsLabel x AtomExpr where
88+ fromLabel = AttributeAtomExpr name
89+ where name = T.pack $ symbolVal @x Proxy
90+
91+
92+data HaskAtomType a where
93+ Int :: HaskAtomType Int
94+ Integer :: HaskAtomType Integer
95+ Double :: HaskAtomType Double
96+ Text :: HaskAtomType Text
97+-- Day :: HaskAtomType Day
98+-- DateTime :: HaskAtomType DateTime
99+-- ByteString :: HaskAtomType ByteString
100+ Bool :: HaskAtomType Bool
101+ Attr :: Atomable a => HaskAtomType a -- a Proxy-like value for type application.
102+
103+toAtomType'' :: Atomable a => HaskAtomType a -> AtomType
104+toAtomType'' (_ :: HaskAtomType a) = toAtomType (Proxy @a)
105+
106+-- usage: relation [tuple [#a 1, #b "b"], tuple [#a 2, #b "b"]]
107+relation :: [TupleExpr] -> RelationalExpr
108+relation ts = MakeRelationFromExprs Nothing (TupleExprs () ts)
109+
110+relation' :: [AttributeExprBase ()] -> [TupleExpr] -> RelationalExpr
111+relation' as' ts = MakeRelationFromExprs (Just as') (TupleExprs () ts)
112+
113+-- usage: tuple [#name "Mike",#age 6]
114+tuple :: [(AttributeName, AtomExpr)] -> TupleExprBase ()
115+tuple as' = TupleExpr (M.fromList as')
116+
117+-- #a rename [#b `as` #c]
118+rename :: RelationalExpr -> [(AttributeName,AttributeName)] -> RelationalExpr
119+rename relExpr renameList = case renameList of
120+ [] -> Restrict TruePredicate relExpr
121+ renames ->
122+ foldl (\acc (old,new) -> Rename old new acc) relExpr renames
123+
124+--project !!
125+-- #a !! [#b,#c]
126+infix 9 !!
127+(!!) :: RelationalExpr -> AttributeNames -> RelationalExpr
128+relExpr !! xs = Project xs relExpr
129+
130+--join ><
131+-- #a >< #b
132+(><) :: RelationalExpr -> RelationalExpr -> RelationalExpr
133+a >< b = Join a b
134+
135+allBut :: AttributeNames -> AttributeNames
136+allBut (AttributeNames ns) = InvertedAttributeNames ns
137+allBut _ = error "give allBut something other than attribute names."
138+
139+allFrom :: RelationalExpr -> AttributeNames
140+allFrom = RelationalExprAttributeNames
141+
142+as :: AttributeNames -> AttributeName -> (AttributeNames, AttributeName)
143+as = (,)
144+
145+-- #a `group` ([#b,#c] `as` #d)
146+group :: RelationalExpr -> (AttributeNames, AttributeName) -> RelationalExpr
147+group relExpr (aNames, aName) = Group aNames aName relExpr
148+
149+-- #a `ungroup` #b
150+ungroup :: RelationalExpr -> AttributeName -> RelationalExpr
151+ungroup relExpr aName = Ungroup aName relExpr
152+
153+-- *Main> #a #:= true #: ( #b (f "count" [1,2]))
154+-- Assign "a" (Extend (AttributeExtendTupleExpr "b" (FunctionAtomExpr "count" [NakedAtomExpr (IntegerAtom 1),NakedAtomExpr (IntegerAtom 2)] ())) (ExistingRelation (Relation attributesFromList [] (RelationTupleSet {asList = [RelationTuple attributesFromList [] []]}))))
155+(#:) :: RelationalExpr -> ExtendTupleExpr -> RelationalExpr
156+a #: b = Extend b a
157+infix 8 #:
158+
159+instance Convertible AtomExpr AtomExpr where
160+ safeConvert n = Right n
161+
162+instance Convertible RelVarName AtomExpr where
163+ safeConvert n = Right $ RelationAtomExpr (RelationVariable n ())
164+
165+instance Convertible RelationalExpr AtomExpr where
166+ safeConvert relExpr = Right $ RelationAtomExpr relExpr
167+
168+instance Convertible RelVarName RelationalExpr where
169+ safeConvert n = Right $ RelationVariable n ()
170+
171+-- @ in tutd
172+-- (@@) "aaa"
173+(@@) :: AttributeName -> AtomExpr
174+(@@) = AttributeAtomExpr
175+
176+-- works in RestrictedPredicateExpr and AttributeExtendTupleExpr
177+-- usage: f "gte" [1]
178+f :: Convertible a AtomExpr => AtomFunctionName -> [a] -> AtomExpr
179+f n as' = FunctionAtomExpr n (map convert as') ()
180+
181+-- DatabaseContextExpr
182+-- define
183+(#::) :: RelVarName -> [AttributeExpr] -> DatabaseContextExpr
184+s #:: xs = Define s xs
185+infix 5 #::
186+
187+-- assign
188+(#:=) :: RelVarName -> RelationalExpr -> DatabaseContextExpr
189+s #:= r = Assign s r
190+infix 5 #:=
191+
192+class Boolean a b where
193+ (&&&) :: a -> b -> RestrictionPredicateExpr
194+ infixl 6 &&&
195+ (|||) :: a -> b -> RestrictionPredicateExpr
196+ infixl 5 |||
197+
198+-- where: @~ mimics the restriction symbol in algebra
199+-- usage: true #: (#a 1) @~ #a ?= 1 &&& not' false ||| (f "gte" [1])
200+(@~) :: Convertible a RestrictionPredicateExpr => RelationalExpr -> a -> RelationalExpr
201+(@~) relExpr resPreExpr = Restrict (convert resPreExpr) relExpr
202+infix 4 @~
203+
204+true :: RelationalExpr
205+true = ExistingRelation relationTrue
206+
207+false :: RelationalExpr
208+false = ExistingRelation relationFalse
209+
210+trueP :: RestrictionPredicateExprBase a
211+trueP = TruePredicate
212+
213+falseP :: RestrictionPredicateExprBase a
214+falseP = NotPredicate TruePredicate
215+
216+(?=) :: Convertible a AtomExpr => AttributeName -> a -> RestrictionPredicateExpr
217+(?=) name a = AttributeEqualityPredicate name (convert a)
218+infix 9 ?=
219+
220+not' :: Convertible a RestrictionPredicateExpr => a -> RestrictionPredicateExpr
221+not' = NotPredicate . convert
222+
223+instance (Convertible a RestrictionPredicateExpr, Convertible b RestrictionPredicateExpr) => Boolean a b where
224+ a &&& b = AndPredicate (convert a) (convert b)
225+ a ||| b = OrPredicate (convert a) (convert b)
226+
227+instance {-# Incoherent #-} Atomable a => Convertible a RestrictionPredicateExpr where
228+ safeConvert n = Right $ AtomExprPredicate $ toAtomExpr . toAtom $ n
229+
230+instance {-# Incoherent #-} Convertible RelationalExpr RestrictionPredicateExpr where
231+ safeConvert a = Right $ RelationalExprPredicate a
232+
233+instance {-# Incoherent #-} Convertible AtomExpr RestrictionPredicateExpr where
234+ safeConvert a = Right $ AtomExprPredicate a
235+
236+instance {-# Incoherent #-} Convertible RestrictionPredicateExpr RestrictionPredicateExpr where
237+ safeConvert a = Right a
238+
239+instance {-# Incoherent #-} Atomable a => Convertible a AtomExpr where
240+ safeConvert n = Right $ toAtomExpr . toAtom $ n
241+
242+toAtomExpr :: Atom -> AtomExpr
243+toAtomExpr (ConstructedAtom n _ xs) = ConstructedAtomExpr n (toAtomExpr <$> xs) ()
244+toAtomExpr a = NakedAtomExpr a
245+
246+
247+
src/lib/ProjectM36/StaticOptimizer.hs+373−248
@@ -1,287 +1,402 @@
1+{-# LANGUAGE FlexibleInstances #-}
2+{-# LANGUAGE FlexibleContexts #-}
13module ProjectM36.StaticOptimizer where
24import ProjectM36.Base
3−import ProjectM36.RelationalExpression
5+import ProjectM36.GraphRefRelationalExpr
46import ProjectM36.Relation
7+import ProjectM36.RelationalExpression
8+import ProjectM36.TransGraphRelationalExpression as TGRE hiding (askGraph)
59import ProjectM36.Error
10+import ProjectM36.Transaction
11+import ProjectM36.NormalizeExpr
612import qualified ProjectM36.Attribute as A
713import qualified ProjectM36.AttributeNames as AS
814import ProjectM36.TupleSet
915import Control.Monad.State
10−import Data.Either (rights, lefts)
11−import Control.Monad.Trans.Reader
16+import Control.Monad.Reader
17+import Control.Monad.Except
18+import Control.Monad.Trans.Except
19+import Data.Functor.Identity
1220import qualified Data.Map as M
1321import qualified Data.Set as S
1422
1523-- the static optimizer performs optimizations which need not take any specific-relation statistics into account
16−optimizeRelationalExpr :: DatabaseContext -> RelationalExpr -> Either RelationalError RelationalExpr
17−optimizeRelationalExpr context expr = runReader (optimizeRelationalExprReader expr) (mkRelationalExprState context)
18−
19−optimizeRelationalExprReader :: RelationalExpr -> RelationalExprState (Either RelationalError RelationalExpr)
20−optimizeRelationalExprReader expr = do
21− eOptExpr <- applyStaticRelationalOptimization expr
24+
25+data GraphRefSOptRelationalExprEnv =
26+ GraphRefSOptRelationalExprEnv
27+ {
28+ ore_graph :: TransactionGraph,
29+ ore_mcontext :: Maybe DatabaseContext
30+ }
31+
32+type GraphRefSOptRelationalExprM a = ReaderT GraphRefSOptRelationalExprEnv (ExceptT RelationalError Identity) a
33+
34+data GraphRefSOptDatabaseContextExprEnv =
35+ GraphRefSOptDatabaseContextExprEnv
36+ {
37+ odce_graph :: TransactionGraph,
38+ odce_context :: DatabaseContext, --not optional for DatabaseContextExpr evaluation
39+ odce_transId :: TransactionId -- parent if context is committed- needed because MultipleExpr optimization requires running the DatabaseContextExprs (with empty relvars)
40+ }
41+
42+type GraphRefSOptDatabaseContextExprM a = ReaderT GraphRefSOptDatabaseContextExprEnv (ExceptT RelationalError Identity) a
43+
44+-- | A temporary function to be replaced by IO-based implementation.
45+optimizeAndEvalRelationalExpr :: RelationalExprEnv -> RelationalExpr -> Either RelationalError Relation
46+optimizeAndEvalRelationalExpr env expr = do
47+ let gfExpr = runProcessExprM UncommittedContextMarker (processRelationalExpr expr) -- references parent tid instead of context! options- I could add the context to the graph with a new transid or implement an evalRelationalExpr in RE.hs to use the context (which is what I had previously)
48+ graph = re_graph env
49+ ctx = re_context env
50+ gfEnv = freshGraphRefRelationalExprEnv (Just ctx) graph
51+ optExpr <- runGraphRefSOptRelationalExprM (Just ctx) (re_graph env) (fullOptimizeGraphRefRelationalExpr gfExpr)
52+ runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr optExpr)
53+
54+class Monad m => AskGraphContext m where
55+ askGraph :: m TransactionGraph
56+ askContext :: m DatabaseContext
57+
58+instance AskGraphContext (ReaderT GraphRefSOptDatabaseContextExprEnv (ExceptT RelationalError Identity)) where
59+ askGraph = asks odce_graph
60+ askContext = asks odce_context
61+
62+instance AskGraphContext (ReaderT GraphRefSOptRelationalExprEnv (ExceptT RelationalError Identity)) where
63+ askGraph = asks ore_graph
64+ askContext = do
65+ mctx <- asks ore_mcontext
66+ case mctx of
67+ Nothing -> throwError NoUncommittedContextInEvalError
68+ Just ctx -> pure ctx
69+
70+askTransId :: GraphRefSOptDatabaseContextExprM TransactionId
71+askTransId = asks odce_transId
72+
73+askMaybeContext :: GraphRefSOptRelationalExprM (Maybe DatabaseContext)
74+askMaybeContext = asks ore_mcontext
75+
76+optimizeDatabaseContextExpr :: DatabaseContextExpr -> GraphRefSOptDatabaseContextExprM GraphRefDatabaseContextExpr
77+optimizeDatabaseContextExpr expr = do
78+ let gfExpr = runProcessExprM UncommittedContextMarker (processDatabaseContextExpr expr)
79+ optimizeGraphRefDatabaseContextExpr gfExpr
80+
81+optimizeAndEvalDatabaseContextExpr :: Bool -> DatabaseContextExpr -> DatabaseContextEvalMonad ()
82+optimizeAndEvalDatabaseContextExpr optimize expr = do
83+ graph <- asks dce_graph
84+ transId <- asks dce_transId
85+ context <- getStateContext
86+ let gfExpr = runProcessExprM UncommittedContextMarker (processDatabaseContextExpr expr)
87+ eOptExpr = if optimize then
88+ runGraphRefSOptDatabaseContextExprM transId context graph (optimizeGraphRefDatabaseContextExpr gfExpr)
89+ else
90+ pure gfExpr
91+ case eOptExpr of
92+ Left err -> throwError err
93+ Right optExpr -> evalGraphRefDatabaseContextExpr optExpr
94+
95+
96+optimizeAndEvalTransGraphRelationalExpr :: TransactionGraph -> TransGraphRelationalExpr -> Either RelationalError Relation
97+optimizeAndEvalTransGraphRelationalExpr graph tgExpr = do
98+ gfExpr <- TGRE.process (TransGraphEvalEnv graph) tgExpr
99+ optExpr <- runGraphRefSOptRelationalExprM Nothing graph (fullOptimizeGraphRefRelationalExpr gfExpr)
100+ let gfEnv = freshGraphRefRelationalExprEnv Nothing graph
101+ runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr optExpr)
102+
103+optimizeAndEvalDatabaseContextIOExpr :: DatabaseContextIOExpr -> DatabaseContextIOEvalMonad (Either RelationalError ())
104+optimizeAndEvalDatabaseContextIOExpr expr = do
105+ transId <- asks dbcio_transId
106+ ctx <- getDBCIOContext
107+ graph <- asks dbcio_graph
108+ let gfExpr = runProcessExprM UncommittedContextMarker (processDatabaseContextIOExpr expr)
109+ eOptExpr = runGraphRefSOptDatabaseContextExprM transId ctx graph (optimizeDatabaseContextIOExpr gfExpr)
22110 case eOptExpr of
23111 Left err -> pure (Left err)
24112 Right optExpr ->
25− applyStaticJoinElimination (applyStaticRestrictionPushdown (applyStaticRestrictionCollapse optExpr))
113+ evalGraphRefDatabaseContextIOExpr optExpr
114+
115+{-
116+runStaticOptimizerMonad :: RelationalExprEnv -> StaticOptimizerMonad a -> Either RelationalError a
117+runStaticOptimizerMonad env m = runIdentity (runExceptT (runReaderT m env))
118+-}
119+
120+runGraphRefSOptRelationalExprM ::
121+ Maybe DatabaseContext ->
122+ TransactionGraph ->
123+ GraphRefSOptRelationalExprM a ->
124+ Either RelationalError a
125+runGraphRefSOptRelationalExprM mctx graph m = runIdentity (runExceptT (runReaderT m env))
126+ where
127+ env = GraphRefSOptRelationalExprEnv {
128+ ore_graph = graph,
129+ ore_mcontext = mctx
130+ }
131+
132+
133+runGraphRefSOptDatabaseContextExprM ::
134+ TransactionId ->
135+ DatabaseContext ->
136+ TransactionGraph ->
137+ GraphRefSOptDatabaseContextExprM a ->
138+ Either RelationalError a
139+runGraphRefSOptDatabaseContextExprM tid ctx graph m =
140+ runIdentity (runExceptT (runReaderT m env))
141+ where
142+ env = GraphRefSOptDatabaseContextExprEnv {
143+ odce_graph = graph,
144+ odce_context = ctx,
145+ odce_transId = tid
146+ }
147+
148+optimizeGraphRefRelationalExpr' ::
149+ Maybe DatabaseContext ->
150+ TransactionGraph ->
151+ GraphRefRelationalExpr ->
152+ Either RelationalError GraphRefRelationalExpr
153+optimizeGraphRefRelationalExpr' mctx graph expr =
154+ runIdentity (runExceptT (runReaderT (optimizeGraphRefRelationalExpr expr) env))
155+ where
156+ env = GraphRefSOptRelationalExprEnv {
157+ ore_graph = graph,
158+ ore_mcontext = mctx
159+ }
160+
161+-- | optimize relational expression within database context expr monad
162+liftGraphRefRelExpr :: GraphRefSOptRelationalExprM a -> GraphRefSOptDatabaseContextExprM a
163+liftGraphRefRelExpr m = do
164+ context <- asks odce_context
165+ graph <- asks odce_graph
166+ lift $ except $ runGraphRefSOptRelationalExprM (Just context) graph m
167+
168+fullOptimizeGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefSOptRelationalExprM GraphRefRelationalExpr
169+fullOptimizeGraphRefRelationalExpr expr = do
170+ optExpr <- optimizeGraphRefRelationalExpr expr
171+ let optExpr' = applyStaticRestrictionPushdown (applyStaticRestrictionCollapse optExpr)
172+ applyStaticJoinElimination optExpr'
26173
27−optimizeDatabaseContextExpr :: DatabaseContext -> DatabaseContextExpr -> Either RelationalError DatabaseContextExpr
28−optimizeDatabaseContextExpr context dbExpr = evalState (applyStaticDatabaseOptimization dbExpr) (freshDatabaseState context)
29174-- apply optimizations which merely remove steps to become no-ops: example: projection of a relation across all of its attributes => original relation
30175
31176--should optimizations offer the possibility to pure errors? If they perform the up-front type-checking, maybe so
32−applyStaticRelationalOptimization :: RelationalExpr -> RelationalExprState (Either RelationalError RelationalExpr)
33−applyStaticRelationalOptimization e@(MakeStaticRelation _ _) = pure $ Right e
177+optimizeGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefSOptRelationalExprM GraphRefRelationalExpr
178+optimizeGraphRefRelationalExpr e@(MakeStaticRelation _ _) = pure e
34179
35−applyStaticRelationalOptimization e@(MakeRelationFromExprs _ _) = pure $ Right e
180+optimizeGraphRefRelationalExpr e@MakeRelationFromExprs{} = pure e
36181
37−applyStaticRelationalOptimization e@(ExistingRelation _) = pure $ Right e
182+optimizeGraphRefRelationalExpr e@(ExistingRelation _) = pure e
38183
39−applyStaticRelationalOptimization e@(RelationVariable _ _) = pure $ Right e
184+optimizeGraphRefRelationalExpr e@(RelationVariable _ _) = pure e
40185
41186--remove project of attributes which removes no attributes
42−applyStaticRelationalOptimization (Project attrNameSet expr) = do
43− relType <- typeForRelationalExpr expr
187+optimizeGraphRefRelationalExpr (Project attrNameSet expr) = do
188+ graph <- askGraph
189+ mctx <- askMaybeContext
190+ let relType = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr expr)
191+ gfEnv = freshGraphRefRelationalExprEnv mctx graph
44192 case relType of
45− Left err -> pure $ Left err
193+ Left err -> throwError err
46194 Right relType2
47− | AS.all == attrNameSet ->
48− applyStaticRelationalOptimization expr
195+ | AS.all == attrNameSet ->
196+ optimizeGraphRefRelationalExpr expr
49197 | AttributeNames (attributeNames relType2) == attrNameSet ->
50− applyStaticRelationalOptimization expr
198+ optimizeGraphRefRelationalExpr expr
51199 | otherwise -> do
52− optimizedSubExpression <- applyStaticRelationalOptimization expr
53− case optimizedSubExpression of
54− Left err -> pure $ Left err
55− Right optSubExpr -> pure (Right (Project attrNameSet optSubExpr))
200+ optSubExpr <- optimizeGraphRefRelationalExpr expr
201+ pure (Project attrNameSet optSubExpr)
56202
57−applyStaticRelationalOptimization (Union exprA exprB) = do
58− eOptExprA <- applyStaticRelationalOptimization exprA
59− eOptExprB <- applyStaticRelationalOptimization exprB
60− case eOptExprA of
61− Left err -> pure $ Left err
62− Right optExprA -> case eOptExprB of
63− Left err -> pure $ Left err
64− Right optExprB -> -- (x where pred1) union (x where pred2) -> (x where pred1 or pred2)
65− case (optExprA, optExprB) of
66− (Restrict predA (RelationVariable nameA ()),
67− Restrict predB (RelationVariable nameB ())) | nameA == nameB -> pure (Right (Restrict (AndPredicate predA predB) (RelationVariable nameA ())))
203+optimizeGraphRefRelationalExpr (Union exprA exprB) = do
204+ optExprA <- optimizeGraphRefRelationalExpr exprA
205+ optExprB <- optimizeGraphRefRelationalExpr exprB
206+ -- (x where pred1) union (x where pred2) -> (x where pred1 or pred2)
207+ case (optExprA, optExprB) of
208+ (Restrict predA (RelationVariable nameA sA),
209+ Restrict predB (RelationVariable nameB sB)) | nameA == nameB && sA == sB -> pure (Restrict (AndPredicate predA predB) (RelationVariable nameA sA))
210+ (exprA', exprB') | isEmptyRelationExpr exprA' -> pure exprB'
211+ | isEmptyRelationExpr exprB' -> pure exprA'
68212 _ -> if optExprA == optExprB then
69− pure (Right optExprA)
213+ pure optExprA
70214 else
71− pure $ Right $ Union optExprA optExprB
215+ pure $ Union optExprA optExprB
72216
73−applyStaticRelationalOptimization (Join exprA exprB) = do
74− eOptExprA <- applyStaticRelationalOptimization exprA
75− eOptExprB <- applyStaticRelationalOptimization exprB
76− case eOptExprA of
77− Left err -> pure $ Left err
78− Right optExprA -> case eOptExprB of
79− Left err -> pure $ Left err
80− Right optExprB ->
81− -- if the relvars to join are the same but with predicates, then just AndPredicate the predicates
82− case (optExprA, optExprB) of
83− (Restrict predA (RelationVariable nameA ()),
84− Restrict predB (RelationVariable nameB ())) | nameA == nameB -> pure (Right (Restrict (AndPredicate predA predB) (RelationVariable nameA ())))
217+optimizeGraphRefRelationalExpr (Join exprA exprB) = do
218+ optExprA <- optimizeGraphRefRelationalExpr exprA
219+ optExprB <- optimizeGraphRefRelationalExpr exprB
220+ -- if the relvars to join are the same but with predicates, then just AndPredicate the predicates
221+ case (optExprA, optExprB) of
222+ (Restrict predA (RelationVariable nameA sA),
223+ Restrict predB (RelationVariable nameB sB)) | nameA == nameB && sA == sB -> pure (Restrict (AndPredicate predA predB) (RelationVariable nameA sA))
85224 _ -> if optExprA == optExprB then --A join A == A
86− pure (Right optExprA)
225+ pure optExprA
87226 else
88− pure (Right (Join optExprA optExprB))
227+ pure (Join optExprA optExprB)
89228
90−applyStaticRelationalOptimization (Difference exprA exprB) = do
91− optExprA <- applyStaticRelationalOptimization exprA
92− optExprB <- applyStaticRelationalOptimization exprB
93− case optExprA of
94− Left err -> pure $ Left err
95− Right optExprA2 -> case optExprB of
96− Left err -> pure $ Left err
97− Right optExprB2 -> if optExprA == optExprB then do --A difference A == A where false
98− eEmptyRel <- typeForRelationalExpr optExprA2
99− case eEmptyRel of
100− Left err -> pure (Left err)
101− Right emptyRel -> pure (Right (ExistingRelation emptyRel))
102− else
103− pure $ Right (Difference optExprA2 optExprB2)
229+optimizeGraphRefRelationalExpr (Difference exprA exprB) = do
230+ graph <- askGraph
231+ context <- askMaybeContext
232+ optExprA <- optimizeGraphRefRelationalExpr exprA
233+ optExprB <- optimizeGraphRefRelationalExpr exprB
234+ if optExprA == optExprB then do --A difference A == A where false
235+ let eEmptyRel = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr optExprA)
236+ gfEnv = freshGraphRefRelationalExprEnv context graph
237+ case eEmptyRel of
238+ Left err -> throwError err
239+ Right emptyRel -> pure (ExistingRelation emptyRel)
240+ else
241+ pure (Difference optExprA optExprB)
104242
105−applyStaticRelationalOptimization e@Rename{} = pure $ Right e
243+optimizeGraphRefRelationalExpr e@Rename{} = pure e
106244
107−applyStaticRelationalOptimization (Group oldAttrNames newAttrName expr) =
108− pure $ Right $ Group oldAttrNames newAttrName expr
245+optimizeGraphRefRelationalExpr (Group oldAttrNames newAttrName expr) =
246+ pure $ Group oldAttrNames newAttrName expr
109247
110−applyStaticRelationalOptimization (Ungroup attrName expr) =
111− pure $ Right $ Ungroup attrName expr
248+optimizeGraphRefRelationalExpr (Ungroup attrName expr) =
249+ pure $ Ungroup attrName expr
112250
113251--remove restriction of nothing
114−applyStaticRelationalOptimization (Restrict predicate expr) = do
252+optimizeGraphRefRelationalExpr (Restrict predicate expr) = do
253+ graph <- askGraph
254+ mctx <- askMaybeContext
115255 optimizedPredicate <- applyStaticPredicateOptimization predicate
116256 case optimizedPredicate of
117− Left err -> pure $ Left err
118− Right optimizedPredicate2
119− | isTrueExpr optimizedPredicate2 -> applyStaticRelationalOptimization expr -- remove predicate entirely
120− | isFalseExpr optimizedPredicate2 -> do -- replace where false predicate with empty relation with attributes from relexpr
121− attributesRel <- typeForRelationalExpr expr
257+ optimizedPredicate' | isTrueExpr optimizedPredicate' -> optimizeGraphRefRelationalExpr expr -- remove predicate entirely
258+ optimizedPredicate' | isFalseExpr optimizedPredicate' -> do -- replace where false predicate with empty relation with attributes from relexpr
259+ let attributesRel = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr expr)
260+ gfEnv = freshGraphRefRelationalExprEnv mctx graph
122261 case attributesRel of
123− Left err -> pure $ Left err
124− Right attributesRelA -> pure $ Right $ MakeStaticRelation (attributes attributesRelA) emptyTupleSet
262+ Left err -> throwError err
263+ Right attributesRelA -> pure $ MakeStaticRelation (attributes attributesRelA) emptyTupleSet
125264 | otherwise -> do
126− optimizedSubExpression <- applyStaticRelationalOptimization expr
127− case optimizedSubExpression of
128− Left err -> pure $ Left err
129− Right optSubExpr -> pure $ Right $ Restrict optimizedPredicate2 optSubExpr
265+ optSubExpr <- optimizeGraphRefRelationalExpr expr
266+ pure $ Restrict optimizedPredicate' optSubExpr
130267
131−applyStaticRelationalOptimization e@(Equals _ _) = pure $ Right e
268+optimizeGraphRefRelationalExpr e@(Equals _ _) = pure e
132269
133−applyStaticRelationalOptimization e@(NotEquals _ _) = pure $ Right e
270+optimizeGraphRefRelationalExpr e@(NotEquals _ _) = pure e
134271
135−applyStaticRelationalOptimization e@(Extend _ _) = pure $ Right e
272+optimizeGraphRefRelationalExpr e@(Extend _ _) = pure e
136273
137−applyStaticDatabaseOptimization :: DatabaseContextExpr -> DatabaseState (Either RelationalError DatabaseContextExpr)
138−applyStaticDatabaseOptimization x@NoOperation = pure $ Right x
139−applyStaticDatabaseOptimization x@(Define _ _) = pure $ Right x
274+optimizeGraphRefRelationalExpr e@(With _ _) = pure e
140275
141−applyStaticDatabaseOptimization x@(Undefine _) = pure $ Right x
276+-- database context expr
277+optimizeGraphRefDatabaseContextExpr :: GraphRefDatabaseContextExpr -> GraphRefSOptDatabaseContextExprM GraphRefDatabaseContextExpr
278+optimizeGraphRefDatabaseContextExpr x@NoOperation = pure x
279+optimizeGraphRefDatabaseContextExpr x@(Define _ _) = pure x
142280
143−applyStaticDatabaseOptimization (Assign name expr) = do
144− context <- getStateContext
145− let optimizedExpr = optimizeRelationalExpr context expr
146− case optimizedExpr of
147− Left err -> pure $ Left err
148− Right optimizedExpr2 -> pure $ Right (Assign name optimizedExpr2)
281+optimizeGraphRefDatabaseContextExpr x@(Undefine _) = pure x
282+
283+optimizeGraphRefDatabaseContextExpr (Assign name expr) = do
284+ optExpr <- liftGraphRefRelExpr (fullOptimizeGraphRefRelationalExpr expr)
285+ pure $ Assign name optExpr
149286
150−applyStaticDatabaseOptimization (Insert targetName expr) = do
151− context <- getStateContext
152− let optimizedExpr = optimizeRelationalExpr context expr
153− case optimizedExpr of
154− Left err -> pure $ Left err
155− Right optimizedExpr2 -> if isEmptyRelationExpr optimizedExpr2 then -- if we are trying to insert an empty relation, do nothing
156− pure (Right NoOperation)
157− else
158− case optimizedExpr2 of
159− -- if the target relvar and the insert relvar are the same, there is nothing to do
160− -- insert s s -> NoOperation
161− RelationVariable insName () | insName == targetName -> pure (Right NoOperation)
162− _ -> pure $ Right (Insert targetName optimizedExpr2)
287+optimizeGraphRefDatabaseContextExpr (Insert targetName expr) = do
288+ optimizedExpr <- liftGraphRefRelExpr (fullOptimizeGraphRefRelationalExpr expr)
289+ if isEmptyRelationExpr optimizedExpr then -- if we are trying to insert an empty relation, do nothing
290+ pure NoOperation
291+ else
292+ case optimizedExpr of
293+ -- if the target relvar and the insert relvar are the same, there is nothing to do
294+ -- insert s s -> NoOperation
295+ RelationVariable insName _ | insName == targetName -> pure NoOperation
296+ _ -> pure (Insert targetName optimizedExpr)
163297
164−applyStaticDatabaseOptimization (Delete name predicate) = do
165− context <- getStateContext
166− let optimizedPredicate = runReader (applyStaticPredicateOptimization predicate) (RelationalExprStateElems context)
167− case optimizedPredicate of
168− Left err -> pure $ Left err
169− Right optimizedPredicate2 -> pure $ Right (Delete name optimizedPredicate2)
298+optimizeGraphRefDatabaseContextExpr (Delete name predicate) =
299+ Delete name <$> liftGraphRefRelExpr (applyStaticPredicateOptimization predicate)
170300
171−applyStaticDatabaseOptimization (Update name upmap predicate) = do
172− context <- getStateContext
173− let optimizedPredicate = runReader (applyStaticPredicateOptimization predicate) (RelationalExprStateElems context)
174− case optimizedPredicate of
175− Left err -> pure $ Left err
176− Right optimizedPredicate2 -> pure $ Right (Update name upmap optimizedPredicate2)
301+optimizeGraphRefDatabaseContextExpr (Update name upmap predicate) =
302+ Update name upmap <$> liftGraphRefRelExpr (applyStaticPredicateOptimization predicate)
177303
178−applyStaticDatabaseOptimization dep@(AddInclusionDependency _ _) = pure $ Right dep
304+optimizeGraphRefDatabaseContextExpr dep@(AddInclusionDependency _ _) = pure dep
179305
180−applyStaticDatabaseOptimization (RemoveInclusionDependency name) = pure $ Right (RemoveInclusionDependency name)
306+optimizeGraphRefDatabaseContextExpr (RemoveInclusionDependency name) = pure (RemoveInclusionDependency name)
181307
182−applyStaticDatabaseOptimization (AddNotification name triggerExpr resultOldExpr resultNewExpr) = do
183− context <- getStateContext
184− let eTriggerExprOpt = optimizeRelationalExpr context triggerExpr
185− case eTriggerExprOpt of
186− Left err -> pure $ Left err
187− Right triggerExprOpt -> --it doesn't make sense to optimize queries when we don't have their proper contexts
188− pure (Right (AddNotification name triggerExprOpt resultOldExpr resultNewExpr))
308+optimizeGraphRefDatabaseContextExpr (AddNotification name triggerExpr resultOldExpr resultNewExpr) =
309+ --we can't optimize these expressions until they run
310+ pure (AddNotification name triggerExpr resultOldExpr resultNewExpr)
189311
190−applyStaticDatabaseOptimization notif@(RemoveNotification _) = pure (Right notif)
312+optimizeGraphRefDatabaseContextExpr notif@(RemoveNotification _) = pure notif
191313
192−applyStaticDatabaseOptimization c@(AddTypeConstructor _ _) = pure (Right c)
193−applyStaticDatabaseOptimization c@(RemoveTypeConstructor _) = pure (Right c)
194−applyStaticDatabaseOptimization c@(RemoveAtomFunction _) = pure (Right c)
195−applyStaticDatabaseOptimization c@(RemoveDatabaseContextFunction _) = pure (Right c)
196−applyStaticDatabaseOptimization c@(ExecuteDatabaseContextFunction _ _) = pure (Right c)
314+optimizeGraphRefDatabaseContextExpr c@(AddTypeConstructor _ _) = pure c
315+optimizeGraphRefDatabaseContextExpr c@(RemoveTypeConstructor _) = pure c
316+optimizeGraphRefDatabaseContextExpr c@(RemoveAtomFunction _) = pure c
317+optimizeGraphRefDatabaseContextExpr c@(RemoveDatabaseContextFunction _) = pure c
318+optimizeGraphRefDatabaseContextExpr c@(ExecuteDatabaseContextFunction _ _) = pure c
197319
198320--optimization: from pgsql lists- check for join condition referencing foreign key- if join projection project away the referenced table, then it does not need to be scanned
199321
200322--applyStaticDatabaseOptimization (MultipleExpr exprs) = pure $ Right $ MultipleExpr exprs
201323--for multiple expressions, we must evaluate
202−applyStaticDatabaseOptimization (MultipleExpr exprs) = do
203− context <- getStateContext
204− let optExprs = evalState substateRunner (contextWithEmptyTupleSets context, M.empty, False)
205− let errors = lefts optExprs
206− if not (null errors) then
207− pure $ Left (head errors)
208− else
209− pure $ Right $ MultipleExpr (rights optExprs)
210− where
211− substateRunner = forM exprs $ \expr -> do
212− --a previous expression could create a relvar, we don't want to miss it, so we clear the tuples and execute the expression to get an empty relation in the relvar
213− _ <- evalDatabaseContextExpr expr
214− applyStaticDatabaseOptimization expr
215− --this error handling could be improved with some lifting presumably
216− --restore original context
217−
218−applyStaticPredicateOptimization :: RestrictionPredicateExpr -> RelationalExprState (Either RelationalError RestrictionPredicateExpr)
324+optimizeGraphRefDatabaseContextExpr (MultipleExpr exprs) = do
325+ --a previous expression in the exprs list could create a relvar; we don't want to miss it, so we clear the tuples and execute the expression to get an empty relation in the relvar
326+ context <- askContext
327+ graph <- askGraph
328+ parentId <- askTransId
329+
330+ let emptyRvs ctx = ctx { relationVariables = mkEmptyRelVars (relationVariables ctx) }
331+ dbcEnv = mkDatabaseContextEvalEnv parentId graph
332+ folder (ctx, expracc) expr = do
333+ --optimize the expr and run it against empty relvars to add it to the context
334+ case runGraphRefSOptDatabaseContextExprM parentId ctx graph (optimizeGraphRefDatabaseContextExpr expr) of
335+ Left err -> throwError err
336+ Right optExpr ->
337+ case runDatabaseContextEvalMonad ctx dbcEnv (evalGraphRefDatabaseContextExpr optExpr) of
338+ Left err -> throwError err
339+ Right dbcState ->
340+ pure (emptyRvs $ dbc_context dbcState, expracc ++ [optExpr])
341+
342+ (_, exprs') <- foldM folder (context,[]) exprs
343+ pure (MultipleExpr exprs')
344+
345+applyStaticPredicateOptimization :: GraphRefRestrictionPredicateExpr -> GraphRefSOptRelationalExprM GraphRefRestrictionPredicateExpr
219346applyStaticPredicateOptimization predi = do
220− eOptPred <- case predi of
347+ optPred <- case predi of
221348-- where x and x => where x
222349 AndPredicate pred1 pred2 -> do
223− eOptPred1 <- applyStaticPredicateOptimization pred1
224− case eOptPred1 of
225− Left err -> pure (Left err)
226− Right optPred1 -> do
227− eOptPred2 <- applyStaticPredicateOptimization pred2
228− case eOptPred2 of
229− Left err -> pure (Left err)
230− Right optPred2 ->
231− if optPred1 == optPred2 then
232− pure (Right optPred1)
233− else
234− pure (Right (AndPredicate optPred1 optPred2))
350+ optPredA <- applyStaticPredicateOptimization pred1
351+ optPredB <- applyStaticPredicateOptimization pred2
352+ if optPredA == optPredB then
353+ pure optPredA
354+ else
355+ pure (AndPredicate optPredA optPredB)
235356-- where x or x => where x
236357 OrPredicate pred1 pred2 -> do
237− eOptPred1 <- applyStaticPredicateOptimization pred1
238− case eOptPred1 of
239− Left err -> pure (Left err)
240− Right optPred1 -> do
241− eOptPred2 <- applyStaticPredicateOptimization pred2
242− case eOptPred2 of
243− Left err -> pure (Left err)
244− Right optPred2 | optPred1 == optPred2 -> pure (Right optPred1)
245− | isTrueExpr optPred1 -> pure (Right optPred1) -- True or x -> True
246− | isTrueExpr optPred2 -> pure (Right optPred2)
247− | otherwise -> pure (Right (OrPredicate optPred1 optPred2))
358+ optPredA <- applyStaticPredicateOptimization pred1
359+ optPredB <- applyStaticPredicateOptimization pred2
360+ if (optPredA == optPredB) || isTrueExpr optPredA then
361+ pure optPredA
362+ else if isTrueExpr optPredB then
363+ pure optPredB
364+ else
365+ pure (OrPredicate optPredA optPredB)
248366 AttributeEqualityPredicate attrNameA (AttributeAtomExpr attrNameB) ->
249367 if attrNameA == attrNameB then
250− pure (Right TruePredicate)
368+ pure TruePredicate
251369 else
252− pure (Right predi)
253− AttributeEqualityPredicate{} -> pure (Right predi)
254− TruePredicate -> pure $ Right predi
255− NotPredicate{} -> pure $ Right predi
256− RelationalExprPredicate{} -> pure (Right predi)
257− AtomExprPredicate{} -> pure (Right predi)
258− case eOptPred of
259− Left err -> pure (Left err)
260− Right optPred ->
261− let attrMap = findStaticRestrictionPredicates optPred in
262− pure (Right (replaceStaticAtomExprs optPred attrMap))
370+ pure predi
371+ AttributeEqualityPredicate{} -> pure predi
372+ TruePredicate -> pure predi
373+ NotPredicate{} -> pure predi
374+ RelationalExprPredicate{} -> pure predi
375+ AtomExprPredicate{} -> pure predi
376+ let attrMap = findStaticRestrictionPredicates optPred
377+ pure (replaceStaticAtomExprs optPred attrMap)
263378
264379--determines if an atom expression is tautologically true
265−isTrueExpr :: RestrictionPredicateExpr -> Bool
380+isTrueExpr :: RestrictionPredicateExprBase a -> Bool
266381isTrueExpr TruePredicate = True
267382isTrueExpr (AtomExprPredicate (NakedAtomExpr (BoolAtom True))) = True
268383isTrueExpr _ = False
269384
270385--determines if an atom expression is tautologically false
271−isFalseExpr :: RestrictionPredicateExpr -> Bool
386+isFalseExpr :: RestrictionPredicateExprBase a -> Bool
272387isFalseExpr (NotPredicate expr) = isTrueExpr expr
273388isFalseExpr (AtomExprPredicate (NakedAtomExpr (BoolAtom False))) = True
274389isFalseExpr _ = False
275390
276391-- determine if the created relation can statically be determined to be empty
277−isEmptyRelationExpr :: RelationalExpr -> Bool
278−isEmptyRelationExpr (MakeRelationFromExprs _ []) = True
392+isEmptyRelationExpr :: RelationalExprBase a -> Bool
393+isEmptyRelationExpr (MakeRelationFromExprs _ (TupleExprs _ [])) = True
279394isEmptyRelationExpr (MakeStaticRelation _ tupSet) = null (asList tupSet)
280395isEmptyRelationExpr (ExistingRelation rel) = rel == emptyRelationWithAttrs (attributes rel)
281396isEmptyRelationExpr _ = False
282397
283398--transitive static variable optimization
284−replaceStaticAtomExprs :: RestrictionPredicateExpr -> M.Map AttributeName AtomExpr -> RestrictionPredicateExpr
399+replaceStaticAtomExprs :: GraphRefRestrictionPredicateExpr -> M.Map AttributeName GraphRefAtomExpr -> GraphRefRestrictionPredicateExpr
285400replaceStaticAtomExprs predIn replaceMap = case predIn of
286401 AttributeEqualityPredicate newAttrName (AttributeAtomExpr matchName) -> case M.lookup matchName replaceMap of
287402 Nothing -> predIn
@@ -294,7 +409,7 @@ replaceStaticAtomExprs predIn replaceMap = case predIn of
294409 RelationalExprPredicate{} -> predIn
295410 AtomExprPredicate{} -> predIn
296411-- used for transitive attribute optimization- only works on statically-determined atoms for now- in the future, this could work for all AtomExprs which don't reference attributes
297−findStaticRestrictionPredicates :: RestrictionPredicateExpr -> M.Map AttributeName AtomExpr
412+findStaticRestrictionPredicates :: GraphRefRestrictionPredicateExpr -> M.Map AttributeName GraphRefAtomExpr
298413findStaticRestrictionPredicates (AttributeEqualityPredicate attrName atomExpr) =
299414 case atomExpr of
300415 val@NakedAtomExpr{} -> M.singleton attrName val
@@ -318,66 +433,72 @@ isStaticAtomExpr FunctionAtomExpr{} = False
318433isStaticAtomExpr RelationAtomExpr{} = False
319434
320435--if the projection of a join only uses the attributes from one of the expressions and there is a foreign key relationship between the expressions, we know that the join is inconsequential and can be removed
321−applyStaticJoinElimination :: RelationalExpr -> RelationalExprState (Either RelationalError RelationalExpr)
436+applyStaticJoinElimination :: GraphRefRelationalExpr -> GraphRefSOptRelationalExprM GraphRefRelationalExpr
322437applyStaticJoinElimination expr@(Project attrNameSet (Join exprA exprB)) = do
323− relState <- ask
324− eProjType <- typeForRelationalExpr expr
325− eTypeA <- typeForRelationalExpr exprA
326− eTypeB <- typeForRelationalExpr exprB
327− case eProjType of
328− Left err -> pure (Left err)
329− Right projType ->
330− case eTypeA of
331− Left err -> pure (Left err)
332− Right typeA ->
333− case eTypeB of
334− Left err -> pure (Left err)
335− Right typeB -> do
336− let matchesProjectionAttributes
337− | attrNames projType `S.isSubsetOf` attrNames typeA =
338− Just ((exprA, typeA), (exprB, typeB))
339− | attrNames projType `S.isSubsetOf` attrNames typeB =
340− Just ((exprB, typeB), (exprA, typeA))
341− | otherwise =
342− Nothing
343− attrNames = A.attributeNameSet . attributes
344− case matchesProjectionAttributes of
345− Nothing -> -- this optimization does not apply
346− pure (Right expr)
347− Just ((joinedExpr, joinedType), (unjoinedExpr, _)) -> do
348− --scan inclusion dependencies for a foreign key relationship
349− incDeps <- inclusionDependencies . stateElemsContext <$> ask
350− let fkConstraint = foldM isFkConstraint False incDeps
351− --search for matching fk constraint
352− isFkConstraint acc (InclusionDependency (Project subattrNames subrv) (Project _ superrv)) =
353− case runReader (evalAttributeNames subattrNames expr) relState of
354− Left _ -> pure acc
355− Right subAttrNameSet ->
356− pure (acc || (joinedExpr == subrv &&
357− unjoinedExpr == superrv &&
358− -- the fk attribute is one of the projection attributes
359− A.attributeNamesContained subAttrNameSet (A.attributeNameSet (attributes joinedType))
438+ graph <- askGraph
439+ case inSameTransaction exprA exprB of
440+ -- the sub exprs are in different transactions or none at all, so we cannot extract inclusion dependencies across transaction boundaries
441+ Nothing -> pure expr
442+ Just marker -> do
443+ commonContext <- case marker of
444+ UncommittedContextMarker -> askContext
445+ TransactionMarker tid -> concreteDatabaseContext <$> lift (except (transactionForId tid graph))
446+ let typeForExpr e = lift $ except $ runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr e)
447+ gfEnv = freshGraphRefRelationalExprEnv (Just commonContext) graph
448+
449+ projType <- typeForExpr expr
450+ typeA <- typeForExpr exprA
451+ typeB <- typeForExpr exprB
452+ let matchesProjectionAttributes
453+ | attrNames projType `S.isSubsetOf` attrNames typeA =
454+ Just ((exprA, typeA), (exprB, typeB))
455+ | attrNames projType `S.isSubsetOf` attrNames typeB =
456+ Just ((exprB, typeB), (exprA, typeA))
457+ | otherwise =
458+ Nothing
459+ attrNames = A.attributeNameSet . attributes
460+ case matchesProjectionAttributes of
461+ Nothing -> -- this optimization does not apply
462+ pure expr
463+ Just ((joinedExpr, joinedType), (unjoinedExpr, _)) -> do
464+ --lookup transaction
465+ --scan inclusion dependencies for a foreign key relationship
466+ let incDeps = inclusionDependencies commonContext
467+ fkConstraint = foldM isFkConstraint False incDeps
468+ --search for matching fk constraint
469+ isFkConstraint acc (InclusionDependency (Project subAttrNames subrv) (Project _ superrv)) = do
470+ let gfSubAttrNames = processM (processAttributeNames subAttrNames)
471+ gfSubRv = processM (processRelationalExpr subrv)
472+ gfSuperRv = processM (processRelationalExpr superrv)
473+ processM = runProcessExprM marker
474+ case runGraphRefRelationalExprM gfEnv (evalGraphRefAttributeNames gfSubAttrNames expr) of
475+ Left _ -> pure acc
476+ Right subAttrNameSet ->
477+ pure (acc || (joinedExpr == gfSubRv &&
478+ unjoinedExpr == gfSuperRv &&
479+ -- the fk attribute is one of the projection attributes
480+ A.attributeNamesContained subAttrNameSet (A.attributeNameSet (attributes joinedType))
360481 ))
361− isFkConstraint acc _ = pure acc
362− case fkConstraint of
363− Right True -> --join elimination optimization applies
364− applyStaticRelationalOptimization (Project attrNameSet joinedExpr)
365− Right False -> --join elimination optimization does not apply
366− pure (Right expr)
367− Left err ->
368− pure (Left err)
482+ isFkConstraint acc _ = pure acc
483+ case fkConstraint of
484+ Right True -> --join elimination optimization applies
485+ optimizeGraphRefRelationalExpr (Project attrNameSet joinedExpr)
486+ Right False -> --join elimination optimization does not apply
487+ pure expr
488+ Left err -> throwError err
369489
370−applyStaticJoinElimination expr = pure (Right expr)
490+applyStaticJoinElimination expr = pure expr
371491
372492--restriction collapse converts chained restrictions into (Restrict (And pred1 pred2 pred3...))
373493 --this optimization should be fairly uncontroversial- performing a tuple scan once is cheaper than twice- parallelization can still take place
374−applyStaticRestrictionCollapse :: RelationalExpr -> RelationalExpr
494+applyStaticRestrictionCollapse :: GraphRefRelationalExpr -> GraphRefRelationalExpr
375495applyStaticRestrictionCollapse expr =
376496 case expr of
377497 MakeRelationFromExprs _ _ -> expr
378498 MakeStaticRelation _ _ -> expr
379499 ExistingRelation _ -> expr
380500 RelationVariable _ _ -> expr
501+ With _ _ -> expr
381502 Project attrs subexpr ->
382503 Project attrs (applyStaticRestrictionCollapse subexpr)
383504 Union sub1 sub2 ->
@@ -407,19 +528,20 @@ applyStaticRestrictionCollapse expr =
407528 andPreds = foldr (\(Restrict subpred _) acc -> AndPredicate acc subpred) firstPred (tail restrictions) in
408529 Restrict andPreds optFinalExpr
409530
410−sequentialRestrictions :: RelationalExpr -> [RelationalExpr]
531+sequentialRestrictions :: RelationalExprBase a -> [RelationalExprBase a]
411532sequentialRestrictions expr@(Restrict _ subexpr) = expr:sequentialRestrictions subexpr
412533sequentialRestrictions _ = []
413534
414535--restriction pushdown only really makes sense for tuple-oriented storage schemes where performing a restriction before projection can cut down on the intermediate storage needed to store the data before the projection
415536-- x{proj} where c1 -> (x where c1){proj} #project on fewer tuples
416537-- (x union y) where c -> (x where c) union (y where c) #with a selective restriction, fewer tuples will need to be joined
417−applyStaticRestrictionPushdown :: RelationalExpr -> RelationalExpr
538+applyStaticRestrictionPushdown :: GraphRefRelationalExpr -> GraphRefRelationalExpr
418539applyStaticRestrictionPushdown expr = case expr of
419540 MakeRelationFromExprs _ _ -> expr
420541 MakeStaticRelation _ _ -> expr
421542 ExistingRelation _ -> expr
422543 RelationVariable _ _ -> expr
544+ With _ _ -> expr
423545 Project _ _ -> expr
424546 --this transformation cannot be inverted because the projection attributes might not exist in the inverted version
425547 Restrict restrictAttrs (Project projAttrs subexpr) ->
@@ -450,4 +572,7 @@ applyStaticRestrictionPushdown expr = case expr of
450572 Extend n sub ->
451573 Extend n (applyStaticRestrictionPushdown sub)
452574
453−
575+-- no optimizations available
576+optimizeDatabaseContextIOExpr :: GraphRefDatabaseContextIOExpr -> GraphRefSOptDatabaseContextExprM GraphRefDatabaseContextIOExpr
577+optimizeDatabaseContextIOExpr = pure
578+
src/lib/ProjectM36/TransGraphRelationalExpression.hs+141−136
@@ -1,175 +1,180 @@
1−{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
1+{-# LANGUAGE FlexibleInstances #-}
22{-# OPTIONS_GHC -fno-warn-orphans #-}
33--really, a better name for this module could be "TransTransactionGraphRelationalExpr", but that name is too long
44module ProjectM36.TransGraphRelationalExpression where
55import ProjectM36.Base
66import ProjectM36.TransactionGraph
7−import ProjectM36.Transaction
8−import ProjectM36.RelationalExpression
97import ProjectM36.Error
10−import ProjectM36.Tuple
11−import ProjectM36.AtomType
128import qualified Data.Map as M
139import Control.Monad.Trans.Reader
14−import Data.Binary
10+import Control.Monad.Trans.Class
11+import Control.Monad.Trans.Except
12+import Data.Functor.Identity
1513
1614-- | The TransGraphRelationalExpression is equivalent to a relational expression except that relation variables can reference points in the transaction graph (at previous points in time).
1715type TransGraphRelationalExpr = RelationalExprBase TransactionIdLookup
1816
19−instance Binary TransGraphRelationalExpr
20−
2117type TransGraphAttributeNames = AttributeNamesBase TransactionIdLookup
2218
23−instance Binary TransGraphAttributeNames
24−
2519type TransGraphExtendTupleExpr = ExtendTupleExprBase TransactionIdLookup
2620
27−instance Binary TransGraphExtendTupleExpr
28−
2921type TransGraphTupleExpr = TupleExprBase TransactionIdLookup
3022
31−instance Binary TransGraphTupleExpr
23+type TransGraphTupleExprs = TupleExprsBase TransactionIdLookup
3224
3325type TransGraphRestrictionPredicateExpr = RestrictionPredicateExprBase TransactionIdLookup
3426
35−instance Binary TransGraphRestrictionPredicateExpr
36−
3727type TransGraphAtomExpr = AtomExprBase TransactionIdLookup
3828
39−instance Binary TransGraphAtomExpr
40−
4129type TransGraphAttributeExpr = AttributeExprBase TransactionIdLookup
4230
31+type TransGraphWithNameExpr = WithNameExprBase TransactionIdLookup
32+
33+newtype TransGraphEvalEnv = TransGraphEvalEnv {
34+ tge_graph :: TransactionGraph
35+ }
36+
37+type TransGraphEvalMonad a = ReaderT TransGraphEvalEnv (ExceptT RelationalError Identity) a
38+
39+process :: TransGraphEvalEnv -> TransGraphRelationalExpr -> Either RelationalError GraphRefRelationalExpr
40+process env texpr = runIdentity (runExceptT (runReaderT (processTransGraphRelationalExpr texpr) env))
41+
42+liftE :: Either RelationalError a -> TransGraphEvalMonad a
43+liftE = lift . except
44+
45+askGraph :: TransGraphEvalMonad TransactionGraph
46+askGraph = tge_graph <$> ask
47+
48+findTransId :: TransactionIdLookup -> TransGraphEvalMonad GraphRefTransactionMarker
49+findTransId tlook = TransactionMarker . transactionId <$> findTrans tlook
50+
51+findTrans :: TransactionIdLookup -> TransGraphEvalMonad Transaction
52+findTrans tlook = do
53+ graph <- askGraph
54+ liftE $ lookupTransaction graph tlook
55+
4356-- OUTDATED a previous attempt at this function attempted to convert TransGraphRelationalExpr to RelationalExpr by resolving the transaction lookups. However, there is no way to resolve a FunctionAtomExpr to an Atom without fully evaluating the higher levels (TupleExpr, etc.). An anonymous function expression cannot be serialized, so that workaround is out. Still, I suspect we can reuse the existing static optimizer logic to work on both structures. The current conversion reduces the chance of whole-query optimization due to full-evaluation on top of full-evaluation, so this function would benefit from some re-design.
44−evalTransGraphRelationalExpr :: TransGraphRelationalExpr -> TransactionGraph -> Either RelationalError RelationalExpr
45−evalTransGraphRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) graph = do
46− tupleExprs' <- mapM (evalTransGraphTupleExpr graph) tupleExprs
57+processTransGraphRelationalExpr :: TransGraphRelationalExpr -> TransGraphEvalMonad GraphRefRelationalExpr
58+processTransGraphRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
59+ tupleExprs' <- processTransGraphTupleExprs tupleExprs
4760 case mAttrExprs of
4861 Nothing -> pure (MakeRelationFromExprs Nothing tupleExprs')
4962 Just attrExprs -> do
50− attrExprs' <- mapM (evalTransGraphAttributeExpr graph) attrExprs
63+ attrExprs' <- mapM processTransGraphAttributeExpr attrExprs
5164 pure (MakeRelationFromExprs (Just attrExprs') tupleExprs')
52−evalTransGraphRelationalExpr (MakeStaticRelation attrs tupSet) _ = pure (MakeStaticRelation attrs tupSet)
53−evalTransGraphRelationalExpr (ExistingRelation rel) _ = pure (ExistingRelation rel)
54−evalTransGraphRelationalExpr (RelationVariable rvname transLookup) graph = do
55− trans <- lookupTransaction graph transLookup
56− rel <- runReader (evalRelationalExpr (RelationVariable rvname ())) (RelationalExprStateElems (concreteDatabaseContext trans))
57− pure (ExistingRelation rel)
58−evalTransGraphRelationalExpr (Project transAttrNames expr) graph = do
59− expr' <- evalTransGraphRelationalExpr expr graph
60− attrNames <- evalTransAttributeNames transAttrNames graph
61− pure (Project attrNames expr')
62−evalTransGraphRelationalExpr (Union exprA exprB) graph = do
63− exprA' <- evalTransGraphRelationalExpr exprA graph
64− exprB' <- evalTransGraphRelationalExpr exprB graph
65− pure (Union exprA' exprB')
66−evalTransGraphRelationalExpr (Join exprA exprB) graph = do
67− exprA' <- evalTransGraphRelationalExpr exprA graph
68− exprB' <- evalTransGraphRelationalExpr exprB graph
69− pure (Join exprA' exprB')
70−evalTransGraphRelationalExpr (Rename attrName1 attrName2 expr) graph = do
71− expr' <- evalTransGraphRelationalExpr expr graph
72− pure (Rename attrName1 attrName2 expr')
73−evalTransGraphRelationalExpr (Difference exprA exprB) graph = do
74− exprA' <- evalTransGraphRelationalExpr exprA graph
75− exprB' <- evalTransGraphRelationalExpr exprB graph
76− pure (Difference exprA' exprB')
77−evalTransGraphRelationalExpr (Group transAttrNames attrName expr) graph = do
78− expr' <- evalTransGraphRelationalExpr expr graph
79− attrNames <- evalTransAttributeNames transAttrNames graph
80− pure (Group attrNames attrName expr')
81−evalTransGraphRelationalExpr (Ungroup attrName expr) graph = do
82− expr' <- evalTransGraphRelationalExpr expr graph
83− pure (Ungroup attrName expr')
84−evalTransGraphRelationalExpr (Restrict predicateExpr expr) graph = do
85− expr' <- evalTransGraphRelationalExpr expr graph
86− predicateExpr' <- evalTransGraphRestrictionPredicateExpr predicateExpr graph
87− pure (Restrict predicateExpr' expr')
88−evalTransGraphRelationalExpr (Equals exprA exprB) graph = do
89− exprA' <- evalTransGraphRelationalExpr exprA graph
90− exprB' <- evalTransGraphRelationalExpr exprB graph
65+processTransGraphRelationalExpr (MakeStaticRelation attrs tupSet) = pure (MakeStaticRelation attrs tupSet)
66+processTransGraphRelationalExpr (ExistingRelation rel) = pure (ExistingRelation rel)
67+processTransGraphRelationalExpr (RelationVariable rvname transLookup) =
68+ RelationVariable rvname <$> findTransId transLookup
69+processTransGraphRelationalExpr (Project transAttrNames expr) =
70+ Project <$> processTransGraphAttributeNames transAttrNames <*> processTransGraphRelationalExpr expr
71+processTransGraphRelationalExpr (Union exprA exprB) =
72+ Union <$> processTransGraphRelationalExpr exprA <*> processTransGraphRelationalExpr exprB
73+processTransGraphRelationalExpr (Join exprA exprB) =
74+ Join <$> processTransGraphRelationalExpr exprA <*> processTransGraphRelationalExpr exprB
75+processTransGraphRelationalExpr (Rename attrName1 attrName2 expr) =
76+ Rename attrName1 attrName2 <$> processTransGraphRelationalExpr expr
77+processTransGraphRelationalExpr (Difference exprA exprB) =
78+ Difference <$> processTransGraphRelationalExpr exprA <*> processTransGraphRelationalExpr exprB
79+processTransGraphRelationalExpr (Group transAttrNames attrName expr) =
80+ Group <$>
81+ processTransGraphAttributeNames transAttrNames <*>
82+ pure attrName <*>
83+ processTransGraphRelationalExpr expr
84+processTransGraphRelationalExpr (Ungroup attrName expr) =
85+ Ungroup attrName <$> processTransGraphRelationalExpr expr
86+processTransGraphRelationalExpr (Restrict predicateExpr expr) =
87+ Restrict <$> evalTransGraphRestrictionPredicateExpr predicateExpr <*>
88+ processTransGraphRelationalExpr expr
89+processTransGraphRelationalExpr (Equals exprA exprB) = do
90+ exprA' <- processTransGraphRelationalExpr exprA
91+ exprB' <- processTransGraphRelationalExpr exprB
9192 pure (Equals exprA' exprB')
92−evalTransGraphRelationalExpr (NotEquals exprA exprB) graph = do
93− exprA' <- evalTransGraphRelationalExpr exprA graph
94− exprB' <- evalTransGraphRelationalExpr exprB graph
93+processTransGraphRelationalExpr (NotEquals exprA exprB) = do
94+ exprA' <- processTransGraphRelationalExpr exprA
95+ exprB' <- processTransGraphRelationalExpr exprB
9596 pure (NotEquals exprA' exprB')
96−evalTransGraphRelationalExpr (Extend extendExpr expr) graph = do
97− extendExpr' <- evalTransGraphExtendTupleExpr extendExpr graph
98− expr' <- evalTransGraphRelationalExpr expr graph
97+processTransGraphRelationalExpr (Extend extendExpr expr) = do
98+ extendExpr' <- processTransGraphExtendTupleExpr extendExpr
99+ expr' <- processTransGraphRelationalExpr expr
99100 pure (Extend extendExpr' expr')
100−
101−evalTransGraphTupleExpr :: TransactionGraph -> TransGraphTupleExpr -> Either RelationalError TupleExpr
102−evalTransGraphTupleExpr graph (TupleExpr attrMap) = do
103− attrAssoc <- mapM (\(attrName, atomExpr) -> do
104− aExpr <- evalTransGraphAtomExpr graph atomExpr
101+processTransGraphRelationalExpr (With views expr) = do
102+ evaldViews <- mapM (\(wnexpr, vexpr) -> do
103+ wnexpr' <- processTransGraphWithNameExpr wnexpr
104+ vexpr' <- processTransGraphRelationalExpr vexpr
105+ pure (wnexpr', vexpr')
106+ ) views
107+ expr' <- processTransGraphRelationalExpr expr
108+ pure (With evaldViews expr')
109+
110+processTransGraphTupleExprs :: TransGraphTupleExprs -> TransGraphEvalMonad GraphRefTupleExprs
111+processTransGraphTupleExprs (TupleExprs marker texprs) =
112+ TupleExprs <$> findTransId marker <*> mapM processTransGraphTupleExpr texprs
113+
114+processTransGraphTupleExpr :: TransGraphTupleExpr -> TransGraphEvalMonad GraphRefTupleExpr
115+processTransGraphTupleExpr (TupleExpr attrMap) = do
116+ let attrAssoc = mapM (\(attrName, atomExpr) -> do
117+ aExpr <- processTransGraphAtomExpr atomExpr
105118 pure (attrName, aExpr)
106119 ) (M.toList attrMap)
107− pure (TupleExpr (M.fromList attrAssoc))
120+ TupleExpr . M.fromList <$> attrAssoc
108121
109−evalTransGraphAtomExpr :: TransactionGraph -> TransGraphAtomExpr -> Either RelationalError AtomExpr
110−evalTransGraphAtomExpr _ (AttributeAtomExpr aname) = pure $ AttributeAtomExpr aname
111−evalTransGraphAtomExpr _ (NakedAtomExpr atom) = pure $ NakedAtomExpr atom
112−evalTransGraphAtomExpr graph (FunctionAtomExpr funcName args tLookup) = do
113− trans <- lookupTransaction graph tLookup
114− --I can't return a FunctionAtomExpr because the function needs to be resolved at a specific context
115− args' <- mapM (evalTransGraphAtomExpr graph) args
116− atom <- runReader (evalAtomExpr emptyTuple (FunctionAtomExpr funcName args' ())) (RelationalExprStateElems (concreteDatabaseContext trans))
117− pure (NakedAtomExpr atom)
118−evalTransGraphAtomExpr graph (RelationAtomExpr expr) = do
119− expr' <- evalTransGraphRelationalExpr expr graph
120− pure (RelationAtomExpr expr')
121−evalTransGraphAtomExpr graph (ConstructedAtomExpr dConsName args tLookup) = do
122− trans <- lookupTransaction graph tLookup
123− args' <- mapM (evalTransGraphAtomExpr graph) args
124− atom <- runReader (evalAtomExpr emptyTuple (ConstructedAtomExpr dConsName args' ())) (RelationalExprStateElems (concreteDatabaseContext trans))
125− pure (NakedAtomExpr atom)
126−
127−evalTransGraphRestrictionPredicateExpr :: TransGraphRestrictionPredicateExpr -> TransactionGraph -> Either RelationalError RestrictionPredicateExpr
128−evalTransGraphRestrictionPredicateExpr TruePredicate _ = pure TruePredicate
129−evalTransGraphRestrictionPredicateExpr (AndPredicate exprA exprB) graph = do
130− exprA' <- evalTransGraphRestrictionPredicateExpr exprA graph
131− exprB' <- evalTransGraphRestrictionPredicateExpr exprB graph
122+processTransGraphAtomExpr :: TransGraphAtomExpr -> TransGraphEvalMonad GraphRefAtomExpr
123+processTransGraphAtomExpr (AttributeAtomExpr aname) = pure $ AttributeAtomExpr aname
124+processTransGraphAtomExpr (NakedAtomExpr atom) = pure $ NakedAtomExpr atom
125+processTransGraphAtomExpr (FunctionAtomExpr funcName args tLookup) =
126+ FunctionAtomExpr funcName <$> mapM processTransGraphAtomExpr args <*> findTransId tLookup
127+processTransGraphAtomExpr (RelationAtomExpr expr) =
128+ RelationAtomExpr <$> processTransGraphRelationalExpr expr
129+processTransGraphAtomExpr (ConstructedAtomExpr dConsName args tLookup) =
130+ ConstructedAtomExpr dConsName <$> mapM processTransGraphAtomExpr args <*> findTransId tLookup
131+evalTransGraphRestrictionPredicateExpr :: TransGraphRestrictionPredicateExpr -> TransGraphEvalMonad GraphRefRestrictionPredicateExpr
132+evalTransGraphRestrictionPredicateExpr TruePredicate = pure TruePredicate
133+evalTransGraphRestrictionPredicateExpr (AndPredicate exprA exprB) = do
134+ exprA' <- evalTransGraphRestrictionPredicateExpr exprA
135+ exprB' <- evalTransGraphRestrictionPredicateExpr exprB
132136 pure (AndPredicate exprA' exprB')
133−evalTransGraphRestrictionPredicateExpr (OrPredicate exprA exprB) graph = do
134− exprA' <- evalTransGraphRestrictionPredicateExpr exprA graph
135− exprB' <- evalTransGraphRestrictionPredicateExpr exprB graph
137+evalTransGraphRestrictionPredicateExpr (OrPredicate exprA exprB) = do
138+ exprA' <- evalTransGraphRestrictionPredicateExpr exprA
139+ exprB' <- evalTransGraphRestrictionPredicateExpr exprB
136140 pure (OrPredicate exprA' exprB')
137−evalTransGraphRestrictionPredicateExpr (NotPredicate expr) graph = do
138− expr' <- evalTransGraphRestrictionPredicateExpr expr graph
139− pure (NotPredicate expr')
140−evalTransGraphRestrictionPredicateExpr (RelationalExprPredicate expr) graph = do
141− expr' <- evalTransGraphRelationalExpr expr graph
142− pure (RelationalExprPredicate expr')
143−evalTransGraphRestrictionPredicateExpr (AtomExprPredicate expr) graph = do
144− expr' <- evalTransGraphAtomExpr graph expr
145− pure (AtomExprPredicate expr')
146−evalTransGraphRestrictionPredicateExpr (AttributeEqualityPredicate attrName expr) graph = do
147− expr' <- evalTransGraphAtomExpr graph expr
148− pure (AttributeEqualityPredicate attrName expr')
141+evalTransGraphRestrictionPredicateExpr (NotPredicate expr) = do
142+ let expr' = evalTransGraphRestrictionPredicateExpr expr
143+ NotPredicate <$> expr'
144+evalTransGraphRestrictionPredicateExpr (RelationalExprPredicate expr) = do
145+ let expr' = processTransGraphRelationalExpr expr
146+ RelationalExprPredicate <$> expr'
147+evalTransGraphRestrictionPredicateExpr (AtomExprPredicate expr) = do
148+ let expr' = processTransGraphAtomExpr expr
149+ AtomExprPredicate <$> expr'
150+evalTransGraphRestrictionPredicateExpr (AttributeEqualityPredicate attrName expr) = do
151+ let expr' = processTransGraphAtomExpr expr
152+ AttributeEqualityPredicate attrName <$> expr'
149153
150−evalTransGraphExtendTupleExpr :: TransGraphExtendTupleExpr -> TransactionGraph -> Either RelationalError ExtendTupleExpr
151−evalTransGraphExtendTupleExpr (AttributeExtendTupleExpr attrName expr) graph = do
152− expr' <- evalTransGraphAtomExpr graph expr
153− pure (AttributeExtendTupleExpr attrName expr')
154−
155−evalTransGraphAttributeExpr :: TransactionGraph -> TransGraphAttributeExpr -> Either RelationalError AttributeExpr
156−evalTransGraphAttributeExpr graph (AttributeAndTypeNameExpr attrName tCons tLookup) = do
157− trans <- lookupTransaction graph tLookup
158− aType <- atomTypeForTypeConstructor tCons (typeConstructorMapping (concreteDatabaseContext trans)) M.empty
159− pure (NakedAttributeExpr (Attribute attrName aType))
160−evalTransGraphAttributeExpr _ (NakedAttributeExpr attr) = pure (NakedAttributeExpr attr)
161−
162−evalTransAttributeNames :: TransGraphAttributeNames -> TransactionGraph -> Either RelationalError AttributeNames
163−evalTransAttributeNames (AttributeNames names) _ = Right (AttributeNames names)
164−evalTransAttributeNames (InvertedAttributeNames names) _ = Right (InvertedAttributeNames names)
165−evalTransAttributeNames (UnionAttributeNames namesA namesB) graph = do
166− nA <- evalTransAttributeNames namesA graph
167− nB <- evalTransAttributeNames namesB graph
168− Right (UnionAttributeNames nA nB)
169−evalTransAttributeNames (IntersectAttributeNames namesA namesB) graph = do
170− nA <- evalTransAttributeNames namesA graph
171− nB <- evalTransAttributeNames namesB graph
172− Right (IntersectAttributeNames nA nB)
173−evalTransAttributeNames (RelationalExprAttributeNames expr) graph = do
174− evaldExpr <- evalTransGraphRelationalExpr expr graph
175− Right (RelationalExprAttributeNames evaldExpr)
154+processTransGraphExtendTupleExpr :: TransGraphExtendTupleExpr -> TransGraphEvalMonad GraphRefExtendTupleExpr
155+processTransGraphExtendTupleExpr (AttributeExtendTupleExpr attrName expr) =
156+ AttributeExtendTupleExpr attrName <$> processTransGraphAtomExpr expr
157+
158+processTransGraphAttributeExpr :: TransGraphAttributeExpr -> TransGraphEvalMonad GraphRefAttributeExpr
159+processTransGraphAttributeExpr (AttributeAndTypeNameExpr attrName tCons tLookup) =
160+ AttributeAndTypeNameExpr attrName tCons <$> findTransId tLookup
161+processTransGraphAttributeExpr (NakedAttributeExpr attr) = pure (NakedAttributeExpr attr)
162+
163+processTransGraphAttributeNames :: TransGraphAttributeNames -> TransGraphEvalMonad GraphRefAttributeNames
164+processTransGraphAttributeNames (AttributeNames names) = pure (AttributeNames names)
165+processTransGraphAttributeNames (InvertedAttributeNames names) = pure (InvertedAttributeNames names)
166+processTransGraphAttributeNames (UnionAttributeNames namesA namesB) = do
167+ nA <- processTransGraphAttributeNames namesA
168+ nB <- processTransGraphAttributeNames namesB
169+ pure (UnionAttributeNames nA nB)
170+processTransGraphAttributeNames (IntersectAttributeNames namesA namesB) = do
171+ nA <- processTransGraphAttributeNames namesA
172+ nB <- processTransGraphAttributeNames namesB
173+ pure (IntersectAttributeNames nA nB)
174+processTransGraphAttributeNames (RelationalExprAttributeNames expr) = do
175+ evaldExpr <- processTransGraphRelationalExpr expr
176+ pure (RelationalExprAttributeNames evaldExpr)
177+
178+processTransGraphWithNameExpr :: TransGraphWithNameExpr -> TransGraphEvalMonad GraphRefWithNameExpr
179+processTransGraphWithNameExpr (WithNameExpr rvname tlookup) =
180+ WithNameExpr rvname <$> findTransId tlookup
src/lib/ProjectM36/Transaction.hs+24−16
@@ -3,28 +3,24 @@ import ProjectM36.Base
33import qualified Data.Set as S
44import qualified Data.UUID as U
55import Data.Time.Clock
6+import qualified Data.List.NonEmpty as NE
67
7−transactionTimestamp :: Transaction -> UTCTime
8−transactionTimestamp (Transaction _ (TransactionInfo _ _ stamp) _) = stamp
9−transactionTimestamp (Transaction _ (MergeTransactionInfo _ _ _ stamp) _) = stamp
8+parentIds :: Transaction -> S.Set TransactionId
9+parentIds (Transaction _ tinfo _) = S.fromList (NE.toList (parents tinfo))
1010
11−transactionParentIds :: Transaction -> S.Set TransactionId
12−transactionParentIds (Transaction _ (TransactionInfo pId _ _) _) = S.singleton pId
13−transactionParentIds (Transaction _ (MergeTransactionInfo pId1 pId2 _ _) _) = S.fromList [pId1, pId2]
11+rootParent :: TransactionParents
12+rootParent = singleParent U.nil
1413
15−transactionChildIds :: Transaction -> S.Set TransactionId
16−transactionChildIds (Transaction _ (TransactionInfo _ children _) _) = children
17−transactionChildIds (Transaction _ (MergeTransactionInfo _ _ children _) _) = children
18−
19−-- | Create a new transaction which is identical to the original except that a new set of child transaction ids is added.
20−transactionSetChildren :: Transaction -> S.Set TransactionId -> Transaction
21−transactionSetChildren t@(Transaction _ (TransactionInfo pId _ stamp) schemas') childIds = Transaction (transactionId t) (TransactionInfo pId childIds stamp) schemas'
22−transactionSetChildren t@(Transaction _ (MergeTransactionInfo pId1 pId2 _ stamp) schemas') childIds = Transaction (transactionId t) (MergeTransactionInfo pId1 pId2 childIds stamp) schemas'
14+singleParent :: TransactionId -> TransactionParents
15+singleParent tid = tid NE.:| []
2316
2417-- | 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.
2518filterTransactionInfoTransactions :: S.Set TransactionId -> TransactionInfo -> TransactionInfo
26−filterTransactionInfoTransactions filterIds (TransactionInfo parentId childIds stamp) = TransactionInfo (filterParent parentId filterIds) (S.intersection childIds filterIds) stamp
27−filterTransactionInfoTransactions filterIds (MergeTransactionInfo parentIdA parentIdB childIds stamp) = MergeTransactionInfo (filterParent parentIdA filterIds) (filterParent parentIdB filterIds) (S.intersection childIds filterIds) stamp
19+filterTransactionInfoTransactions filterIds tinfo =
20+ tinfo { parents = case
21+ NE.filter (`S.member` filterIds) (parents tinfo) of
22+ [] -> rootParent
23+ xs -> NE.fromList xs}
2824
2925filterParent :: TransactionId -> S.Set TransactionId -> TransactionId
3026filterParent parentId validIds = if S.member parentId validIds then parentId else U.nil
@@ -44,3 +40,15 @@ schemas (Transaction _ _ schemas') = schemas'
4440-- | Returns all subschemas which are isomorphic or sub-isomorphic to the concrete schema.
4541subschemas :: Transaction -> Subschemas
4642subschemas (Transaction _ _ (Schemas _ sschemas)) = sschemas
43+
44+fresh :: TransactionId -> UTCTime -> Schemas -> Transaction
45+fresh freshId stamp' = Transaction freshId tinfo
46+ where
47+ tinfo = TransactionInfo {parents = rootParent,
48+ stamp = stamp',
49+ merkleHash = mempty
50+ }
51+
52+timestamp :: Transaction -> UTCTime
53+timestamp (Transaction _ tinfo _) = stamp tinfo
54+
src/lib/ProjectM36/Transaction/Persist.hs+66−59
@@ -1,3 +1,4 @@
1+{-# LANGUAGE TypeApplications #-}
12module ProjectM36.Transaction.Persist where
23import ProjectM36.Base
34import ProjectM36.Error
@@ -7,25 +8,24 @@ import ProjectM36.AtomFunction
78import ProjectM36.Persist (writeBSFileSync, DiskSync, renameSync)
89import qualified Data.Map as M
910import qualified Data.HashSet as HS
10−import qualified Data.Binary as B
11−--import qualified Data.ByteString as BS
1211import System.FilePath
1312import System.Directory
1413import qualified Data.Text as T
1514import Control.Monad
1615import ProjectM36.ScriptSession
1716import ProjectM36.AtomFunctions.Basic (precompiledAtomFunctions)
18−import Control.Exception
17+import Codec.Winery
18+
19+#ifdef PM36_HASKELL_SCRIPTING
1920import GHC
21+import Control.Exception
2022import GHC.Paths
21−import Codec.Compression.GZip
22−import qualified Data.ByteString as BS
23−import qualified Data.ByteString.Lazy as BSL
23+#endif
2424
2525getDirectoryNames :: FilePath -> IO [FilePath]
26−getDirectoryNames path = do
27− subpaths <- getDirectoryContents path
28− return $ filter (\n -> n `notElem` ["..", "."]) subpaths
26+getDirectoryNames path =
27+ filter (\ n -> n `notElem` ["..", "."]) <$> getDirectoryContents path
28+
2929
3030tempTransactionDir :: FilePath -> TransactionId -> FilePath
3131tempTransactionDir dbdir transId = dbdir </> "." ++ show transId
@@ -36,8 +36,8 @@ transactionDir dbdir transId = dbdir </> show transId
3636transactionInfoPath :: FilePath -> FilePath
3737transactionInfoPath transdir = transdir </> "info"
3838
39−relvarsDir :: FilePath -> FilePath
40−relvarsDir transdir = transdir </> "relvars"
39+relvarsPath :: FilePath -> FilePath
40+relvarsPath transdir = transdir </> "relvars"
4141
4242incDepsDir :: FilePath -> FilePath
4343incDepsDir transdir = transdir </> "incdeps"
@@ -62,7 +62,7 @@ readTransaction dbdir transId mScriptSession = do
6262 return $ Left $ MissingTransactionError transId
6363 else do
6464 relvars <- readRelVars transDir
65− transInfo <- B.decodeFile (transactionInfoPath transDir)
65+ transInfo <- readFileDeserialise (transactionInfoPath transDir)
6666 incDeps <- readIncDeps transDir
6767 typeCons <- readTypeConstructorMapping transDir
6868 sschemas <- readSubschemas transDir
@@ -85,77 +85,75 @@ writeTransaction sync dbdir trans = do
8585 transDirExists <- doesDirectoryExist finalTransDir
8686 unless transDirExists $ do
8787 --create sub directories
88− mapM_ createDirectory [tempTransDir, relvarsDir tempTransDir, incDepsDir tempTransDir, dbcFuncsDir tempTransDir]
88+ mapM_ createDirectory [tempTransDir, incDepsDir tempTransDir, dbcFuncsDir tempTransDir]
8989 writeRelVars sync tempTransDir (relationVariables context)
9090 writeIncDeps sync tempTransDir (inclusionDependencies context)
9191 writeAtomFuncs sync tempTransDir (atomFunctions context)
9292 writeDBCFuncs sync tempTransDir (dbcFunctions context)
9393 writeTypeConstructorMapping sync tempTransDir (typeConstructorMapping context)
9494 writeSubschemas sync tempTransDir (subschemas trans)
95− B.encodeFile (transactionInfoPath tempTransDir) (transactionInfo trans)
95+ writeFileSerialise (transactionInfoPath tempTransDir) (transactionInfo trans)
9696 --move the temp directory to final location
9797 renameSync sync tempTransDir finalTransDir
98− pure ()
99−
100−writeRelVar :: DiskSync -> FilePath -> (RelVarName, Relation) -> IO ()
101−writeRelVar sync transDir (relvarName, rel) = do
102− let relvarPath = relvarsDir transDir </> T.unpack relvarName
103− writeBSFileSync sync relvarPath (compress (B.encode rel))
104−
105−writeRelVars :: DiskSync -> FilePath -> M.Map RelVarName Relation -> IO ()
106−writeRelVars sync transDir relvars = mapM_ (writeRelVar sync transDir) $ M.toList relvars
10798
108−readRelVars :: FilePath -> IO (M.Map RelVarName Relation)
109−readRelVars transDir = do
110− let relvarsPath = relvarsDir transDir
111− relvarNames <- getDirectoryNames relvarsPath
112− relvars <- mapM (\name -> do
113− rel <- B.decode . decompress . BSL.fromStrict <$> BS.readFile (relvarsPath </> name)
114− return (T.pack name, rel)) relvarNames
115− return $ M.fromList relvars
99+writeRelVars :: DiskSync -> FilePath -> RelationVariables -> IO ()
100+writeRelVars sync transDir relvars = do
101+ let path = relvarsPath transDir
102+ writeBSFileSync sync path (serialise relvars)
103+
104+readRelVars :: FilePath -> IO RelationVariables
105+readRelVars transDir =
106+ readFileDeserialise (relvarsPath transDir)
116107
117108writeAtomFuncs :: DiskSync -> FilePath -> AtomFunctions -> IO ()
118109writeAtomFuncs sync transDir funcs = do
119110 let atomFuncPath = atomFuncsPath transDir
120− writeBSFileSync sync atomFuncPath (B.encode $ map (\f -> (atomFuncType f, atomFuncName f, atomFunctionScript f)) (HS.toList funcs))
111+ writeBSFileSync sync atomFuncPath (serialise $ map (\f -> (atomFuncType f, atomFuncName f, atomFunctionScript f)) (HS.toList funcs))
121112
122113--all the atom functions are in one file
123114readAtomFuncs :: FilePath -> Maybe ScriptSession -> IO AtomFunctions
124115readAtomFuncs transDir mScriptSession = do
125− atomFuncsList <- B.decodeFile (atomFuncsPath transDir)
116+ atomFuncsList <- readFileDeserialise (atomFuncsPath transDir)
126117 --only Haskell script functions can be serialized
127118 --we always return the pre-compiled functions
128119 funcs <- mapM (\(funcType, funcName, mFuncScript) -> loadAtomFunc precompiledAtomFunctions mScriptSession funcName funcType mFuncScript) atomFuncsList
129120 pure (HS.union precompiledAtomFunctions (HS.fromList funcs))
130121
131122loadAtomFunc :: AtomFunctions -> Maybe ScriptSession -> AtomFunctionName -> [AtomType] -> Maybe AtomFunctionBodyScript -> IO AtomFunction
132−loadAtomFunc precompiledFuncs mScriptSession funcName funcType mFuncScript = case mFuncScript of
123+loadAtomFunc precompiledFuncs _mScriptSession funcName _funcType mFuncScript = case mFuncScript of
133124 --handle pre-compiled case- pull it from the precompiled list
134125 Nothing -> case atomFunctionForName funcName precompiledFuncs of
135126 --WARNING: possible landmine here if we remove a precompiled atom function in the future, then the transaction cannot be restored
136127 Left _ -> error ("expected precompiled atom function: " ++ T.unpack funcName)
137128 Right realFunc -> pure realFunc
138129 --handle a real Haskell scripted function- compile and load
139− Just funcScript ->
140− case mScriptSession of
130+ Just _funcScript ->
131+#ifdef PM36_HASKELL_SCRIPTING
132+ case _mScriptSession of
141133 Nothing -> error "attempted to read serialized AtomFunction without scripting enabled"
142134 Just scriptSession -> do
143135 --risk of GHC exception during compilation here
144136 eCompiledScript <- runGhc (Just libdir) $ do
145137 setSession (hscEnv scriptSession)
146− compileScript (atomFunctionBodyType scriptSession) funcScript
138+ compileScript (atomFunctionBodyType scriptSession) _funcScript
147139 case eCompiledScript of
148140 Left err -> throwIO err
149141 Right compiledScript -> pure AtomFunction { atomFuncName = funcName,
150− atomFuncType = funcType,
151− atomFuncBody = AtomFunctionBody (Just funcScript) compiledScript }
142+ atomFuncType = _funcType,
143+ atomFuncBody = AtomFunctionBody (Just _funcScript) compiledScript }
144+#else
145+ error "Haskell scripting is disabled"
146+#endif
152147
153148--if the script session is enabled, compile the script, otherwise, hard error!
154149
155150readAtomFunc :: FilePath -> AtomFunctionName -> Maybe ScriptSession -> AtomFunctions -> IO AtomFunction
151+#if !defined(PM36_HASKELL_SCRIPTING)
152+readAtomFunc _ _ _ _ = error "Haskell scripting is disabled"
153+#else
156154readAtomFunc transDir funcName mScriptSession precompiledFuncs = do
157155 let atomFuncPath = atomFuncsPath transDir
158− (funcType, mFuncScript) <- B.decodeFile atomFuncPath
156+ (funcType, mFuncScript) <- readFileDeserialise @([AtomType],Maybe T.Text) atomFuncPath
159157 case mFuncScript of
160158 --handle pre-compiled case- pull it from the precompiled list
161159 Nothing -> case atomFunctionForName funcName precompiledFuncs of
@@ -163,7 +161,8 @@ readAtomFunc transDir funcName mScriptSession precompiledFuncs = do
163161 Left _ -> error ("expected precompiled atom function: " ++ T.unpack funcName)
164162 Right realFunc -> pure realFunc
165163 --handle a real Haskell scripted function- compile and load
166− Just funcScript ->
164+ Just funcScript ->
165+
167166 case mScriptSession of
168167 Nothing -> error "attempted to read serialized AtomFunction without scripting enabled"
169168 Just scriptSession -> do
@@ -176,6 +175,7 @@ readAtomFunc transDir funcName mScriptSession precompiledFuncs = do
176175 Right compiledScript -> pure AtomFunction { atomFuncName = funcName,
177176 atomFuncType = funcType,
178177 atomFuncBody = AtomFunctionBody (Just funcScript) compiledScript }
178+#endif
179179
180180
181181writeDBCFuncs :: DiskSync -> FilePath -> DatabaseContextFunctions -> IO ()
@@ -184,40 +184,48 @@ writeDBCFuncs sync transDir funcs = mapM_ (writeDBCFunc sync transDir) (HS.toLis
184184writeDBCFunc :: DiskSync -> FilePath -> DatabaseContextFunction -> IO ()
185185writeDBCFunc sync transDir func = do
186186 let dbcFuncPath = dbcFuncsDir transDir </> T.unpack (dbcFuncName func)
187− writeBSFileSync sync dbcFuncPath (B.encode (dbcFuncType func, databaseContextFunctionScript func))
187+ writeBSFileSync sync dbcFuncPath (serialise (dbcFuncType func, databaseContextFunctionScript func))
188188
189189readDBCFuncs :: FilePath -> Maybe ScriptSession -> IO DatabaseContextFunctions
190190readDBCFuncs transDir mScriptSession = do
191191 funcNames <- getDirectoryNames (dbcFuncsDir transDir)
192192 --only Haskell script functions can be serialized
193193 --we always return the pre-compiled functions
194− funcs <- mapM ((\name -> readDBCFunc transDir name mScriptSession precompiledDatabaseContextFunctions) . T.pack) funcNames
195− return $ HS.union basicDatabaseContextFunctions (HS.fromList funcs)
194+ let funcs = mapM ((\name -> readDBCFunc transDir name mScriptSession precompiledDatabaseContextFunctions) . T.pack) funcNames
195+ HS.union basicDatabaseContextFunctions . HS.fromList <$> funcs
196196
197−readDBCFunc :: FilePath -> DatabaseContextFunctionName -> Maybe ScriptSession -> DatabaseContextFunctions -> IO DatabaseContextFunction
197+readDBCFunc :: FilePath -> DatabaseContextFunctionName -> Maybe ScriptSession -> DatabaseContextFunctions -> IO DatabaseContextFunction
198+#if !defined(PM36_HASKELL_SCRIPTING)
199+readDBCFunc transDir funcName _ precompiledFuncs = do
200+#else
198201readDBCFunc transDir funcName mScriptSession precompiledFuncs = do
202+#endif
199203 let dbcFuncPath = dbcFuncsDir transDir </> T.unpack funcName
200− (funcType, mFuncScript) <- B.decodeFile dbcFuncPath
204+ (_funcType, mFuncScript) <- readFileDeserialise @([AtomType], Maybe T.Text) dbcFuncPath
201205 case mFuncScript of
202206 Nothing -> case databaseContextFunctionForName funcName precompiledFuncs of
203207 Left _ -> error ("expected precompiled dbc function: " ++ T.unpack funcName)
204208 Right realFunc -> pure realFunc --return precompiled function
205− Just funcScript ->
209+ Just _funcScript ->
210+#ifdef PM36_HASKELL_SCRIPTING
206211 case mScriptSession of
207212 Nothing -> error "attempted to read serialized AtomFunction without scripting enabled"
208213 Just scriptSession -> do
209214 eCompiledScript <- runGhc (Just libdir) $ do
210215 setSession (hscEnv scriptSession)
211− compileScript (dbcFunctionBodyType scriptSession) funcScript
216+ compileScript (dbcFunctionBodyType scriptSession) _funcScript
212217 case eCompiledScript of
213218 Left err -> throwIO err
214219 Right compiledScript -> pure DatabaseContextFunction { dbcFuncName = funcName,
215− dbcFuncType = funcType,
216− dbcFuncBody = DatabaseContextFunctionBody (Just funcScript) compiledScript}
220+ dbcFuncType = _funcType,
221+ dbcFuncBody = DatabaseContextFunctionBody (Just _funcScript) compiledScript}
222+#else
223+ error "Haskell scripting is disabled"
224+#endif
217225
218226writeIncDep :: DiskSync -> FilePath -> (IncDepName, InclusionDependency) -> IO ()
219227writeIncDep sync transDir (incDepName, incDep) =
220− writeBSFileSync sync (incDepsDir transDir </> T.unpack incDepName) $ B.encode incDep
228+ writeBSFileSync sync (incDepsDir transDir </> T.unpack incDepName) $ serialise incDep
221229
222230writeIncDeps :: DiskSync -> FilePath -> M.Map IncDepName InclusionDependency -> IO ()
223231writeIncDeps sync transDir incdeps = mapM_ (writeIncDep sync transDir) $ M.toList incdeps
@@ -225,33 +233,32 @@ writeIncDeps sync transDir incdeps = mapM_ (writeIncDep sync transDir) $ M.toLis
225233readIncDep :: FilePath -> IncDepName -> IO (IncDepName, InclusionDependency)
226234readIncDep transDir incdepName = do
227235 let incDepPath = incDepsDir transDir </> T.unpack incdepName
228− incDepData <- B.decodeFile incDepPath
236+ incDepData <- readFileDeserialise incDepPath
229237 pure (incdepName, incDepData)
230238
231239readIncDeps :: FilePath -> IO (M.Map IncDepName InclusionDependency)
232240readIncDeps transDir = do
233241 let incDepsPath = incDepsDir transDir
234242 incDepNames <- getDirectoryNames incDepsPath
235− incDeps <- mapM (readIncDep transDir . T.pack) incDepNames
236− return $ M.fromList incDeps
243+ M.fromList <$> mapM (readIncDep transDir . T.pack) incDepNames
237244
238245readSubschemas :: FilePath -> IO Subschemas
239246readSubschemas transDir = do
240247 let sschemasPath = subschemasPath transDir
241− B.decodeFile sschemasPath
248+ readFileDeserialise sschemasPath
242249
243250writeSubschemas :: DiskSync -> FilePath -> Subschemas -> IO ()
244251writeSubschemas sync transDir sschemas = do
245252 let sschemasPath = subschemasPath transDir
246− writeBSFileSync sync sschemasPath (B.encode sschemas)
253+ writeBSFileSync sync sschemasPath (serialise sschemas)
247254
248255writeTypeConstructorMapping :: DiskSync -> FilePath -> TypeConstructorMapping -> IO ()
249256writeTypeConstructorMapping sync path types = let atPath = typeConsPath path in
250− writeBSFileSync sync atPath $ B.encode types
257+ writeBSFileSync sync atPath $ serialise types
251258
252259readTypeConstructorMapping :: FilePath -> IO TypeConstructorMapping
253260readTypeConstructorMapping path = do
254261 let atPath = typeConsPath path
255− B.decodeFile atPath
262+ readFileDeserialise atPath
263+
256264
257−
src/lib/ProjectM36/Transaction/Type.hsnew file+8
@@ -0,0 +1,8 @@
1+module ProjectM36.Transaction where
2+import ProjectM36.Base
3+
4+uid :: Transaction -> TransactionId
5+uid (Transaction uid _ _) = uid
6+
7+info :: Transaction -> TransactionInfo
8+info (Transaction _ info _) = info
src/lib/ProjectM36/TransactionDiffs.hsnew file+12
@@ -0,0 +1,12 @@
1+module ProjectM36.TransactionDiffs where
2+import ProjectM36.Base
3+import Data.List.NonEmpty
4+import Data.UUID as U
5+
6+{-
7+root :: TransactionDiffs
8+root = single U.nil NoOperation
9+
10+single :: TransactionId -> TransactionDiffExpr -> TransactionDiffs
11+single tid expr = (tid, expr) :| []
12+-}
src/lib/ProjectM36/TransactionGraph.hs+240−151
@@ -1,46 +1,52 @@
1−{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}
1+{-# LANGUAGE DeriveGeneric, CPP, FlexibleContexts, DerivingVia #-}
22module ProjectM36.TransactionGraph where
33import ProjectM36.Base
44import ProjectM36.Error
55import ProjectM36.Transaction
6+import ProjectM36.TransactionInfo as TI
67import ProjectM36.Relation
78import ProjectM36.TupleSet
89import ProjectM36.Tuple
910import ProjectM36.RelationalExpression
1011import ProjectM36.TransactionGraph.Merge
12+import ProjectM36.MerkleHash
1113import qualified ProjectM36.DisconnectedTransaction as Discon
14+import qualified ProjectM36.Attribute as A
1215
16+import Codec.Winery
17+import Control.Monad.Except hiding (join)
18+import Control.Monad.Reader hiding (join)
1319import qualified Data.Vector as V
14−import qualified ProjectM36.Attribute as A
1520import qualified Data.UUID as U
1621import qualified Data.Set as S
1722import qualified Data.Map as M
18−import Control.Monad
23+import qualified Data.List.NonEmpty as NE
1924import Data.Time.Clock
2025import qualified Data.Text as T
2126import GHC.Generics
22−import Data.Binary
2327import Data.Either (lefts, rights, isRight)
28+#if __GLASGOW_HASKELL__ < 804
2429import Data.Monoid
30+#endif
2531import Control.Arrow
2632import Data.Maybe
27−
28−{-
29−--import Debug.Trace
30−import Control.Monad.Reader
31−import qualified ProjectM36.DisconnectedTransaction as D
32−-}
33+import Data.UUID.V4
34+import qualified Data.ByteString.Lazy as BL
35+import ProjectM36.DatabaseContext as DBC
36+import Crypto.Hash.SHA256
3337
3438-- | Record a lookup for a specific transaction in the graph.
3539data TransactionIdLookup = TransactionIdLookup TransactionId |
3640 TransactionIdHeadNameLookup HeadName [TransactionIdHeadBacktrack]
37− deriving (Show, Eq, Binary, Generic)
41+ deriving (Show, Eq, Generic)
42+ deriving Serialise via WineryVariant TransactionIdLookup
3843
3944-- | Used for git-style head backtracking such as topic~3^2.
40−data TransactionIdHeadBacktrack = TransactionIdHeadParentBacktrack Int | -- ^ git equivalent of ~: walk back n parents, arbitrarily choosing a parent when a choice must be made
45+data TransactionIdHeadBacktrack = TransactionIdHeadParentBacktrack Int | -- ^ git equivalent of ~v: walk back n parents, arbitrarily choosing a parent when a choice must be made
4146 TransactionIdHeadBranchBacktrack Int | -- ^ git equivalent of ^: walk back one parent level to the nth arbitrarily-chosen parent
4247 TransactionStampHeadBacktrack UTCTime -- ^ git equivalent of 'git-rev-list -n 1 --before X' find the first transaction which was created before the timestamp
43− deriving (Show, Eq, Binary, Generic)
48+ deriving (Show, Eq, Generic)
49+ deriving Serialise via WineryVariant TransactionIdHeadBacktrack
4450
4551
4652-- | Operators which manipulate a transaction graph and which transaction the current 'Session' is based upon.
@@ -52,22 +58,32 @@ data TransactionGraphOperator = JumpToHead HeadName |
5258 MergeTransactions MergeStrategy HeadName HeadName |
5359 Commit |
5460 Rollback
55− deriving (Eq, Show, Binary, Generic)
61+ deriving (Eq, Show, Generic)
62+ deriving Serialise via WineryVariant TransactionGraphOperator
5663
5764isCommit :: TransactionGraphOperator -> Bool
5865isCommit Commit = True
5966isCommit _ = False
6067
61−data ROTransactionGraphOperator = ShowGraph
68+data ROTransactionGraphOperator = ShowGraph | ValidateMerkleHashes
6269 deriving Show
6370
6471bootstrapTransactionGraph :: UTCTime -> TransactionId -> DatabaseContext -> TransactionGraph
65−bootstrapTransactionGraph stamp freshId context = TransactionGraph bootstrapHeads bootstrapTransactions
72+bootstrapTransactionGraph stamp' freshId context = TransactionGraph bootstrapHeads bootstrapTransactions
6673 where
6774 bootstrapHeads = M.singleton "master" freshTransaction
6875 newSchemas = Schemas context M.empty
69− freshTransaction = Transaction freshId (TransactionInfo U.nil S.empty stamp) newSchemas
70− bootstrapTransactions = S.singleton freshTransaction
76+ freshTransaction = fresh freshId stamp' newSchemas
77+ hashedTransaction = Transaction freshId ((transactionInfo freshTransaction) { merkleHash = calculateMerkleHash freshTransaction emptyTransactionGraph }) newSchemas
78+ bootstrapTransactions = S.singleton hashedTransaction
79+
80+-- | Create a transaction graph from a context.
81+freshTransactionGraph :: DatabaseContext -> IO (TransactionGraph, TransactionId)
82+freshTransactionGraph ctx = do
83+ now <- getCurrentTime
84+ freshId <- nextRandom
85+ pure (bootstrapTransactionGraph now freshId ctx, freshId)
86+
7187
7288emptyTransactionGraph :: TransactionGraph
7389emptyTransactionGraph = TransactionGraph M.empty S.empty
@@ -86,76 +102,79 @@ headNameForTransaction transaction (TransactionGraph heads _) = if M.null matchi
86102 where
87103 matchingTrans = M.filter (transaction ==) heads
88104
89−transactionForId :: TransactionId -> TransactionGraph -> Either RelationalError Transaction
90−transactionForId tid graph
91− | tid == U.nil =
92− Left RootTransactionTraversalError
93− | S.null matchingTrans =
94− Left $ NoSuchTransactionError tid
95− | otherwise =
96− Right $ head (S.toList matchingTrans)
97− where
98− matchingTrans = S.filter (\(Transaction idMatch _ _) -> idMatch == tid) (transactionsForGraph graph)
99−
100105transactionsForIds :: S.Set TransactionId -> TransactionGraph -> Either RelationalError (S.Set Transaction)
101−transactionsForIds idSet graph = do
102− transList <- forM (S.toList idSet) (`transactionForId` graph)
103− return (S.fromList transList)
106+transactionsForIds idSet graph =
107+ S.fromList <$> forM (S.toList idSet) (`transactionForId` graph)
108+
109+-- | A root transaction terminates a graph and has no parents.
110+isRootTransaction :: Transaction -> Bool
111+isRootTransaction trans = parentIds trans == S.singleton U.nil
104112
105−isRootTransaction :: Transaction -> TransactionGraph -> Bool
106−isRootTransaction (Transaction _ (TransactionInfo pId _ _) _) _ = U.null pId
107−isRootTransaction (Transaction _ MergeTransactionInfo{} _) _ = False
113+rootTransactions :: TransactionGraph -> S.Set Transaction
114+rootTransactions graph = S.filter isRootTransaction (transactionsForGraph graph)
108115
109116-- the first transaction has no parent - all other do have parents- merges have two parents
110117parentTransactions :: Transaction -> TransactionGraph -> Either RelationalError (S.Set Transaction)
111−parentTransactions (Transaction _ (TransactionInfo pId _ _) _) graph = do
112− trans <- transactionForId pId graph
113− return (S.singleton trans)
114−
115−parentTransactions (Transaction _ (MergeTransactionInfo pId1 pId2 _ _) _ ) graph = transactionsForIds (S.fromList [pId1, pId2]) graph
116−
118+parentTransactions trans = transactionsForIds (parentIds trans)
117119
118120childTransactions :: Transaction -> TransactionGraph -> Either RelationalError (S.Set Transaction)
119−childTransactions (Transaction _ (TransactionInfo _ children _) _) = transactionsForIds children
120−childTransactions (Transaction _ (MergeTransactionInfo _ _ children _) _) = transactionsForIds children
121+childTransactions trans graph = transactionsForIds childIds graph
122+ where
123+ childIds = S.map transactionId (S.filter filt (transactionsForGraph graph))
124+ filt trans' = S.member (transactionId trans) (parentIds trans')
121125
122126-- create a new commit and add it to the heads
123127-- technically, the new head could be added to an existing commit, but by adding a new commit, the new head is unambiguously linked to a new commit (with a context indentical to its parent)
124128addBranch :: UTCTime -> TransactionId -> HeadName -> TransactionId -> TransactionGraph -> Either RelationalError (Transaction, TransactionGraph)
125−addBranch stamp newId newBranchName branchPointId graph = do
129+addBranch stamp' newId newBranchName branchPointId graph = do
126130 parentTrans <- transactionForId branchPointId graph
127− let newTrans = Transaction newId (TransactionInfo branchPointId S.empty stamp) (schemas parentTrans)
131+ let newTrans = Transaction newId (TI.singleParent branchPointId stamp') (schemas parentTrans)
128132 addTransactionToGraph newBranchName newTrans graph
129133
130134--adds a disconnected transaction to a transaction graph at some head
131135addDisconnectedTransaction :: UTCTime -> TransactionId -> HeadName -> DisconnectedTransaction -> TransactionGraph -> Either RelationalError (Transaction, TransactionGraph)
132−addDisconnectedTransaction stamp newId headName (DisconnectedTransaction parentId schemas' _) = addTransactionToGraph headName (Transaction newId (TransactionInfo parentId S.empty stamp) schemas')
133−
134−
136+addDisconnectedTransaction stamp' newId headName (DisconnectedTransaction parentId schemas' _) graph = addTransactionToGraph headName newTrans' graph
137+ where
138+ newTrans = Transaction newId newTInfo schemas'
139+ newTInfo = TI.singleParent parentId stamp'
140+ newTrans' = Transaction newId (newTInfo { merkleHash = newHash }) schemas'
141+ newHash = calculateMerkleHash newTrans graph--lookup parents in graph to calculate
142+--LOOP
135143addTransactionToGraph :: HeadName -> Transaction -> TransactionGraph -> Either RelationalError (Transaction, TransactionGraph)
136144addTransactionToGraph headName newTrans graph = do
137− let parentIds = transactionParentIds newTrans
138− childIds = transactionChildIds newTrans
145+ let parentIds' = parentIds newTrans
139146 newId = transactionId newTrans
140147 validateIds ids = mapM (`transactionForId` graph) (S.toList ids)
141− addChildTransaction trans = transactionSetChildren trans (S.insert newId (transactionChildIds trans))
148+ childTs <- childTransactions newTrans graph
142149 --validate that the parent transactions are in the graph
143− _ <- validateIds parentIds
144− when (S.size parentIds < 1) (Left $ NewTransactionMissingParentError newId)
150+ _ <- validateIds parentIds'
151+ when (S.size parentIds' < 1) (Left $ NewTransactionMissingParentError newId)
145152 --if the headName already exists, ensure that it refers to a parent
146153 case transactionForHead headName graph of
147154 Nothing -> pure () -- any headName is OK
148− Just trans -> when (S.notMember (transactionId trans) parentIds) (Left (HeadNameSwitchingHeadProhibitedError headName))
155+ Just trans -> when (S.notMember (transactionId trans) parentIds') (Left (HeadNameSwitchingHeadProhibitedError headName))
149156 --validate that the transaction has no children
150− unless (S.null childIds) (Left $ NewTransactionMayNotHaveChildrenError newId)
157+ unless (S.null childTs) (Left $ NewTransactionMayNotHaveChildrenError newId)
151158 --validate that the trasaction's id is unique
152159 when (isRight (transactionForId newId graph)) (Left (TransactionIdInUseError newId))
153− --update the parent transactions to point to the new transaction
154− parents <- mapM (`transactionForId` graph) (S.toList parentIds)
155− let updatedParents = S.map addChildTransaction (S.fromList parents)
156− updatedTransSet = S.insert newTrans (S.union updatedParents (transactionsForGraph graph))
157− updatedHeads = M.insert headName newTrans (transactionHeadsForGraph graph)
158− pure (newTrans, TransactionGraph updatedHeads updatedTransSet)
160+ --replace all references to UncommittedTransactionMarker to new transaction id
161+ let newTrans' = newTransUncommittedReplace newTrans
162+ updatedTransSet = S.insert newTrans' (transactionsForGraph graph)
163+ updatedHeads = M.insert headName newTrans' (transactionHeadsForGraph graph)
164+ pure (newTrans', TransactionGraph updatedHeads updatedTransSet)
165+
166+--replace all occurrences of the uncommitted context marker
167+newTransUncommittedReplace :: Transaction -> Transaction
168+newTransUncommittedReplace trans@(Transaction tid tinfo (Schemas ctx sschemas)) =
169+ Transaction tid tinfo (Schemas fixedContext sschemas)
170+ where
171+ uncommittedReplace UncommittedContextMarker = TransactionMarker tid
172+ uncommittedReplace marker = marker
173+ relvars = relationVariables (concreteDatabaseContext trans)
174+ fixedRelvars = M.map (fmap uncommittedReplace) relvars
175+ fixedContext = ctx { relationVariables = fixedRelvars }
176+
177+
159178
160179validateGraph :: TransactionGraph -> Maybe [RelationalError]
161180validateGraph graph@(TransactionGraph _ transSet) = do
@@ -227,7 +246,7 @@ evalGraphOp _ _ discon graph (WalkBackToTime backTime) = do
227246 case transactionForId jumpDest graph of
228247 Left err -> Left err
229248 Right trans -> do
230− let disconnectedTrans = DisconnectedTransaction (transactionId trans) (schemas trans) False
249+ let disconnectedTrans = Discon.freshTransaction (transactionId trans) (schemas trans)
231250 Right (disconnectedTrans, graph)
232251
233252-- add new head pointing to branchPoint
@@ -245,15 +264,15 @@ evalGraphOp newId discon@(DisconnectedTransaction parentId disconContext) graph
245264
246265-- create a new commit and add it to the heads
247266-- technically, the new head could be added to an existing commit, but by adding a new commit, the new head is unambiguously linked to a new commit (with a context indentical to its parent)
248−evalGraphOp stamp newId (DisconnectedTransaction parentId schemas' _) graph (Branch newBranchName) = do
249− let newDiscon = DisconnectedTransaction newId schemas' False
250− case addBranch stamp newId newBranchName parentId graph of
267+evalGraphOp stamp' newId (DisconnectedTransaction parentId schemas' _) graph (Branch newBranchName) = do
268+ let newDiscon = Discon.freshTransaction newId schemas'
269+ case addBranch stamp' newId newBranchName parentId graph of
251270 Left err -> Left err
252271 Right (_, newGraph) -> Right (newDiscon, newGraph)
253272
254273-- add the disconnected transaction to the graph
255274-- affects graph and disconnectedtransaction- the new disconnectedtransaction's parent is the freshly committed transaction
256−evalGraphOp stamp newTransId discon@(DisconnectedTransaction parentId schemas' _) graph Commit = case transactionForId parentId graph of
275+evalGraphOp stamp' newTransId discon@(DisconnectedTransaction parentId schemas' _) graph Commit = case transactionForId parentId graph of
257276 Left err -> Left err
258277 Right parentTransaction -> case headNameForTransaction parentTransaction graph of
259278 Nothing -> Left $ TransactionIsNotAHeadError parentId
@@ -261,17 +280,20 @@ evalGraphOp stamp newTransId discon@(DisconnectedTransaction parentId schemas' _
261280 Left err-> Left err
262281 Right (_, updatedGraph) -> Right (newDisconnectedTrans, updatedGraph)
263282 where
264− newDisconnectedTrans = DisconnectedTransaction newTransId schemas' False
265− maybeUpdatedGraph = addDisconnectedTransaction stamp newTransId headName discon graph
283+ newDisconnectedTrans = Discon.freshTransaction newTransId schemas'
284+ maybeUpdatedGraph = addDisconnectedTransaction stamp' newTransId headName discon graph
266285
267286-- refresh the disconnected transaction, return the same graph
268287evalGraphOp _ _ (DisconnectedTransaction parentId _ _) graph Rollback = case transactionForId parentId graph of
269288 Left err -> Left err
270289 Right parentTransaction -> Right (newDiscon, graph)
271290 where
272− newDiscon = DisconnectedTransaction parentId (schemas parentTransaction) False
291+ newDiscon = Discon.freshTransaction parentId (schemas parentTransaction)
273292
274−evalGraphOp stamp newId (DisconnectedTransaction parentId _ _) graph (MergeTransactions mergeStrategy headNameA headNameB) = mergeTransactions stamp newId parentId mergeStrategy (headNameA, headNameB) graph
293+evalGraphOp stamp' newId (DisconnectedTransaction parentId _ _) graph (MergeTransactions mergeStrategy headNameA headNameB) =
294+ runGraphRefRelationalExprM env $ mergeTransactions stamp' newId parentId mergeStrategy (headNameA, headNameB)
295+ where
296+ env = freshGraphRefRelationalExprEnv Nothing graph
275297
276298evalGraphOp _ _ discon graph@(TransactionGraph graphHeads transSet) (DeleteBranch branchName) = case transactionForHead branchName graph of
277299 Nothing -> Left (NoSuchHeadNameError branchName)
@@ -284,6 +306,7 @@ graphAsRelation (DisconnectedTransaction parentId _ _) graph@(TransactionGraph _
284306 mkRelationFromList attrs tupleMatrix
285307 where
286308 attrs = A.attributesFromList [Attribute "id" TextAtomType,
309+ Attribute "hash" ByteStringAtomType,
287310 Attribute "stamp" DateTimeAtomType,
288311 Attribute "parents" (RelationAtomType parentAttributes),
289312 Attribute "current" BoolAtomType,
@@ -293,7 +316,8 @@ graphAsRelation (DisconnectedTransaction parentId _ _) graph@(TransactionGraph _
293316 tupleGenerator transaction = case transactionParentsRelation transaction graph of
294317 Left err -> Left err
295318 Right parentTransRel -> Right [TextAtom $ T.pack $ show (transactionId transaction),
296− DateTimeAtom (transactionTimestamp transaction),
319+ ByteStringAtom $ _unMerkleHash (merkleHash (transactionInfo transaction)),
320+ DateTimeAtom (timestamp transaction),
297321 RelationAtom parentTransRel,
298322 BoolAtom $ parentId == transactionId transaction,
299323 TextAtom $ fromMaybe "" (headNameForTransaction transaction graph)
@@ -301,7 +325,7 @@ graphAsRelation (DisconnectedTransaction parentId _ _) graph@(TransactionGraph _
301325
302326transactionParentsRelation :: Transaction -> TransactionGraph -> Either RelationalError Relation
303327transactionParentsRelation trans graph =
304− if isRootTransaction trans graph then
328+ if isRootTransaction trans then
305329 mkRelation attrs emptyTupleSet
306330 else do
307331 parentTransSet <- parentTransactions trans graph
@@ -320,39 +344,47 @@ evalROGraphOp discon graph ShowGraph = do
320344-}
321345
322346-- | Execute the merge strategy against the transactions, returning a new transaction which can be then added to the transaction graph
323−createMergeTransaction :: UTCTime -> TransactionId -> MergeStrategy -> TransactionGraph -> (Transaction, Transaction) -> Either MergeError Transaction
324−createMergeTransaction stamp newId (SelectedBranchMergeStrategy selectedBranch) graph t2@(trans1, trans2) = do
347+createMergeTransaction :: UTCTime -> TransactionId -> MergeStrategy -> (Transaction, Transaction) -> GraphRefRelationalExprM Transaction
348+createMergeTransaction stamp' newId (SelectedBranchMergeStrategy selectedBranch) t2@(trans1, trans2) = do
349+ graph <- gfGraph
325350 selectedTrans <- validateHeadName selectedBranch graph t2
326− pure $ Transaction newId (MergeTransactionInfo (transactionId trans1) (transactionId trans2) S.empty stamp) (schemas selectedTrans)
351+ pure $ addMerkleHash graph $
352+ Transaction newId (TransactionInfo {
353+ parents = NE.fromList [transactionId trans1,
354+ transactionId trans2],
355+ stamp = stamp',
356+ merkleHash = mempty }) (schemas selectedTrans)
327357
328358-- merge functions, relvars, individually
329−createMergeTransaction stamp newId strat@UnionMergeStrategy graph t2 = createUnionMergeTransaction stamp newId strat graph t2
359+createMergeTransaction stamp' newId strat@UnionMergeStrategy t2 =
360+ createUnionMergeTransaction stamp' newId strat t2
330361
331362-- merge function, relvars, but, on error, just take the component from the preferred branch
332−createMergeTransaction stamp newId strat@(UnionPreferMergeStrategy _) graph t2 = createUnionMergeTransaction stamp newId strat graph t2
363+createMergeTransaction stamp' newId strat@(UnionPreferMergeStrategy _) t2 =
364+ createUnionMergeTransaction stamp' newId strat t2
333365
334366-- | Returns the correct Transaction for the branch name in the graph and ensures that it is one of the two transaction arguments in the tuple.
335−validateHeadName :: HeadName -> TransactionGraph -> (Transaction, Transaction) -> Either MergeError Transaction
367+validateHeadName :: HeadName -> TransactionGraph -> (Transaction, Transaction) -> GraphRefRelationalExprM Transaction
336368validateHeadName headName graph (t1, t2) =
337369 case transactionForHead headName graph of
338− Nothing -> Left SelectedHeadMismatchMergeError
370+ Nothing -> throwError (MergeTransactionError SelectedHeadMismatchMergeError)
339371 Just trans -> if trans /= t1 && trans /= t2 then
340− Left SelectedHeadMismatchMergeError
372+ throwError (MergeTransactionError SelectedHeadMismatchMergeError)
341373 else
342− Right trans
374+ pure trans
343375
344376-- Algorithm: start at one transaction and work backwards up the parents. If there is a node we have not yet visited as a child, then walk that up to its head. If that branch contains the goal transaction, then we have completed a valid subgraph traversal.
345377subGraphOfFirstCommonAncestor :: TransactionGraph -> TransactionHeads -> Transaction -> Transaction -> S.Set Transaction -> Either RelationalError TransactionGraph
346−subGraphOfFirstCommonAncestor origGraph resultHeads currentTrans goalTrans traverseSet = do
347− let currentid = transactionId currentTrans
378+subGraphOfFirstCommonAncestor origGraph resultHeads currentTrans' goalTrans traverseSet = do
379+ let currentid = transactionId currentTrans'
348380 goalid = transactionId goalTrans
349− if currentTrans == goalTrans then
381+ if currentTrans' == goalTrans then
350382 Right (TransactionGraph resultHeads traverseSet) -- add filter
351383 --catch root transaction to improve error?
352384 else do
353− currentTransChildren <- S.fromList <$> mapM (`transactionForId` origGraph) (S.toList (transactionChildIds currentTrans))
354− let searchChildren = S.difference (S.insert currentTrans traverseSet) currentTransChildren
355− searchChild start = pathToTransaction origGraph start goalTrans (S.insert currentTrans traverseSet)
385+ currentTransChildren <- childTransactions currentTrans' origGraph
386+ let searchChildren = S.difference (S.insert currentTrans' traverseSet) currentTransChildren
387+ searchChild start' = pathToTransaction origGraph start' goalTrans (S.insert currentTrans' traverseSet)
356388 childSearches = map searchChild (S.toList searchChildren)
357389 errors = lefts childSearches
358390 pathsFound = rights childSearches
@@ -361,17 +393,16 @@ subGraphOfFirstCommonAncestor origGraph resultHeads currentTrans goalTrans trave
361393 unless (null realErrors) (Left (head realErrors))
362394 -- if no paths found, search the parent
363395 if null pathsFound then
364− case oneParent currentTrans of
396+ case oneParent currentTrans' of
365397 Left RootTransactionTraversalError -> Left (NoCommonTransactionAncestorError currentid goalid)
366398 Left err -> Left err
367399 Right currentTransParent ->
368− subGraphOfFirstCommonAncestor origGraph resultHeads currentTransParent goalTrans (S.insert currentTrans traverseSet)
400+ subGraphOfFirstCommonAncestor origGraph resultHeads currentTransParent goalTrans (S.insert currentTrans' traverseSet)
369401 else -- we found a path
370402 Right (TransactionGraph resultHeads (S.unions (traverseSet : pathsFound)))
371403 where
372− oneParent (Transaction _ (TransactionInfo parentId _ _) _) = transactionForId parentId origGraph
373− oneParent (Transaction _ (MergeTransactionInfo parentId _ _ _) _) = transactionForId parentId origGraph
374−
404+ oneParent (Transaction _ tinfo _) = transactionForId (NE.head (parents tinfo)) origGraph
405+
375406-- | Search from a past graph point to all following heads for a specific transaction. If found, return the transaction path, otherwise a RelationalError.
376407pathToTransaction :: TransactionGraph -> Transaction -> Transaction -> S.Set Transaction -> Either RelationalError (S.Set Transaction)
377408pathToTransaction graph currentTransaction targetTransaction accumTransSet = do
@@ -379,11 +410,11 @@ pathToTransaction graph currentTransaction targetTransaction accumTransSet = do
379410 if transactionId targetTransaction == transactionId currentTransaction then
380411 Right accumTransSet
381412 else do
382− currentTransChildren <- mapM (`transactionForId` graph) (S.toList (transactionChildIds currentTransaction))
413+ currentTransChildren <- childTransactions currentTransaction graph
383414 if null currentTransChildren then
384415 Left (FailedToFindTransactionError targetId)
385416 else do
386− let searches = map (\t -> pathToTransaction graph t targetTransaction (S.insert t accumTransSet)) currentTransChildren
417+ let searches = map (\t -> pathToTransaction graph t targetTransaction (S.insert t accumTransSet)) (S.toList currentTransChildren)
387418 let realErrors = filter (/= FailedToFindTransactionError targetId) (lefts searches)
388419 paths = rights searches
389420 if not (null realErrors) then -- found some real errors
@@ -393,35 +424,39 @@ pathToTransaction graph currentTransaction targetTransaction accumTransSet = do
393424 else --we have some paths!
394425 Right (S.unions paths)
395426
396−mergeTransactions :: UTCTime -> TransactionId -> TransactionId -> MergeStrategy -> (HeadName, HeadName) -> TransactionGraph -> Either RelationalError (DisconnectedTransaction, TransactionGraph)
397−mergeTransactions stamp newId parentId mergeStrategy (headNameA, headNameB) graph = do
427+mergeTransactions :: UTCTime -> TransactionId -> TransactionId -> MergeStrategy -> (HeadName, HeadName) -> GraphRefRelationalExprM (DisconnectedTransaction, TransactionGraph)
428+mergeTransactions stamp' newId parentId mergeStrategy (headNameA, headNameB) = do
429+ graph <- gfGraph
398430 let transactionForHeadErr name = case transactionForHead name graph of
399− Nothing -> Left (NoSuchHeadNameError name)
400− Just t -> Right t
401− transA <- transactionForHeadErr headNameA
402− transB <- transactionForHeadErr headNameB
403− disconParent <- transactionForId parentId graph
404− let subHeads = M.filterWithKey (\k _ -> elem k [headNameA, headNameB]) (transactionHeadsForGraph graph)
405− subGraph <- subGraphOfFirstCommonAncestor graph subHeads transA transB S.empty
406− subGraph' <- filterSubGraph subGraph subHeads
407− case createMergeTransaction stamp newId mergeStrategy subGraph' (transA, transB) of
408− Left err -> Left (MergeTransactionError err)
409− Right mergedTrans -> case checkConstraints (concreteDatabaseContext mergedTrans) of
410− Just err -> Left err
411− Nothing -> case headNameForTransaction disconParent graph of
412− Nothing -> Left (TransactionIsNotAHeadError parentId)
431+ Nothing -> throwError (NoSuchHeadNameError name)
432+ Just t -> pure t
433+ runE e = case e of
434+ Left e' -> throwError e'
435+ Right v -> pure v
436+ transA <- transactionForHeadErr headNameA
437+ transB <- transactionForHeadErr headNameB
438+ disconParent <- gfTransForId parentId
439+ let subHeads = M.filterWithKey (\k _ -> k `elem` [headNameA, headNameB]) (transactionHeadsForGraph graph)
440+ subGraph <- runE $ subGraphOfFirstCommonAncestor graph subHeads transA transB S.empty
441+ subGraph' <- runE $ filterSubGraph subGraph subHeads
442+ mergedTrans <- local (const (freshGraphRefRelationalExprEnv Nothing subGraph')) $ createMergeTransaction stamp' newId mergeStrategy (transA, transB)
443+ case headNameForTransaction disconParent graph of
444+ Nothing -> throwError (TransactionIsNotAHeadError parentId)
413445 Just headName -> do
414− (newTrans, newGraph) <- addTransactionToGraph headName mergedTrans graph
415− let newGraph' = TransactionGraph (transactionHeadsForGraph newGraph) (transactionsForGraph newGraph)
416− newDiscon = DisconnectedTransaction newId (schemas newTrans) False
417− pure (newDiscon, newGraph')
446+ (newTrans, newGraph) <- runE $ addTransactionToGraph headName mergedTrans graph
447+ case checkConstraints (concreteDatabaseContext mergedTrans) newId graph of
448+ Left err -> throwError err
449+ Right _ -> do
450+ let newGraph' = TransactionGraph (transactionHeadsForGraph newGraph) (transactionsForGraph newGraph)
451+ newDiscon = Discon.freshTransaction newId (schemas newTrans)
452+ pure (newDiscon, newGraph')
418453
419454--TEMPORARY COPY/PASTE
420455showTransactionStructureX :: Transaction -> TransactionGraph -> String
421456showTransactionStructureX trans graph = headInfo ++ " " ++ show (transactionId trans) ++ " " ++ parentTransactionsInfo
422457 where
423458 headInfo = maybe "" show (headNameForTransaction trans graph)
424− parentTransactionsInfo = if isRootTransaction trans graph then "root" else case parentTransactions trans graph of
459+ parentTransactionsInfo = if isRootTransaction trans then "root" else case parentTransactions trans graph of
425460 Left err -> show err
426461 Right parentTransSet -> concat $ S.toList $ S.map (show . transactionId) parentTransSet
427462
@@ -440,25 +475,29 @@ filterSubGraph graph heads = Right $ TransactionGraph newHeads newTransSet
440475 newHeads = M.map (filterTransaction validIds) heads
441476
442477--helper function for commonalities in union merge
443−createUnionMergeTransaction :: UTCTime -> TransactionId -> MergeStrategy -> TransactionGraph -> (Transaction, Transaction) -> Either MergeError Transaction
444−createUnionMergeTransaction stamp newId strategy graph (t1,t2) = do
478+createUnionMergeTransaction :: UTCTime -> TransactionId -> MergeStrategy -> (Transaction, Transaction) -> GraphRefRelationalExprM Transaction
479+createUnionMergeTransaction stamp' newId strategy (t1,t2) = do
445480 let contextA = concreteDatabaseContext t1
446481 contextB = concreteDatabaseContext t2
447−
482+ liftMergeE x = case x of
483+ Left e -> throwError (MergeTransactionError e)
484+ Right t -> pure t
485+
486+ graph <- gfGraph
448487 preference <- case strategy of
449488 UnionMergeStrategy -> pure PreferNeither
450489 UnionPreferMergeStrategy preferBranch ->
451490 case transactionForHead preferBranch graph of
452− Nothing -> Left (PreferredHeadMissingMergeError preferBranch)
491+ Nothing -> throwError (MergeTransactionError (PreferredHeadMissingMergeError preferBranch))
453492 Just preferredTrans -> pure $ if t1 == preferredTrans then PreferFirst else PreferSecond
454− badStrat -> Left (InvalidMergeStrategyError badStrat)
493+ badStrat -> throwError (MergeTransactionError (InvalidMergeStrategyError badStrat))
455494
456− incDeps <- unionMergeMaps preference (inclusionDependencies contextA) (inclusionDependencies contextB)
495+ incDeps <- liftMergeE $ unionMergeMaps preference (inclusionDependencies contextA) (inclusionDependencies contextB)
457496 relVars <- unionMergeRelVars preference (relationVariables contextA) (relationVariables contextB)
458− atomFuncs <- unionMergeAtomFunctions preference (atomFunctions contextA) (atomFunctions contextB)
459− notifs <- unionMergeMaps preference (notifications contextA) (notifications contextB)
460− types <- unionMergeTypeConstructorMapping preference (typeConstructorMapping contextA) (typeConstructorMapping contextB)
461− dbcFuncs <- unionMergeDatabaseContextFunctions preference (dbcFunctions contextA) (dbcFunctions contextB)
497+ atomFuncs <- liftMergeE $ unionMergeAtomFunctions preference (atomFunctions contextA) (atomFunctions contextB)
498+ notifs <- liftMergeE $ unionMergeMaps preference (notifications contextA) (notifications contextB)
499+ types <- liftMergeE $ unionMergeTypeConstructorMapping preference (typeConstructorMapping contextA) (typeConstructorMapping contextB)
500+ dbcFuncs <- liftMergeE $ unionMergeDatabaseContextFunctions preference (dbcFunctions contextA) (dbcFunctions contextB)
462501 -- TODO: add merge of subschemas
463502 let newContext = DatabaseContext {
464503 inclusionDependencies = incDeps,
@@ -469,7 +508,12 @@ createUnionMergeTransaction stamp newId strategy graph (t1,t2) = do
469508 typeConstructorMapping = types
470509 }
471510 newSchemas = Schemas newContext (subschemas t1)
472− pure (Transaction newId (MergeTransactionInfo (transactionId t1) (transactionId t2) S.empty stamp) newSchemas)
511+ pure $ addMerkleHash graph $
512+ Transaction newId (TransactionInfo {
513+ parents = NE.fromList [transactionId t1,
514+ transactionId t2],
515+ stamp = stamp',
516+ merkleHash = mempty }) newSchemas
473517
474518lookupTransaction :: TransactionGraph -> TransactionIdLookup -> Either RelationalError Transaction
475519lookupTransaction graph (TransactionIdLookup tid) = transactionForId tid graph
@@ -486,56 +530,57 @@ backtrackGraph :: TransactionGraph -> TransactionId -> TransactionIdHeadBacktrac
486530-- tilde, step back one parent link- if a choice must be made, choose the "first" link arbitrarily
487531backtrackGraph graph currentTid (TransactionIdHeadParentBacktrack steps) = do
488532 trans <- transactionForId currentTid graph
489− let parents = S.toAscList (transactionParentIds trans)
490− if length parents < 1 then
491− Left RootTransactionTraversalError
492− else do
493− parentTrans <- transactionForId (head parents) graph
494− if steps == 1 then
495− pure (transactionId parentTrans)
496− else
497− backtrackGraph graph (transactionId parentTrans) (TransactionIdHeadParentBacktrack (steps - 1))
533+
534+ let parentIds' = S.toAscList (parentIds trans)
535+ case parentIds' of
536+ [] -> Left RootTransactionTraversalError
537+ firstParentId:_ -> do
538+ parentTrans <- transactionForId firstParentId graph
539+ if steps == 1 then
540+ pure (transactionId parentTrans)
541+ else
542+ backtrackGraph graph (transactionId parentTrans) (TransactionIdHeadParentBacktrack (steps - 1))
498543
499544backtrackGraph graph currentTid (TransactionIdHeadBranchBacktrack steps) = do
500545 trans <- transactionForId currentTid graph
501− let parents = transactionParentIds trans
502− if S.size parents < 1 then
546+ let parentIds' = parentIds trans
547+ if S.size parentIds' < 1 then
503548 Left RootTransactionTraversalError
504− else if S.size parents < steps then
505− Left (ParentCountTraversalError (S.size parents) steps)
549+ else if S.size parentIds' < steps then
550+ Left (ParentCountTraversalError (S.size parentIds') steps)
506551 else
507− pure (S.elemAt (steps - 1) parents)
552+ pure (S.elemAt (steps - 1) parentIds')
508553
509−backtrackGraph graph currentTid btrack@(TransactionStampHeadBacktrack stamp) = do
554+backtrackGraph graph currentTid btrack@(TransactionStampHeadBacktrack stamp') = do
510555 trans <- transactionForId currentTid graph
511− let parents = transactionParentIds trans
512− if transactionTimestamp trans < stamp then
556+ let parentIds' = parentIds trans
557+ if timestamp trans <= stamp' then
513558 pure currentTid
514− else if S.null parents then
559+ else if S.null parentIds' then
515560 Left RootTransactionTraversalError
516561 else
517− let arbitraryParent = head (S.toList parents) in
562+ let arbitraryParent = head (S.toList parentIds') in
518563 backtrackGraph graph arbitraryParent btrack
519564
520565-- | Create a temporary branch for commit, merge the result to head, delete the temporary branch. This is useful to atomically commit a transaction, avoiding a TransactionIsNotHeadError but trading it for a potential MergeError.
521566--this is not a GraphOp because it combines multiple graph operations
522567autoMergeToHead :: UTCTime -> (TransactionId, TransactionId, TransactionId) -> DisconnectedTransaction -> HeadName -> MergeStrategy -> TransactionGraph -> Either RelationalError (DisconnectedTransaction, TransactionGraph)
523−autoMergeToHead stamp (tempBranchTransId, tempCommitTransId, mergeTransId) discon mergeToHeadName strat graph = do
568+autoMergeToHead stamp' (tempBranchTransId, tempCommitTransId, mergeTransId) discon mergeToHeadName strat graph = do
524569 let tempBranchName = "mergebranch_" <> U.toText tempBranchTransId
525570 --create the temp branch
526− (discon', graph') <- evalGraphOp stamp tempBranchTransId discon graph (Branch tempBranchName)
571+ (discon', graph') <- evalGraphOp stamp' tempBranchTransId discon graph (Branch tempBranchName)
527572
528573 --commit to the new branch- possible future optimization: don't require fsync for this- create a temp commit type
529− (discon'', graph'') <- evalGraphOp stamp tempCommitTransId discon' graph' Commit
574+ (discon'', graph'') <- evalGraphOp stamp' tempCommitTransId discon' graph' Commit
530575
531576 --jump to merge head
532− (discon''', graph''') <- evalGraphOp stamp tempBranchTransId discon'' graph'' (JumpToHead mergeToHeadName)
577+ (discon''', graph''') <- evalGraphOp stamp' tempBranchTransId discon'' graph'' (JumpToHead mergeToHeadName)
533578
534579 --create the merge
535− (discon'''', graph'''') <- evalGraphOp stamp mergeTransId discon''' graph''' (MergeTransactions strat tempBranchName mergeToHeadName)
580+ (discon'''', graph'''') <- evalGraphOp stamp' mergeTransId discon''' graph''' (MergeTransactions strat tempBranchName mergeToHeadName)
536581
537582 --delete the temp branch
538− (discon''''', graph''''') <- evalGraphOp stamp tempBranchTransId discon'''' graph'''' (DeleteBranch tempBranchName)
583+ (discon''''', graph''''') <- evalGraphOp stamp' tempBranchTransId discon'''' graph'''' (DeleteBranch tempBranchName)
539584 {-
540585 let rel = runReader (evalRelationalExpr (RelationVariable "s" ())) (mkRelationalExprState $ D.concreteDatabaseContext discon'''')
541586 traceShowM rel
@@ -543,4 +588,48 @@ autoMergeToHead stamp (tempBranchTransId, tempCommitTransId, mergeTransId) disco
543588
544589 pure (discon''''', graph''''')
545590
591+
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 }
546596
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+16−12
@@ -2,10 +2,11 @@
22module ProjectM36.TransactionGraph.Merge where
33import ProjectM36.Base
44import ProjectM36.Error
5+import ProjectM36.RelationalExpression
6+import Control.Monad.Except hiding (join)
57import qualified Data.Set as S
68import qualified Data.Map as M
79import qualified ProjectM36.TypeConstructorDef as TCD
8−import ProjectM36.Relation
910import Control.Monad (foldM)
1011import qualified Data.HashSet as HS
1112
@@ -22,19 +23,22 @@ unionMergeMaps prefer mapA mapB = case prefer of
2223 Left StrategyViolatesComponentMergeError
2324
2425-- perform the merge even if the attributes are different- is this what we want? Obviously, we need finer-grained merge options.
25−unionMergeRelation :: MergePreference -> Relation -> Relation -> Either MergeError Relation
26−unionMergeRelation prefer relA relB = case relA `union` relB of
27− Right unionRel -> pure unionRel
28− Left (AttributeNamesMismatchError _) -> preferredRelVar
29− Left _ -> Left StrategyViolatesRelationVariableMergeError
30− where
31− preferredRelVar = case prefer of
32− PreferFirst -> Right relA
33− PreferSecond -> Right relB
34− PreferNeither -> Left StrategyViolatesRelationVariableMergeError
26+unionMergeRelation :: MergePreference -> GraphRefRelationalExpr -> GraphRefRelationalExpr -> GraphRefRelationalExprM GraphRefRelationalExpr
27+unionMergeRelation prefer relA relB = do
28+ let unioned = Union relA relB
29+ mergeErr = MergeTransactionError StrategyViolatesRelationVariableMergeError
30+ preferredRelVar =
31+ case prefer of
32+ PreferFirst -> pure relA
33+ PreferSecond -> pure relB
34+ PreferNeither -> throwError mergeErr
35+ handler AttributeNamesMismatchError{} = preferredRelVar
36+ handler _err' = throwError mergeErr
37+ --typecheck first?
38+ (evalGraphRefRelationalExpr unioned >> pure (Union relA relB)) `catchError` handler
3539
3640--try to execute unions against the relvars contents -- if a relvar only appears in one context, include it
37−unionMergeRelVars :: MergePreference -> RelationVariables -> RelationVariables -> Either MergeError RelationVariables
41+unionMergeRelVars :: MergePreference -> RelationVariables -> RelationVariables -> GraphRefRelationalExprM RelationVariables
3842unionMergeRelVars prefer relvarsA relvarsB = do
3943 let allNames = S.toList (S.union (M.keysSet relvarsA) (M.keysSet relvarsB))
4044 foldM (\acc name -> do
src/lib/ProjectM36/TransactionGraph/Persist.hs+26−15
@@ -1,8 +1,8 @@
11module ProjectM36.TransactionGraph.Persist where
22import ProjectM36.Error
3−import ProjectM36.TransactionGraph
43import ProjectM36.Transaction
54import ProjectM36.Transaction.Persist
5+import ProjectM36.RelationalExpression
66import ProjectM36.Base
77import ProjectM36.ScriptSession
88import ProjectM36.Persist (writeFileSync, renameSync, DiskSync)
@@ -21,9 +21,12 @@ import Data.Either (isRight)
2121import Data.Maybe (fromMaybe)
2222import qualified Data.List as L
2323import Control.Exception.Base
24−import qualified Data.Text.IO as TIO
24+import qualified Data.ByteString as BS
25+import qualified Data.Text.Encoding as TE
2526import Data.ByteString (ByteString)
27+#if __GLASGOW_HASKELL__ < 804
2628import Data.Monoid
29+#endif
2730import qualified Crypto.Hash.SHA256 as SHA256
2831import Control.Arrow
2932import Data.Time.Clock
@@ -83,13 +86,12 @@ setupDatabaseDir sync dbdir bootstrapGraph = do
8386 locker <- openLockFile (lockFilePath dbdir)
8487 gDigest <- bracket_ (lockFile locker WriteLock) (unlockFile locker) (readGraphTransactionIdFileDigest dbdir)
8588 pure (Right (locker, gDigest))
86− else if not m36exists then do
87− locks <- bootstrapDatabaseDir sync dbdir bootstrapGraph
88− pure (Right locks)
89+ else if not m36exists then
90+ Right <$> bootstrapDatabaseDir sync dbdir bootstrapGraph
8991 else
9092 pure (Left (InvalidDirectoryError dbdir))
9193{-
92−initialize a database directory with the graph from which to bootstrap- return lock file handle
94+initialize a database directory with the graph from which to bootstrap- return lock file handle which must be closed by the caller
9395-}
9496bootstrapDatabaseDir :: DiskSync -> FilePath -> TransactionGraph -> IO (LockFile, LockFileHash)
9597bootstrapDatabaseDir sync dbdir bootstrapGraph = do
@@ -192,26 +194,35 @@ writeGraphTransactionIdFile sync destDirectory (TransactionGraph _ transSet) = w
192194 uuidInfo = T.intercalate "\n" graphLines
193195 digest = SHA256.hash (encodeUtf8 uuidInfo)
194196 graphLines = S.toList $ S.map graphLine transSet
195− epochTime = realToFrac . utcTimeToPOSIXSeconds . transactionTimestamp :: Transaction -> Double
197+ epochTime = realToFrac . utcTimeToPOSIXSeconds . timestamp :: Transaction -> Double
196198 graphLine trans = U.toText (transactionId trans)
197199 <> " "
198200 <> T.pack (show (epochTime trans))
199201 <> " "
200− <> T.intercalate " " (S.toList (S.map U.toText $ transactionParentIds trans))
202+ <> T.intercalate " " (S.toList (S.map U.toText $ parentIds trans))
201203
202204readGraphTransactionIdFileDigest :: FilePath -> IO LockFileHash
203205readGraphTransactionIdFileDigest dbdir = do
204− graphTransactionIdData <- TIO.readFile (transactionLogPath dbdir)
205− pure (SHA256.hash (encodeUtf8 graphTransactionIdData))
206+ let graphTransactionIdData = readUTF8FileOrError (transactionLogPath dbdir)
207+ SHA256.hash . encodeUtf8 <$> graphTransactionIdData
206208
207209readGraphTransactionIdFile :: FilePath -> IO (Either PersistenceError [(TransactionId, UTCTime, [TransactionId])])
208210readGraphTransactionIdFile dbdir = do
209211 --read in all transactions' uuids
210− let grapher line = let tid:epochText:parentIds = T.words line in
211− (readUUID tid, readEpoch epochText, map readUUID parentIds)
212+ let grapher line = let tid:epochText:parentIds' = T.words line in
213+ (readUUID tid, readEpoch epochText, map readUUID parentIds')
212214 readUUID uuidText = fromMaybe (error "failed to read uuid") (U.fromText uuidText)
213215 readEpoch t = posixSecondsToUTCTime (realToFrac (either (error "failed to read epoch") fst (double t)))
214− --warning: uses lazy IO
215− graphTransactionIdData <- TIO.readFile (transactionLogPath dbdir)
216− return $ Right (map grapher $ T.lines graphTransactionIdData)
216+ Right . map grapher . T.lines <$> readUTF8FileOrError (transactionLogPath dbdir)
217+
218+--rationale- reading essential database files must fail hard
219+readUTF8FileOrError :: FilePath -> IO T.Text
220+readUTF8FileOrError pathIn = do
221+ eFileBytes <- try (BS.readFile pathIn) :: IO (Either IOError BS.ByteString)
222+ case eFileBytes of
223+ Left err -> error (show err)
224+ Right fileBytes ->
225+ case TE.decodeUtf8' fileBytes of
226+ Left err -> error (show err)
227+ Right utf8Bytes -> pure utf8Bytes
217228
src/lib/ProjectM36/TransactionGraph/Show.hs+3−4
@@ -1,17 +1,16 @@
11module ProjectM36.TransactionGraph.Show where
22import ProjectM36.Base
33import ProjectM36.TransactionGraph
4−import ProjectM36.Transaction
54import qualified Data.Set as S
65
76showTransactionStructure :: Transaction -> TransactionGraph -> String
8−showTransactionStructure trans graph = headInfo ++ " " ++ show (transactionId trans) ++ " p" ++ parentTransactionsInfo ++ " c" ++ childTransactionsInfo
7+showTransactionStructure trans graph = headInfo ++ " " ++ show (transactionId trans) ++ " p" ++ parentTransactionsInfo
98 where
109 headInfo = maybe "" show (headNameForTransaction trans graph)
11− parentTransactionsInfo = if isRootTransaction trans graph then "root" else case parentTransactions trans graph of
10+ parentTransactionsInfo = if isRootTransaction trans then "root" else case parentTransactions trans graph of
1211 Left err -> show err
1312 Right parentTransSet -> concat $ S.toList $ S.map (show . transactionId) parentTransSet
14− childTransactionsInfo = show (S.toList (transactionChildIds trans))
13+
1514
1615showGraphStructure :: TransactionGraph -> String
1716showGraphStructure graph@(TransactionGraph _ transSet) = S.foldr folder "" transSet
src/lib/ProjectM36/TransactionGraph/Types.hsnew file+12
@@ -0,0 +1,12 @@
1+module ProjectM36.TransactionGraph.Types where
2+import ProjectM36.Base
3+
4+transactions :: TransactionGraph -> S.Set Transaction
5+transactions (TransactionGraph _ t) = t
6+
7+transactionHeads :: TransactionGraph -> TransactionHeads
8+transactionHeads (TransactionGraph heads _) = heads
9+
10+transactionInfoDiffs :: TransactionInfo -> TransactionDiffs
11+transactionInfoDiffs (TransactionInfo _ d _) = d
12+transactionInfoDiffs (MergeTransactionInfo _ _ d _ ) = d
src/lib/ProjectM36/TransactionInfo.hsnew file+12
@@ -0,0 +1,12 @@
1+module ProjectM36.TransactionInfo where
2+import ProjectM36.Base
3+import Data.Time.Clock
4+import qualified Data.List.NonEmpty as NE
5+
6+-- | Create a TransactionInfo with just one parent transaction ID.
7+singleParent :: TransactionId -> UTCTime -> TransactionInfo
8+singleParent tid stamp' = TransactionInfo {
9+ parents = tid NE.:| [],
10+ stamp = stamp',
11+ merkleHash = mempty }
12+
src/lib/ProjectM36/Tuple.hs+49−43
@@ -1,7 +1,7 @@
11module ProjectM36.Tuple where
22import ProjectM36.Base
33import ProjectM36.Error
4−import ProjectM36.Attribute
4+import ProjectM36.Attribute as A
55import ProjectM36.Atom
66import ProjectM36.AtomType
77import ProjectM36.DataTypes.Primitive
@@ -15,19 +15,19 @@ import Control.Arrow
1515import Data.Maybe
1616
1717emptyTuple :: RelationTuple
18−emptyTuple = RelationTuple V.empty V.empty
18+emptyTuple = RelationTuple mempty mempty
1919
2020tupleSize :: RelationTuple -> Int
21−tupleSize (RelationTuple tupAttrs _) = V.length tupAttrs
21+tupleSize (RelationTuple tupAttrs _) = arity tupAttrs
2222
2323tupleAttributeNameSet :: RelationTuple -> S.Set AttributeName
24−tupleAttributeNameSet (RelationTuple tupAttrs _) = S.fromList $ V.toList $ V.map attributeName tupAttrs
24+tupleAttributeNameSet (RelationTuple tupAttrs _) = attributeNameSet tupAttrs
2525
2626tupleAttributes :: RelationTuple -> Attributes
2727tupleAttributes (RelationTuple tupAttrs _) = tupAttrs
2828
2929tupleAssocs :: RelationTuple -> [(AttributeName, Atom)]
30−tupleAssocs (RelationTuple attrVec tupVec) = V.toList $ V.map (first attributeName) (V.zip attrVec tupVec)
30+tupleAssocs (RelationTuple attrs tupVec) = V.toList $ V.map (first attributeName) (V.zip (attributesVec attrs) tupVec)
3131
3232orderedTupleAssocs :: RelationTuple -> [(AttributeName, Atom)]
3333orderedTupleAssocs tup@(RelationTuple attrVec _) = map (\attr -> (attributeName attr, atomForAttr (attributeName attr))) oAttrs
@@ -42,23 +42,15 @@ tupleAtoms :: RelationTuple -> V.Vector Atom
4242tupleAtoms (RelationTuple _ tupVec) = tupVec
4343
4444atomForAttributeName :: AttributeName -> RelationTuple -> Either RelationalError Atom
45−atomForAttributeName attrName (RelationTuple tupAttrs tupVec) = case V.findIndex (\attr -> attributeName attr == attrName) tupAttrs of
45+atomForAttributeName attrName (RelationTuple tupAttrs tupVec) = case V.findIndex (\attr -> attributeName attr == attrName) (attributesVec tupAttrs) of
4646 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
4747 Just index -> case tupVec V.!? index of
4848 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))
4949 Just atom -> Right atom
5050
51−{- -- resolve naming clash with Attribute and Relation later
52−atomTypeForAttributeName :: AttributeName -> RelationTuple -> Either RelationalError Atom
53−atomTypeForAttributeName attrName tup = do
54− atom <- atomForAttributeName attrName tup
55− return $ atomTypeForAtom atom
56−-}
57−
5851atomsForAttributeNames :: V.Vector AttributeName -> RelationTuple -> Either RelationalError (V.Vector Atom)
59−atomsForAttributeNames attrNames tuple = do
60− vindices <- vectorIndicesForAttributeNames attrNames (tupleAttributes tuple)
61− return $ V.map (\index -> tupleAtoms tuple V.! index) vindices
52+atomsForAttributeNames attrNames tuple =
53+ V.map (\index -> tupleAtoms tuple V.! index) <$> vectorIndicesForAttributeNames attrNames (tupleAttributes tuple)
6254
6355vectorIndicesForAttributeNames :: V.Vector AttributeName -> Attributes -> Either RelationalError (V.Vector Int)
6456vectorIndicesForAttributeNames attrNameVec attrs = if not $ V.null unknownAttrNames then
@@ -67,7 +59,7 @@ vectorIndicesForAttributeNames attrNameVec attrs = if not $ V.null unknownAttrNa
6759 Right $ V.map mapper attrNameVec
6860 where
6961 unknownAttrNames = V.filter (`V.notElem` attributeNames attrs) attrNameVec
70− mapper attrName = fromMaybe (error "logic failure in vectorIndicesForAttributeNames") (V.elemIndex attrName (V.map attributeName attrs))
62+ mapper attrName = fromMaybe (error "logic failure in vectorIndicesForAttributeNames") (V.elemIndex attrName (attributeNames attrs))
7163
7264
7365relationForAttributeName :: AttributeName -> RelationTuple -> Either RelationalError Relation
@@ -94,10 +86,10 @@ mkRelationTuples attrs = map mapper
9486 mapper = mkRelationTuple attrs
9587
9688mkRelationTupleFromMap :: M.Map AttributeName Atom -> RelationTuple
97−mkRelationTupleFromMap attrMap = RelationTuple attrs (V.map (\attrName -> attrMap M.! attrName) attrNames)
89+mkRelationTupleFromMap attrMap = RelationTuple (attributesFromList attrs) (V.map (attrMap M.!) (V.fromList attrNames))
9890 where
99− attrNames = V.fromList (M.keys attrMap)
100− attrs = V.map (\attrName -> Attribute attrName (atomTypeForAtom (attrMap M.! attrName))) attrNames
91+ attrNames = M.keys attrMap
92+ attrs = map (\attrName -> Attribute attrName (atomTypeForAtom (attrMap M.! attrName))) attrNames
10193
10294--return error if attribute names match but their types do not
10395singleTupleSetJoin :: Attributes -> RelationTuple -> RelationTupleSet -> Either RelationalError [RelationTuple]
@@ -128,8 +120,8 @@ singleTupleJoin joinedAttrs tup1@(RelationTuple tupAttrs1 _) tup2@(RelationTuple
128120 return $ Just $ RelationTuple joinedAttrs newVec
129121 where
130122 keysIntersection = V.map attributeName attrsIntersection
131− attrsIntersection = V.filter (`V.elem` tupAttrs1) tupAttrs2
132− newVec = V.map (findAtomForAttributeName . attributeName) joinedAttrs
123+ attrsIntersection = V.filter (`V.elem` attributesVec tupAttrs1) (attributesVec tupAttrs2)
124+ newVec = V.map (findAtomForAttributeName . attributeName) (attributesVec joinedAttrs)
133125 --search both tuples for the attribute
134126 findAtomForAttributeName attrName = head $ rights $ fmap (atomForAttributeName attrName) [tup1, tup2]
135127
@@ -146,23 +138,31 @@ vectorUnion v1 v2 = V.foldr folder v1 v2
146138tupleExtend :: RelationTuple -> RelationTuple -> RelationTuple
147139tupleExtend (RelationTuple tupAttrs1 tupVec1) (RelationTuple tupAttrs2 tupVec2) = RelationTuple newAttrs newVec
148140 where
149− newAttrs = tupAttrs1 V.++ tupAttrs2
150− newVec = tupVec1 V.++ tupVec2
141+ newAttrs = tupAttrs1 <> tupAttrs2
142+ newVec = tupVec1 <> tupVec2
151143
152144tupleAtomExtend :: AttributeName -> Atom -> RelationTuple -> RelationTuple
153145tupleAtomExtend newAttrName atom tupIn = tupleExtend tupIn newTup
154146 where
155− newTup = RelationTuple (V.singleton $ Attribute newAttrName (atomTypeForAtom atom)) (V.singleton atom)
147+ newTup = RelationTuple (A.singleton $ Attribute newAttrName (atomTypeForAtom atom)) (V.singleton atom)
156148
157−--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)]
158−tupleProject :: S.Set AttributeName -> RelationTuple -> RelationTuple
149+{-tupleProject :: S.Set AttributeName -> RelationTuple -> RelationTuple
159150tupleProject projectAttrs (RelationTuple attrs tupVec) = RelationTuple newAttrs newTupVec
160151 where
161− deleteIndices = V.findIndices (\attr -> S.notMember (attributeName attr) projectAttrs) attrs
152+ deleteIndices = V.findIndices (\attr -> S.notMember (attributeName attr) projectAttrs) (attributesVec attrs)
162153 indexDeleter = V.ifilter (\index _ -> V.notElem index deleteIndices)
163− newAttrs = indexDeleter attrs
154+ newAttrs = case A.projectionAttributesForNames projectAttrs attrs of
155+ Left err -> error (show (err, projectAttrs, attrs))
156+ Right attrs' -> attrs'
164157 newTupVec = indexDeleter tupVec
165−
158+-}
159+-- remember that the attributes order matters
160+tupleProject :: Attributes -> RelationTuple -> Either RelationalError RelationTuple
161+tupleProject projectAttrs tup = do
162+ newTupVec <- foldM (\acc attr ->
163+ V.snoc acc <$> atomForAttributeName (attributeName attr) tup
164+ ) V.empty (attributesVec projectAttrs)
165+ pure $ reorderTuple projectAttrs (RelationTuple projectAttrs newTupVec)
166166--return the attributes and atoms which are equal in both vectors
167167--semi-join
168168tupleIntersection :: RelationTuple -> RelationTuple -> RelationTuple
@@ -170,12 +170,14 @@ tupleIntersection tuple1 tuple2 = RelationTuple newAttrs newTupVec
170170 where
171171 attrs1 = tupleAttributes tuple1
172172 attrs2 = tupleAttributes tuple2
173− matchingIndices = V.findIndices (\attr -> V.elem attr attrs2 &&
174− atomForAttributeName (attributeName attr) tuple1 ==
175− atomForAttributeName (attributeName attr) tuple2
176− ) attrs1
173+ intersectAttrs = A.intersection attrs1 attrs2
174+ matchingIndices = V.findIndices (\attr -> A.member attr intersectAttrs &&
175+ atomForAttributeName (attributeName attr) tuple1 ==
176+ atomForAttributeName (attributeName attr) tuple2) (attributesVec attrs1)
177177 indexFilter = V.ifilter (\index _ -> V.elem index matchingIndices)
178− newAttrs = indexFilter attrs1
178+ newAttrs = case A.projectionAttributesForNames (A.attributeNameSet intersectAttrs) attrs1 of
179+ Left _ -> mempty
180+ Right attrs' -> attrs'
179181 newTupVec = indexFilter (tupleAtoms tuple1)
180182
181183-- | An optimized form of tuple update which updates vectors efficiently.
@@ -183,19 +185,20 @@ updateTupleWithAtoms :: M.Map AttributeName Atom -> RelationTuple -> RelationTup
183185updateTupleWithAtoms updateMap (RelationTuple attrs tupVec) = RelationTuple attrs newVec
184186 where
185187 updateKeysSet = M.keysSet updateMap
186− updateKeysIVec = V.filter (\(_,attr) -> S.member (attributeName attr) updateKeysSet) (V.indexed attrs)
188+ updateKeysIVec = V.filter (\(_,attr) -> S.member (attributeName attr) updateKeysSet) (V.indexed (attributesVec attrs))
187189 newVec = V.update tupVec updateVec
188190 updateVec = V.map (\(index, attr) -> (index, updateMap M.! attributeName attr)) updateKeysIVec
189191
190192tupleToMap :: RelationTuple -> M.Map AttributeName Atom
191193tupleToMap (RelationTuple attrs tupVec) = M.fromList assocList
192194 where
193− assocList = V.toList $ V.map (\(index, attr) -> (attributeName attr, tupVec V.! index)) (V.indexed attrs)
195+ assocList = V.toList $ V.map (\(index, attr) -> (attributeName attr, tupVec V.! index)) (V.indexed (attributesVec attrs))
194196
197+-- | Validate that the tuple has the correct attributes in the correct order
195198verifyTuple :: Attributes -> RelationTuple -> Either RelationalError RelationTuple
196−verifyTuple attrs tuple = let attrsTypes = V.map atomType attrs
199+verifyTuple attrs tuple = let attrsTypes = A.atomTypes attrs
197200 tupleTypes = V.map atomTypeForAtom (tupleAtoms tuple) in
198− if V.length attrs /= V.length tupleTypes then
201+ if A.arity attrs /= V.length tupleTypes then
199202 Left $ TupleAttributeCountMismatchError 0
200203 else do
201204 mapM_ (uncurry atomTypeVerify) (V.zip attrsTypes tupleTypes)
@@ -204,15 +207,18 @@ verifyTuple attrs tuple = let attrsTypes = V.map atomType attrs
204207--two tuples can be equal but the vectors of attributes could be out-of-order
205208--reorder if necessary- this is useful during relMogrify so that all the relation's tuples have identical atom/attribute ordering
206209reorderTuple :: Attributes -> RelationTuple -> RelationTuple
207−reorderTuple attrs tupIn = if tupleAttributes tupIn == attrs then
210+reorderTuple attrs tupIn = if attributesAndOrderEqual (tupleAttributes tupIn) attrs then
208211 tupIn
209212 else
210− RelationTuple attrs (V.map mapper attrs)
213+ RelationTuple attrs (V.map mapper (attributesVec attrs))
211214 where
212215 mapper attr = case atomForAttributeName (attributeName attr) tupIn of
213− Left _ -> error "logic failure in reorderTuple"
216+ Left err -> error ("logic bug in reorderTuple: " ++ show err <> show tupIn)
214217 Right atom -> atom
215218
216219--used in Generics derivation for ADTs without named attributes
217220trimTuple :: Int -> RelationTuple -> RelationTuple
218−trimTuple index (RelationTuple attrs vals) = RelationTuple (V.drop index attrs) (V.drop index vals)
221+trimTuple index (RelationTuple attrs vals) =
222+ RelationTuple newAttrs (V.drop index vals)
223+ where
224+ newAttrs = A.drop index attrs
src/lib/ProjectM36/TupleSet.hs+7
@@ -31,3 +31,10 @@ mkTupleSet attrs tuples = verifyTupleSet attrs (RelationTupleSet tuples)
3131
3232mkTupleSetFromList :: Attributes -> [[Atom]] -> Either RelationalError RelationTupleSet
3333mkTupleSetFromList 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+139−37
@@ -4,24 +4,47 @@
44{-# LANGUAGE ScopedTypeVariables #-}
55{-# LANGUAGE TypeOperators #-}
66{-# LANGUAGE UndecidableInstances #-}
7−
8−module ProjectM36.Tupleable where
7+{-# LANGUAGE CPP #-}
8+
9+module ProjectM36.Tupleable
10+ ( toInsertExpr
11+ , toDefineExpr
12+ , tupleAssocsEqualityPredicate
13+ , partitionByAttributes
14+ , toUpdateExpr
15+ , toDeleteExpr
16+ , validateAttributes
17+ , Tupleable(..)
18+
19+ -- * Generics
20+ , genericToTuple
21+ , genericFromTuple
22+ , genericToAttributes
23+ , TupleableG(..)
24+ -- ** Options
25+ , defaultTupleableOptions
26+ , TupleableOptions()
27+ , fieldModifier
28+ ) where
929
1030import Data.Foldable
1131import Data.List (partition)
1232import qualified Data.Map as Map
33+#if __GLASGOW_HASKELL__ < 804
1334import Data.Monoid
35+#endif
1436import Data.Proxy
1537import qualified Data.Text as T
1638import qualified Data.Vector as V
1739import GHC.Generics
1840import ProjectM36.Atomable
19−import ProjectM36.Attribute hiding (null)
41+import ProjectM36.Attribute as A hiding (null, toList)
2042import ProjectM36.Base
2143import ProjectM36.DataTypes.Primitive
2244import ProjectM36.Error
2345import ProjectM36.Tuple
2446import ProjectM36.TupleSet
47+import qualified Data.Set as S
2548
2649{-import Data.Binary
2750import Control.DeepSeq
@@ -66,7 +89,7 @@ toInsertExpr vals rvName = do
6689
6790-- | 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'.
6891toDefineExpr :: forall a proxy. Tupleable a => proxy a -> RelVarName -> DatabaseContextExpr
69−toDefineExpr _ rvName = Define rvName (map NakedAttributeExpr (V.toList attrs))
92+toDefineExpr _ rvName = Define rvName (map NakedAttributeExpr (V.toList (attributesVec attrs)))
7093 where
7194 attrs = toAttributes (Proxy :: Proxy a)
7295
@@ -90,96 +113,175 @@ partitionByAttributes attrs =
90113-- expression. This expression flushes the non-key attributes of the value to
91114-- a tuple with the matching key attributes.
92115toUpdateExpr ::
93− Tupleable a => RelVarName -> [AttributeName] -> a -> DatabaseContextExpr
94−toUpdateExpr rvName keyAttrs a = Update rvName updateMap keyRestriction
116+ forall a. Tupleable a => RelVarName -> [AttributeName] -> a -> Either RelationalError DatabaseContextExpr
117+toUpdateExpr rvName keyAttrs a = validateAttributes (S.fromList keyAttrs) expectedAttrSet (Update rvName updateMap keyRestriction)
95118 where
96119 (keyPairs, updatePairs) = partitionByAttributes keyAttrs a
97120 updateMap = Map.fromList $ fmap NakedAtomExpr <$> updatePairs
98121 keyRestriction = tupleAssocsEqualityPredicate keyPairs
122+ expectedAttrSet = attributeNameSet (toAttributes (Proxy :: Proxy a))
99123
100124-- | Convert a list of key attributes and a 'Tupleable' value to a 'Delete'
101125-- expression. This expression deletes tuples matching the key attributes from
102126-- the value.
103127toDeleteExpr ::
104− Tupleable a => RelVarName -> [AttributeName] -> a -> DatabaseContextExpr
105−toDeleteExpr rvName keyAttrs a = Delete rvName keyRestriction
128+ forall a. Tupleable a => RelVarName -> [AttributeName] -> a -> Either RelationalError DatabaseContextExpr
129+toDeleteExpr rvName keyAttrs val = validateAttributes (S.fromList keyAttrs) expectedAttrSet (Delete rvName keyRestriction)
106130 where
107− keyPairs = fst $ partitionByAttributes keyAttrs a
131+ keyPairs = fst $ partitionByAttributes keyAttrs val
108132 keyRestriction = tupleAssocsEqualityPredicate keyPairs
133+ expectedAttrSet = attributeNameSet (toAttributes (Proxy :: Proxy a))
109134
135+validateAttributes :: S.Set AttributeName -> S.Set AttributeName -> a -> Either RelationalError a
136+validateAttributes actualAttrs expectedAttrs val
137+ | S.null actualAttrs = Left EmptyAttributesError
138+ | not (S.null nonMatchingAttrs) = Left (NoSuchAttributeNamesError nonMatchingAttrs)
139+ | otherwise = Right val
140+ where
141+ nonMatchingAttrs = attributeNamesNotContained actualAttrs expectedAttrs
142+
143+-- | Types that can be converted to and from 'RelationTuple'.
144+--
145+-- deriving without customization:
146+--
147+-- > data Example = Example
148+-- > { foo :: Integer
149+-- > , bar :: Text
150+-- > }
151+-- > deriving (Generic)
152+-- >
153+-- > instance Tupleable Example
154+--
155+-- deriving with customization using "ProjectM36.Tupleable.Deriving":
156+--
157+-- > data Example = Example
158+-- > { exampleFoo :: Integer
159+-- > , exampleBar :: Text
160+-- > }
161+-- > deriving stock (Generic)
162+-- > deriving (Tupleable)
163+-- > via Codec (Field (DropPrefix "example" >>> CamelCase)) Example
110164class Tupleable a where
111165 toTuple :: a -> RelationTuple
112166
113167 fromTuple :: RelationTuple -> Either RelationalError a
114168
115− toAttributes :: proxy a -> Attributes
169+ toAttributes :: Proxy a -> Attributes
116170
117171 default toTuple :: (Generic a, TupleableG (Rep a)) => a -> RelationTuple
118− toTuple v = toTupleG (from v)
172+ toTuple = genericToTuple defaultTupleableOptions
119173
120174 default fromTuple :: (Generic a, TupleableG (Rep a)) => RelationTuple -> Either RelationalError a
121− fromTuple tup = to <$> fromTupleG tup
175+ fromTuple = genericFromTuple defaultTupleableOptions
176+
177+ default toAttributes :: (Generic a, TupleableG (Rep a)) => Proxy a -> Attributes
178+ toAttributes = genericToAttributes defaultTupleableOptions
122179
123− default toAttributes :: (Generic a, TupleableG (Rep a)) => proxy a -> Attributes
124− toAttributes _ = toAttributesG (from (undefined :: a))
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
209+
210+genericToAttributes :: forall a. (Generic a, TupleableG (Rep a)) => TupleableOptions -> Proxy a -> Attributes
211+genericToAttributes opts _ = toAttributesG opts (from (undefined :: a))
125212
126213class TupleableG g where
127− toTupleG :: g a -> RelationTuple
128− toAttributesG :: g a -> Attributes
129− fromTupleG :: RelationTuple -> Either RelationalError (g a)
214+ toTupleG :: TupleableOptions -> g a -> RelationTuple
215+ toAttributesG :: TupleableOptions -> g a -> Attributes
216+ fromTupleG :: TupleableOptions -> RelationTuple -> Either RelationalError (g a)
217+ isRecordTypeG :: g a -> Bool
130218
131219--data type metadata
132220instance (Datatype c, TupleableG a) => TupleableG (M1 D c a) where
133− toTupleG (M1 v) = toTupleG v
134− toAttributesG (M1 v) = toAttributesG v
135− fromTupleG v = M1 <$> fromTupleG v
221+ toTupleG opts (M1 v) = toTupleG opts v
222+ toAttributesG opts (M1 v) = toAttributesG opts v
223+ fromTupleG opts v = M1 <$> fromTupleG opts v
224+ isRecordTypeG (M1 v) = isRecordTypeG v
136225
137226--constructor metadata
138227instance (Constructor c, TupleableG a, AtomableG a) => TupleableG (M1 C c a) where
139− toTupleG (M1 v) = RelationTuple attrs atoms
228+ toTupleG opts (M1 v) = RelationTuple attrs atoms
140229 where
141− attrsToCheck = toAttributesG v
142− counter = V.generate (V.length attrsToCheck) id
143− attrs = V.zipWith (\num attr@(Attribute name typ) -> if T.null name then
230+ attrsToCheck = toAttributesG opts v
231+ counter = V.generate (arity attrsToCheck) id
232+ attrs = attributesFromList (V.toList attrsV)
233+ attrsV = V.zipWith (\num attr@(Attribute name typ) -> if T.null name then
144234 Attribute ("attr" <> T.pack (show (num + 1))) typ
145235 else
146− attr) counter attrsToCheck
236+ attr) counter (attributesVec attrsToCheck)
147237 atoms = V.fromList (toAtomsG v)
148− toAttributesG (M1 v) = toAttributesG v
149− fromTupleG tup = M1 <$> fromTupleG tup
238+ toAttributesG opts (M1 v) = toAttributesG opts v
239+ fromTupleG opts tup = M1 <$> fromTupleG opts tup
240+ isRecordTypeG (M1 v) = isRecordTypeG v
150241
151242-- product types
152243instance (TupleableG a, TupleableG b) => TupleableG (a :*: b) where
153244 toTupleG = error "toTupleG"
154− 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
155− fromTupleG tup = (:*:) <$> fromTupleG tup <*> fromTupleG (trimTuple 1 tup)
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
246+ fromTupleG opts tup = (:*:) <$> fromTupleG opts tup <*> fromTupleG opts processedTuple
247+ where
248+ processedTuple = if isRecordTypeG (undefined :: a x) then
249+ tup
250+ else
251+ trimTuple 1 tup
252+ isRecordTypeG ~(x :*: y) = isRecordTypeG x || isRecordTypeG y
156253
157254--selector/record
158255instance (Selector c, AtomableG a) => TupleableG (M1 S c a) where
159256 toTupleG = error "toTupleG"
160− toAttributesG m@(M1 v) = V.singleton (Attribute name aType)
257+ toAttributesG opts m@(M1 v) = A.singleton (Attribute modifiedName aType)
161258 where
162259 name = T.pack (selName m)
260+ modifiedName = if T.null name then
261+ name
262+ else
263+ fieldModifier opts name
163264 aType = toAtomTypeG v
164− fromTupleG tup = if null name then -- non-record type, just pull off the first tuple item
265+ fromTupleG opts tup = if null name then -- non-record type, just pull off the first tuple item
165266 M1 <$> atomv (V.head (tupleAtoms tup))
166267 else do
167− atom <- atomForAttributeName (T.pack name) tup
268+ atom <- atomForAttributeName (fieldModifier opts (T.pack name)) tup
168269 val <- atomv atom
169270 pure (M1 val)
170271 where
171− expectedAtomType = atomType (V.head (toAttributesG (undefined :: M1 S c a x)))
272+ expectedAtomType = atomType (V.head (attributesVec (toAttributesG opts (undefined :: M1 S c a x))))
172273 atomv atom = maybe (Left (AtomTypeMismatchError
173274 expectedAtomType
174275 (atomTypeForAtom atom)
175276 )) Right (fromAtomG atom [atom])
176277 name = selName (undefined :: M1 S c a x)
278+ isRecordTypeG _ = not (null (selName (undefined :: M1 S c a x)))
177279
178280--constructors with no arguments
179281--basically useless but orthoganal to relationTrue
180282instance TupleableG U1 where
181− toTupleG _= emptyTuple
182− toAttributesG _ = emptyAttributes
183− fromTupleG _ = pure U1
184−
283+ toTupleG _ _ = emptyTuple
284+ toAttributesG _ _ = emptyAttributes
285+ fromTupleG _ _ = pure U1
286+ isRecordTypeG _ = False
185287
src/lib/ProjectM36/Tupleable/Deriving.hsnew file+229
@@ -0,0 +1,229 @@
1+{-# LANGUAGE ScopedTypeVariables #-}
2+{-# LANGUAGE TypeOperators #-}
3+{-# LANGUAGE KindSignatures #-}
4+{-# LANGUAGE DataKinds #-}
5+{-# LANGUAGE FlexibleContexts #-}
6+{-# LANGUAGE UndecidableInstances #-}
7+
8+-- | Newtypes for deriving Tupleable instances with customization using
9+-- @DerivingVia@.
10+--
11+-- Inspired by
12+-- [Dhall.Deriving](https://hackage.haskell.org/package/dhall-1.33.1/docs/Dhall-Deriving.html)
13+-- which in turn was inspired by Matt Parson's blog post
14+-- [Mirror Mirror: Reflection and Encoding Via](https://www.parsonsmatt.org/2020/02/04/mirror_mirror.html).
15+--
16+-- required extensions:
17+--
18+-- * DerivingVia
19+-- * DeriveGenerics
20+-- * TypeOperators (for @('<<<')@ and @('>>>')@)
21+-- * DataKinds (for types that take a string argument)
22+
23+module ProjectM36.Tupleable.Deriving
24+ ( -- * DerivingVia Newtype
25+ Codec(..)
26+
27+ -- * Type-level Options
28+ , ModifyOptions(..)
29+ , Field
30+
31+ -- * Type-level 'T.Text' -> 'T.Text' Functions
32+ , ModifyText(..)
33+ , AddPrefix
34+ , DropPrefix
35+ , AddSuffix
36+ , DropSuffix
37+ , UpperCase
38+ , LowerCase
39+ , TitleCase
40+ , CamelCase
41+ , PascalCase
42+ , SnakeCase
43+ , SpinalCase
44+ , TrainCase
45+
46+ -- * Composition
47+ , AsIs
48+ , type (<<<)
49+ , type (>>>)
50+
51+ -- * Re-Exports
52+ , Generic
53+ , module ProjectM36.Tupleable
54+ ) where
55+import Data.Maybe (fromMaybe)
56+import Data.Proxy
57+import qualified Data.Text as T
58+import Data.Text.Manipulate
59+import GHC.TypeLits
60+import GHC.Generics (Generic, Rep)
61+import ProjectM36.Tupleable
62+
63+
64+-- | A newtype wrapper to allow for easier deriving of 'Tupleable' instances
65+-- with customization.
66+--
67+-- The @tag@ type variable can be used to specify options for converting the
68+-- datatype to and from a 'RelationTuple'. For example,
69+--
70+-- > data Example = Example
71+-- > { exampleFoo :: Int
72+-- > , exampleBar :: Int
73+-- > }
74+-- > deriving stock (Generic)
75+-- > deriving (Tupleable)
76+-- > via Codec (Field (DropPrefix "example" >>> CamelCase)) Example
77+--
78+-- will derive an instance of 'Tupleable' where field names are translated into
79+-- attribute names by dropping the prefix @"example"@ and then converting the
80+-- result to camelCase. So @"exampleFoo"@ becomes @"foo"@ and @"exampleBar"@
81+-- becomes @"bar"@.
82+--
83+-- Requires the @DerivingGeneric@ and @DerivingVia@ extensions to be enabled.
84+newtype Codec tag a = Codec { unCodec :: a }
85+
86+instance (ModifyOptions tag, Generic a, TupleableG (Rep a)) => Tupleable (Codec tag a) where
87+ toTuple v = genericToTuple opts (unCodec v)
88+ where
89+ opts = modifyOptions (Proxy :: Proxy tag) defaultTupleableOptions
90+
91+ fromTuple tup = Codec <$> genericFromTuple opts tup
92+ where
93+ opts = modifyOptions (Proxy :: Proxy tag) defaultTupleableOptions
94+
95+ toAttributes _ = genericToAttributes opts (Proxy :: Proxy a)
96+ where
97+ opts = modifyOptions (Proxy :: Proxy tag) defaultTupleableOptions
98+
99+-- | Types that can be used as tags for 'Codec'.
100+class ModifyOptions a where
101+ modifyOptions :: proxy a -> TupleableOptions -> TupleableOptions
102+
103+-- | Change how record field names are translated into attribute names. For
104+-- example,
105+--
106+-- > Field SnakeCase
107+--
108+-- will translate the field name @fooBar@ into the attribute name @foo_bar@.
109+data Field a
110+
111+instance ModifyText a => ModifyOptions (Field a) where
112+ modifyOptions _ opts = opts { fieldModifier = newFieldModifier }
113+ where
114+ newFieldModifier = modifyText (Proxy :: Proxy a) . fieldModifier opts
115+
116+-- | Types that can be used in options that modify 'T.Text' such as in 'Field'.
117+class ModifyText a where
118+ modifyText :: proxy a -> T.Text -> T.Text
119+
120+-- | Add a prefix. @AddPrefix "foo"@ will transform @"bar"@ into @"foobar"@.
121+data AddPrefix (prefix :: Symbol)
122+
123+instance KnownSymbol prefix => ModifyText (AddPrefix prefix) where
124+ modifyText _ oldText = prefixText <> oldText
125+ where
126+ prefixText = T.pack (symbolVal (Proxy :: Proxy prefix))
127+
128+-- | Drop a prefix. @DropPrefix "bar"@ will transform @"foobar"@ into @"foo"@.
129+data DropPrefix (prefix :: Symbol)
130+
131+instance KnownSymbol prefix => ModifyText (DropPrefix prefix) where
132+ modifyText _ oldText = fromMaybe oldText (T.stripPrefix prefixText oldText)
133+ where
134+ prefixText = T.pack (symbolVal (Proxy :: Proxy prefix))
135+
136+-- | Add a suffix. @AddSuffix "bar"@ will transform @"foo"@ into @"foobar"@.
137+data AddSuffix (suffix :: Symbol)
138+
139+instance KnownSymbol suffix => ModifyText (AddSuffix suffix) where
140+ modifyText _ oldText = oldText <> suffixText
141+ where
142+ suffixText = T.pack (symbolVal (Proxy :: Proxy suffix))
143+
144+-- | Drop a suffix. @DropSuffix "bar"@ will transform @"foobar"@ into @"foo"@.
145+data DropSuffix (suffix :: Symbol)
146+
147+instance KnownSymbol suffix => ModifyText (DropSuffix suffix) where
148+ modifyText _ oldText = fromMaybe oldText (T.stripSuffix suffixText oldText)
149+ where
150+ suffixText = T.pack (symbolVal (Proxy :: Proxy suffix))
151+
152+-- | Convert to UPPERCASE. Will transform @"foobar"@ into @\"FOOBAR\"@.
153+data UpperCase
154+
155+instance ModifyText UpperCase where
156+ modifyText _ = T.toUpper
157+
158+-- | Convert to lowercase. Will transform @\"FOOBAR\"@ into @"foobar"@.
159+data LowerCase
160+
161+instance ModifyText LowerCase where
162+ modifyText _ = T.toLower
163+
164+-- | Convert to Title Case. Will transform @"fooBar"@ into @\"Foo Bar\"@.
165+data TitleCase
166+
167+instance ModifyText TitleCase where
168+ modifyText _ = toTitle
169+
170+-- | Convert to camelCase. Will transform @"foo_bar"@ into @"fooBar"@.
171+data CamelCase
172+
173+instance ModifyText CamelCase where
174+ modifyText _ = toCamel
175+
176+-- | Convert to PascalCase. Will transform @"foo_bar"@ into @\"FooBar\"@.
177+data PascalCase
178+
179+instance ModifyText PascalCase where
180+ modifyText _ = toPascal
181+
182+-- | Convert to snake_case. Will transform @"fooBar"@ into @"foo_bar"@.
183+data SnakeCase
184+
185+instance ModifyText SnakeCase where
186+ modifyText _ = toSnake
187+
188+-- | Convert to spinal-case. will transform @"fooBar"@ into @"foo-bar"@.
189+data SpinalCase
190+
191+instance ModifyText SpinalCase where
192+ modifyText _ = toSpinal
193+
194+-- | Convert to Train-Case. Will transform @"fooBar"@ into @\"Foo-Bar\"@.
195+data TrainCase
196+
197+instance ModifyText TrainCase where
198+ modifyText _ = toTrain
199+
200+-- | Identity option.
201+type AsIs = ()
202+
203+instance ModifyOptions () where
204+ modifyOptions _ = id
205+
206+instance ModifyText () where
207+ modifyText _ = id
208+
209+-- | Right to left composition.
210+--
211+-- Requires the @TypeOperators@ extension to be enabled.
212+data a <<< b
213+
214+instance (ModifyOptions a, ModifyOptions b) => ModifyOptions (a <<< b) where
215+ modifyOptions _ = modifyOptions (Proxy :: Proxy a) . modifyOptions (Proxy :: Proxy b)
216+
217+instance (ModifyText a, ModifyText b) => ModifyText (a <<< b) where
218+ modifyText _ = modifyText (Proxy :: Proxy a) . modifyText (Proxy :: Proxy b)
219+
220+-- | Left to right composition.
221+--
222+-- Requires the @TypeOperators@ extension to be enabled.
223+data a >>> b
224+
225+instance (ModifyOptions a, ModifyOptions b) => ModifyOptions (a >>> b) where
226+ modifyOptions _ = modifyOptions (Proxy :: Proxy b) . modifyOptions (Proxy :: Proxy a)
227+
228+instance (ModifyText a, ModifyText b) => ModifyText (a >>> b) where
229+ modifyText _ = modifyText (Proxy :: Proxy b) . modifyText (Proxy :: Proxy a)
src/lib/ProjectM36/TypeConstructor.hs+4−6
@@ -1,19 +1,17 @@
11module ProjectM36.TypeConstructor where
22import ProjectM36.Base
3−import qualified Data.Set as S
43
54name :: TypeConstructor -> TypeConstructorName
65name (ADTypeConstructor name' _) = name'
76name (PrimitiveTypeConstructor name' _) = name'
8−name (TypeVariable _) = error "spam" --v --not really the name, but this is used for display only
7+name (RelationAtomTypeConstructor _) = error "name called on RelationAtomTypeConstructor"
8+name (TypeVariable _) = error "name called on TypeVariable" --v --not really the name, but this is used for display only
99
1010arguments :: TypeConstructor -> [TypeConstructor]
1111arguments (ADTypeConstructor _ args) = args
1212arguments (PrimitiveTypeConstructor _ _) = []
13+arguments (RelationAtomTypeConstructor _) = []
1314arguments (TypeVariable _) = []
1415
15−typeVars :: TypeConstructor -> S.Set TypeVarName
16−typeVars (PrimitiveTypeConstructor _ _) = S.empty
17−typeVars (ADTypeConstructor _ args) = S.unions (map typeVars args)
18−typeVars (TypeVariable v) = S.singleton v
16+
1917
src/lib/ProjectM36/WCWidth.hsnew file+425
@@ -0,0 +1,425 @@
1+module ProjectM36.WCWidth where
2+import Data.Set.Range
3+import Data.Char
4+
5+wIDEEASTASIAN :: RangeSet Int
6+wIDEEASTASIAN = foldr insertRange empty [
7+ (0x1100, 0x115f), -- Hangul Choseong Kiyeok ..Hangul Choseong Filler
8+ (0x231a, 0x231b), -- Watch ..Hourglass
9+ (0x2329, 0x232a), -- Left-pointing Angle Brac..Right-pointing Angle Bra
10+ (0x23e9, 0x23ec), -- Black Right-pointing Dou..Black Down-pointing Doub
11+ (0x23f0, 0x23f0), -- Alarm Clock ..Alarm Clock
12+ (0x23f3, 0x23f3), -- Hourglass With Flowing S..Hourglass With Flowing S
13+ (0x25fd, 0x25fe), -- White Medium Small Squar..Black Medium Small Squar
14+ (0x2614, 0x2615), -- Umbrella With Rain Drops..Hot Beverage
15+ (0x2648, 0x2653), -- Aries ..Pisces
16+ (0x267f, 0x267f), -- Wheelchair Symbol ..Wheelchair Symbol
17+ (0x2693, 0x2693), -- Anchor ..Anchor
18+ (0x26a1, 0x26a1), -- High Voltage Sign ..High Voltage Sign
19+ (0x26aa, 0x26ab), -- Medium White Circle ..Medium Black Circle
20+ (0x26bd, 0x26be), -- Soccer Ball ..Baseball
21+ (0x26c4, 0x26c5), -- Snowman Without Snow ..Sun Behind Cloud
22+ (0x26ce, 0x26ce), -- Ophiuchus ..Ophiuchus
23+ (0x26d4, 0x26d4), -- No Entry ..No Entry
24+ (0x26ea, 0x26ea), -- Church ..Church
25+ (0x26f2, 0x26f3), -- Fountain ..Flag In Hole
26+ (0x26f5, 0x26f5), -- Sailboat ..Sailboat
27+ (0x26fa, 0x26fa), -- Tent ..Tent
28+ (0x26fd, 0x26fd), -- Fuel Pump ..Fuel Pump
29+ (0x2705, 0x2705), -- White Heavy Check Mark ..White Heavy Check Mark
30+ (0x270a, 0x270b), -- Raised Fist ..Raised Hand
31+ (0x2728, 0x2728), -- Sparkles ..Sparkles
32+ (0x274c, 0x274c), -- Cross Mark ..Cross Mark
33+ (0x274e, 0x274e), -- Negative Squared Cross M..Negative Squared Cross M
34+ (0x2753, 0x2755), -- Black Question Mark Orna..White Exclamation Mark O
35+ (0x2757, 0x2757), -- Heavy Exclamation Mark S..Heavy Exclamation Mark S
36+ (0x2795, 0x2797), -- Heavy Plus Sign ..Heavy Division Sign
37+ (0x27b0, 0x27b0), -- Curly Loop ..Curly Loop
38+ (0x27bf, 0x27bf), -- Double Curly Loop ..Double Curly Loop
39+ (0x2b1b, 0x2b1c), -- Black Large Square ..White Large Square
40+ (0x2b50, 0x2b50), -- White Medium Star ..White Medium Star
41+ (0x2b55, 0x2b55), -- Heavy Large Circle ..Heavy Large Circle
42+ (0x2e80, 0x2e99), -- Cjk Radical Repeat ..Cjk Radical Rap
43+ (0x2e9b, 0x2ef3), -- Cjk Radical Choke ..Cjk Radical C-simplified
44+ (0x2f00, 0x2fd5), -- Kangxi Radical One ..Kangxi Radical Flute
45+ (0x2ff0, 0x2ffb), -- Ideographic Description ..Ideographic Description
46+ (0x3000, 0x303e), -- Ideographic Space ..Ideographic Variation In
47+ (0x3041, 0x3096), -- Hiragana Letter Small A ..Hiragana Letter Small Ke
48+ (0x3099, 0x30ff), -- Combining Katakana-hirag..Katakana Digraph Koto
49+ (0x3105, 0x312d), -- Bopomofo Letter B ..Bopomofo Letter Ih
50+ (0x3131, 0x318e), -- Hangul Letter Kiyeok ..Hangul Letter Araeae
51+ (0x3190, 0x31ba), -- Ideographic Annotation L..Bopomofo Letter Zy
52+ (0x31c0, 0x31e3), -- Cjk Stroke T ..Cjk Stroke Q
53+ (0x31f0, 0x321e), -- Katakana Letter Small Ku..Parenthesized Korean Cha
54+ (0x3220, 0x3247), -- Parenthesized Ideograph ..Circled Ideograph Koto
55+ (0x3250, 0x32fe), -- Partnership Sign ..Circled Katakana Wo
56+ (0x3300, 0x4dbf), -- Square Apaato ..
57+ (0x4e00, 0xa48c), -- Cjk Unified Ideograph-4e..Yi Syllable Yyr
58+ (0xa490, 0xa4c6), -- Yi Radical Qot ..Yi Radical Ke
59+ (0xa960, 0xa97c), -- Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
60+ (0xac00, 0xd7a3), -- Hangul Syllable Ga ..Hangul Syllable Hih
61+ (0xf900, 0xfaff), -- Cjk Compatibility Ideogr..
62+ (0xfe10, 0xfe19), -- Presentation Form For Ve..Presentation Form For Ve
63+ (0xfe30, 0xfe52), -- Presentation Form For Ve..Small Full Stop
64+ (0xfe54, 0xfe66), -- Small Semicolon ..Small Equals Sign
65+ (0xfe68, 0xfe6b), -- Small Reverse Solidus ..Small Commercial At
66+ (0xff01, 0xff60), -- Fullwidth Exclamation Ma..Fullwidth Right White Pa
67+ (0xffe0, 0xffe6), -- Fullwidth Cent Sign ..Fullwidth Won Sign
68+ (0x16fe0, 0x16fe0), -- (nil) ..
69+ (0x17000, 0x187ec), -- (nil) ..
70+ (0x18800, 0x18af2), -- (nil) ..
71+ (0x1b000, 0x1b001), -- Katakana Letter Archaic ..Hiragana Letter Archaic
72+ (0x1f004, 0x1f004), -- Mahjong Tile Red Dragon ..Mahjong Tile Red Dragon
73+ (0x1f0cf, 0x1f0cf), -- Playing Card Black Joker..Playing Card Black Joker
74+ (0x1f18e, 0x1f18e), -- Negative Squared Ab ..Negative Squared Ab
75+ (0x1f191, 0x1f19a), -- Squared Cl ..Squared Vs
76+ (0x1f200, 0x1f202), -- Square Hiragana Hoka ..Squared Katakana Sa
77+ (0x1f210, 0x1f23b), -- Squared Cjk Unified Ideo..
78+ (0x1f240, 0x1f248), -- Tortoise Shell Bracketed..Tortoise Shell Bracketed
79+ (0x1f250, 0x1f251), -- Circled Ideograph Advant..Circled Ideograph Accept
80+ (0x1f300, 0x1f320), -- Cyclone ..Shooting Star
81+ (0x1f32d, 0x1f335), -- Hot Dog ..Cactus
82+ (0x1f337, 0x1f37c), -- Tulip ..Baby Bottle
83+ (0x1f37e, 0x1f393), -- Bottle With Popping Cork..Graduation Cap
84+ (0x1f3a0, 0x1f3ca), -- Carousel Horse ..Swimmer
85+ (0x1f3cf, 0x1f3d3), -- Cricket Bat And Ball ..Table Tennis Paddle And
86+ (0x1f3e0, 0x1f3f0), -- House Building ..European Castle
87+ (0x1f3f4, 0x1f3f4), -- Waving Black Flag ..Waving Black Flag
88+ (0x1f3f8, 0x1f43e), -- Badminton Racquet And Sh..Paw Prints
89+ (0x1f440, 0x1f440), -- Eyes ..Eyes
90+ (0x1f442, 0x1f4fc), -- Ear ..Videocassette
91+ (0x1f4ff, 0x1f53d), -- Prayer Beads ..Down-pointing Small Red
92+ (0x1f54b, 0x1f54e), -- Kaaba ..Menorah With Nine Branch
93+ (0x1f550, 0x1f567), -- Clock Face One Oclock ..Clock Face Twelve-thirty
94+ (0x1f57a, 0x1f57a), -- (nil) ..
95+ (0x1f595, 0x1f596), -- Reversed Hand With Middl..Raised Hand With Part Be
96+ (0x1f5a4, 0x1f5a4), -- (nil) ..
97+ (0x1f5fb, 0x1f64f), -- Mount Fuji ..Person With Folded Hands
98+ (0x1f680, 0x1f6c5), -- Rocket ..Left Luggage
99+ (0x1f6cc, 0x1f6cc), -- Sleeping Accommodation ..Sleeping Accommodation
100+ (0x1f6d0, 0x1f6d2), -- Place Of Worship ..
101+ (0x1f6eb, 0x1f6ec), -- Airplane Departure ..Airplane Arriving
102+ (0x1f6f4, 0x1f6f6), -- (nil) ..
103+ (0x1f910, 0x1f91e), -- Zipper-mouth Face ..
104+ (0x1f920, 0x1f927), -- (nil) ..
105+ (0x1f930, 0x1f930), -- (nil) ..
106+ (0x1f933, 0x1f93e), -- (nil) ..
107+ (0x1f940, 0x1f94b), -- (nil) ..
108+ (0x1f950, 0x1f95e), -- (nil) ..
109+ (0x1f980, 0x1f991), -- Crab ..
110+ (0x1f9c0, 0x1f9c0), -- Cheese Wedge ..Cheese Wedge
111+ (0x20000, 0x2fffd), -- Cjk Unified Ideograph-20..
112+ (0x30000, 0x3fffd) -- (nil) ..
113+ ]
114+
115+zEROWIDTH :: RangeSet Int
116+zEROWIDTH = foldr insertRange empty [
117+ (0x0300, 0x036f), -- Combining Grave Accent ..Combining Latin Small Le
118+ (0x0483, 0x0489), -- Combining Cyrillic Titlo..Combining Cyrillic Milli
119+ (0x0591, 0x05bd), -- Hebrew Accent Etnahta ..Hebrew Point Meteg
120+ (0x05bf, 0x05bf), -- Hebrew Point Rafe ..Hebrew Point Rafe
121+ (0x05c1, 0x05c2), -- Hebrew Point Shin Dot ..Hebrew Point Sin Dot
122+ (0x05c4, 0x05c5), -- Hebrew Mark Upper Dot ..Hebrew Mark Lower Dot
123+ (0x05c7, 0x05c7), -- Hebrew Point Qamats Qata..Hebrew Point Qamats Qata
124+ (0x0610, 0x061a), -- Arabic Sign Sallallahou ..Arabic Small Kasra
125+ (0x064b, 0x065f), -- Arabic Fathatan ..Arabic Wavy Hamza Below
126+ (0x0670, 0x0670), -- Arabic Letter Superscrip..Arabic Letter Superscrip
127+ (0x06d6, 0x06dc), -- Arabic Small High Ligatu..Arabic Small High Seen
128+ (0x06df, 0x06e4), -- Arabic Small High Rounde..Arabic Small High Madda
129+ (0x06e7, 0x06e8), -- Arabic Small High Yeh ..Arabic Small High Noon
130+ (0x06ea, 0x06ed), -- Arabic Empty Centre Low ..Arabic Small Low Meem
131+ (0x0711, 0x0711), -- Syriac Letter Superscrip..Syriac Letter Superscrip
132+ (0x0730, 0x074a), -- Syriac Pthaha Above ..Syriac Barrekh
133+ (0x07a6, 0x07b0), -- Thaana Abafili ..Thaana Sukun
134+ (0x07eb, 0x07f3), -- Nko Combining Short High..Nko Combining Double Dot
135+ (0x0816, 0x0819), -- Samaritan Mark In ..Samaritan Mark Dagesh
136+ (0x081b, 0x0823), -- Samaritan Mark Epentheti..Samaritan Vowel Sign A
137+ (0x0825, 0x0827), -- Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
138+ (0x0829, 0x082d), -- Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
139+ (0x0859, 0x085b), -- Mandaic Affrication Mark..Mandaic Gemination Mark
140+ (0x08d4, 0x08e1), -- (nil) ..
141+ (0x08e3, 0x0902), -- Arabic Turned Damma Belo..Devanagari Sign Anusvara
142+ (0x093a, 0x093a), -- Devanagari Vowel Sign Oe..Devanagari Vowel Sign Oe
143+ (0x093c, 0x093c), -- Devanagari Sign Nukta ..Devanagari Sign Nukta
144+ (0x0941, 0x0948), -- Devanagari Vowel Sign U ..Devanagari Vowel Sign Ai
145+ (0x094d, 0x094d), -- Devanagari Sign Virama ..Devanagari Sign Virama
146+ (0x0951, 0x0957), -- Devanagari Stress Sign U..Devanagari Vowel Sign Uu
147+ (0x0962, 0x0963), -- Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
148+ (0x0981, 0x0981), -- Bengali Sign Candrabindu..Bengali Sign Candrabindu
149+ (0x09bc, 0x09bc), -- Bengali Sign Nukta ..Bengali Sign Nukta
150+ (0x09c1, 0x09c4), -- Bengali Vowel Sign U ..Bengali Vowel Sign Vocal
151+ (0x09cd, 0x09cd), -- Bengali Sign Virama ..Bengali Sign Virama
152+ (0x09e2, 0x09e3), -- Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
153+ (0x0a01, 0x0a02), -- Gurmukhi Sign Adak Bindi..Gurmukhi Sign Bindi
154+ (0x0a3c, 0x0a3c), -- Gurmukhi Sign Nukta ..Gurmukhi Sign Nukta
155+ (0x0a41, 0x0a42), -- Gurmukhi Vowel Sign U ..Gurmukhi Vowel Sign Uu
156+ (0x0a47, 0x0a48), -- Gurmukhi Vowel Sign Ee ..Gurmukhi Vowel Sign Ai
157+ (0x0a4b, 0x0a4d), -- Gurmukhi Vowel Sign Oo ..Gurmukhi Sign Virama
158+ (0x0a51, 0x0a51), -- Gurmukhi Sign Udaat ..Gurmukhi Sign Udaat
159+ (0x0a70, 0x0a71), -- Gurmukhi Tippi ..Gurmukhi Addak
160+ (0x0a75, 0x0a75), -- Gurmukhi Sign Yakash ..Gurmukhi Sign Yakash
161+ (0x0a81, 0x0a82), -- Gujarati Sign Candrabind..Gujarati Sign Anusvara
162+ (0x0abc, 0x0abc), -- Gujarati Sign Nukta ..Gujarati Sign Nukta
163+ (0x0ac1, 0x0ac5), -- Gujarati Vowel Sign U ..Gujarati Vowel Sign Cand
164+ (0x0ac7, 0x0ac8), -- Gujarati Vowel Sign E ..Gujarati Vowel Sign Ai
165+ (0x0acd, 0x0acd), -- Gujarati Sign Virama ..Gujarati Sign Virama
166+ (0x0ae2, 0x0ae3), -- Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
167+ (0x0b01, 0x0b01), -- Oriya Sign Candrabindu ..Oriya Sign Candrabindu
168+ (0x0b3c, 0x0b3c), -- Oriya Sign Nukta ..Oriya Sign Nukta
169+ (0x0b3f, 0x0b3f), -- Oriya Vowel Sign I ..Oriya Vowel Sign I
170+ (0x0b41, 0x0b44), -- Oriya Vowel Sign U ..Oriya Vowel Sign Vocalic
171+ (0x0b4d, 0x0b4d), -- Oriya Sign Virama ..Oriya Sign Virama
172+ (0x0b56, 0x0b56), -- Oriya Ai Length Mark ..Oriya Ai Length Mark
173+ (0x0b62, 0x0b63), -- Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
174+ (0x0b82, 0x0b82), -- Tamil Sign Anusvara ..Tamil Sign Anusvara
175+ (0x0bc0, 0x0bc0), -- Tamil Vowel Sign Ii ..Tamil Vowel Sign Ii
176+ (0x0bcd, 0x0bcd), -- Tamil Sign Virama ..Tamil Sign Virama
177+ (0x0c00, 0x0c00), -- Telugu Sign Combining Ca..Telugu Sign Combining Ca
178+ (0x0c3e, 0x0c40), -- Telugu Vowel Sign Aa ..Telugu Vowel Sign Ii
179+ (0x0c46, 0x0c48), -- Telugu Vowel Sign E ..Telugu Vowel Sign Ai
180+ (0x0c4a, 0x0c4d), -- Telugu Vowel Sign O ..Telugu Sign Virama
181+ (0x0c55, 0x0c56), -- Telugu Length Mark ..Telugu Ai Length Mark
182+ (0x0c62, 0x0c63), -- Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
183+ (0x0c81, 0x0c81), -- Kannada Sign Candrabindu..Kannada Sign Candrabindu
184+ (0x0cbc, 0x0cbc), -- Kannada Sign Nukta ..Kannada Sign Nukta
185+ (0x0cbf, 0x0cbf), -- Kannada Vowel Sign I ..Kannada Vowel Sign I
186+ (0x0cc6, 0x0cc6), -- Kannada Vowel Sign E ..Kannada Vowel Sign E
187+ (0x0ccc, 0x0ccd), -- Kannada Vowel Sign Au ..Kannada Sign Virama
188+ (0x0ce2, 0x0ce3), -- Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
189+ (0x0d01, 0x0d01), -- Malayalam Sign Candrabin..Malayalam Sign Candrabin
190+ (0x0d41, 0x0d44), -- Malayalam Vowel Sign U ..Malayalam Vowel Sign Voc
191+ (0x0d4d, 0x0d4d), -- Malayalam Sign Virama ..Malayalam Sign Virama
192+ (0x0d62, 0x0d63), -- Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
193+ (0x0dca, 0x0dca), -- Sinhala Sign Al-lakuna ..Sinhala Sign Al-lakuna
194+ (0x0dd2, 0x0dd4), -- Sinhala Vowel Sign Ketti..Sinhala Vowel Sign Ketti
195+ (0x0dd6, 0x0dd6), -- Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
196+ (0x0e31, 0x0e31), -- Thai Character Mai Han-a..Thai Character Mai Han-a
197+ (0x0e34, 0x0e3a), -- Thai Character Sara I ..Thai Character Phinthu
198+ (0x0e47, 0x0e4e), -- Thai Character Maitaikhu..Thai Character Yamakkan
199+ (0x0eb1, 0x0eb1), -- Lao Vowel Sign Mai Kan ..Lao Vowel Sign Mai Kan
200+ (0x0eb4, 0x0eb9), -- Lao Vowel Sign I ..Lao Vowel Sign Uu
201+ (0x0ebb, 0x0ebc), -- Lao Vowel Sign Mai Kon ..Lao Semivowel Sign Lo
202+ (0x0ec8, 0x0ecd), -- Lao Tone Mai Ek ..Lao Niggahita
203+ (0x0f18, 0x0f19), -- Tibetan Astrological Sig..Tibetan Astrological Sig
204+ (0x0f35, 0x0f35), -- Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung
205+ (0x0f37, 0x0f37), -- Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung
206+ (0x0f39, 0x0f39), -- Tibetan Mark Tsa -phru ..Tibetan Mark Tsa -phru
207+ (0x0f71, 0x0f7e), -- Tibetan Vowel Sign Aa ..Tibetan Sign Rjes Su Nga
208+ (0x0f80, 0x0f84), -- Tibetan Vowel Sign Rever..Tibetan Mark Halanta
209+ (0x0f86, 0x0f87), -- Tibetan Sign Lci Rtags ..Tibetan Sign Yang Rtags
210+ (0x0f8d, 0x0f97), -- Tibetan Subjoined Sign L..Tibetan Subjoined Letter
211+ (0x0f99, 0x0fbc), -- Tibetan Subjoined Letter..Tibetan Subjoined Letter
212+ (0x0fc6, 0x0fc6), -- Tibetan Symbol Padma Gda..Tibetan Symbol Padma Gda
213+ (0x102d, 0x1030), -- Myanmar Vowel Sign I ..Myanmar Vowel Sign Uu
214+ (0x1032, 0x1037), -- Myanmar Vowel Sign Ai ..Myanmar Sign Dot Below
215+ (0x1039, 0x103a), -- Myanmar Sign Virama ..Myanmar Sign Asat
216+ (0x103d, 0x103e), -- Myanmar Consonant Sign M..Myanmar Consonant Sign M
217+ (0x1058, 0x1059), -- Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
218+ (0x105e, 0x1060), -- Myanmar Consonant Sign M..Myanmar Consonant Sign M
219+ (0x1071, 0x1074), -- Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
220+ (0x1082, 0x1082), -- Myanmar Consonant Sign S..Myanmar Consonant Sign S
221+ (0x1085, 0x1086), -- Myanmar Vowel Sign Shan ..Myanmar Vowel Sign Shan
222+ (0x108d, 0x108d), -- Myanmar Sign Shan Counci..Myanmar Sign Shan Counci
223+ (0x109d, 0x109d), -- Myanmar Vowel Sign Aiton..Myanmar Vowel Sign Aiton
224+ (0x135d, 0x135f), -- Ethiopic Combining Gemin..Ethiopic Combining Gemin
225+ (0x1712, 0x1714), -- Tagalog Vowel Sign I ..Tagalog Sign Virama
226+ (0x1732, 0x1734), -- Hanunoo Vowel Sign I ..Hanunoo Sign Pamudpod
227+ (0x1752, 0x1753), -- Buhid Vowel Sign I ..Buhid Vowel Sign U
228+ (0x1772, 0x1773), -- Tagbanwa Vowel Sign I ..Tagbanwa Vowel Sign U
229+ (0x17b4, 0x17b5), -- Khmer Vowel Inherent Aq ..Khmer Vowel Inherent Aa
230+ (0x17b7, 0x17bd), -- Khmer Vowel Sign I ..Khmer Vowel Sign Ua
231+ (0x17c6, 0x17c6), -- Khmer Sign Nikahit ..Khmer Sign Nikahit
232+ (0x17c9, 0x17d3), -- Khmer Sign Muusikatoan ..Khmer Sign Bathamasat
233+ (0x17dd, 0x17dd), -- Khmer Sign Atthacan ..Khmer Sign Atthacan
234+ (0x180b, 0x180d), -- Mongolian Free Variation..Mongolian Free Variation
235+ (0x1885, 0x1886), -- Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
236+ (0x18a9, 0x18a9), -- Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
237+ (0x1920, 0x1922), -- Limbu Vowel Sign A ..Limbu Vowel Sign U
238+ (0x1927, 0x1928), -- Limbu Vowel Sign E ..Limbu Vowel Sign O
239+ (0x1932, 0x1932), -- Limbu Small Letter Anusv..Limbu Small Letter Anusv
240+ (0x1939, 0x193b), -- Limbu Sign Mukphreng ..Limbu Sign Sa-i
241+ (0x1a17, 0x1a18), -- Buginese Vowel Sign I ..Buginese Vowel Sign U
242+ (0x1a1b, 0x1a1b), -- Buginese Vowel Sign Ae ..Buginese Vowel Sign Ae
243+ (0x1a56, 0x1a56), -- Tai Tham Consonant Sign ..Tai Tham Consonant Sign
244+ (0x1a58, 0x1a5e), -- Tai Tham Sign Mai Kang L..Tai Tham Consonant Sign
245+ (0x1a60, 0x1a60), -- Tai Tham Sign Sakot ..Tai Tham Sign Sakot
246+ (0x1a62, 0x1a62), -- Tai Tham Vowel Sign Mai ..Tai Tham Vowel Sign Mai
247+ (0x1a65, 0x1a6c), -- Tai Tham Vowel Sign I ..Tai Tham Vowel Sign Oa B
248+ (0x1a73, 0x1a7c), -- Tai Tham Vowel Sign Oa A..Tai Tham Sign Khuen-lue
249+ (0x1a7f, 0x1a7f), -- Tai Tham Combining Crypt..Tai Tham Combining Crypt
250+ (0x1ab0, 0x1abe), -- Combining Doubled Circum..Combining Parentheses Ov
251+ (0x1b00, 0x1b03), -- Balinese Sign Ulu Ricem ..Balinese Sign Surang
252+ (0x1b34, 0x1b34), -- Balinese Sign Rerekan ..Balinese Sign Rerekan
253+ (0x1b36, 0x1b3a), -- Balinese Vowel Sign Ulu ..Balinese Vowel Sign Ra R
254+ (0x1b3c, 0x1b3c), -- Balinese Vowel Sign La L..Balinese Vowel Sign La L
255+ (0x1b42, 0x1b42), -- Balinese Vowel Sign Pepe..Balinese Vowel Sign Pepe
256+ (0x1b6b, 0x1b73), -- Balinese Musical Symbol ..Balinese Musical Symbol
257+ (0x1b80, 0x1b81), -- Sundanese Sign Panyecek ..Sundanese Sign Panglayar
258+ (0x1ba2, 0x1ba5), -- Sundanese Consonant Sign..Sundanese Vowel Sign Pan
259+ (0x1ba8, 0x1ba9), -- Sundanese Vowel Sign Pam..Sundanese Vowel Sign Pan
260+ (0x1bab, 0x1bad), -- Sundanese Sign Virama ..Sundanese Consonant Sign
261+ (0x1be6, 0x1be6), -- Batak Sign Tompi ..Batak Sign Tompi
262+ (0x1be8, 0x1be9), -- Batak Vowel Sign Pakpak ..Batak Vowel Sign Ee
263+ (0x1bed, 0x1bed), -- Batak Vowel Sign Karo O ..Batak Vowel Sign Karo O
264+ (0x1bef, 0x1bf1), -- Batak Vowel Sign U For S..Batak Consonant Sign H
265+ (0x1c2c, 0x1c33), -- Lepcha Vowel Sign E ..Lepcha Consonant Sign T
266+ (0x1c36, 0x1c37), -- Lepcha Sign Ran ..Lepcha Sign Nukta
267+ (0x1cd0, 0x1cd2), -- Vedic Tone Karshana ..Vedic Tone Prenkha
268+ (0x1cd4, 0x1ce0), -- Vedic Sign Yajurvedic Mi..Vedic Tone Rigvedic Kash
269+ (0x1ce2, 0x1ce8), -- Vedic Sign Visarga Svari..Vedic Sign Visarga Anuda
270+ (0x1ced, 0x1ced), -- Vedic Sign Tiryak ..Vedic Sign Tiryak
271+ (0x1cf4, 0x1cf4), -- Vedic Tone Candra Above ..Vedic Tone Candra Above
272+ (0x1cf8, 0x1cf9), -- Vedic Tone Ring Above ..Vedic Tone Double Ring A
273+ (0x1dc0, 0x1df5), -- Combining Dotted Grave A..Combining Up Tack Above
274+ (0x1dfb, 0x1dff), -- (nil) ..Combining Right Arrowhea
275+ (0x20d0, 0x20f0), -- Combining Left Harpoon A..Combining Asterisk Above
276+ (0x2cef, 0x2cf1), -- Coptic Combining Ni Abov..Coptic Combining Spiritu
277+ (0x2d7f, 0x2d7f), -- Tifinagh Consonant Joine..Tifinagh Consonant Joine
278+ (0x2de0, 0x2dff), -- Combining Cyrillic Lette..Combining Cyrillic Lette
279+ (0x302a, 0x302d), -- Ideographic Level Tone M..Ideographic Entering Ton
280+ (0x3099, 0x309a), -- Combining Katakana-hirag..Combining Katakana-hirag
281+ (0xa66f, 0xa672), -- Combining Cyrillic Vzmet..Combining Cyrillic Thous
282+ (0xa674, 0xa67d), -- Combining Cyrillic Lette..Combining Cyrillic Payer
283+ (0xa69e, 0xa69f), -- Combining Cyrillic Lette..Combining Cyrillic Lette
284+ (0xa6f0, 0xa6f1), -- Bamum Combining Mark Koq..Bamum Combining Mark Tuk
285+ (0xa802, 0xa802), -- Syloti Nagri Sign Dvisva..Syloti Nagri Sign Dvisva
286+ (0xa806, 0xa806), -- Syloti Nagri Sign Hasant..Syloti Nagri Sign Hasant
287+ (0xa80b, 0xa80b), -- Syloti Nagri Sign Anusva..Syloti Nagri Sign Anusva
288+ (0xa825, 0xa826), -- Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
289+ (0xa8c4, 0xa8c5), -- Saurashtra Sign Virama ..
290+ (0xa8e0, 0xa8f1), -- Combining Devanagari Dig..Combining Devanagari Sig
291+ (0xa926, 0xa92d), -- Kayah Li Vowel Ue ..Kayah Li Tone Calya Plop
292+ (0xa947, 0xa951), -- Rejang Vowel Sign I ..Rejang Consonant Sign R
293+ (0xa980, 0xa982), -- Javanese Sign Panyangga ..Javanese Sign Layar
294+ (0xa9b3, 0xa9b3), -- Javanese Sign Cecak Telu..Javanese Sign Cecak Telu
295+ (0xa9b6, 0xa9b9), -- Javanese Vowel Sign Wulu..Javanese Vowel Sign Suku
296+ (0xa9bc, 0xa9bc), -- Javanese Vowel Sign Pepe..Javanese Vowel Sign Pepe
297+ (0xa9e5, 0xa9e5), -- Myanmar Sign Shan Saw ..Myanmar Sign Shan Saw
298+ (0xaa29, 0xaa2e), -- Cham Vowel Sign Aa ..Cham Vowel Sign Oe
299+ (0xaa31, 0xaa32), -- Cham Vowel Sign Au ..Cham Vowel Sign Ue
300+ (0xaa35, 0xaa36), -- Cham Consonant Sign La ..Cham Consonant Sign Wa
301+ (0xaa43, 0xaa43), -- Cham Consonant Sign Fina..Cham Consonant Sign Fina
302+ (0xaa4c, 0xaa4c), -- Cham Consonant Sign Fina..Cham Consonant Sign Fina
303+ (0xaa7c, 0xaa7c), -- Myanmar Sign Tai Laing T..Myanmar Sign Tai Laing T
304+ (0xaab0, 0xaab0), -- Tai Viet Mai Kang ..Tai Viet Mai Kang
305+ (0xaab2, 0xaab4), -- Tai Viet Vowel I ..Tai Viet Vowel U
306+ (0xaab7, 0xaab8), -- Tai Viet Mai Khit ..Tai Viet Vowel Ia
307+ (0xaabe, 0xaabf), -- Tai Viet Vowel Am ..Tai Viet Tone Mai Ek
308+ (0xaac1, 0xaac1), -- Tai Viet Tone Mai Tho ..Tai Viet Tone Mai Tho
309+ (0xaaec, 0xaaed), -- Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
310+ (0xaaf6, 0xaaf6), -- Meetei Mayek Virama ..Meetei Mayek Virama
311+ (0xabe5, 0xabe5), -- Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
312+ (0xabe8, 0xabe8), -- Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
313+ (0xabed, 0xabed), -- Meetei Mayek Apun Iyek ..Meetei Mayek Apun Iyek
314+ (0xfb1e, 0xfb1e), -- Hebrew Point Judeo-spani..Hebrew Point Judeo-spani
315+ (0xfe00, 0xfe0f), -- Variation Selector-1 ..Variation Selector-16
316+ (0xfe20, 0xfe2f), -- Combining Ligature Left ..Combining Cyrillic Titlo
317+ (0x101fd, 0x101fd), -- Phaistos Disc Sign Combi..Phaistos Disc Sign Combi
318+ (0x102e0, 0x102e0), -- Coptic Epact Thousands M..Coptic Epact Thousands M
319+ (0x10376, 0x1037a), -- Combining Old Permic Let..Combining Old Permic Let
320+ (0x10a01, 0x10a03), -- Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
321+ (0x10a05, 0x10a06), -- Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
322+ (0x10a0c, 0x10a0f), -- Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
323+ (0x10a38, 0x10a3a), -- Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
324+ (0x10a3f, 0x10a3f), -- Kharoshthi Virama ..Kharoshthi Virama
325+ (0x10ae5, 0x10ae6), -- Manichaean Abbreviation ..Manichaean Abbreviation
326+ (0x11001, 0x11001), -- Brahmi Sign Anusvara ..Brahmi Sign Anusvara
327+ (0x11038, 0x11046), -- Brahmi Vowel Sign Aa ..Brahmi Virama
328+ (0x1107f, 0x11081), -- Brahmi Number Joiner ..Kaithi Sign Anusvara
329+ (0x110b3, 0x110b6), -- Kaithi Vowel Sign U ..Kaithi Vowel Sign Ai
330+ (0x110b9, 0x110ba), -- Kaithi Sign Virama ..Kaithi Sign Nukta
331+ (0x11100, 0x11102), -- Chakma Sign Candrabindu ..Chakma Sign Visarga
332+ (0x11127, 0x1112b), -- Chakma Vowel Sign A ..Chakma Vowel Sign Uu
333+ (0x1112d, 0x11134), -- Chakma Vowel Sign Ai ..Chakma Maayyaa
334+ (0x11173, 0x11173), -- Mahajani Sign Nukta ..Mahajani Sign Nukta
335+ (0x11180, 0x11181), -- Sharada Sign Candrabindu..Sharada Sign Anusvara
336+ (0x111b6, 0x111be), -- Sharada Vowel Sign U ..Sharada Vowel Sign O
337+ (0x111ca, 0x111cc), -- Sharada Sign Nukta ..Sharada Extra Short Vowe
338+ (0x1122f, 0x11231), -- Khojki Vowel Sign U ..Khojki Vowel Sign Ai
339+ (0x11234, 0x11234), -- Khojki Sign Anusvara ..Khojki Sign Anusvara
340+ (0x11236, 0x11237), -- Khojki Sign Nukta ..Khojki Sign Shadda
341+ (0x1123e, 0x1123e), -- (nil) ..
342+ (0x112df, 0x112df), -- Khudawadi Sign Anusvara ..Khudawadi Sign Anusvara
343+ (0x112e3, 0x112ea), -- Khudawadi Vowel Sign U ..Khudawadi Sign Virama
344+ (0x11300, 0x11301), -- Grantha Sign Combining A..Grantha Sign Candrabindu
345+ (0x1133c, 0x1133c), -- Grantha Sign Nukta ..Grantha Sign Nukta
346+ (0x11340, 0x11340), -- Grantha Vowel Sign Ii ..Grantha Vowel Sign Ii
347+ (0x11366, 0x1136c), -- Combining Grantha Digit ..Combining Grantha Digit
348+ (0x11370, 0x11374), -- Combining Grantha Letter..Combining Grantha Letter
349+ (0x11438, 0x1143f), -- (nil) ..
350+ (0x11442, 0x11444), -- (nil) ..
351+ (0x11446, 0x11446), -- (nil) ..
352+ (0x114b3, 0x114b8), -- Tirhuta Vowel Sign U ..Tirhuta Vowel Sign Vocal
353+ (0x114ba, 0x114ba), -- Tirhuta Vowel Sign Short..Tirhuta Vowel Sign Short
354+ (0x114bf, 0x114c0), -- Tirhuta Sign Candrabindu..Tirhuta Sign Anusvara
355+ (0x114c2, 0x114c3), -- Tirhuta Sign Virama ..Tirhuta Sign Nukta
356+ (0x115b2, 0x115b5), -- Siddham Vowel Sign U ..Siddham Vowel Sign Vocal
357+ (0x115bc, 0x115bd), -- Siddham Sign Candrabindu..Siddham Sign Anusvara
358+ (0x115bf, 0x115c0), -- Siddham Sign Virama ..Siddham Sign Nukta
359+ (0x115dc, 0x115dd), -- Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
360+ (0x11633, 0x1163a), -- Modi Vowel Sign U ..Modi Vowel Sign Ai
361+ (0x1163d, 0x1163d), -- Modi Sign Anusvara ..Modi Sign Anusvara
362+ (0x1163f, 0x11640), -- Modi Sign Virama ..Modi Sign Ardhacandra
363+ (0x116ab, 0x116ab), -- Takri Sign Anusvara ..Takri Sign Anusvara
364+ (0x116ad, 0x116ad), -- Takri Vowel Sign Aa ..Takri Vowel Sign Aa
365+ (0x116b0, 0x116b5), -- Takri Vowel Sign U ..Takri Vowel Sign Au
366+ (0x116b7, 0x116b7), -- Takri Sign Nukta ..Takri Sign Nukta
367+ (0x1171d, 0x1171f), -- Ahom Consonant Sign Medi..Ahom Consonant Sign Medi
368+ (0x11722, 0x11725), -- Ahom Vowel Sign I ..Ahom Vowel Sign Uu
369+ (0x11727, 0x1172b), -- Ahom Vowel Sign Aw ..Ahom Sign Killer
370+ (0x11c30, 0x11c36), -- (nil) ..
371+ (0x11c38, 0x11c3d), -- (nil) ..
372+ (0x11c3f, 0x11c3f), -- (nil) ..
373+ (0x11c92, 0x11ca7), -- (nil) ..
374+ (0x11caa, 0x11cb0), -- (nil) ..
375+ (0x11cb2, 0x11cb3), -- (nil) ..
376+ (0x11cb5, 0x11cb6), -- (nil) ..
377+ (0x16af0, 0x16af4), -- Bassa Vah Combining High..Bassa Vah Combining High
378+ (0x16b30, 0x16b36), -- Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
379+ (0x16f8f, 0x16f92), -- Miao Tone Right ..Miao Tone Below
380+ (0x1bc9d, 0x1bc9e), -- Duployan Thick Letter Se..Duployan Double Mark
381+ (0x1d167, 0x1d169), -- Musical Symbol Combining..Musical Symbol Combining
382+ (0x1d17b, 0x1d182), -- Musical Symbol Combining..Musical Symbol Combining
383+ (0x1d185, 0x1d18b), -- Musical Symbol Combining..Musical Symbol Combining
384+ (0x1d1aa, 0x1d1ad), -- Musical Symbol Combining..Musical Symbol Combining
385+ (0x1d242, 0x1d244), -- Combining Greek Musical ..Combining Greek Musical
386+ (0x1da00, 0x1da36), -- Signwriting Head Rim ..Signwriting Air Sucking
387+ (0x1da3b, 0x1da6c), -- Signwriting Mouth Closed..Signwriting Excitement
388+ (0x1da75, 0x1da75), -- Signwriting Upper Body T..Signwriting Upper Body T
389+ (0x1da84, 0x1da84), -- Signwriting Location Hea..Signwriting Location Hea
390+ (0x1da9b, 0x1da9f), -- Signwriting Fill Modifie..Signwriting Fill Modifie
391+ (0x1daa1, 0x1daaf), -- Signwriting Rotation Mod..Signwriting Rotation Mod
392+ (0x1e000, 0x1e006), -- (nil) ..
393+ (0x1e008, 0x1e018), -- (nil) ..
394+ (0x1e01b, 0x1e021), -- (nil) ..
395+ (0x1e023, 0x1e024), -- (nil) ..
396+ (0x1e026, 0x1e02a), -- (nil) ..
397+ (0x1e8d0, 0x1e8d6), -- Mende Kikakui Combining ..Mende Kikakui Combining
398+ (0x1e944, 0x1e94a), -- (nil) ..
399+ (0xe0100, 0xe01ef) -- Variation Selector-17 ..Variation Selector-256
400+ ]
401+
402+
403+basicZero :: RangeSet Int
404+basicZero = foldr insertRange empty [
405+ (0, 0),
406+ (0x034f, 0x034f),
407+ (0x200b, 0x200f),
408+ (0x2028, 0x2029),
409+ (0x202a, 0x202e),
410+ (0x2060, 0x2063)
411+ ]
412+
413+ctrlChars :: RangeSet Int
414+ctrlChars = foldr insertRange empty [
415+ (1, 32),
416+ (0x07f, 0x09F)
417+ ]
418+
419+wcwidth :: Char -> Int
420+wcwidth c | queryPoint v basicZero = 0
421+ | queryPoint v ctrlChars = -1
422+ | queryPoint v wIDEEASTASIAN = 2
423+ | queryPoint v zEROWIDTH = 0
424+ | otherwise = 1
425+ where v = ord c
src/lib/ProjectM36/Win32Handle.hs+4−1
@@ -53,5 +53,8 @@ withHandleToHANDLE haskell_handle action =
5353 -- Do what the user originally wanted
5454 action windows_handle
5555
56+#if MIN_VERSION_Win32(2,5,1)
57+#else
5658withStablePtr :: a -> (StablePtr a -> IO b) -> IO b
57−withStablePtr value = bracket (newStablePtr value) freeStablePtr
59+withStablePtr value = bracket (newStablePtr value) freeStablePtr
60+#endif
src/lib/ProjectM36/WithNameExpr.hsnew file+86
@@ -0,0 +1,86 @@
1+module ProjectM36.WithNameExpr where
2+import ProjectM36.Base
3+
4+-- substitute all instances of With-based macros to remove macro context
5+-- ideally, we would use a different relational expr type to "prove" that the with macros can no longer exist
6+type WithNameAssocs = [(GraphRefWithNameExpr, GraphRefRelationalExpr)]
7+-- | Drop macros into the relational expression wherever they are referenced.
8+substituteWithNameMacros ::
9+ WithNameAssocs ->
10+ GraphRefRelationalExpr ->
11+ GraphRefRelationalExpr
12+substituteWithNameMacros _ e@MakeRelationFromExprs{} = e
13+substituteWithNameMacros _ e@MakeStaticRelation{} = e
14+substituteWithNameMacros _ e@ExistingRelation{} = e
15+substituteWithNameMacros macros e@(RelationVariable rvname tid) =
16+ let
17+ macroFilt (WithNameExpr macroName macroTid, _) = rvname == macroName && tid== macroTid in
18+ case filter macroFilt macros of
19+ [] -> e
20+ [(_,replacement)] -> replacement
21+ _ -> error "more than one macro matched!"
22+substituteWithNameMacros macros (Project attrs expr) =
23+ Project attrs (substituteWithNameMacros macros expr)
24+substituteWithNameMacros macros (Union exprA exprB) =
25+ Union (substituteWithNameMacros macros exprA) (substituteWithNameMacros macros exprB)
26+substituteWithNameMacros macros (Join exprA exprB) =
27+ Join (substituteWithNameMacros macros exprA) (substituteWithNameMacros macros exprB)
28+substituteWithNameMacros macros (Rename attrA attrB expr) =
29+ Rename attrA attrB (substituteWithNameMacros macros expr)
30+substituteWithNameMacros macros (Difference exprA exprB) =
31+ Difference (substituteWithNameMacros macros exprA) (substituteWithNameMacros macros exprB)
32+substituteWithNameMacros macros (Group attrs attr expr) =
33+ Group attrs attr (substituteWithNameMacros macros expr)
34+substituteWithNameMacros macros (Ungroup attr expr) =
35+ Ungroup attr (substituteWithNameMacros macros expr)
36+substituteWithNameMacros macros (Restrict pred' expr) =
37+ Restrict (substituteWithNameMacrosRestrictionPredicate macros pred') (substituteWithNameMacros macros expr)
38+substituteWithNameMacros macros (Equals exprA exprB) =
39+ Equals (substituteWithNameMacros macros exprA) (substituteWithNameMacros macros exprB)
40+substituteWithNameMacros macros (NotEquals exprA exprB) =
41+ NotEquals (substituteWithNameMacros macros exprA) (substituteWithNameMacros macros exprB)
42+substituteWithNameMacros macros (Extend extendTup expr) =
43+ Extend (substituteWitNameMacrosExtendTupleExpr macros extendTup) (substituteWithNameMacros macros expr)
44+substituteWithNameMacros macros (With moreMacros expr) =
45+ --collect and update nested with exprs
46+ let newMacros = foldr macroFolder macros moreMacros
47+ macroFolder (wnexpr, mexpr) acc =
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
51+ substituteWithNameMacros newMacros expr
52+
53+
54+substituteWithNameMacrosRestrictionPredicate :: WithNameAssocs -> GraphRefRestrictionPredicateExpr -> GraphRefRestrictionPredicateExpr
55+substituteWithNameMacrosRestrictionPredicate macros pred' =
56+ let sub = substituteWithNameMacrosRestrictionPredicate macros in
57+ case pred' of
58+ TruePredicate -> pred'
59+ AndPredicate exprA exprB ->
60+ AndPredicate (sub exprA) (sub exprB)
61+ OrPredicate exprA exprB ->
62+ OrPredicate (sub exprA) (sub exprB)
63+ NotPredicate expr ->
64+ NotPredicate (sub expr)
65+ RelationalExprPredicate reexpr ->
66+ RelationalExprPredicate (substituteWithNameMacros macros reexpr)
67+ AtomExprPredicate atomExpr ->
68+ AtomExprPredicate (substituteWithNameMacrosAtomExpr macros atomExpr)
69+ AttributeEqualityPredicate attrName atomExpr ->
70+ AttributeEqualityPredicate attrName (substituteWithNameMacrosAtomExpr macros atomExpr)
71+
72+substituteWitNameMacrosExtendTupleExpr :: WithNameAssocs -> GraphRefExtendTupleExpr -> GraphRefExtendTupleExpr
73+substituteWitNameMacrosExtendTupleExpr macros (AttributeExtendTupleExpr attrName atomExpr) =
74+ AttributeExtendTupleExpr attrName (substituteWithNameMacrosAtomExpr macros atomExpr)
75+
76+substituteWithNameMacrosAtomExpr :: WithNameAssocs -> GraphRefAtomExpr -> GraphRefAtomExpr
77+substituteWithNameMacrosAtomExpr macros atomExpr =
78+ case atomExpr of
79+ e@AttributeAtomExpr{} -> e
80+ e@NakedAtomExpr{} -> e
81+ FunctionAtomExpr fname atomExprs tid ->
82+ FunctionAtomExpr fname (map (substituteWithNameMacrosAtomExpr macros) atomExprs) tid
83+ RelationAtomExpr reExpr ->
84+ RelationAtomExpr (substituteWithNameMacros macros reExpr)
85+ ConstructedAtomExpr dconsName atomExprs tid ->
86+ ConstructedAtomExpr dconsName (map (substituteWithNameMacrosAtomExpr macros) atomExprs) tid
stack.ghc8.10.yamlnew file+19
@@ -0,0 +1,19 @@
1+resolver: lts-17.13
2+packages:
3+ - "."
4+
5+extra-deps:
6+ - git: https://github.com/agentm/curryer.git
7+ commit: 74ecaac619ad1165a4517d5c0f4e530493bda130
8+ - git: https://github.com/composewell/streamly.git
9+ commit: ac3af8749194f1788704dda8667d0b3807075cc2
10+ - fast-builder-0.1.2.1
11+ - rset-1.0.0
12+ - winery-1.3.2
13+ - barbies-th-0.1.8
14+ - base16-bytestring-1.0.1.0
15+
16+flags:
17+ project-m36:
18+ stack: true
19+# allow-newer: true
stack.ghc8.6.yamlnew file+62
@@ -0,0 +1,62 @@
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-14.27
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+ - git: https://github.com/agentm/curryer.git
13+ commit: 74ecaac619ad1165a4517d5c0f4e530493bda130
14+ - git: https://github.com/composewell/streamly.git
15+ commit: ac3af8749194f1788704dda8667d0b3807075cc2
16+ - fast-builder-0.1.2.1
17+ - winery-1.3.2
18+ - barbies-2.0.2.0
19+ - barbies-th-0.1.7
20+ - extended-reals-0.2.3.0
21+ - data-interval-2.0.1
22+ - stm-containers-1.1.0.4
23+ - stm-hamt-1.2.0.4
24+ - rset-1.0.0
25+ - hashable-time-0.2.0.2
26+ - network-transport-tcp-0.6.0
27+ - megaparsec-7.0.5
28+ - prettyprinter-1.7.0
29+ - prettyprinter-ansi-terminal-1.1.2
30+ - fusion-plugin-types-0.1.0
31+ - base16-bytestring-1.0.1.0
32+ - modern-uri-0.3.4.0
33+ - cryptohash-sha256-0.11.102.0
34+ - http-types-0.12.3
35+
36+# Override default flag values for local packages and extra-deps
37+flags:
38+ project-m36:
39+ stack: true
40+
41+# Extra package databases containing global packages
42+extra-package-dbs: []
43+
44+# Control whether we use the GHC we find on the path
45+# system-ghc: true
46+
47+# Require a specific version of stack, using version ranges
48+# require-stack-version: -any # Default
49+# require-stack-version: >= 1.0.0
50+
51+# Override the architecture used by stack, especially useful on Windows
52+# arch: i386
53+# arch: x86_64
54+
55+# Extra directories used by stack for building
56+# extra-include-dirs: [/path/to/dir]
57+# extra-lib-dirs: [/path/to/dir]
58+
59+# Allow a newer minor version of GHC than the snapshot specifies
60+# compiler-check: newer-minor
61+
62+allow-newer: true
stack.yaml → stack.ghc8.8.yamlrenamed+28−14
@@ -2,26 +2,41 @@
22# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
33
44# 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
5+resolver: lts-16.4
66
77# Local packages, usually specified by relative directory name
88packages:
9−- '.'
9+ - "."
1010# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
1111extra-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
12+ - git: https://github.com/agentm/curryer.git
13+ commit: 74ecaac619ad1165a4517d5c0f4e530493bda130
14+ - git: https://github.com/composewell/streamly.git
15+ commit: ac3af8749194f1788704dda8667d0b3807075cc2
16+ - fast-builder-0.1.2.1
17+ - winery-1.3.2
18+ - barbies-2.0.2.0
19+ - barbies-th-0.1.7
20+ - extended-reals-0.2.3.0
21+ - data-interval-2.0.1
22+ - stm-containers-1.1.0.4
23+ - stm-hamt-1.2.0.4
24+ - rset-1.0.0
25+ - hashable-time-0.2.0.2
26+ - network-transport-tcp-0.7.0
27+ - megaparsec-7.0.5
28+ - network-2.8.0.1
29+ - primitive-extras-0.8
30+ - primitive-unlifted-0.1.3.0
31+ - prettyprinter-1.7.0
32+ - prettyprinter-ansi-terminal-1.1.2
33+ - base16-bytestring-1.0.1.0
34+ - modern-uri-0.3.4.0
2235
2336# Override default flag values for local packages and extra-deps
24−flags: {}
37+flags:
38+ project-m36:
39+ stack: true
2540
2641# Extra package databases containing global packages
2742extra-package-dbs: []
@@ -45,4 +60,3 @@ extra-package-dbs: []
4560# compiler-check: newer-minor
4661
4762allow-newer: true
48−
test/Client/Simple.hs+15−10
@@ -3,11 +3,13 @@ import Test.HUnit
33import System.Exit
44import ProjectM36.Relation
55import qualified ProjectM36.Client as C
6+import ProjectM36.DateExamples
7+import ProjectM36.DatabaseContext
68import System.IO.Temp
79import System.FilePath
810import ProjectM36.TupleSet
911import ProjectM36.Attribute
10−import qualified Data.Vector as V
12+import qualified Data.Map as M
1113
1214main :: IO ()
1315main = do
@@ -15,7 +17,7 @@ main = do
1517 if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess
1618
1719testList :: Test
18−testList = TestList [testSimpleCommitSuccess, testSimpleCommitFailure]
20+testList = TestList [testSimpleCommitSuccess, testSimpleCommitFailure, testSimpleUpdate]
1921
2022assertEither :: (Show a) => IO (Either a b) -> IO b
2123assertEither x = do
@@ -45,6 +47,7 @@ testSimpleCommitSuccess = TestCase $
4547 eRes <- C.executeRelationalExpr sess conn relExpr
4648 assertEqual "x and y" (Right relationTrue) eRes
4749
50+
4851testSimpleCommitFailure :: Test
4952testSimpleCommitFailure = TestCase $ do
5053 let failAttrs = attributesFromList [Attribute "fail" IntAtomType]
@@ -55,13 +58,15 @@ testSimpleCommitFailure = TestCase $ do
5558 execute $ Assign "x" (ExistingRelation relationTrue)
5659 --cause error
5760 execute $ Assign "x" (MakeStaticRelation failAttrs emptyTupleSet)
58− let expectedErr = Left (RelError (RelVarAssignmentTypeMismatchError V.empty failAttrs))
61+ let expectedErr = Left (RelError (RelationTypeMismatchError mempty failAttrs))
5962 assertEqual "dbc error" expectedErr err
60−
61−
62−
6363
64−
65−
66−
67−
64+-- #176 default merge couldn't handle Update
65+testSimpleUpdate :: Test
66+testSimpleUpdate = TestCase $ do
67+ let connInfo = InProcessConnectionInfo NoPersistence emptyNotificationCallback []
68+ dbconn <- assertEither (simpleConnectProjectM36 connInfo)
69+ assertEither $ withTransaction dbconn $
70+ execute $ databaseContextAsDatabaseContextExpr dateExamples
71+ assertEither $ withTransaction dbconn $
72+ execute $ Update "s" (M.singleton "sname" (C.NakedAtomExpr (C.TextAtom "Blakey"))) (C.AttributeEqualityPredicate "sname" (C.NakedAtomExpr (C.TextAtom "Blake")))
test/DataFrame.hsnew file+61
@@ -0,0 +1,61 @@
1+import ProjectM36.Client
2+import ProjectM36.DataFrame
3+import TutorialD.Interpreter.TestBase
4+
5+import Test.HUnit
6+import System.Exit
7+import qualified Data.Set as S
8+
9+testList :: Test
10+testList = TestList [testOrderBy, testLimit, testOffset]
11+
12+main :: IO ()
13+main = do
14+ tcounts <- runTestTT testList
15+ if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess
16+
17+testOrderBy :: Test
18+testOrderBy = TestCase $ do
19+ (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback
20+ Right df <- executeDataFrameExpr sessionId dbconn (
21+ DataFrameExpr {
22+ convertExpr = Project (AttributeNames (S.singleton "status")) (RelationVariable "s" ()),
23+ orderExprs = [AttributeOrderExpr "status" AscendingOrder],
24+ offset = Nothing,
25+ limit = Nothing
26+ })
27+ let vals = map (\tup -> case atomForAttributeName "status" tup of
28+ Left err -> error (show err)
29+ Right atom -> atom) (tuples df)
30+ assertEqual "sort order of s" [IntegerAtom 10, IntegerAtom 20, IntegerAtom 30] vals
31+
32+testOffset :: Test
33+testOffset = TestCase $ do
34+ (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback
35+ Right df <- executeDataFrameExpr sessionId dbconn (
36+ DataFrameExpr {
37+ convertExpr = Project (AttributeNames (S.singleton "status")) (RelationVariable "s" ()),
38+ orderExprs = [AttributeOrderExpr "status" AscendingOrder],
39+ offset = Just 1,
40+ limit = Nothing
41+ })
42+ let vals = map (\tup -> case atomForAttributeName "status" tup of
43+ Left err -> error (show err)
44+ Right atom -> atom) (tuples df)
45+ assertEqual "sort + offset" [IntegerAtom 20, IntegerAtom 30] vals
46+
47+testLimit :: Test
48+testLimit = TestCase $ do
49+ (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback
50+ Right df <- executeDataFrameExpr sessionId dbconn (
51+ DataFrameExpr {
52+ convertExpr = Project (AttributeNames (S.singleton "status")) (RelationVariable "s" ()),
53+ orderExprs = [AttributeOrderExpr "status" DescendingOrder],
54+ offset = Nothing,
55+ limit = Just 1
56+ })
57+ let vals = map (\tup -> case atomForAttributeName "status" tup of
58+ Left err -> error (show err)
59+ Right atom -> atom) (tuples df)
60+ assertEqual "sort + limit" [IntegerAtom 30] vals
61+
test/IsomorphicSchema.hs+43−33
@@ -4,13 +4,13 @@ import ProjectM36.Error
44import ProjectM36.IsomorphicSchema
55import ProjectM36.Relation
66import ProjectM36.RelationalExpression
7+import ProjectM36.TransactionGraph
8+import ProjectM36.StaticOptimizer
79import qualified ProjectM36.DatabaseContext as DBC
810import qualified ProjectM36.Attribute as A
911import System.Exit
1012import qualified Data.Map as M
1113import qualified Data.Set as S
12−import Control.Monad.State
13−import Control.Monad.Trans.Reader
1414
1515testList :: Test
1616testList = TestList [testIsoRename, testIsoRestrict, testIsoUnion, testSchemaValidation]
@@ -36,7 +36,7 @@ assertMaybe x msg = case x of
3636testSchemaValidation :: Test
3737testSchemaValidation = TestCase $ do
3838 let potentialSchema = DBC.basicDatabaseContext {
39− relationVariables = M.singleton "anotherRel" relationTrue
39+ relationVariables = M.singleton "anotherRel" (ExistingRelation relationTrue)
4040 }
4141 -- missing relvars failure
4242 morphs = [IsoRename "true" "true", IsoRename "false" "false"]
@@ -50,15 +50,17 @@ testSchemaValidation = TestCase $ do
5050testIsoRename :: Test
5151testIsoRename = TestCase $ do
5252 -- create a schema with two relvars and rename one while the other remains the same in the isomorphic schema
53− let schemaA = mkRelationalExprState DBC.empty {
54− relationVariables = M.fromList [("employee", relationTrue),
55− ("department", relationFalse)]
53+ let ctx = DBC.empty {
54+ relationVariables = M.fromList [("employee", ExistingRelation relationTrue),
55+ ("department", ExistingRelation relationFalse)]
5656 }
57− isomorphsAtoB = [IsoRename "emp" "employee",
57+ (graph, _) <- freshTransactionGraph ctx
58+ let isomorphsAtoB = [IsoRename "emp" "employee",
5859 IsoRename "department" "department"]
59− unionExpr = Union (RelationVariable "emp" ()) (RelationVariable "department" ())
60+ unionExpr = Union (RelationVariable "emp" ()) (RelationVariable "department" ())
61+ env = mkRelationalExprEnv ctx graph
6062 relExpr <- assertEither (applyRelationalExprSchemaIsomorphs isomorphsAtoB unionExpr)
61− let relResult = runReader (evalRelationalExpr relExpr) schemaA
63+ let relResult = optimizeAndEvalRelationalExpr env relExpr
6264 assertEqual "employee relation morph" (Right relationTrue) relResult
6365
6466testIsoRestrict :: Test
@@ -67,62 +69,70 @@ testIsoRestrict = TestCase $ do
6769 -- the virtual schema has an employee
6870 let empattrs = A.attributesFromList [Attribute "name" TextAtomType,
6971 Attribute "boss" TextAtomType]
72+ (graph, transId) <- freshTransactionGraph DBC.empty
7073 emprel <- assertEither $ mkRelationFromList empattrs
7174 [[TextAtom "Steve", TextAtom ""],
7275 [TextAtom "Cindy", TextAtom "Steve"],
7376 [TextAtom "Sam", TextAtom "Steve"]]
7477 let predicate = AttributeEqualityPredicate "boss" (NakedAtomExpr (TextAtom ""))
75− bossRel <- assertEither $ runReader (evalRelationalExpr (Restrict predicate (ExistingRelation emprel))) (mkRelationalExprState DBC.empty)
76− nonBossRel <- assertEither $ runReader (evalRelationalExpr (Restrict (NotPredicate predicate) (ExistingRelation emprel))) (mkRelationalExprState DBC.empty)
78+ reenv = mkRelationalExprEnv DBC.empty graph
79+ bossRel <- assertEither $ runRelationalExprM reenv (evalRelationalExpr (Restrict predicate (ExistingRelation emprel)))
80+ nonBossRel <- assertEither $ runRelationalExprM reenv (evalRelationalExpr (Restrict (NotPredicate predicate) (ExistingRelation emprel)))
7781
78− let schemaA = mkRelationalExprState DBC.empty {
79− relationVariables = M.fromList [("nonboss", nonBossRel),
80− ("boss", bossRel)]
82+ let schemaA = mkRelationalExprEnv baseContext graph
83+ baseContext = DBC.empty {
84+ relationVariables = M.fromList [("nonboss", ExistingRelation nonBossRel),
85+ ("boss", ExistingRelation bossRel)]
8186 }
82−
8387 isomorphsAtoB = [IsoRestrict "employee" predicate ("boss", "nonboss")]
8488 bossq = RelationVariable "boss" ()
8589 nonbossq = RelationVariable "nonboss" ()
8690 employeeq = RelationVariable "employee" ()
8791 unionq = Union bossq nonbossq
8892 empExpr <- assertEither (applyRelationalExprSchemaIsomorphs isomorphsAtoB employeeq)
89− let empResult = runReader (evalRelationalExpr empExpr) schemaA
90− unionResult = runReader (evalRelationalExpr unionq) schemaA
93+ let empResult = evalRelExpr (evalRelationalExpr empExpr)
94+ unionResult = evalRelExpr (evalRelationalExpr unionq)
95+ evalRelExpr = runRelationalExprM schemaA
9196 assertEqual "boss/nonboss isorestrict" unionResult empResult
9297 --execute database context expr
9398 bobRel <- assertEither (mkRelationFromList empattrs [[TextAtom "Bob", TextAtom ""]])
9499 let schemaBInsertExpr = Insert "employee" (ExistingRelation bobRel)
95100 schemaBInsertExpr' <- assertEither (processDatabaseContextExprInSchema (Schema isomorphsAtoB) schemaBInsertExpr)
96− let (postInsertContext,_,_) = execState (evalDatabaseContextExpr schemaBInsertExpr') (freshDatabaseState (stateElemsContext schemaA))
97− expectedRel = runReader (evalRelationalExpr (Union (RelationVariable "boss" ()) (RelationVariable "nonboss" ()))) (mkRelationalExprState postInsertContext)
101+ let Right dbcState = evalDBCExpr schemaBInsertExpr'
102+ postInsertContext = dbc_context dbcState
103+ evalDBCExpr expr' = runDatabaseContextEvalMonad baseContext dbcenv (optimizeAndEvalDatabaseContextExpr False expr')
104+ dbcenv = mkDatabaseContextEvalEnv transId graph
105+ expectedRel = runRelationalExprM postInsertEnv (evalRelationalExpr (Union (RelationVariable "boss" ()) (RelationVariable "nonboss" ())))
106+ postInsertEnv = mkRelationalExprEnv postInsertContext graph
98107 --execute the expression against the schema and compare against the base context
99108 processedExpr <- assertEither (processRelationalExprInSchema (Schema isomorphsAtoB) (RelationVariable "employee" ()))
100− let processedRel = runReader (evalRelationalExpr processedExpr) (mkRelationalExprState postInsertContext)
109+ let processedRel = runRelationalExprM postInsertEnv (evalRelationalExpr processedExpr)
101110 assertEqual "insert bob boss" expectedRel processedRel
102111
103112testIsoUnion :: Test
104113testIsoUnion = TestCase $ do
105114 --create motors relation which is split into low-power (<50 horsepower) and high-power (>=50 horsepower) motors
106115 --the schema is contains the split relvars
116+ (graph, _) <- freshTransactionGraph DBC.empty
107117 motorsRel <- assertEither $ mkRelationFromList (A.attributesFromList [Attribute "name" TextAtomType,
108− Attribute "power" IntAtomType])
109− [[TextAtom "Puny", IntAtom 10],
110− [TextAtom "Scooter", IntAtom 49],
111− [TextAtom "Auto", IntAtom 200],
112− [TextAtom "Tractor", IntAtom 500]]
113− let baseSchema = mkRelationalExprState DBC.basicDatabaseContext {
114− relationVariables = M.singleton "motor" motorsRel
115− }
116− splitPredicate = AtomExprPredicate (FunctionAtomExpr "lt" [AttributeAtomExpr "power", NakedAtomExpr (IntAtom 50)] ())
118+ Attribute "power" IntegerAtomType])
119+ [[TextAtom "Puny", IntegerAtom 10],
120+ [TextAtom "Scooter", IntegerAtom 49],
121+ [TextAtom "Auto", IntegerAtom 200],
122+ [TextAtom "Tractor", IntegerAtom 500]]
123+ let env = mkRelationalExprEnv DBC.basicDatabaseContext {
124+ relationVariables = M.singleton "motor" (ExistingRelation motorsRel)
125+ } graph
126+ splitPredicate = AtomExprPredicate (FunctionAtomExpr "lt" [AttributeAtomExpr "power", NakedAtomExpr (IntegerAtom 50)] ())
117127 splitIsomorphs = [IsoUnion ("lowpower", "highpower") splitPredicate "motor",
118128 IsoRename "true" "true",
119129 IsoRename "false" "false"]
120− lowmotors = runReader (evalRelationalExpr (Restrict splitPredicate (RelationVariable "motor" ()))) baseSchema
121− highmotors = runReader (evalRelationalExpr (Restrict (NotPredicate splitPredicate) (RelationVariable "motor" ()))) baseSchema
122− relResult expr = runReader (evalRelationalExpr expr) baseSchema
130+ lowmotors = runRelationalExprM env (evalRelationalExpr (Restrict splitPredicate (RelationVariable "motor" ())))
131+ highmotors = runRelationalExprM env (evalRelationalExpr (Restrict (NotPredicate splitPredicate) (RelationVariable "motor" ())))
132+ relResult expr = runRelationalExprM env (evalRelationalExpr expr)
123133 lowpowerExpr <- assertEither (processRelationalExprInSchema (Schema splitIsomorphs) (RelationVariable "lowpower" ()))
124134 lowpowerRel <- assertEither (relResult lowpowerExpr)
125135 highpowerExpr <- assertEither (processRelationalExprInSchema (Schema splitIsomorphs) (RelationVariable "highpower" ()))
126136 highpowerRel <- assertEither (relResult highpowerExpr)
127137 assertEqual "lowpower relation difference" (Right lowpowerRel) lowmotors
128− assertEqual "highpower relation difference" (Right highpowerRel) highmotors
138+ assertEqual "highpower relation difference" (Right highpowerRel) highmotors
test/Relation/Atomable.hs+89−14
@@ -1,8 +1,7 @@
11--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 #-}
2+{-# LANGUAGE DeriveGeneric, DeriveAnyClass, OverloadedStrings, TypeApplications, DerivingVia #-}
33import Test.HUnit
44import ProjectM36.Client
5−import Data.Binary
65import Control.DeepSeq
76import System.Exit
87import TutorialD.Interpreter.TestBase
@@ -13,42 +12,83 @@ import Data.Time.Calendar (fromGregorian)
1312import Data.Text
1413import qualified Data.Map as M
1514import Data.Proxy
15+import Codec.Winery
1616
1717{-# ANN module ("Hlint: ignore Use newtype instead of data" :: String) #-}
1818data Test1T = Test1C Integer
19− deriving (Generic, Show, Eq, Binary, NFData, Atomable)
19+ deriving (Generic, Show, Eq, NFData, Atomable)
20+ deriving Serialise via WineryVariant Test1T
2021
2122data Test2T x = Test2C x
22− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
23+ deriving (Show, Generic, Eq, NFData, Atomable)
24+ deriving Serialise via WineryVariant (Test2T x)
2325
2426data Test3T = Test3C Integer Integer
25− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
27+ deriving (Show, Generic, Eq, NFData, Atomable)
28+ deriving Serialise via WineryVariant Test3T
2629
2730data Test4T = Test4Ca Integer |
2831 Test4Cb Integer
29− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
32+ deriving (Show, Generic, Eq, NFData, Atomable)
33+ deriving Serialise via WineryVariant Test4T
3034
3135data TestListT = TestListC [Integer]
32− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
36+ deriving (Show, Generic, Eq, NFData, Atomable)
37+ deriving Serialise via WineryVariant TestListT
3338
39+data TestNonEmptyT = TestNonEmptyC [Integer]
40+ deriving (Show, Generic, Eq, NFData, Atomable)
41+ deriving Serialise via WineryVariant TestNonEmptyT
42+
3443data Test5T = Test5C {
3544 con1 :: Integer,
3645 con2 :: Integer
37− } deriving (Show, Generic, Eq, Binary, NFData, Atomable)
46+ } deriving (Show, Generic, Eq, NFData, Atomable)
47+ deriving Serialise via WineryRecord Test5T
3848
3949data Test6T = Test6C (Maybe Integer)
40− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
50+ deriving (Show, Generic, Eq, NFData, Atomable)
51+ deriving Serialise via WineryVariant Test6T
4152
4253data Test7T = Test7C (Either Integer Integer)
43− deriving (Show, Generic, Eq, Binary, NFData, Atomable)
44−
54+ deriving (Show, Generic, Eq, NFData, Atomable)
55+ deriving Serialise via WineryVariant Test7T
56+
57+data Test8T = Test8C Test1T
58+ deriving (Show, Generic, Eq, NFData, Atomable)
59+ deriving Serialise via WineryVariant Test8T
60+
61+data User = User
62+ { userFirstName :: Text
63+ , userLastName :: Text
64+ } deriving (Eq, Ord, Show, Generic, NFData, Atomable)
65+ deriving Serialise via WineryRecord User
66+
67+data Test9_4T = Test9_4C {
68+ f9_41 :: Int,
69+ f9_42 :: Int,
70+ f9_43 :: Int,
71+ f9_44 :: Int }
72+ deriving (Show, Generic, Eq, NFData, Atomable)
73+ deriving Serialise via WineryRecord Test9_4T
74+
75+data Test9_5T = Test9_5C {
76+ f9_51 :: Int,
77+ f9_52 :: Int,
78+ f9_53 :: Int,
79+ f9_54 :: Int,
80+ f9_55 :: Int
81+ }
82+ deriving (Show, Generic, Eq, NFData, Atomable)
83+ deriving Serialise via WineryRecord Test9_5T
84+
4585main :: IO ()
4686main = do
4787 tcounts <- runTestTT testList
4888 if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess
4989
5090testList :: Test
51−testList = TestList [testHaskell2DB, testADT1, testADT2, testADT3, testADT4, testADT5, testBasicMarshaling, testListInstance, testADT6Maybe, testADT7Either]
91+testList = TestList [testHaskell2DB, testADT1, testADT2, testADT3, testADT4, testADT5, testBasicMarshaling, testSimpleList, testListInstance, testNonEmptyInstance, testADT6Maybe, testADT7Either, testNonPrimitiveValues, testRecordType, testManyFields]
5292
5393-- test some basic data types like int, day, etc.
5494testBasicMarshaling :: Test
@@ -77,7 +117,7 @@ testHaskell2DB = TestCase $ do
77117 let createRelExpr = Assign "x" rel
78118
79119 rel = MakeRelationFromExprs Nothing
80− [TupleExpr (M.singleton "a1" (NakedAtomExpr atomVal))]
120+ (TupleExprs () [TupleExpr (M.singleton "a1" (NakedAtomExpr atomVal))])
81121 atomVal = toAtom exampleVal
82122 exampleVal = Test1C 10
83123 checkExecuteDatabaseContextExpr sessionId dbconn createRelExpr
@@ -131,4 +171,39 @@ checkExecuteDatabaseContextExpr sessionId dbconn expr = executeDatabaseContextEx
131171testListInstance :: Test
132172testListInstance = TestCase $ do
133173 let example = TestListC [3,4,5]
134− assertEqual "List instance" example (fromAtom (toAtom example))
174+ assertEqual "List instance" example (fromAtom (toAtom example))
175+
176+testSimpleList :: Test
177+testSimpleList = TestCase $ do
178+ let example = toAtom @[Integer] [1,2,3]
179+ expected = ConstructedAtom "Cons" (ConstructedAtomType "List" (M.fromList [("a",IntegerAtomType)])) [IntegerAtom 1,ConstructedAtom "Cons" (ConstructedAtomType "List" (M.fromList [("a",IntegerAtomType)])) [IntegerAtom 2,ConstructedAtom "Cons" (ConstructedAtomType "List" (M.fromList [("a",IntegerAtomType)])) [IntegerAtom 3,ConstructedAtom "Empty" (ConstructedAtomType "List" (M.fromList [("a",IntegerAtomType)])) []]]]
180+ assertEqual "simple list" expected example
181+
182+testNonEmptyInstance :: Test
183+testNonEmptyInstance = TestCase $ do
184+ let example = TestNonEmptyC [3,4,5]
185+ assertEqual "NonEmpty instance" example (fromAtom (toAtom example))
186+
187+testNonPrimitiveValues :: Test
188+testNonPrimitiveValues = TestCase $ do
189+ let example = Test8C (Test1C 3)
190+ assertEqual "non-primitive values" example (fromAtom (toAtom example))
191+
192+testRecordType :: Test
193+testRecordType = TestCase $ do
194+ let example = User { userFirstName = "Bob"
195+ ,userLastName = "Smith"
196+ }
197+ assertEqual "User record" example (fromAtom (toAtom example))
198+ let expected = AddTypeConstructor (ADTypeConstructorDef "User" []) [DataConstructorDef "User" [DataConstructorDefTypeConstructorArg (PrimitiveTypeConstructor "Text" TextAtomType),DataConstructorDefTypeConstructorArg (PrimitiveTypeConstructor "Text" TextAtomType)]]
199+
200+ assertEqual "User record to database context expr" expected (toAddTypeExpr (Proxy :: Proxy User))
201+
202+--test both odd and even product types with more than 2 fields
203+testManyFields :: Test
204+testManyFields = TestCase $ do
205+ let example4 = Test9_4C 1 2 3 4
206+ assertEqual "four fields product type" example4 (fromAtom (toAtom example4))
207+
208+ let example5 = Test9_5C 1 2 3 4 5
209+ assertEqual "five fields product type" example5 (fromAtom (toAtom example5))
test/Relation/Basic.hs+27−14
@@ -3,13 +3,11 @@ import ProjectM36.Base
33import ProjectM36.Relation
44import ProjectM36.Error
55import ProjectM36.DateExamples
6−import ProjectM36.TupleSet
7−import ProjectM36.Attribute hiding (null, attributeNames)
86import ProjectM36.DataTypes.Primitive
97import ProjectM36.RelationalExpression
8+import ProjectM36.TransactionGraph
109import ProjectM36.Tuple
1110import qualified ProjectM36.DatabaseContext as DBC
12−import Control.Monad.Trans.Reader
1311import qualified ProjectM36.Attribute as A
1412import qualified Data.Map as M
1513import qualified Data.Vector as V
@@ -25,7 +23,8 @@ testList = TestList [testRelation "relationTrue" relationTrue, testRelation "rel
2523 testRelation "products" productsRel,
2624 testRelation "supplierProducts" supplierProductsRel,
2725 testMkRelationFromExprsBadAttrs,
28− testDuplicateAttributes
26+ testExistingRelationType,
27+ testReorderTuple
2928 ]
3029
3130main :: IO ()
@@ -63,8 +62,8 @@ validateAttrTypesMatchTupleAttrTypes rel@(Relation attrs tupSet) = foldr (\tuple
6362 tupleAtomCheck tuple = V.all (== True) (attrChecks tuple)
6463 attrChecks tuple = V.map (\attr -> case atomForAttributeName (A.attributeName attr) tuple of
6564 Left _ -> False
66− Right atom -> (Right $ atomTypeForAtom atom) ==
67− A.atomTypeForAttributeName (A.attributeName attr) attrs) (attributes rel)
65+ Right atom -> Right (atomTypeForAtom atom) ==
66+ A.atomTypeForAttributeName (A.attributeName attr) attrs) (attributesVec (attributes rel))
6867
6968simpleRel :: Relation
7069simpleRel = case mkRelation attrs tupleSet of
@@ -93,14 +92,28 @@ testMkRelation1 = TestCase $ assertEqual "key mismatch" expectedError (mkRelatio
9392
9493testMkRelationFromExprsBadAttrs :: Test
9594testMkRelationFromExprsBadAttrs = TestCase $ do
96− let context = DBC.empty
97− case runReader (evalRelationalExpr (MakeRelationFromExprs (Just [AttributeAndTypeNameExpr "badAttr1" (PrimitiveTypeConstructor "Int" IntAtomType) ()]) [TupleExpr (M.singleton "badAttr2" (NakedAtomExpr (IntAtom 1)))])) (mkRelationalExprState context) of
95+ let context = DBC.empty
96+ (graph,_) <- freshTransactionGraph context
97+ let reenv = mkRelationalExprEnv context graph
98+ reExpr = MakeRelationFromExprs (Just [AttributeAndTypeNameExpr "badAttr1" (PrimitiveTypeConstructor "Int" IntAtomType) ()]) (TupleExprs () [TupleExpr (M.singleton "badAttr2" (NakedAtomExpr (IntAtom 1)))])
99+ evald = runRelationalExprM reenv (evalRelationalExpr reExpr)
100+ case evald of
98101 Left err -> assertEqual "tuple type mismatch" (TupleAttributeTypeMismatchError (A.attributesFromList [Attribute "badAttr2" IntAtomType])) err
99102 Right _ -> assertFailure "expected tuple type mismatch"
100103
101−--creating an empty relation with duplicate attribute names should fail
102−testDuplicateAttributes :: Test
103−testDuplicateAttributes = TestCase $ do
104− let eRel = mkRelation attrs emptyTupleSet
105− attrs = attributesFromList [Attribute "a" IntAtomType, Attribute "a" TextAtomType]
106− assertEqual "duplicate attribute names" (Left (DuplicateAttributeNamesError (S.singleton "a"))) eRel
104+testExistingRelationType :: Test
105+testExistingRelationType = TestCase $ do
106+ (graph, _) <- freshTransactionGraph dateExamples
107+ let typeResult = runRelationalExprM reenv (typeForRelationalExpr (ExistingRelation relationTrue))
108+ reenv = mkRelationalExprEnv dateExamples graph
109+ assertEqual "ExistingRelation with tuples type" (Right relationFalse) typeResult
110+
111+-- | Ensure that tuple reordering honors the
112+testReorderTuple :: Test
113+testReorderTuple = TestCase $ do
114+ let tup1 = mkRelationTuple attrs1 (V.fromList [IntAtom 4, TextAtom "test"])
115+ attrs1 = A.attributesFromList [Attribute "a" IntAtomType, Attribute "b" TextAtomType]
116+ attrs2 = A.attributesFromList [Attribute "b" TextAtomType, Attribute "a" IntAtomType]
117+ actual = reorderTuple attrs2 tup1
118+ expected = mkRelationTuple attrs2 (V.fromList [TextAtom "test", IntAtom 4])
119+ assertEqual "reorderTuple" expected actual
test/Relation/Export/CSV.hs+25−20

This diff is too big to show here.

test/Relation/StaticOptimizer.hs+84−60

This diff is too big to show here.

test/Relation/Tupleable.hs+210−30

This diff is too big to show here.

test/Server/Main.hs+46−29

This diff is too big to show here.

test/Server/WebSocket.hs+9−7

This diff is too big to show here.

test/TransactionGraph/Merge.hs+70−39

This diff is too big to show here.

test/TransactionGraph/Persist.hs+83−18

This diff is too big to show here.

test/TutorialD/Interpreter/AtomFunctionScript.hs+25−17

This diff is too big to show here.

test/TutorialD/Interpreter/DatabaseContextFunctionScript.hs+16−17

This diff is too big to show here.

test/TutorialD/Interpreter/Import/ImportTest.hsnew file+47

This diff is too big to show here.

test/TutorialD/Interpreter/Import/TutorialD.hsdeleted−21

This diff is too big to show here.

test/TutorialD/Interpreter/Import/httpimporttest.tutdnew file+2

This diff is too big to show here.

test/TutorialD/Interpreter/TestBase.hs+7−8

This diff is too big to show here.

test/TutorialD/Interpreter.hs → test/TutorialD/InterpreterTest.hsrenamed+232−39

This diff is too big to show here.

test/TutorialD/PrinterTest.hsnew file+47

This diff is too big to show here.

test/scripts.hs+5−2

This diff is too big to show here.