f4cf770 · project-m36 · git.iko.soy

git.iko.soy/project-m36

Merge branch 'master' into support_ghc_8.2

# Conflicts: # .travis.yml # src/lib/ProjectM36/RelationalExpression.hs # src/lib/ProjectM36/ScriptSession.hs # src/lib/ProjectM36/Server.hs

commitf4cf7702e3ff30cc8c31e3a9621e1c3c1b9302ca authorAgentM <agentm@themactionfaction.com> dateTue 30 Jan 2018, 21:16 (9 years ago) parentaf1821e a2b50ed

79 files changed+4361−640

compare with master

unifiedsplit

.appveyor.ymlnew file+37

@@ -0,0 +1,37 @@

1+build: off

3+version: 1.0.{build}-{branch}

5+image: Visual Studio 2017

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+

20+platform:

21+ - x64

22+

23+cache:

24+ - "c:\\sr"

25+ - "%LocalAppData%\\Programs\\stack"

26+# - ".stack-work" # send us over the 1 GB limit

27+

28+test_script:

29+ - stack setup > nul

30+# The ugly echo "" hack is to avoid complaints about 0 being an invalid file

31+# descriptor

32+ - echo "" | stack --no-terminal test

33+# - 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

34+

35+#artifacts:

36+# - path: project-m36.7z

37+# name: project-m36.7z

.gitignore+5−1

@@ -14,4 +14,8 @@ nextsteps

1414\#*\#

1515view-system-notes

1616persistence-notes

17−*.pyc

17+*.pyc

18+jupyter/itutd.egg-info

19+jupyter/build

20+juyter/dist

21+.ipynb_checkpoints

.travis.yml+45−40

@@ -1,4 +1,4 @@

1−# For more information, see https://github.com/hvr/multi-ghc-travis

1+# For more information, see https://github.com/ChrisPenner/haskell-stack-travis-ci

22language: c

33sudo: false

@@ -7,52 +7,57 @@ git:

88cache:

99 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

10+ - $HOME/.ghc

11+ - $HOME/.cabal

12+ - $HOME/.stack

13+ - .stack-work

14+ timeout: 1000

2115

2216matrix:

17+ fast_finish: true

2318 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

19+ - env: CACHE_NAME=7.10.3 STACK_YAML=stack.ghc7.10.yaml

20+ compiler: ": #stack 7.10.3"

21+

22+ - env: CACHE_NAME=8.0.2 STACK_YAML=stack.ghc8.0.yaml

23+ compiler: ": #stack 8.0.2"

4124

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

25+ - env: CACHE_NAME=8.2.1 STACK_YAML=stack.ghc8.2.yaml

26+ compiler: ": #stack 8.2.1"

4727

48− - cabal new-build -w ${HC} --enable-tests --dep -j2 all --allow-newer=distributed-process

28+ - env: CACHE_NAME=osx-8.0.2 STACK_YAML=stack.yaml

29+ os: osx

30+ os_image: xcode7.3

31+ compiler: ": #stack 8.0.2"

32+

33+before_script:

34+ - unset CC

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

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

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

4938

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

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

5241script:

53− - cabal sdist

54− - cabal new-build -w ${HC} --allow-newer=distributed-process

55− - cabal new-test -w ${HC} --allow-newer=distributed-process

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 --allow-newer=distributed-process

42+ - |

43+ # Run tests

44+ set -e

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

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

47+ - |

48+ #Run HLint

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

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

51+ fi

52+ - |

53+ #Run Haddock

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

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

56+ fi

57+

58+after_success:

59+ - |

60+ # Build and ship binary

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

62+

5863# EOF

.travis/attach-binary.shnew file+25

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

1+#!/bin/sh

2+set -o errexit -o verbose

4+if test ! "$BUILD_BINARY" || test ! "$TRAVIS_TAG"

5+then

6+ echo 'This is not a release build.'

7+elif test ! "$GITHUB_TOKEN"

8+then

9+ echo 'The GITHUB_TOKEN environment variable is not set!'

10+ exit 1

11+else

12+ echo "Building binary for $TRAVIS_OS_NAME to $TRAVIS_TAG..."

13+ stack build --ghc-options -O2 --pedantic

14+ echo "Attaching binary for $TRAVIS_OS_NAME to $TRAVIS_TAG..."

15+ OWNER="$(echo "$TRAVIS_REPO_SLUG" | cut -f1 -d/)"

16+ REPO="$(echo "$TRAVIS_REPO_SLUG" | cut -f2 -d/)"

17+ BIN="$(stack path --local-install-root)/bin/$REPO"

18+ BUNDLE_NAME="$REPO-$TRAVIS_TAG-$TRAVIS_OS_NAME.tar.gz"

19+ cp "$BIN" "./$REPO"

20+ chmod +x "./$REPO"

21+ tar -czf "$BUNDLE_NAME" "$REPO"

22+ echo "SHA256:"

23+ shasum -a 256 "$BUNDLE_NAME"

24+ ghr -t "$GITHUB_TOKEN" -u "$OWNER" -r "$REPO" --replace "$(git describe --tags)" "$BUNDLE_NAME"

25+fi

.travis/install-dependencies.shnew file+22

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

1+# Run tests

2+if [[ "$(uname)" = "Darwin" ]]; then

3+ timeout_cmd="gtimeout"

4+else

5+ timeout_cmd="timeout"

6+fi

7+$timeout_cmd 15m stack --no-terminal --jobs=2 --install-ghc --system-ghc build --only-dependencies --fast

8+ret=$?

9+case "$ret" in

10+ 0)

11+ # continue

12+ ;;

13+ 124)

14+ echo "Timed out while installing dependencies."

15+ echo "Try building again by pushing a new commit."

16+ exit 1

17+ ;;

18+ *)

19+ echo "Failed to install dependencies; stack exited with $ret"

20+ exit "$ret"

21+ ;;

22+esac

.travis/install-ghc.shnew file+16

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

1+#!/bin/sh

2+set -eux

3+#assume stack is installed

4+STACK=~/.local/bin/stack

6+fetch_ghc_osx() {

7+ echo "Using stack to install GHC $GHC_VERSION"

8+ $STACK setup $GHC_VERSION

9+}

10+

11+if [ "$(uname)" = "Darwin" ]; then

12+ fetch_ghc_osx

13+else

14+ #installed by apt

15+ echo "Linux GHC $GHC_VERSION via APT already installed."

16+fi

.travis/install-ghr.shnew file+21

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

1+#!/bin/sh

2+set -o errexit -o verbose

4+if test ! "$BUILD_BINARY" || test ! "$TRAVIS_TAG"

5+then

6+ echo 'This is not a release build.'

7+else

8+ if [ "$TRAVIS_OS_NAME" = "linux" ]

9+ then

10+ ARCH="linux"

11+ else

12+ ARCH="darwin"

13+ fi

14+ echo "Installing ghr"

15+ URL="https://github.com/tcnksm/ghr/releases/download/v0.5.4/ghr_v0.5.4_${ARCH}_386.zip"

16+ curl -L ${URL} > ghr.zip

17+ mkdir -p "$HOME/bin"

18+ export PATH="$HOME/bin:$PATH"

19+ unzip ghr.zip -d "$HOME/bin"

20+ rm ghr.zip

21+fi

.travis/install-stack.shnew file+27

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

1+#!/bin/sh

3+# Adapted from https://github.com/commercialhaskell/stack

5+set -eux

7+travis_retry() {

8+ cmd=$*

9+ $cmd || (sleep 2 && $cmd) || (sleep 10 && $cmd)

10+}

11+

12+fetch_stack_osx() {

13+ curl -skL https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin;

14+}

15+

16+fetch_stack_linux() {

17+ curl -sL https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack';

18+}

19+

20+# We need stack to generate cabal files with precise bounds, even for cabal

21+# builds.

22+mkdir -p ~/.local/bin;

23+if [ "$(uname)" = "Darwin" ]; then

24+ travis_retry fetch_stack_osx

25+else

26+ travis_retry fetch_stack_linux

27+fi

Changelog.markdown+6

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

1+# 2017-11-14

3+* alter websocket server API to allow for multiple representations (JSON, text, or HTML) to be selected and returned simultaneously

4+* add jupyter kernel for TutorialD interpreter

5+* fix warnings suggested by new hlint 2.0.10

17# 2017-10-08 (v0.3)

39* replaced overuse of `undefined` with `Proxy` in `Tupleable` and `Atomable` typeclasses

README.markdown+10−2

@@ -5,6 +5,8 @@

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)

77[![Build status](https://travis-ci.org/agentm/project-m36.svg?branch=master)](https://travis-ci.org/agentm/project-m36)

8+[![Windows Build status](https://ci.appveyor.com/api/projects/status/q7jyddd6dy1ibqdo/branch/master?svg=true)](https://ci.appveyor.com/project/agentm/project-m36)

810

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

1012

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

5052

51531. [Installation and Introduction to Project:M36](docs/introduction_to_projectm36.markdown)

52541. [Introduction to the Relational Algebra](docs/introduction_to_the_relational_algebra.markdown)

55+1. [TutorialD via Jupyter Notebook Walkthrough](jupyter/TutorialD%20Notebook%20Walkthrough.ipynb)

53561. [TutorialD Tutorial](docs/tutd_tutorial.markdown)

54571. [15 Minute Tutorial](docs/15_minute_tutorial.markdown)

55581. [Developer's Change Log](Changelog.markdown)

@@ -70,11 +73,16 @@ Project:M36 supports multiple frontends which target different audiences.

70731. [Serving Remote ProjectM36 Databases](docs/server_mode.markdown)

71741. [Using Notifications](docs/using_notifications.markdown)

72751. [Merge Transactions](docs/merge_transactions.markdown)

73−1. [WebSocket Server](docs/websocket_server.markdown)

74761. [Atom (Value) Functions](docs/atomfunctions.markdown)

75771. [Trans-Graph Relational Expressions](docs/transgraphrelationalexpr.markdown)

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

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

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

81+

82+### Integrations

83+

84+1. [WebSocket Server](docs/websocket_server.markdown)

85+1. [Jupyter Notebook Kernel](docs/jupypter_kernel.markdown)

7886

7987## Development

8088

@@ -89,6 +97,6 @@ Project:M36 is developed in Haskell and compiled with GHC 7.10 or GHC 8.0.2 or l

8997

9098## Suggested Reading

9199

92−* [Out of the Tarpit](http://shaffner.us/cs/papers/tarpit.pdf): a proposed software architecture which minimizes state and complexity. Project:M36 implements the requirements of this paper.

100+* [Out of the Tarpit](https://github.com/papers-we-love/papers-we-love/blob/2eb8d21/design/out-of-the-tar-pit.pdf): a proposed software architecture which minimizes state and complexity. Project:M36 implements the requirements of this paper.

93101* [Database Design & Relational Theory: Normal Forms and All That Jazz](http://shop.oreilly.com/product/0636920025276.do): mathematical foundations for the principles of the relational algebra

94102* [Database Explorations: Essays on the Third Manifesto and Related Topics](http://bookstore.trafford.com/Products/SKU-000177853/Database-Explorations.aspx): additional essays and debates on practical approaches to relational algebra engine design

cbits/darwin_statfs.cnew file+23

@@ -0,0 +1,23 @@

1+#include <sys/param.h>

2+#include <sys/mount.h>

3+#include <stdio.h>

5+#ifndef _PROJECT_M36_STATFS_

6+#define _PROJECT_M36_STATFS_

7+#ifdef __APPLE__

8+int cDarwinFSJournaled(const char* path)

9+{

10+ struct statfs s = {0};

11+ int ret = statfs(path, &s);

12+ if(ret < 0)

13+ {

14+ /* error */

15+ return ret;

16+ }

17+ else

18+ {

19+ return s.f_flags & MNT_JOURNALED;

20+ }

21+}

22+#endif

23+#endif

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+

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+

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+

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² 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² 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² 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² 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² 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² 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² 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² 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² 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² 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² 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² 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² 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²

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 = '⁹';

1109+ }

1110+ if (iters >= 1e6) {

1111+ denom = '1e6'; power = '⁶';

1112+ }

1113+ else if (iters >= 1e3) {

1114+ denom = '1e3'; power = '³';

1115+ }

1116+ else denom = 1;

1117+ if (denom > 1) {

1118+ iters = (iters / denom).toFixed();

1119+ iters += '×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/filesystem-persistence.markdownnew file+128

@@ -0,0 +1,128 @@

1+# Project-M36 Filesystem Persistence

3+## Introduction

5+Existing database persistent storage is not suitable for Project:M36 storage for several reasons:

7+* typical SQL storage doesn't support relation-valued attributes

8+ * Project:M36 supports nested relations, relations as values- a useful feature of the relational algebra

9+* typical SQL storage relies on writing and rewriting files to save space

10+ * Project:M36 uses a write-one-read-many strategy to support database branching, concurrency, and compression

11+* typical SQL storage maps each table to one or more files

12+ * Project:M36 obviates the one-to-one mapping between relation variables and files and allows for multiple representations of a single relation variable and evaluated expressions on disk

13+* typical SQL storage maintains only the latest state of the database

14+ * Project:M36 stores a graph of transactions and supports multiple heads of contention

15+* typical key-value storage is poorly typed or even schemaless

16+ * Project:M36 is strongly-typed which enforces correctness and can benefit compression schemes and performance

17+

18+## Requirements

19+

20+* storage of an append-at-leaves (transaction) graph with highly concurrent read access

21+* database [durability](https://en.wikipedia.org/wiki/ACID#Durability)

22+* extensibility

23+ * examples include future compression types, dynamic atom (value) types, database context extensions, new relation types (such as recurrence relations), backwards-compatibility for atom values

24+* platform-agnosticism

25+ * postgresql's C-struct-to-disk design means that switching platforms requires a dump-and-restore, even if the database directory can be physically moved to the new machine- it's not always clear what constitutes a platform changes (float/int timestamps)

26+* upgradeability

27+ * postgresql software upgrades require painful database dump-and-restores or pg_upgrade, causing downtime

28+ * be able to read older formats to prevent costly data-rewrites

29+* backwards-compatibility

30+ * no one wants to rewrite their database files during upgrades, even if it is on-the-fly like with pg_upgrade

31+* multiple remote readers and writers to the storage

32+ * mutliple servers can read/write the same storage over networked filesystems as long as there are some basic locking guarantees

33+ * multiple servers can read the same storage without locking guarantees

34+ * we can protect WORM storage with fine-grained locking and still maintain high-concurrency

35+* singular format for data export/import (dump/restore)

36+ * we won't need a pseudo-cross-platform dump format (like pg_dump's output) because the file format is already cross-platform

37+ * sharing the format for internal and external usage means we can share the same tools

38+ * the dump format can be a subset of the internal format

39+* existence of a Haskell-based serialization library

40+* POSIX filesystem semantics and atomicity guarantees

41+

42+## Current, Insufficient Design

43+

44+### Filesystem Requirements

45+

46+* POSIX, journaled filesystem

47+ * ext3/4, xfs, etc.

48+ * simulate POSIX semantics on Windows possibly with locking

49+

50+The first pass of the on-disk storage for Project:M36 was implemented with a focus on correctness, but not performance or intelligent disk storage usage. As such, it is valuable as a baseline for the new implementation.

51+

52+* uses Data.Binary to serialize entire Haskell data structures to disk

53+* includes lots of redundancy

54+ * for example, each new transaction writes all current relation variables to disk- instead, we should be able to reference unchanged relvars from previous transactions (they are already safely on disk)

55+* loses the in-memory data structure sharing that was present when writing the data (one of the benefits of immutable data structures)

56+* writes a platform-specific format

57+* is not extensible, backwards-, or forwards-compatible

58+* cannot be used as a portable, exportable format

59+* compression is all-or-nothing

60+

61+### Directory Layout

62+

63+* /m36v*x* - includes a human-readable transaction graph listing. The *x* references the version of persistence format.

64+* /lockFile - an empty file used for synchronizing multiple project-m36 server contending for the transaction graph

65+* /heads - a human-readable mapping of head names to transaction ids

66+* /<transaction id> - a directory containing all data needed to reconstruct a transaction

67+ * /atomfuncs - a Binary-serialized listing of `AtomFunction`s

68+ * /dbcfuncs - a Binary-serialized listing of `DatabaseContextFunction`s

69+ * /incdeps - a Binary-serialized listing of `InclusionDependency`s

70+ * /info - a Binary-serialized listing of `TransactionInfo` (current and parent transaction ids)

71+ * /relvars - a directory containing files named after the relvars with each file's contents being a serialized `Relation`

72+ * dynamic names should not appear in the filesystem as the filesystem naming requirements will be different from Project:M36 naming requirements

73+ * /schemas - a Binary-serialized listing of alternative isomorphic schemas

74+ * /typecons - a Binary-serialized listing of `TypeConstructor`s (data types)

75+

76+## New, Shiny, Proposed Design

77+

78+### Directory Layout

79+

80+Most of the existing directory layout remains useful. The one-transaction-per-directory layout maximizes read performance using a WORM strategy. Later transactions can refer to past transactions to cut down on immediate IO. Due to the idempotence of the `DatabaseContextExpr`, we can optionally serialize the expression itself to further reduce and defer IO. Deferred updates can be resolved on-demand or in the background by replacing transaction directories, individual files, or by adding supplementary relation representations (more on these below).

81+

82+Improvements:

83+

84+* wrap up small objects together

85+ * We experienced unnecessarily high disk usage when saving atom functions in individual files. Wrap up smaller data structures (especially when less than 4KB) into one file.

86+* use [cbor](https://github.com/well-typed/cborg) binary format to allow external tools to be able to read the on-disk format

87+ * the cbor format allows for forwards and backwards compatibility for atom types and includes relevant built-in types

88+

89+### Relation representations

90+

91+One area where almost every DBMS has fallen flat is in *data independece*, the separation between the logical database state representation and the on-disk format. Project:M36 aims to remedy this with "relation representations" which acknowledges that every relation (including the results of relational expresssions) can have multiple on-disk or in-memory representations. The purpose of a query planner is to choose the optimal representation for the given request.

92+

93+Most DBMSes do make an inadvertent attempt to support multiple relation representations via indexes. An index can be viewed as an independent representation of a relation in a different format (optimized for certain queries), but these same DBMSes fail to hide this abstraction in the logical layer, instead forcing users to create and maintain indexes as a separate entity.

94+

95+Relational representations, however, are never presented to the user of the logical layer of the database. Such representations can be created automatically. For example, if a certain query result (always a relation) is requested often, the DBMS may choose to cache the result as a relation representation mapped to the query itself. Thereafter, if the query is requested again (within an unchanged database state, of course), the planner can choose to send the pre-computed result back. This is known as a "query cache", but we can extend this same model to any other possible representation.

96+

97+Another representation type includes alternative representations of a relation variable's value designed for specific projections or restrictions. For example, a relation may be stored on disk as a btree with the nodes representing a relation's key. This is obviously equivalent to an index (either populated with the remainder of the tuple attributes or not, if the query is merely checking for existence).

98+

99+Note that if two relation representations are isomorphic, as in the example of a btree containing the key and remaining tuple values, then all other representations of the same relation are redundant. Under storage pressure, we can delete all but one representation. Which one the DBMS chooses to delete is arbitrary. When we have adequate space, we can create additional representations in the background without affecting correctness.

100+

101+The on-disk representation need not correspond to the logical relation variables at all. Besides query caches, the DBMS can freely store multiple relations in the same file as long as there is a relational expression to distinguish between the logical relation variables. Conversely, a single relation variable's value could span multiple files, simulating what other DBMSes call sharding but without exposing the implementation details to the users.

102+

103+Considering that user involvement in the creation of relation representations is the norm, how can the DBMS create such representations and maintain them automatically? This will likely be an area of research, but we can start simply with a query cache and automatic cost-based indexing based on actual queries executed.

104+

105+When broken free from user control, the DBMS is free to create arbitrary representations with the only consideration being available IO and memory resources.

106+

107+### Deferred updates

108+

109+Virtually all DBMSes execute database updates against existing files which store tuples. However, because Project:M36 updates are idempotent, we can save expressions to disk for *deferred updates*. Database update expressions saved to disk can drastically increase the rate at which we can execute updates because the expression is likely far smaller than the number of tuples which the expression will change. Because Project:M36 uses per-transaction directories, once a deferred update is actually evaluated, the directory can be atomically replaced with the evaluated result. Of course, to save disk storage and IO, the DBMS can also choose to discard the evaluated result and continue to store the update. This is nothing novel- git does this by storing code diffs between commits. The only novelty is in recognizing the value of idempotent updates.

110+

111+### Linked relations

112+

113+Every database update creates a new state based on an old state and an update expression. In the previous section, we demonstrated how the expression along with the previous state is sufficient to create the new state. Alternatively, the DBMS can also store a "diff" (difference) in the form of a relational expr with a link to the previous state.

114+

115+For example, if we have a relation variable of employees' names and we insert another employee name, the new state is the union of the previous state of the relation variable and a relation containing the new employee's name. The evaluated expression which requests the new state is merely replaced with the union- similar to a macro.

116+

117+This strategy can also be viewed as a form of compression. In the general case where a relation variable has not changed from one transaction to the next transaction, we can merely store what amounts to a symbolic link to the relation variable in the previous state.

118+

119+### Risks of Redesign

120+

121+* cborg module has had only one release, is probably less than ready for production use, but the initial results are promising and is developed and backed by well-known Haskellers and a Haskell shop

122+ * are there alternatives we should consider?

123+* increased code complexity

124+ * executor needs to be separated from current relational EDSL to support scanning various types of relation representations

125+ * the new EDSL may not leak its representations to the user-level EDSL

126+ * query executor will need access to the full transaction graph to cover relation links and deferred updates; currently, all state is wrapped up into the `DatabaseContext`

127+* how and when to create new relation representations and when to defer updates will be an active area of research

128+* requires more consideration in reducing IO and storage requirements; this was not a major driver of the initial design

docs/jupyter_kernel.markdownnew file+49

@@ -0,0 +1,49 @@

1+# TutorialD Jupyter Kernel for Project:M36

3+## Introduction

5+[The Jupyter Notebook](https://jupyter-notebook.readthedocs.io/en/stable/notebook.html) is web-based tool for experimenting with various languages. Project:M36 offers a Jupyter kernel for the TutorialD interpreter.

7+The kernel automatically starts and stops its own websocket-server-based database and offers no filesystem persistence, which is similar to other jupyter kernels.

9+## Installation

10+

11+To install the `tutd` kernel:

12+

13+* install the `itutd` module into your jupyter virtual environment:

14+```

15+$ cd project-m36/jupyter/itutd

16+$ pip install .

17+```

18+

19+* install `kernel.json`:

20+

21+ ```$ mkdir ~/Library/Jupyter/kernels/itutd && cp project-m36/jupyter/kernel.json ~/Library/Jupyter/kernels/itutd``` (macOS)

22+

23+ ```$ mkdir ~/.local/share/jupyter/kernels/tutd && cp project-m36/jupyter/kernel.json ~/.local/share/jupyter/kernels/tutd``` (Linux)

24+

25+ ```$ mkdir %APPDATA%\jupyter\kernels\tutd && copy project-m36\jupyter\kernel.json %APPDATA%\jupyter\kernels\tutd``` (Windows)

26+

27+* check that the kernel is detected:

28+```

29+$ jupyter kernelspec list

30+Available kernels:

31+ python2 ...

32+ tutd ...

33+```

34+

35+* add `project-m36-server` to `PATH` environment variable

36+

37+```

38+$ export PATH=$PATH:<path/to/project-m36-websocket-server>

39+$ which project-m36-websocket-server

40+/path/to/project-m36-websocket-server

41+```

42+

43+From within this python virtual environment, you can now start jupyter with TutorialD support.

44+

45+## Usage

46+

47+With the kernel installed, run `jupyter notebook` for the web-based interface and click "New" at the top right of the page. The TutorialD kernel should be in the list.

48+

49+Once a new TutorialD notebook is opened, the interpreter is identical to the `tutd` command line interpreter and accepts the same commands. If you are new to Project:M36-flavored TutorialD, please [read the tutorial](/docs/tutd_tutorial.markdown).

docs/reaching_out_of_the_tarpit.markdown+6−6

@@ -2,11 +2,11 @@

33## Introduction

5−[Project:M36](https://github.com/agentm/project-m36) is a relational algebra database management system (RDBMS) written in the Haskell programming language whose purpose is to implement the foundation for functional relational programming as described in the excellent paper ["Out of the Tarpit"](http://shaffner.us/cs/papers/tarpit.pdf). This document describes how Project:M36 meets the design goals laid out in the paper.

5+[Project:M36](https://github.com/agentm/project-m36) is a relational algebra database management system (RDBMS) written in the Haskell programming language whose purpose is to implement the foundation for functional relational programming as described in the excellent paper ["Out of the Tarpit"](https://github.com/papers-we-love/papers-we-love/blob/2eb8d21/design/out-of-the-tar-pit.pdf). This document describes how Project:M36 meets the design goals laid out in the paper.

77## Why is "Out of the Tarpit" Important?

9−The "Out of the Tarpit" paper, written in 2006, consolidates decades of software development research and experience to explain why software written today is chock-full of software bugs. The paper categorizes sources of complexity and then proceeds to propose a software architecture which promises to reduce unnecessary software complexity so that the resultant software is maximally focused on actual business rules. It is recommended to read [the paper](http://shaffner.us/cs/papers/tarpit.pdf) before reading the remainder of this document.

9+The "Out of the Tarpit" paper, written in 2006, consolidates decades of software development research and experience to explain why software written today is chock-full of software bugs. The paper categorizes sources of complexity and then proceeds to propose a software architecture which promises to reduce unnecessary software complexity so that the resultant software is maximally focused on actual business rules. It is recommended to read [the paper](https://github.com/papers-we-love/papers-we-love/blob/2eb8d21/design/out-of-the-tar-pit.pdf) before reading the remainder of this document.

1010

1111## Laying the Foundations for Reduced Complexity

1212

@@ -21,14 +21,14 @@ The central software component of functional-relational programming is a relatio

2121* **declarative**: thus removing accidental complexity (such as accidental ordering)

2222* **restricted**: removing mistaken features; if a programming language allows a programmer to do something less-than-savory, then that misfeature will be used

2323

24−and provides ([p.37](http://shaffner.us/cs/papers/tarpit.pdf)):

24+and provides ([p.37](https://github.com/papers-we-love/papers-we-love/blob/2eb8d21/design/out-of-the-tar-pit.pdf)):

2525

2626* **structure**: a closed world system whereby all data is represented by relations

2727* **manipulation**: a means to simulate mutation of the application state over time

2828* **data integrity**: constraints which prevent illogical data constructions

2929* **data independence**: logical and physical representations of state which are clearly separated

3030

31−The relational model is a mathematical model for storing and manipulating "essential state" ([p.25](http://shaffner.us/cs/papers/tarpit.pdf)). As a mathematical model, it not beholden to any specific implementation or quirks.

31+The relational model is a mathematical model for storing and manipulating "essential state" ([p.25](https://github.com/papers-we-love/papers-we-love/blob/2eb8d21/design/out-of-the-tar-pit.pdf)). As a mathematical model, it not beholden to any specific implementation or quirks.

3232

3333Unfortunately, due to the quirks of legacy implementations, much of what developers learn about the relational model is [wrong](/docs/on_null.markdown). Project:M36 aims to rectify this situation by providing a mathematically coherent implementation of the relational model. Contrast the mathematical approach to existing databases which sacrifice or elide a mathematical model in lieu of "performance". Refer to [Knuth on premature optimization](https://en.wikiquote.org/wiki/Donald_Knuth) for additional details.

3434

@@ -70,7 +70,7 @@ TutorialD (master/main): :showexpr p

7070

7171### Infrastructure Requirements

7272

73−Project:M36 meets or exceeds the enumerated "Infrastructure" ([p.47](http://shaffner.us/cs/papers/tarpit.pdf)) requirements (except one):

73+Project:M36 meets or exceeds the enumerated "Infrastructure" ([p.47](https://github.com/papers-we-love/papers-we-love/blob/2eb8d21/design/out-of-the-tar-pit.pdf)) requirements (except one):

7474

7575* **Infrastructure for Essential State**: relation variable manipulation, storage, and data types

7676* **Infrastructure for Essential Logic**: relational expression evaluation, functions to operate on values, a language (TutorialD or Haskell), type inference, and constraints

@@ -82,7 +82,7 @@ Derived relations, as described in the paper, are not supported in Project:M36 b

8282

8383### Feeders and Observers

8484

85−The "Out of the Tarpit" paper distinguishes between pushing data to the database and pulling data out of the database ([p.46](http://shaffner.us/cs/papers/tarpit.pdf)): "feeders" continually update the state of the database to best reflect reality and "observers" request notifications on relational state changes and take action on them.

85+The "Out of the Tarpit" paper distinguishes between pushing data to the database and pulling data out of the database ([p.46](https://github.com/papers-we-love/papers-we-love/blob/2eb8d21/design/out-of-the-tar-pit.pdf)): "feeders" continually update the state of the database to best reflect reality and "observers" request notifications on relational state changes and take action on them.

8686

8787SQL developers are already intimately familiar with "feeders"- these are merely INSERT and UPDATE statements issued to the database via some middleware.

8888

docs/tupleable.markdown+4

@@ -29,6 +29,10 @@ The ```Tupleable``` module includes the following functions:

2929

3030 * ```toInsertExpr :: forall a t. (Tupleable a, Traversable t) => t a -> RelVarName -> Either RelationalError DatabaseContextExpr```

3131 * creates an ```Insert``` expression which can be used to insert a set of ```Tupleable``` values into the relation variable named by the ```RelVarName```

32+ * ```toUpdateExpr :: forall a. Tupleable a => RelVarName -> [AttributeName] -> a -> Either RelationalError DatabaseContextExpr```

33+ * 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

34+ * ```toDeleteExpr :: forall a. Tupleable a => RelVarName -> [AttributeName] -> a -> Either RelationalError DatabaseContextExpr```

35+ * 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

3236 * ```toAttributes :: proxy a -> Attributes```

3337 * generates ```Attributes``` from a ```Tupleable``` value- can be used with ```undefined```, so an actual value is not necessary

3438 * ```toTuple :: a -> RelationTuple```

docs/tutd_tutorial.markdown+38−1

@@ -180,6 +180,37 @@ TutorialD (master/main): :showexpr p{color,city}

180180└──────┴─────┘

181181```

182182

183+Projection attributes can also be inverted using `all but`:

184+

185+```

186+TutorialD (master/main): :showexpr s{all but city}

187+┌────────┬───────────┬───────────────┐

188+│s#::Text│sname::Text│status::Integer│

189+├────────┼───────────┼───────────────┤

190+│"S2" │"Jones" │10 │

191+│"S3" │"Blake" │30 │

192+│"S1" │"Smith" │20 │

193+│"S5" │"Adams" │30 │

194+│"S4" │"Clark" │20 │

195+└────────┴───────────┴───────────────┘

196+```

197+

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

199+

200+```

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

202+┌──────────┬────────┬───────────┬───────────────┐

203+│city::Text│s#::Text│sname::Text│status::Integer│

204+├──────────┼────────┼───────────┼───────────────┤

205+│"London" │"S1" │"Smith" │20 │

206+│"London" │"S4" │"Clark" │20 │

207+│"Paris" │"S2" │"Jones" │10 │

208+│"Paris" │"S3" │"Blake" │30 │

209+└──────────┴────────┴───────────┴───────────────┘

210+```

211+

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

213+

183214#### Restriction

184215

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

@@ -206,7 +237,7 @@ TutorialD (master/main): :showexpr s where ^lt(@status,20)

206237

207238#### Join

208239

209−Joins are binary operators and are applied with the "join" keyword. The equivalent in SQL would be a "NATURAL JOIN". To join attributes which are not identically-named, use the rename operator

240+Joins are binary operators and are applied with the "join" keyword. The equivalent in SQL would be a "NATURAL JOIN". To join attributes which are not identically-named, use the `rename` operator.

210241

211242```

212243TutorialD (master/main): :showexpr s join sp

@@ -227,6 +258,12 @@ TutorialD (master/main): :showexpr s join sp

227258└──────┴──┴───┴──┴─────┴──────┘

228259```

229260

261+As a convenience, `tutd` also supports semijoin (`matching`) and antijoin (`not matching`) syntax.

262+

263+`s matching sp` or `s semijoin sp` is equivalent to `(s join sp){all from s}` which returns all tuples in `s` which appear in the join of `s` and `sp`.

264+

265+`s not matching sp` or `s antijoin sp` is equivalent to `s minus (s matching sp)` which returns all tuples in `s` which do not appear in the join of `s` and `sp`. Thus, semjoin and antijoin are inverses of each other.

266+

230267#### Union

231268

232269The 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.

jupyter/TutorialD Notebook Walkthrough.ipynbnew file+794

@@ -0,0 +1,794 @@

1+{

2+ "cells": [

3+ {

4+ "cell_type": "markdown",

5+ "metadata": {},

6+ "source": [

7+ "# Introduction to TutorialD via Jupyter Notebook\n",

8+ "\n",

9+ "Thanks for trying Project:M36 via this Jupyter notebook. TutorialD is a language for interacting with relational algebra databases, similar to SQL but without the historical cruft. This notebook is based on the [TutorialD Tutorial](https://github.com/agentm/project-m36/blob/master/docs/tutd_tutorial.markdown). \n",

10+ "\n",

11+ "[Project:M36](https://github.com/agentm/project-m36) is a feature-rich database management system (DBMS) which casts off the baggage of legacy DBMSes by adhering strictly to the mathematics of the relational algebra.\n",

12+ "\n",

13+ "Please refer to the [Project:M36 documentation](https://github.com/agentm/project-m36#documentation) for more detailed examples. Let's get started!\n",

14+ "\n",

15+ "First, let's import the Chris Date example relation variables. The relation variables provided in the example are:\n",

16+ "\n",

17+ "* `s` suppliers\n",

18+ "* `sp` supplier-parts\n",

19+ "* `p` parts"

20+ ]

21+ },

22+ {

23+ "cell_type": "code",

24+ "execution_count": 1,

25+ "metadata": {},

26+ "outputs": [

27+ {

28+ "data": {

29+ "text/html": [

30+ "ok"

31+ ],

32+ "text/plain": [

33+ "ok"

34+ ]

35+ },

36+ "metadata": {},

37+ "output_type": "display_data"

38+ }

39+ ],

40+ "source": [

41+ ":importexample date"

42+ ]

43+ },

44+ {

45+ "cell_type": "markdown",

46+ "metadata": {},

47+ "source": [

48+ "If you see an error in the previous cell regarding `project-m36-websocket-server` not being in your `PATH`, add the binary to your `PATH` and restart the jupyter server.\n",

49+ "\n",

50+ "Let's take a look at the relation variables."

51+ ]

52+ },

53+ {

54+ "cell_type": "code",

55+ "execution_count": 2,

56+ "metadata": {},

57+ "outputs": [

58+ {

59+ "data": {

60+ "text/html": [

61+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>s#::Text</th><th>sname::Text</th><th>status::Integer</th><th>city::Text</th></tr><tr><td>\"S3\"</td><td>\"Blake\"</td><td>30</td><td>\"Paris\"</td></tr><tr><td>\"S5\"</td><td>\"Adams\"</td><td>30</td><td>\"Athens\"</td></tr><tr><td>\"S4\"</td><td>\"Clark\"</td><td>20</td><td>\"London\"</td></tr><tr><td>\"S1\"</td><td>\"Smith\"</td><td>20</td><td>\"London\"</td></tr><tr><td>\"S2\"</td><td>\"Jones\"</td><td>10</td><td>\"Paris\"</td></tr><tfoot><tr><td colspan=\"100%\">Finite 5 tuples</td></tr></tfoot></table>"

62+ ],

63+ "text/plain": [

64+ "┌──────────┬────────┬───────────┬───────────────┐\n",

65+ "│city::Text│s#::Text│sname::Text│status::Integer│\n",

66+ "├──────────┼────────┼───────────┼───────────────┤\n",

67+ "│\"Paris\" │\"S2\" │\"Jones\" │10 │\n",

68+ "│\"London\" │\"S1\" │\"Smith\" │20 │\n",

69+ "│\"London\" │\"S4\" │\"Clark\" │20 │\n",

70+ "│\"Athens\" │\"S5\" │\"Adams\" │30 │\n",

71+ "│\"Paris\" │\"S3\" │\"Blake\" │30 │\n",

72+ "└──────────┴────────┴───────────┴───────────────┘"

73+ ]

74+ },

75+ "metadata": {},

76+ "output_type": "display_data"

77+ }

78+ ],

79+ "source": [

80+ ":showexpr s"

81+ ]

82+ },

83+ {

84+ "cell_type": "code",

85+ "execution_count": 3,

86+ "metadata": {},

87+ "outputs": [

88+ {

89+ "data": {

90+ "text/html": [

91+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>s#::Text</th><th>p#::Text</th><th>qty::Integer</th></tr><tr><td>\"S1\"</td><td>\"P2\"</td><td>200</td></tr><tr><td>\"S1\"</td><td>\"P1\"</td><td>300</td></tr><tr><td>\"S3\"</td><td>\"P2\"</td><td>200</td></tr><tr><td>\"S2\"</td><td>\"P2\"</td><td>400</td></tr><tr><td>\"S4\"</td><td>\"P5\"</td><td>400</td></tr><tr><td>\"S1\"</td><td>\"P5\"</td><td>100</td></tr><tr><td>\"S1\"</td><td>\"P6\"</td><td>100</td></tr><tr><td>\"S2\"</td><td>\"P1\"</td><td>300</td></tr><tr><td>\"S1\"</td><td>\"P4\"</td><td>200</td></tr><tr><td>\"S4\"</td><td>\"P4\"</td><td>300</td></tr><tr><td>\"S4\"</td><td>\"P2\"</td><td>200</td></tr><tr><td>\"S1\"</td><td>\"P3\"</td><td>400</td></tr><tfoot><tr><td colspan=\"100%\">Finite 12 tuples</td></tr></tfoot></table>"

92+ ],

93+ "text/plain": [

94+ "┌────────┬────────────┬────────┐\n",

95+ "│p#::Text│qty::Integer│s#::Text│\n",

96+ "├────────┼────────────┼────────┤\n",

97+ "│\"P3\" │400 │\"S1\" │\n",

98+ "│\"P2\" │200 │\"S4\" │\n",

99+ "│\"P4\" │300 │\"S4\" │\n",

100+ "│\"P4\" │200 │\"S1\" │\n",

101+ "│\"P1\" │300 │\"S2\" │\n",

102+ "│\"P6\" │100 │\"S1\" │\n",

103+ "│\"P5\" │100 │\"S1\" │\n",

104+ "│\"P5\" │400 │\"S4\" │\n",

105+ "│\"P2\" │400 │\"S2\" │\n",

106+ "│\"P2\" │200 │\"S3\" │\n",

107+ "│\"P1\" │300 │\"S1\" │\n",

108+ "│\"P2\" │200 │\"S1\" │\n",

109+ "└────────┴────────────┴────────┘"

110+ ]

111+ },

112+ "metadata": {},

113+ "output_type": "display_data"

114+ }

115+ ],

116+ "source": [

117+ ":showexpr sp"

118+ ]

119+ },

120+ {

121+ "cell_type": "code",

122+ "execution_count": 4,

123+ "metadata": {

124+ "scrolled": true

125+ },

126+ "outputs": [

127+ {

128+ "data": {

129+ "text/html": [

130+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>p#::Text</th><th>pname::Text</th><th>color::Text</th><th>weight::Integer</th><th>city::Text</th></tr><tr><td>\"P3\"</td><td>\"Screw\"</td><td>\"Blue\"</td><td>17</td><td>\"Oslo\"</td></tr><tr><td>\"P2\"</td><td>\"Bolt\"</td><td>\"Green\"</td><td>17</td><td>\"Paris\"</td></tr><tr><td>\"P4\"</td><td>\"Screw\"</td><td>\"Red\"</td><td>14</td><td>\"London\"</td></tr><tr><td>\"P6\"</td><td>\"Cog\"</td><td>\"Red\"</td><td>19</td><td>\"London\"</td></tr><tr><td>\"P1\"</td><td>\"Nut\"</td><td>\"Red\"</td><td>12</td><td>\"London\"</td></tr><tr><td>\"P5\"</td><td>\"Cam\"</td><td>\"Blue\"</td><td>12</td><td>\"Paris\"</td></tr><tfoot><tr><td colspan=\"100%\">Finite 6 tuples</td></tr></tfoot></table>"

131+ ],

132+ "text/plain": [

133+ "┌──────────┬───────────┬────────┬───────────┬───────────────┐\n",

134+ "│city::Text│color::Text│p#::Text│pname::Text│weight::Integer│\n",

135+ "├──────────┼───────────┼────────┼───────────┼───────────────┤\n",

136+ "│\"Paris\" │\"Blue\" │\"P5\" │\"Cam\" │12 │\n",

137+ "│\"London\" │\"Red\" │\"P1\" │\"Nut\" │12 │\n",

138+ "│\"London\" │\"Red\" │\"P6\" │\"Cog\" │19 │\n",

139+ "│\"London\" │\"Red\" │\"P4\" │\"Screw\" │14 │\n",

140+ "│\"Paris\" │\"Green\" │\"P2\" │\"Bolt\" │17 │\n",

141+ "│\"Oslo\" │\"Blue\" │\"P3\" │\"Screw\" │17 │\n",

142+ "└──────────┴───────────┴────────┴───────────┴───────────────┘"

143+ ]

144+ },

145+ "metadata": {},

146+ "output_type": "display_data"

147+ }

148+ ],

149+ "source": [

150+ "\n",

151+ ":showexpr p"

152+ ]

153+ },

154+ {

155+ "cell_type": "markdown",

156+ "metadata": {},

157+ "source": [

158+ "## Relational Operators\n",

159+ "\n",

160+ "### Restriction\n",

161+ "\n",

162+ "We can see that there is a many-to-many relationship between `s` (suppliers) and `p` (parts) via the `sp` relation variable.\n",

163+ "\n",

164+ "Let's look at the suppliers who are in London. This is called \"restriction\".\n",

165+ "\n",

166+ "Note that the relation attributes have appropriate types which restrict the values which they can contain."

167+ ]

168+ },

169+ {

170+ "cell_type": "code",

171+ "execution_count": 5,

172+ "metadata": {},

173+ "outputs": [

174+ {

175+ "data": {

176+ "text/html": [

177+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>s#::Text</th><th>sname::Text</th><th>status::Integer</th><th>city::Text</th></tr><tr><td>\"S4\"</td><td>\"Clark\"</td><td>20</td><td>\"London\"</td></tr><tr><td>\"S1\"</td><td>\"Smith\"</td><td>20</td><td>\"London\"</td></tr><tfoot><tr><td colspan=\"100%\">Finite 2 tuples</td></tr></tfoot></table>"

178+ ],

179+ "text/plain": [

180+ "┌──────────┬────────┬───────────┬───────────────┐\n",

181+ "│city::Text│s#::Text│sname::Text│status::Integer│\n",

182+ "├──────────┼────────┼───────────┼───────────────┤\n",

183+ "│\"London\" │\"S1\" │\"Smith\" │20 │\n",

184+ "│\"London\" │\"S4\" │\"Clark\" │20 │\n",

185+ "└──────────┴────────┴───────────┴───────────────┘"

186+ ]

187+ },

188+ "metadata": {},

189+ "output_type": "display_data"

190+ }

191+ ],

192+ "source": [

193+ ":showexpr s where city=\"London\""

194+ ]

195+ },

196+ {

197+ "cell_type": "markdown",

198+ "metadata": {},

199+ "source": [

200+ "### Join And Projection\n",

201+ "\n",

202+ "Let's examine which parts the London suppliers offer. In the following expression, we make use of the relational join operator (equivalent to `NATURAL JOIN` in SQL) and projection using the trailing curly brackets to only return the relation attributes which interest us."

203+ ]

204+ },

205+ {

206+ "cell_type": "code",

207+ "execution_count": 6,

208+ "metadata": {},

209+ "outputs": [

210+ {

211+ "data": {

212+ "text/html": [

213+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>qty::Integer</th><th>pname::Text</th><th>p#::Text</th></tr><tr><td>100</td><td>\"Cog\"</td><td>\"P6\"</td></tr><tr><td>300</td><td>\"Nut\"</td><td>\"P1\"</td></tr><tr><td>300</td><td>\"Screw\"</td><td>\"P4\"</td></tr><tr><td>200</td><td>\"Screw\"</td><td>\"P4\"</td></tr><tfoot><tr><td colspan=\"100%\">Finite 4 tuples</td></tr></tfoot></table>"

214+ ],

215+ "text/plain": [

216+ "┌────────┬───────────┬────────────┐\n",

217+ "│p#::Text│pname::Text│qty::Integer│\n",

218+ "├────────┼───────────┼────────────┤\n",

219+ "│\"P4\" │\"Screw\" │200 │\n",

220+ "│\"P4\" │\"Screw\" │300 │\n",

221+ "│\"P1\" │\"Nut\" │300 │\n",

222+ "│\"P6\" │\"Cog\" │100 │\n",

223+ "└────────┴───────────┴────────────┘"

224+ ]

225+ },

226+ "metadata": {},

227+ "output_type": "display_data"

228+ }

229+ ],

230+ "source": [

231+ ":showexpr ((s where city=\"London\") join sp join p){p#,pname,qty}"

232+ ]

233+ },

234+ {

235+ "cell_type": "markdown",

236+ "metadata": {},

237+ "source": [

238+ "### Extend and Atom Functions\n",

239+ "\n",

240+ "We can also execute server-side functions on values and add them to our result relation."

241+ ]

242+ },

243+ {

244+ "cell_type": "code",

245+ "execution_count": 7,

246+ "metadata": {},

247+ "outputs": [

248+ {

249+ "data": {

250+ "text/html": [

251+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>s#::Text</th><th>status::Integer</th><th>statusplus10::Integer</th></tr><tr><td>\"S1\"</td><td>20</td><td>30</td></tr><tr><td>\"S4\"</td><td>20</td><td>30</td></tr><tr><td>\"S5\"</td><td>30</td><td>40</td></tr><tr><td>\"S3\"</td><td>30</td><td>40</td></tr><tr><td>\"S2\"</td><td>10</td><td>20</td></tr><tfoot><tr><td colspan=\"100%\">Finite 5 tuples</td></tr></tfoot></table>"

252+ ],

253+ "text/plain": [

254+ "┌────────┬───────────────┬─────────────────────┐\n",

255+ "│s#::Text│status::Integer│statusplus10::Integer│\n",

256+ "├────────┼───────────────┼─────────────────────┤\n",

257+ "│\"S2\" │10 │20 │\n",

258+ "│\"S3\" │30 │40 │\n",

259+ "│\"S5\" │30 │40 │\n",

260+ "│\"S4\" │20 │30 │\n",

261+ "│\"S1\" │20 │30 │\n",

262+ "└────────┴───────────────┴─────────────────────┘"

263+ ]

264+ },

265+ "metadata": {},

266+ "output_type": "display_data"

267+ }

268+ ],

269+ "source": [

270+ ":showexpr (s:{statusplus10:=add(@status,10)}){s#,status,statusplus10}"

271+ ]

272+ },

273+ {

274+ "cell_type": "markdown",

275+ "metadata": {},

276+ "source": [

277+ "### Group and Ungroup\n",

278+ "\n",

279+ "Unlike most databases, Project:M36 supports relation-valued attributes. This means that database values (atoms) can also be relations. Relation-valued attributes can be represented in the notebook as nested tables of values. Note that the nested relation's type is `relation {qty::Integer,pname::Text,s#::Text}`. \n",

280+ "\n",

281+ "Relation-valued attributes reduce tuple duplication by clearly associating certain values with their related multiple tuples. The `group` operator can also be used to create the SQL equivalent of `OUTER JOIN` but without the need for representing `NULL` in any form.\n",

282+ "\n",

283+ "Let's list the available counts for each supplier for each part."

284+ ]

285+ },

286+ {

287+ "cell_type": "code",

288+ "execution_count": 8,

289+ "metadata": {},

290+ "outputs": [

291+ {

292+ "data": {

293+ "text/html": [

294+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>p#::Text</th><th>availability::relation {qty::Integer,pname::Text,s#::Text}</th></tr><tr><td>\"P6\"</td><td><style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>qty::Integer</th><th>pname::Text</th><th>s#::Text</th></tr><tr><td>100</td><td>\"Cog\"</td><td>\"S1\"</td></tr><tfoot><tr><td colspan=\"100%\">Finite 1 tuples</td></tr></tfoot></table></td></tr><tr><td>\"P1\"</td><td><style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>qty::Integer</th><th>pname::Text</th><th>s#::Text</th></tr><tr><td>300</td><td>\"Nut\"</td><td>\"S2\"</td></tr><tr><td>300</td><td>\"Nut\"</td><td>\"S1\"</td></tr><tfoot><tr><td colspan=\"100%\">Finite 2 tuples</td></tr></tfoot></table></td></tr><tr><td>\"P2\"</td><td><style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>qty::Integer</th><th>pname::Text</th><th>s#::Text</th></tr><tr><td>200</td><td>\"Bolt\"</td><td>\"S4\"</td></tr><tr><td>200</td><td>\"Bolt\"</td><td>\"S1\"</td></tr><tr><td>400</td><td>\"Bolt\"</td><td>\"S2\"</td></tr><tr><td>200</td><td>\"Bolt\"</td><td>\"S3\"</td></tr><tfoot><tr><td colspan=\"100%\">Finite 4 tuples</td></tr></tfoot></table></td></tr><tr><td>\"P4\"</td><td><style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>qty::Integer</th><th>pname::Text</th><th>s#::Text</th></tr><tr><td>200</td><td>\"Screw\"</td><td>\"S1\"</td></tr><tr><td>300</td><td>\"Screw\"</td><td>\"S4\"</td></tr><tfoot><tr><td colspan=\"100%\">Finite 2 tuples</td></tr></tfoot></table></td></tr><tr><td>\"P3\"</td><td><style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>qty::Integer</th><th>pname::Text</th><th>s#::Text</th></tr><tr><td>400</td><td>\"Screw\"</td><td>\"S1\"</td></tr><tfoot><tr><td colspan=\"100%\">Finite 1 tuples</td></tr></tfoot></table></td></tr><tr><td>\"P5\"</td><td><style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>qty::Integer</th><th>pname::Text</th><th>s#::Text</th></tr><tr><td>400</td><td>\"Cam\"</td><td>\"S4\"</td></tr><tr><td>100</td><td>\"Cam\"</td><td>\"S1\"</td></tr><tfoot><tr><td colspan=\"100%\">Finite 2 tuples</td></tr></tfoot></table></td></tr><tfoot><tr><td colspan=\"100%\">Finite 6 tuples</td></tr></tfoot></table>"

295+ ],

296+ "text/plain": [

297+ "┌──────────────────────────────────────────────────────────┬────────┐\n",

298+ "│availability::relation {qty::Integer,pname::Text,s#::Text}│p#::Text│\n",

299+ "├──────────────────────────────────────────────────────────┼────────┤\n",

300+ "│┌───────────┬────────────┬────────┐ │\"P5\" │\n",

301+ "││pname::Text│qty::Integer│s#::Text│ │ │\n",

302+ "│├───────────┼────────────┼────────┤ │ │\n",

303+ "││\"Cam\" │100 │\"S1\" │ │ │\n",

304+ "││\"Cam\" │400 │\"S4\" │ │ │\n",

305+ "│└───────────┴────────────┴────────┘ │ │\n",

306+ "│┌───────────┬────────────┬────────┐ │\"P3\" │\n",

307+ "││pname::Text│qty::Integer│s#::Text│ │ │\n",

308+ "│├───────────┼────────────┼────────┤ │ │\n",

309+ "││\"Screw\" │400 │\"S1\" │ │ │\n",

310+ "│└───────────┴────────────┴────────┘ │ │\n",

311+ "│┌───────────┬────────────┬────────┐ │\"P4\" │\n",

312+ "││pname::Text│qty::Integer│s#::Text│ │ │\n",

313+ "│├───────────┼────────────┼────────┤ │ │\n",

314+ "││\"Screw\" │300 │\"S4\" │ │ │\n",

315+ "││\"Screw\" │200 │\"S1\" │ │ │\n",

316+ "│└───────────┴────────────┴────────┘ │ │\n",

317+ "│┌───────────┬────────────┬────────┐ │\"P2\" │\n",

318+ "││pname::Text│qty::Integer│s#::Text│ │ │\n",

319+ "│├───────────┼────────────┼────────┤ │ │\n",

320+ "││\"Bolt\" │200 │\"S3\" │ │ │\n",

321+ "││\"Bolt\" │400 │\"S2\" │ │ │\n",

322+ "││\"Bolt\" │200 │\"S1\" │ │ │\n",

323+ "││\"Bolt\" │200 │\"S4\" │ │ │\n",

324+ "│└───────────┴────────────┴────────┘ │ │\n",

325+ "│┌───────────┬────────────┬────────┐ │\"P1\" │\n",

326+ "││pname::Text│qty::Integer│s#::Text│ │ │\n",

327+ "│├───────────┼────────────┼────────┤ │ │\n",

328+ "││\"Nut\" │300 │\"S1\" │ │ │\n",

329+ "││\"Nut\" │300 │\"S2\" │ │ │\n",

330+ "│└───────────┴────────────┴────────┘ │ │\n",

331+ "│┌───────────┬────────────┬────────┐ │\"P6\" │\n",

332+ "││pname::Text│qty::Integer│s#::Text│ │ │\n",

333+ "│├───────────┼────────────┼────────┤ │ │\n",

334+ "││\"Cog\" │100 │\"S1\" │ │ │\n",

335+ "│└───────────┴────────────┴────────┘ │ │\n",

336+ "└──────────────────────────────────────────────────────────┴────────┘"

337+ ]

338+ },

339+ "metadata": {},

340+ "output_type": "display_data"

341+ }

342+ ],

343+ "source": [

344+ ":showexpr (p join sp){qty,pname,s#,p#} group ({s#,pname,qty} as availability)"

345+ ]

346+ },

347+ {

348+ "cell_type": "markdown",

349+ "metadata": {},

350+ "source": [

351+ "We can flatten the relation-valued attributes, thereby generating more top-level tuples."

352+ ]

353+ },

354+ {

355+ "cell_type": "code",

356+ "execution_count": 9,

357+ "metadata": {},

358+ "outputs": [

359+ {

360+ "data": {

361+ "text/html": [

362+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>qty::Integer</th><th>pname::Text</th><th>s#::Text</th><th>p#::Text</th></tr><tr><td>400</td><td>\"Screw\"</td><td>\"S1\"</td><td>\"P3\"</td></tr><tr><td>200</td><td>\"Bolt\"</td><td>\"S4\"</td><td>\"P2\"</td></tr><tr><td>100</td><td>\"Cog\"</td><td>\"S1\"</td><td>\"P6\"</td></tr><tr><td>100</td><td>\"Cam\"</td><td>\"S1\"</td><td>\"P5\"</td></tr><tr><td>300</td><td>\"Nut\"</td><td>\"S2\"</td><td>\"P1\"</td></tr><tr><td>400</td><td>\"Cam\"</td><td>\"S4\"</td><td>\"P5\"</td></tr><tr><td>300</td><td>\"Screw\"</td><td>\"S4\"</td><td>\"P4\"</td></tr><tr><td>200</td><td>\"Bolt\"</td><td>\"S1\"</td><td>\"P2\"</td></tr><tr><td>200</td><td>\"Screw\"</td><td>\"S1\"</td><td>\"P4\"</td></tr><tr><td>200</td><td>\"Bolt\"</td><td>\"S3\"</td><td>\"P2\"</td></tr><tr><td>300</td><td>\"Nut\"</td><td>\"S1\"</td><td>\"P1\"</td></tr><tr><td>400</td><td>\"Bolt\"</td><td>\"S2\"</td><td>\"P2\"</td></tr><tfoot><tr><td colspan=\"100%\">Finite 12 tuples</td></tr></tfoot></table>"

363+ ],

364+ "text/plain": [

365+ "┌────────┬───────────┬────────────┬────────┐\n",

366+ "│p#::Text│pname::Text│qty::Integer│s#::Text│\n",

367+ "├────────┼───────────┼────────────┼────────┤\n",

368+ "│\"P2\" │\"Bolt\" │400 │\"S2\" │\n",

369+ "│\"P1\" │\"Nut\" │300 │\"S1\" │\n",

370+ "│\"P2\" │\"Bolt\" │200 │\"S3\" │\n",

371+ "│\"P4\" │\"Screw\" │200 │\"S1\" │\n",

372+ "│\"P2\" │\"Bolt\" │200 │\"S1\" │\n",

373+ "│\"P4\" │\"Screw\" │300 │\"S4\" │\n",

374+ "│\"P5\" │\"Cam\" │400 │\"S4\" │\n",

375+ "│\"P1\" │\"Nut\" │300 │\"S2\" │\n",

376+ "│\"P5\" │\"Cam\" │100 │\"S1\" │\n",

377+ "│\"P6\" │\"Cog\" │100 │\"S1\" │\n",

378+ "│\"P2\" │\"Bolt\" │200 │\"S4\" │\n",

379+ "│\"P3\" │\"Screw\" │400 │\"S1\" │\n",

380+ "└────────┴───────────┴────────────┴────────┘"

381+ ]

382+ },

383+ "metadata": {},

384+ "output_type": "display_data"

385+ }

386+ ],

387+ "source": [

388+ ":showexpr ((p join sp){qty,pname,s#,p#} group ({s#,pname,qty} as availability)) ungroup availability"

389+ ]

390+ },

391+ {

392+ "cell_type": "markdown",

393+ "metadata": {},

394+ "source": [

395+ "## Database State Operators\n",

396+ "\n",

397+ "Thus far, we have only been inspecting the database state. Next, let's cover some database update operators. These operators are all similar to SQL operators, so we don't need a lot of exposition."

398+ ]

399+ },

400+ {

401+ "cell_type": "markdown",

402+ "metadata": {},

403+ "source": [

404+ "### Insert"

405+ ]

406+ },

407+ {

408+ "cell_type": "code",

409+ "execution_count": 10,

410+ "metadata": {},

411+ "outputs": [

412+ {

413+ "data": {

414+ "text/html": [

415+ "ok"

416+ ],

417+ "text/plain": [

418+ "ok"

419+ ]

420+ },

421+ "metadata": {},

422+ "output_type": "display_data"

423+ }

424+ ],

425+ "source": [

426+ "insert s relation{tuple{s# \"S6\", sname \"Bob\", status 50, city \"Boston\"}}"

427+ ]

428+ },

429+ {

430+ "cell_type": "code",

431+ "execution_count": 11,

432+ "metadata": {},

433+ "outputs": [

434+ {

435+ "data": {

436+ "text/html": [

437+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>city::Text</th><th>s#::Text</th><th>sname::Text</th><th>status::Integer</th></tr><tr><td>\"Boston\"</td><td>\"S6\"</td><td>\"Bob\"</td><td>50</td></tr><tr><td>\"Paris\"</td><td>\"S3\"</td><td>\"Blake\"</td><td>30</td></tr><tr><td>\"Athens\"</td><td>\"S5\"</td><td>\"Adams\"</td><td>30</td></tr><tr><td>\"London\"</td><td>\"S4\"</td><td>\"Clark\"</td><td>20</td></tr><tr><td>\"London\"</td><td>\"S1\"</td><td>\"Smith\"</td><td>20</td></tr><tr><td>\"Paris\"</td><td>\"S2\"</td><td>\"Jones\"</td><td>10</td></tr><tfoot><tr><td colspan=\"100%\">Finite 6 tuples</td></tr></tfoot></table>"

438+ ],

439+ "text/plain": [

440+ "┌──────────┬────────┬───────────┬───────────────┐\n",

441+ "│city::Text│s#::Text│sname::Text│status::Integer│\n",

442+ "├──────────┼────────┼───────────┼───────────────┤\n",

443+ "│\"Paris\" │\"S2\" │\"Jones\" │10 │\n",

444+ "│\"London\" │\"S1\" │\"Smith\" │20 │\n",

445+ "│\"London\" │\"S4\" │\"Clark\" │20 │\n",

446+ "│\"Athens\" │\"S5\" │\"Adams\" │30 │\n",

447+ "│\"Paris\" │\"S3\" │\"Blake\" │30 │\n",

448+ "│\"Boston\" │\"S6\" │\"Bob\" │50 │\n",

449+ "└──────────┴────────┴───────────┴───────────────┘"

450+ ]

451+ },

452+ "metadata": {},

453+ "output_type": "display_data"

454+ }

455+ ],

456+ "source": [

457+ ":showexpr s"

458+ ]

459+ },

460+ {

461+ "cell_type": "markdown",

462+ "metadata": {},

463+ "source": [

464+ "### Delete"

465+ ]

466+ },

467+ {

468+ "cell_type": "code",

469+ "execution_count": 12,

470+ "metadata": {},

471+ "outputs": [

472+ {

473+ "data": {

474+ "text/html": [

475+ "ok"

476+ ],

477+ "text/plain": [

478+ "ok"

479+ ]

480+ },

481+ "metadata": {},

482+ "output_type": "display_data"

483+ }

484+ ],

485+ "source": [

486+ "delete s where sname=\"Bob\""

487+ ]

488+ },

489+ {

490+ "cell_type": "code",

491+ "execution_count": 13,

492+ "metadata": {},

493+ "outputs": [

494+ {

495+ "data": {

496+ "text/html": [

497+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>city::Text</th><th>s#::Text</th><th>sname::Text</th><th>status::Integer</th></tr><tr><td>\"Paris\"</td><td>\"S3\"</td><td>\"Blake\"</td><td>30</td></tr><tr><td>\"Athens\"</td><td>\"S5\"</td><td>\"Adams\"</td><td>30</td></tr><tr><td>\"London\"</td><td>\"S4\"</td><td>\"Clark\"</td><td>20</td></tr><tr><td>\"London\"</td><td>\"S1\"</td><td>\"Smith\"</td><td>20</td></tr><tr><td>\"Paris\"</td><td>\"S2\"</td><td>\"Jones\"</td><td>10</td></tr><tfoot><tr><td colspan=\"100%\">Finite 5 tuples</td></tr></tfoot></table>"

498+ ],

499+ "text/plain": [

500+ "┌──────────┬────────┬───────────┬───────────────┐\n",

501+ "│city::Text│s#::Text│sname::Text│status::Integer│\n",

502+ "├──────────┼────────┼───────────┼───────────────┤\n",

503+ "│\"Paris\" │\"S2\" │\"Jones\" │10 │\n",

504+ "│\"London\" │\"S1\" │\"Smith\" │20 │\n",

505+ "│\"London\" │\"S4\" │\"Clark\" │20 │\n",

506+ "│\"Athens\" │\"S5\" │\"Adams\" │30 │\n",

507+ "│\"Paris\" │\"S3\" │\"Blake\" │30 │\n",

508+ "└──────────┴────────┴───────────┴───────────────┘"

509+ ]

510+ },

511+ "metadata": {},

512+ "output_type": "display_data"

513+ }

514+ ],

515+ "source": [

516+ ":showexpr s"

517+ ]

518+ },

519+ {

520+ "cell_type": "markdown",

521+ "metadata": {},

522+ "source": [

523+ "### Update"

524+ ]

525+ },

526+ {

527+ "cell_type": "code",

528+ "execution_count": 14,

529+ "metadata": {},

530+ "outputs": [

531+ {

532+ "data": {

533+ "text/html": [

534+ "ok"

535+ ],

536+ "text/plain": [

537+ "ok"

538+ ]

539+ },

540+ "metadata": {},

541+ "output_type": "display_data"

542+ }

543+ ],

544+ "source": [

545+ "update s where city=\"London\" (status:=90)"

546+ ]

547+ },

548+ {

549+ "cell_type": "code",

550+ "execution_count": 15,

551+ "metadata": {},

552+ "outputs": [

553+ {

554+ "data": {

555+ "text/html": [

556+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>city::Text</th><th>s#::Text</th><th>sname::Text</th><th>status::Integer</th></tr><tr><td>\"London\"</td><td>\"S1\"</td><td>\"Smith\"</td><td>90</td></tr><tr><td>\"Paris\"</td><td>\"S3\"</td><td>\"Blake\"</td><td>30</td></tr><tr><td>\"Athens\"</td><td>\"S5\"</td><td>\"Adams\"</td><td>30</td></tr><tr><td>\"London\"</td><td>\"S4\"</td><td>\"Clark\"</td><td>90</td></tr><tr><td>\"Paris\"</td><td>\"S2\"</td><td>\"Jones\"</td><td>10</td></tr><tfoot><tr><td colspan=\"100%\">Finite 5 tuples</td></tr></tfoot></table>"

557+ ],

558+ "text/plain": [

559+ "┌──────────┬────────┬───────────┬───────────────┐\n",

560+ "│city::Text│s#::Text│sname::Text│status::Integer│\n",

561+ "├──────────┼────────┼───────────┼───────────────┤\n",

562+ "│\"Paris\" │\"S2\" │\"Jones\" │10 │\n",

563+ "│\"London\" │\"S4\" │\"Clark\" │90 │\n",

564+ "│\"Athens\" │\"S5\" │\"Adams\" │30 │\n",

565+ "│\"Paris\" │\"S3\" │\"Blake\" │30 │\n",

566+ "│\"London\" │\"S1\" │\"Smith\" │90 │\n",

567+ "└──────────┴────────┴───────────┴───────────────┘"

568+ ]

569+ },

570+ "metadata": {},

571+ "output_type": "display_data"

572+ }

573+ ],

574+ "source": [

575+ ":showexpr s"

576+ ]

577+ },

578+ {

579+ "cell_type": "markdown",

580+ "metadata": {},

581+ "source": [

582+ "### Assign"

583+ ]

584+ },

585+ {

586+ "cell_type": "code",

587+ "execution_count": 16,

588+ "metadata": {},

589+ "outputs": [

590+ {

591+ "data": {

592+ "text/html": [

593+ "ok"

594+ ],

595+ "text/plain": [

596+ "ok"

597+ ]

598+ },

599+ "metadata": {},

600+ "output_type": "display_data"

601+ }

602+ ],

603+ "source": [

604+ "london_suppliers := s where city=\"London\""

605+ ]

606+ },

607+ {

608+ "cell_type": "code",

609+ "execution_count": 17,

610+ "metadata": {},

611+ "outputs": [

612+ {

613+ "data": {

614+ "text/html": [

615+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>city::Text</th><th>s#::Text</th><th>sname::Text</th><th>status::Integer</th></tr><tr><td>\"London\"</td><td>\"S1\"</td><td>\"Smith\"</td><td>90</td></tr><tr><td>\"London\"</td><td>\"S4\"</td><td>\"Clark\"</td><td>90</td></tr><tfoot><tr><td colspan=\"100%\">Finite 2 tuples</td></tr></tfoot></table>"

616+ ],

617+ "text/plain": [

618+ "┌──────────┬────────┬───────────┬───────────────┐\n",

619+ "│city::Text│s#::Text│sname::Text│status::Integer│\n",

620+ "├──────────┼────────┼───────────┼───────────────┤\n",

621+ "│\"London\" │\"S4\" │\"Clark\" │90 │\n",

622+ "│\"London\" │\"S1\" │\"Smith\" │90 │\n",

623+ "└──────────┴────────┴───────────┴───────────────┘"

624+ ]

625+ },

626+ "metadata": {},

627+ "output_type": "display_data"

628+ }

629+ ],

630+ "source": [

631+ ":showexpr london_suppliers"

632+ ]

633+ },

634+ {

635+ "cell_type": "markdown",

636+ "metadata": {},

637+ "source": [

638+ "## Constraints\n",

639+ "\n",

640+ "Project:M36 supports too many features to cover in one notebook, but constraints are certainly essential.\n",

641+ "\n",

642+ "Let's examine the current constraints."

643+ ]

644+ },

645+ {

646+ "cell_type": "code",

647+ "execution_count": 18,

648+ "metadata": {},

649+ "outputs": [

650+ {

651+ "data": {

652+ "text/html": [

653+ "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style><table class=\"pm36relation\"\"><tr><th>name::Text</th><th>sub::Text</th><th>super::Text</th></tr><tr><td>\"p_pkey\"</td><td>\"NotEquals (Project (AttributeNames (fromList [\\\"b\\\"])) (Extend (AttributeExtendTupleExpr \\\"b\\\" (FunctionAtomExpr \\\"count\\\" [AttributeAtomExpr \\\"a\\\"] ())) (Extend (AttributeExtendTupleExpr \\\"a\\\" (RelationAtomExpr (RelationVariable \\\"p\\\" ()))) (ExistingRelation (Relation [] (RelationTupleSet {asList = [RelationTuple [] []]})))))) (Project (AttributeNames (fromList [\\\"b\\\"])) (Extend (AttributeExtendTupleExpr \\\"b\\\" (FunctionAtomExpr \\\"count\\\" [AttributeAtomExpr \\\"a\\\"] ())) (Extend (AttributeExtendTupleExpr \\\"a\\\" (RelationAtomExpr (Project (AttributeNames (fromList [\\\"p#\\\"])) (RelationVariable \\\"p\\\" ())))) (ExistingRelation (Relation [] (RelationTupleSet {asList = [RelationTuple [] []]}))))))\"</td><td>\"ExistingRelation (Relation [] (RelationTupleSet {asList = []}))\"</td></tr><tr><td>\"s_pkey\"</td><td>\"NotEquals (Project (AttributeNames (fromList [\\\"b\\\"])) (Extend (AttributeExtendTupleExpr \\\"b\\\" (FunctionAtomExpr \\\"count\\\" [AttributeAtomExpr \\\"a\\\"] ())) (Extend (AttributeExtendTupleExpr \\\"a\\\" (RelationAtomExpr (RelationVariable \\\"s\\\" ()))) (ExistingRelation (Relation [] (RelationTupleSet {asList = [RelationTuple [] []]})))))) (Project (AttributeNames (fromList [\\\"b\\\"])) (Extend (AttributeExtendTupleExpr \\\"b\\\" (FunctionAtomExpr \\\"count\\\" [AttributeAtomExpr \\\"a\\\"] ())) (Extend (AttributeExtendTupleExpr \\\"a\\\" (RelationAtomExpr (Project (AttributeNames (fromList [\\\"s#\\\"])) (RelationVariable \\\"s\\\" ())))) (ExistingRelation (Relation [] (RelationTupleSet {asList = [RelationTuple [] []]}))))))\"</td><td>\"ExistingRelation (Relation [] (RelationTupleSet {asList = []}))\"</td></tr><tr><td>\"sp_pkey\"</td><td>\"NotEquals (Project (AttributeNames (fromList [\\\"b\\\"])) (Extend (AttributeExtendTupleExpr \\\"b\\\" (FunctionAtomExpr \\\"count\\\" [AttributeAtomExpr \\\"a\\\"] ())) (Extend (AttributeExtendTupleExpr \\\"a\\\" (RelationAtomExpr (RelationVariable \\\"sp\\\" ()))) (ExistingRelation (Relation [] (RelationTupleSet {asList = [RelationTuple [] []]})))))) (Project (AttributeNames (fromList [\\\"b\\\"])) (Extend (AttributeExtendTupleExpr \\\"b\\\" (FunctionAtomExpr \\\"count\\\" [AttributeAtomExpr \\\"a\\\"] ())) (Extend (AttributeExtendTupleExpr \\\"a\\\" (RelationAtomExpr (Project (AttributeNames (fromList [\\\"p#\\\",\\\"s#\\\"])) (RelationVariable \\\"sp\\\" ())))) (ExistingRelation (Relation [] (RelationTupleSet {asList = [RelationTuple [] []]}))))))\"</td><td>\"ExistingRelation (Relation [] (RelationTupleSet {asList = []}))\"</td></tr><tfoot><tr><td colspan=\"100%\">Finite 3 tuples</td></tr></tfoot></table>"

654+ ],

655+ "text/plain": [

656+ "┌──────────┬───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┬─────────────────────────────────────────────────────────────────┐\n",

657+ "│name::Text│sub::Text │super::Text │\n",

658+ "├──────────┼───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┼─────────────────────────────────────────────────────────────────┤\n",

659+ "│\"sp_pkey\" │\"NotEquals (Project (AttributeNames (fromList [\\\"b\\\"])) (Extend (AttributeExtendTupleExpr \\\"b\\\" (FunctionAtomExpr \\\"count\\\" [AttributeAtomExpr \\\"a\\\"] ())) (Extend (AttributeExtendTupleExpr \\\"a\\\" (RelationAtomExpr (RelationVariable \\\"sp\\\" ()))) (ExistingRelation (Relation [] (RelationTupleSet {asList = [RelationTuple [] []]})))))) (Project (AttributeNames (fromList [\\\"b\\\"])) (Extend (AttributeExtendTupleExpr \\\"b\\\" (FunctionAtomExpr \\\"count\\\" [AttributeAtomExpr \\\"a\\\"] ())) (Extend (AttributeExtendTupleExpr \\\"a\\\" (RelationAtomExpr (Project (AttributeNames (fromList [\\\"p#\\\",\\\"s#\\\"])) (RelationVariable \\\"sp\\\" ())))) (ExistingRelation (Relation [] (RelationTupleSet {asList = [RelationTuple [] []]}))))))\"│\"ExistingRelation (Relation [] (RelationTupleSet {asList = []}))\"│\n",

660+ "│\"s_pkey\" │\"NotEquals (Project (AttributeNames (fromList [\\\"b\\\"])) (Extend (AttributeExtendTupleExpr \\\"b\\\" (FunctionAtomExpr \\\"count\\\" [AttributeAtomExpr \\\"a\\\"] ())) (Extend (AttributeExtendTupleExpr \\\"a\\\" (RelationAtomExpr (RelationVariable \\\"s\\\" ()))) (ExistingRelation (Relation [] (RelationTupleSet {asList = [RelationTuple [] []]})))))) (Project (AttributeNames (fromList [\\\"b\\\"])) (Extend (AttributeExtendTupleExpr \\\"b\\\" (FunctionAtomExpr \\\"count\\\" [AttributeAtomExpr \\\"a\\\"] ())) (Extend (AttributeExtendTupleExpr \\\"a\\\" (RelationAtomExpr (Project (AttributeNames (fromList [\\\"s#\\\"])) (RelationVariable \\\"s\\\" ())))) (ExistingRelation (Relation [] (RelationTupleSet {asList = [RelationTuple [] []]}))))))\" │\"ExistingRelation (Relation [] (RelationTupleSet {asList = []}))\"│\n",

661+ "│\"p_pkey\" │\"NotEquals (Project (AttributeNames (fromList [\\\"b\\\"])) (Extend (AttributeExtendTupleExpr \\\"b\\\" (FunctionAtomExpr \\\"count\\\" [AttributeAtomExpr \\\"a\\\"] ())) (Extend (AttributeExtendTupleExpr \\\"a\\\" (RelationAtomExpr (RelationVariable \\\"p\\\" ()))) (ExistingRelation (Relation [] (RelationTupleSet {asList = [RelationTuple [] []]})))))) (Project (AttributeNames (fromList [\\\"b\\\"])) (Extend (AttributeExtendTupleExpr \\\"b\\\" (FunctionAtomExpr \\\"count\\\" [AttributeAtomExpr \\\"a\\\"] ())) (Extend (AttributeExtendTupleExpr \\\"a\\\" (RelationAtomExpr (Project (AttributeNames (fromList [\\\"p#\\\"])) (RelationVariable \\\"p\\\" ())))) (ExistingRelation (Relation [] (RelationTupleSet {asList = [RelationTuple [] []]}))))))\" │\"ExistingRelation (Relation [] (RelationTupleSet {asList = []}))\"│\n",

662+ "└──────────┴───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────────┘"

663+ ]

664+ },

665+ "metadata": {},

666+ "output_type": "display_data"

667+ }

668+ ],

669+ "source": [

670+ ":constraints"

671+ ]

672+ },

673+ {

674+ "cell_type": "markdown",

675+ "metadata": {},

676+ "source": [

677+ "Constraints are represented as \"inclusion dependencies\". An inclusion dependency is a generalization of all possible constraints on the database and can represent keys, uniqueness constraints, foreign key constraints, as well as span multiple relation variables.\n",

678+ "\n",

679+ "An inclusion dependency requires that the result of relational expression `sub` is a subset of relational expression `super`.\n",

680+ "\n",

681+ "Project:M36 includes some utilities to generate inclusion dependencies."

682+ ]

683+ },

684+ {

685+ "cell_type": "code",

686+ "execution_count": 19,

687+ "metadata": {},

688+ "outputs": [

689+ {

690+ "data": {

691+ "text/html": [

692+ "ok"

693+ ],

694+ "text/plain": [

695+ "ok"

696+ ]

697+ },

698+ "metadata": {},

699+ "output_type": "display_data"

700+ }

701+ ],

702+ "source": [

703+ "sandwich := relation{tuple{name \"Cheese\", price 4},tuple{name \"Tuna\", price 5}}"

704+ ]

705+ },

706+ {

707+ "cell_type": "code",

708+ "execution_count": 20,

709+ "metadata": {},

710+ "outputs": [

711+ {

712+ "data": {

713+ "text/html": [

714+ "ok"

715+ ],

716+ "text/plain": [

717+ "ok"

718+ ]

719+ },

720+ "metadata": {},

721+ "output_type": "display_data"

722+ }

723+ ],

724+ "source": [

725+ "key sandwich_name{name} sandwich"

726+ ]

727+ },

728+ {

729+ "cell_type": "code",

730+ "execution_count": 21,

731+ "metadata": {},

732+ "outputs": [

733+ {

734+ "ename": "TutorialDError",

735+ "evalue": "",

736+ "output_type": "error",

737+ "traceback": [

738+ "InclusionDependencyCheckError \"sandwich_name\""

739+ ]

740+ }

741+ ],

742+ "source": [

743+ "insert sandwich relation{tuple{name \"Tuna\", price 6}}"

744+ ]

745+ },

746+ {

747+ "cell_type": "markdown",

748+ "metadata": {},

749+ "source": [

750+ "## Jupyter Kernel Features\n",

751+ "\n",

752+ "By default, the TutorialD kernel will automatically start a `project-m36-websocket-server` when the first TutorialD command is executed. For this to work, `project-m36-websocket-server` must be in the jupyter server's `PATH` environment variable.\n",

753+ "\n",

754+ "### Magic\n",

755+ "\n",

756+ "Like the python kernel, the TutorialD kernel includes some commands to interact directly with the kernel. These commands are not passed to the TutorialD interpreter.\n",

757+ "\n",

758+ "* `%help` brings up some help which includes links to additional documentation\n",

759+ "* `%connect ws://<host>:<port> <dbname>` connects to the `project-m36-websocket-server` already running. For example:\n",

760+ " ```\n",

761+ " %connect ws://localhost:64000 employees\n",

762+ " ```\n",

763+ " connects to the websocket server running on the localhost on port 64000 and selects the database named \"employees\". Note that the database name is not part of the websocket URL.\n",

764+ " \n",

765+ "## Conclusion\n",

766+ "\n",

767+ "[Project:M36](https://github.com/agentm/project-m36) is a fully-featured relational algebra engine suitable for use a database. It sets out to prove that sticking to the mathematical underpinnings of the relational algebra is straightforward and results in improved correctness and performance.\n",

768+ "\n",

769+ "If you would like to learn more, please refer to the [documentation](https://github.com/agentm/project-m36#documentation) and join our welcoming [community](https://github.com/agentm/project-m36#community) to ask questions."

770+ ]

771+ },

772+ {

773+ "cell_type": "code",

774+ "execution_count": null,

775+ "metadata": {},

776+ "outputs": [],

777+ "source": []

778+ }

779+ ],

780+ "metadata": {

781+ "kernelspec": {

782+ "display_name": "TutorialD (Project:M36)",

783+ "language": "TutorialD",

784+ "name": "tutd"

785+ },

786+ "language_info": {

787+ "file_extension": ".tutd",

788+ "mimetype": "text/x-tutd",

789+ "name": "TutorialD"

790+ }

791+ },

792+ "nbformat": 4,

793+ "nbformat_minor": 2

794+}

jupyter/itutd/ITutorialDKernel.pynew file+179

@@ -0,0 +1,179 @@

1+from ipykernel.kernelbase import Kernel

2+import subprocess

3+from websocket import create_connection, WebSocketConnectionClosedException, WebSocketBadStatusException

4+import time

5+import select

6+import json

7+import socket

8+import errno

9+import urlparse

10+

11+class ITutorialDKernel(Kernel):

12+ implementation = 'ITutorialD'

13+ implementation_version = '0.1'

14+

15+ banner = 'TutorialD kernel using Project:M36 https://github.com/agentm/project-m36'

16+

17+ language = 'TutorialD'

18+ language_version = '0.3'

19+ language_info = {

20+ 'name': 'TutorialD',

21+ 'mimetype': 'text/x-tutd',

22+ 'file_extension': '.tutd',

23+ }

24+ dbserver = None

25+ ws = None

26+

27+# todo: implement wrong database name handling

28+ def runtutd(self, tutd):

29+ #setup server

30+ dbname = 'jupyter'

31+ port = 63000

32+ if not self.ws and not self.dbserver:

33+ try:

34+ self.dbserver = subprocess.Popen(['project-m36-websocket-server',

35+ '--database', dbname,

36+ '--port', str(port)],

37+ )

38+ except OSError as err:

39+ if err.errno == errno.ENOENT:

40+ return ('"project-m36-websocket-server" is not in the PATH environment variable and could not be started.', None)

41+ else:

42+ raise

43+ res = self.connect_ws('ws://127.0.0.1:63000', dbname, retries=10)

44+ if res:

45+ return ('Connection failed: {}'.format(res), None)

46+

47+ self.ws.send('executetutd/html+text:' + tutd)

48+ try:

49+ jsonresult = self.discard_prompts()

50+ except WebSocketConnectionClosedException:

51+ self.ws = None

52+ return ('Websocket server closed the connection.',None)

53+ res = json.loads(jsonresult)

54+ if 'displayerror' in res:

55+ return (res['displayerror']['text'], None)

56+ elif 'acknowledged' in res:

57+ return (None, {'html':'ok', 'text':'ok'})

58+ else:

59+ return (None, res['displayrelation'])

60+

61+ def connect_ws(self, url, dbname, retries=0):

62+ while 1:

63+ try:

64+ ws = create_connection(url)

65+ except socket.error as err:

66+ if err.errno in (errno.ECONNREFUSED, ):

67+ time.sleep(1.0)

68+ if retries == 0:

69+ return 'Failed to connect to websocket.'

70+ retries -= 1

71+ else:

72+ raise

73+ except WebSocketBadStatusException:

74+ return 'Failed to negotiate websocket connection.'

75+ else:

76+ break

77+ self.ws = ws

78+ self.ws.send('connectdb:{}'.format(dbname))

79+ msg = json.loads(self.ws.recv())

80+ if 'displayerror' in msg:

81+ return msg['displayerror']['tag']

82+ return None

83+

84+ def discard_prompts(self):

85+ #read from the websocket until a non-prompt message is received

86+ while 1:

87+ sel = select.select([self.ws.sock],[],[],0)

88+ if len(sel[0]) > 0:

89+ #there is something to read

90+ msg = self.ws.recv()

91+ if 'promptInfo' not in msg:

92+ return msg

93+

94+ def send_error(self, msg):

95+ stream_content = {'ename':'TutorialDError',

96+ 'traceback':[msg],

97+ 'evalue':''}

98+ self.send_response(self.iopub_socket, 'error', stream_content)

99+

100+

101+ def process_magic(self, code):

102+ #handle "magic" processing of commands which are not sent to the tutd interpreter

103+ cmds = code.split(' ')

104+ ok = {'text':'ok', 'html':'ok'}

105+

106+ if cmds[0] == '%connect' and len(cmds) == 3:

107+ #connect to alternate database

108+ url = urlparse.urlparse(cmds[1])

109+ dbname = cmds[2]

110+ if not url.scheme.startswith('ws'):

111+ return ('Rejected attempt to connect to non-websocket. Use ws:// or wss:// scheme',None)

112+ res = self.connect_ws(url.geturl(), dbname)

113+ if res: #error from connection

114+ return (res, None, None)

115+ else: #connection successful

116+ return (None, ok, None)

117+ elif cmds[0] == '%help' and len(cmds) == 1:

118+ #display some help

119+ return (None, ok, self.show_help())

120+ elif cmds[0].startswith('%'):

121+ return ('Invalid magic command.', None)

122+

123+ def do_execute(self, code, silent,

124+ store_history=True,

125+ user_expressions=False,

126+ allow_stdin=False):

127+ magic = self.process_magic(code)

128+ payload = None

129+ if magic:

130+ (err, result, payload) = magic

131+ else:

132+ (err, result) = self.runtutd(code)

133+ if not silent:

134+ if err:

135+ status = 'error'

136+ self.send_error(err)

137+ else:

138+ status = 'ok'

139+ display_content = {

140+ 'data':{'text/html':result['html'],

141+ 'text/plain':result['text']},

142+ 'metadata':{},

143+ 'transient':{}

144+ }

145+ self.send_response(self.iopub_socket, 'display_data', display_content)

146+ ret ={'status': status,

147+ 'execution_count': self.execution_count,

148+ 'payload':[payload],

149+ 'user_expressions':{}}

150+ if payload:

151+ ret['payload'] = [payload]

152+ return ret

153+

154+ def do_shutdown(self, restart):

155+ if self.dbserver:

156+ self.dbserver.terminate()

157+ self.dbserver.kill()

158+

159+ def show_help(self):

160+ return {'source': 'page',

161+ 'start':0,

162+ 'data':{'text/html':'''<h1>Project:M36 TutorialD Jupyter Kernel Help</h1>

163+<p>TutorialD is an interactive language for the relational algebra.</p>

164+

165+<p><a href="https://github.com/agentm/project-m36/blob/master/docs/15_minute_tutorial.markdown">15 Minute TutorialD Introduction</a></p>

166+<p><a href="https://github.com/agentm/project-m36/blob/master/docs/tutd_tutorial.markdown">TutorialD Documentation</a></p>

167+''',

168+ 'text/plain':

169+'''Project:M36 TutorialD Jupyter Kernel Help

170+

171+TutorialD is an interactive language for the relational algebra.

172+

173+15 Minute TutorialD Introduction: https://github.com/agentm/project-m36/blob/master/docs/15_minute_tutorial.markdown

174+TutorialD Documentation: https://github.com/agentm/project-m36/blob/master/docs/tutd_tutorial.markdown

175+'''}}

176+

177+if __name__ == '__main__':

178+ from ipykernel.kernelapp import IPKernelApp

179+ IPKernelApp.launch_instance(kernel_class=ITutorialDKernel)

jupyter/itutd/__init__.pynew file+1

@@ -0,0 +1 @@

jupyter/itutd/__main__.pynew file+4

@@ -0,0 +1,4 @@

1+from ipykernel.kernelapp import IPKernelApp

2+from . import ITutorialDKernel

4+IPKernelApp.launch_instance(kernel_class=ITutorialDKernel)

jupyter/kernel.jsonnew file+5

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

1+{

2+ "language":"TutorialD",

3+ "display_name":"TutorialD (Project:M36)",

4+ "argv":["python", "-m", "itutd.ITutorialDKernel", "-f", "{connection_file}"]

5+}

jupyter/setup.pynew file+19

@@ -0,0 +1,19 @@

1+from setuptools import setup

3+setup(

4+ name='itutd',

5+ version='0.1',

6+ packages=['itutd'],

7+ description='TutorialD Jupyter kernel for Project:M36',

8+ author='AgentM',

9+ author_email='agentm@themactionfaction.com',

10+ url='https://github.com/agentm/project-m36/jupyter/',

11+ install_requires=[

12+ 'jupyter_client', 'IPython', 'ipykernel', 'websocket-client'

13+ ],

14+ classifiers=[

15+ 'Intended Audience :: Developers',

16+ 'License :: OSI Approved :: Public Domain',

17+ 'Programming Language :: Python :: 2',

18+ ],

19+)

project-m36.cabal+17−10

@@ -147,13 +147,14 @@ Library

147147 ProjectM36.Transaction.Persist,

148148 ProjectM36.TypeConstructor,

149149 ProjectM36.TypeConstructorDef,

150− ProjectM36.FileLock

150+ ProjectM36.FileLock,

151+ ProjectM36.FSType

151152 GHC-Options: -Wall

152153 if os(windows)

153154 Build-Depends: Win32 >= 2.3

154155 Other-Modules: ProjectM36.Win32Handle

155156 else

156− C-sources: cbits/DirectoryFsync.c

157+ C-sources: cbits/DirectoryFsync.c, cbits/darwin_statfs.c

157158 Build-Depends: unix

158159 CC-Options: -fPIC

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

@@ -225,13 +226,6 @@ Executable tutd

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

226227 Default-Language: Haskell2010

227228 Default-Extensions: OverloadedStrings

228−-- if os(windows)

229−-- Build-Depends: Win32 >= 2.3 && < 2.4

230−-- Other-Modules: ProjectM36.Win32Handle

231−-- else

232−-- C-sources: ProjectM36/DirectoryFsync.c

233−-- Build-Depends: unix

234−

235229

236230Executable project-m36-server

237231 Build-Depends: base,

@@ -285,6 +279,17 @@ Executable bigrel

285279 if flag(profiler)

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

287281

282+Benchmark basic-benchmark

283+ Default-Language: Haskell2010

284+ Default-Extensions: OverloadedStrings

285+ Build-Depends: base, criterion, project-m36, text, vector, transformers, containers, temporary, directory, filepath

286+ Main-Is: benchmark/Basic.hs

287+ Type: exitcode-stdio-1.0

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

289+ HS-Source-Dirs: ./src/bin

290+ if flag(profiler)

291+ GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall

292+

288293Test-Suite test-tutoriald

289294 Default-Language: Haskell2010

290295 Default-Extensions: OverloadedStrings

@@ -434,7 +439,7 @@ Test-Suite test-scripts

434439

435440Executable project-m36-websocket-server

436441 Default-Language: Haskell2010

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

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

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

439444 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

440445 GHC-Options: -Wall

@@ -534,3 +539,5 @@ Executable handles

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

535540 if flag(profiler)

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

542+

543+

scripts/DateExamples.tutd+4−2

@@ -20,5 +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−foreign key sp2s sp{s#} in s{s#};

24−foreign key sp2p sp{p#} in p{p#};

23+key s_pkey {s#} s

24+key p_key {p#} p

25+foreign key s_sp_fk sp{s#} in s{s#};

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

src/bin/ProjectM36/Server/WebSocket.hs+54−21

@@ -1,3 +1,4 @@

1+{-# LANGUAGE LambdaCase #-}

12module ProjectM36.Server.WebSocket where

23-- 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

34-- 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

@@ -9,11 +10,17 @@ import qualified Data.Text as T

910import qualified Network.WebSockets as WS

1011import ProjectM36.Server.RemoteCallTypes.Json ()

1112import ProjectM36.Client.Json ()

13+import ProjectM36.Relation.Show.Term

14+import ProjectM36.Relation.Show.HTML

1215import Data.Aeson

1316import TutorialD.Interpreter

1417import TutorialD.Interpreter.Base

1518import ProjectM36.Client

1619import Control.Exception

20+import Data.Attoparsec.Text

21+import Control.Applicative

22+import Text.Megaparsec.Error

23+import Data.Functor

1724

1825websocketProxyServer :: Port -> Hostname -> WS.ServerApp

1926websocketProxyServer port host pending = do

@@ -26,10 +33,9 @@ websocketProxyServer port host pending = do

2633 else do

2734 let dbname = T.unpack $ T.drop (T.length connectdbmsg) dbmsg

2835 bracket (createConnection conn dbname port host)

29− (\eDBconn -> case eDBconn of

30− Right dbconn -> close dbconn

31− Left _ -> pure ()) $ \eDBconn ->

32− case eDBconn of

36+ (\case

37+ Right dbconn -> close dbconn

38+ Left _ -> pure ()) $ \case

3339 Left err -> sendError conn err

3440 Right dbconn -> do

3541 eSessionId <- createSessionAtHead dbconn "master"

@@ -43,12 +49,11 @@ websocketProxyServer port host pending = do

4349 sendPromptInfo pInfo conn

4450 sendPromptInfo pInfo conn

4551 msg <- WS.receiveData conn :: IO T.Text

46− let tutdprefix = "executetutd:"

47− case msg of

48− _ | tutdprefix `T.isPrefixOf` msg -> do

49− let tutdString = T.drop (T.length tutdprefix) msg

52+ case parseOnly parseExecuteMessage msg of

53+ Left _ -> unexpectedMsg

54+ Right (presentation, tutdString) ->

5055 case parseTutorialD tutdString of

51− Left err -> handleOpResult conn dbconn (DisplayErrorResult ("parse error: " `T.append` T.pack (show err)))

56+ Left err -> handleOpResult conn dbconn presentation (DisplayErrorResult ("parse error: " `T.append` T.pack (parseErrorPretty err)))

5257 Right parsed -> do

5358 let timeoutFilter exc = if exc == RequestTimeoutException

5459 then Just exc

@@ -57,9 +62,8 @@ websocketProxyServer port host pending = do

5762 result <- evalTutorialD sessionId dbconn SafeEvaluation parsed

5863 pInfo' <- promptInfo sessionId dbconn

5964 sendPromptInfo pInfo' conn

60− handleOpResult conn dbconn result

61− catchJust timeoutFilter responseHandler (\_ -> handleOpResult conn dbconn (DisplayErrorResult "Request Timed Out."))

62− _ -> unexpectedMsg

65+ handleOpResult conn dbconn presentation result

66+ catchJust timeoutFilter responseHandler (\_ -> handleOpResult conn dbconn presentation (DisplayErrorResult "Request Timed Out."))

6367 pure ()

6468

6569notificationCallback :: WS.Connection -> NotificationCallback

@@ -74,15 +78,22 @@ createConnection wsconn dbname port host = connectProjectM36 (RemoteProcessConne

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

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

7680

77−handleOpResult :: WS.Connection -> Connection -> TutorialDOperatorResult -> IO ()

78−handleOpResult conn db QuitResult = WS.sendClose conn ("close" :: T.Text) >> close db

79−handleOpResult conn _ (DisplayResult out) = WS.sendTextData conn (encode (object ["display" .= out]))

80−handleOpResult _ _ (DisplayIOResult ioout) = ioout

81−handleOpResult conn _ (DisplayErrorResult err) = WS.sendTextData conn (encode (object ["displayerror" .= err]))

82−handleOpResult conn _ (DisplayParseErrorResult _ err) = WS.sendTextData conn (encode (object ["displayparseerrorresult" .= show err]))

83−handleOpResult conn _ QuietSuccessResult = WS.sendTextData conn (encode (object ["acknowledged" .= True]))

84−handleOpResult conn _ (DisplayRelationResult rel) = WS.sendTextData conn (encode (object ["displayrelation" .= rel]))

85−

81+handleOpResult :: WS.Connection -> Connection -> Presentation -> TutorialDOperatorResult -> IO ()

82+handleOpResult conn db _ QuitResult = WS.sendClose conn ("close" :: T.Text) >> close db

83+handleOpResult conn _ _ (DisplayResult out) = WS.sendTextData conn (encode (object ["display" .= out]))

84+handleOpResult _ _ _ (DisplayIOResult ioout) = ioout

85+handleOpResult conn _ presentation (DisplayErrorResult err) = do

86+ let jsono = ["json" .= err | jsonPresentation presentation]

87+ texto = ["text" .= err | textPresentation presentation]

88+ htmlo = ["html" .= err | htmlPresentation presentation]

89+ WS.sendTextData conn (encode (object ["displayerror" .= object (jsono ++ texto ++ htmlo)]))

90+handleOpResult conn _ _ (DisplayParseErrorResult _ err) = WS.sendTextData conn (encode (object ["displayparseerrorresult" .= show err]))

91+handleOpResult conn _ _ QuietSuccessResult = WS.sendTextData conn (encode (object ["acknowledged" .= True]))

92+handleOpResult conn _ presentation (DisplayRelationResult rel) = do

93+ let jsono = ["json" .= rel | jsonPresentation presentation]

94+ texto = ["text" .= showRelation rel | textPresentation presentation]

95+ htmlo = ["html" .= relationAsHTML rel | htmlPresentation presentation]

96+ WS.sendTextData conn (encode (object ["displayrelation" .= object (jsono ++ texto ++ htmlo)]))

8697-- get current schema and head name for client

8798promptInfo :: SessionId -> Connection -> IO (HeadName, SchemaName)

8899promptInfo sessionId conn = do

@@ -92,3 +103,25 @@ promptInfo sessionId conn = do

92103

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

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

106+

107+--a returning relation can be returned as JSON, Text (for consoles), or HTML

108+data Presentation = Presentation {

109+ jsonPresentation :: Bool,

110+ textPresentation :: Bool,

111+ htmlPresentation :: Bool }

112+

113+data PresentationFlag = JSONFlag | TextFlag | HTMLFlag

114+

115+parseExecuteMessage :: Parser (Presentation, T.Text)

116+parseExecuteMessage = do

117+ _ <- string "executetutd/"

118+ flags <- sepBy ((string "json" $> JSONFlag) <|>

119+ (string "text" $> TextFlag) <|>

120+ (string "html" $> HTMLFlag)) "+"

121+ let presentation = foldr (\flag acc -> case flag of

122+ JSONFlag -> acc {jsonPresentation = True}

123+ TextFlag -> acc {textPresentation = True}

124+ HTMLFlag -> acc {htmlPresentation = True}) (Presentation False False False) flags

125+ _ <- char ':'

126+ tutd <- T.pack <$> manyTill anyChar endOfInput

127+ pure (presentation, tutd)

src/bin/ProjectM36/Server/WebSocket/project-m36.js+3−3

@@ -82,7 +82,7 @@ ProjectM36Connection.prototype.handleResponse = function(message)

8282

8383 if(relation)

8484 {

85− this.statuscallback(new ProjectM36Status(relation, null, null));

85+ this.statuscallback(new ProjectM36Status(relation['json'], null, null));

8686 }

8787

8888 if(acknowledged)

@@ -96,7 +96,7 @@ ProjectM36Connection.prototype.handleResponse = function(message)

9696 {

9797 error=error.tag; // for error objects

9898 }

99− this.statuscallback(new ProjectM36Status(null, null, error));

99+ this.statuscallback(new ProjectM36Status(null, null, error['json']));

100100 }

101101

102102 if(prompt)

@@ -117,7 +117,7 @@ ProjectM36Connection.prototype.handleResponse = function(message)

117117*/

118118ProjectM36Connection.prototype.executeTutorialD = function(tutd)

119119{

120− this.socket.send("executetutd:" + tutd);

120+ this.socket.send("executetutd/json:" + tutd);

121121}

122122

123123/**

src/bin/ProjectM36/Server/WebSocket/websocket-client.html+1−1

@@ -108,7 +108,7 @@ margin-bottom: 5pt;

108108 <option value="ws">ws://</option>

109109 </select>

110110 <input type="text" name="host" value="localhost" placeholder="Host"/>:

111− <input id="port" type="number" placeholder="Port" name="port" min="0" max="32767" value="8888"/>/

111+ <input id="port" type="number" placeholder="Port" name="port" min="0" max="65535" value="8888"/>/

112112 <input type="text" name="path" placeholder="path" value=""/>

113113 <label>database:</label><input type="text" placeholder="Database Name" name="dbname" value="test"/>

114114 <input type="submit" name="connect" value="Connect"/>

src/bin/TutorialD/Interpreter.hs+9−8

@@ -1,4 +1,4 @@

1−{-# LANGUAGE GADTs #-}

1+{-# LANGUAGE GADTs, LambdaCase #-}

22module TutorialD.Interpreter where

33import TutorialD.Interpreter.Base

44import TutorialD.Interpreter.RODatabaseContextOperator

@@ -224,9 +224,10 @@ evalTutorialDInteractive sessionId conn safe interactive expr = case expr of

224224

225225type GhcPkgPath = String

226226type TutorialDExec = String

227+type CheckFS = Bool

227228

228−data InterpreterConfig = LocalInterpreterConfig PersistenceStrategy HeadName (Maybe TutorialDExec) [GhcPkgPath] |

229− RemoteInterpreterConfig C.NodeId C.DatabaseName HeadName (Maybe TutorialDExec)

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

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

230231

231232outputNotificationCallback :: C.NotificationCallback

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

@@ -244,7 +245,7 @@ reprLoop config sessionId conn = do

244245 eHeadName <- C.headName sessionId conn

245246 eSchemaName <- C.currentSchemaName sessionId conn

246247 let prompt = promptText eHeadName eSchemaName

247− catchInterrupt = handleJust (\exc -> case exc of

248+ catchInterrupt = handleJust (\case

248249 UserInterrupt -> Just Nothing

249250 _ -> Nothing) (\_ -> do

250251 hPutStrLn stderr "Statement cancelled. Use \":quit\" to exit tutd."

@@ -253,15 +254,15 @@ reprLoop config sessionId conn = do

253254 case maybeLine of

254255 Nothing -> return ()

255256 Just line -> do

256− runTutorialD sessionId conn (T.pack line)

257+ runTutorialD sessionId conn (Just (T.length prompt)) (T.pack line)

257258 reprLoop config sessionId conn

258259

259260

260−runTutorialD :: C.SessionId -> C.Connection -> T.Text -> IO ()

261−runTutorialD sessionId conn tutd =

261+runTutorialD :: C.SessionId -> C.Connection -> Maybe PromptLength -> T.Text -> IO ()

262+runTutorialD sessionId conn mPromptLength tutd =

262263 case parseTutorialD tutd of

263264 Left err ->

264− displayOpResult $ DisplayParseErrorResult 0 err

265+ displayOpResult $ DisplayParseErrorResult mPromptLength err

265266 Right parsed ->

266267 catchJust (\exc -> if exc == C.RequestTimeoutException then Just exc else Nothing) (do

267268 evald <- evalTutorialDInteractive sessionId conn UnsafeEvaluation True parsed

src/bin/TutorialD/Interpreter/Base.hs+11−7

@@ -22,6 +22,7 @@ import Control.Monad.Random

2222import Data.List.NonEmpty as NE

2323import Data.Time.Clock

2424import Data.Time.Format

25+import Control.Monad (void)

2526

2627displayOpResult :: TutorialDOperatorResult -> IO ()

2728displayOpResult QuitResult = return ()

@@ -34,11 +35,12 @@ displayOpResult (DisplayRelationResult rel) = do

3435 gen <- newStdGen

3536 let randomlySortedRel = evalRand (randomizeTupleOrder rel) gen

3637 TIO.putStrLn (showRelation randomlySortedRel)

37−displayOpResult (DisplayParseErrorResult promptLength err) = TIO.putStrLn pointyString >> TIO.putStr ("ERR:" <> errString)

38− where

39− errString = T.pack (parseErrorPretty err)

40− errorIndent = unPos (sourceColumn (NE.head (errorPos err)))

41− pointyString = T.justifyRight (promptLength + fromIntegral errorIndent) '_' "^"

38+displayOpResult (DisplayParseErrorResult mPromptLength err) = do

39+ let errString = T.pack (parseErrorPretty err)

40+ errorIndent = unPos (sourceColumn (NE.head (errorPos err)))

41+ pointyString len = T.justifyRight (len + fromIntegral errorIndent) '_' "^"

42+ maybe (pure ()) (TIO.putStrLn . pointyString) mPromptLength

43+ TIO.putStr ("ERR:" <> errString)

4244

4345spaceConsumer :: Parser ()

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

@@ -50,7 +52,7 @@ reserved :: String -> Parser ()

5052reserved word = try (string word *> notFollowedBy opChar *> spaceConsumer)

5153

5254reservedOp :: String -> Parser ()

53−reservedOp op = try (string op *> notFollowedBy opChar *> spaceConsumer)

55+reservedOp op = try (spaceConsumer *> string op *> notFollowedBy opChar *> spaceConsumer)

5456

5557parens :: Parser a -> Parser a

5658parens = between (symbol "(") (symbol ")")

@@ -119,12 +121,14 @@ showRelationAttributes attrs = "{" <> T.concat (L.intersperse ", " $ L.map showA

119121 showAttribute (Attribute name atomType) = name <> " " <> prettyAtomType atomType

120122 attrsL = V.toList attrs

121123

124+type PromptLength = Int

125+

122126data TutorialDOperatorResult = QuitResult |

123127 DisplayResult StringType |

124128 DisplayIOResult (IO ()) |

125129 DisplayRelationResult Relation |

126130 DisplayErrorResult StringType |

127− DisplayParseErrorResult Int (ParseError Char Dec) | -- Int refers to length of prompt text

131+ DisplayParseErrorResult (Maybe PromptLength) (ParseError Char Dec) | -- Int refers to length of prompt text

128132 QuietSuccessResult

129133 deriving (Generic)

130134

src/bin/TutorialD/Interpreter/DatabaseContextExpr.hs+8−9

@@ -15,6 +15,7 @@ import qualified ProjectM36.RelationalExpression as RE

1515import ProjectM36.Key

1616import ProjectM36.FunctionalDependency

1717import Data.Monoid

18+import Data.Functor

1819

1920--parsers which create "database expressions" which modify the database context (such as relvar assignment)

2021databaseContextExprP :: Parser DatabaseContextExpr

@@ -76,15 +77,12 @@ defineP = do

7677undefineP :: Parser DatabaseContextExpr

7778undefineP = do

7879 reservedOp "undefine"

79− relVarName <- identifier

80− return $ Undefine relVarName

80+ Undefine <$> identifier

8181

8282deleteP :: Parser DatabaseContextExpr

8383deleteP = do

8484 reservedOp "delete"

85− relVarName <- identifier

86− predicate <- option TruePredicate (reservedOp "where" *> restrictionPredicateP)

87− return $ Delete relVarName predicate

85+ Delete <$> identifier <*> option TruePredicate (reservedOp "where" *> restrictionPredicateP)

8886

8987updateP :: Parser DatabaseContextExpr

9088updateP = do

@@ -101,7 +99,7 @@ addConstraintP = do

10199 reservedOp "constraint" <|> reservedOp "foreign key"

102100 constraintName <- identifier

103101 subset <- relExprP

104− op <- (reservedOp "in" *> pure SubsetOp) <|> (reservedOp "equals" *> pure EqualityOp)

102+ op <- (reservedOp "in" $> SubsetOp) <|> (reservedOp "equals" $> EqualityOp)

105103 superset <- relExprP

106104 let subsetA = incDepSet constraintName subset superset

107105 subsetB = incDepSet (constraintName <> "_eqInvert") superset subset --inverted args for equality constraint

@@ -201,14 +199,15 @@ evalDatabaseContextExpr :: Bool -> DatabaseContext -> DatabaseContextExpr -> Eit

201199evalDatabaseContextExpr useOptimizer context expr = do

202200 optimizedExpr <- evalState (applyStaticDatabaseOptimization expr) (RE.freshDatabaseState context)

203201 case runState (RE.evalDatabaseContextExpr (if useOptimizer then optimizedExpr else expr)) (RE.freshDatabaseState context) of

204− (Nothing, (context',_, _)) -> Right context'

205− (Just err, _) -> Left err

202+ (Right (), (context',_, _)) -> Right context'

203+ (Left err, _) -> Left err

206204

207205

208206interpretDatabaseContextExpr :: DatabaseContext -> T.Text -> Either RelationalError DatabaseContext

209207interpretDatabaseContextExpr context tutdstring = case parse databaseExprOpP "" tutdstring of

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

211− Right parsed -> evalDatabaseContextExpr True context parsed

209+ Right parsed ->

210+ evalDatabaseContextExpr True context parsed

212211

213212{-

214213--no optimization

src/bin/TutorialD/Interpreter/InformationOperator.hs+5

@@ -4,6 +4,11 @@ import Data.Text

44import Text.Megaparsec

55import Text.Megaparsec.Text

66import TutorialD.Interpreter.Base

7+-- older versions of stack fail to

8+#if !defined(VERSION_project_m36)

9+# warning Failed to discover proper version from cabal_macros.h

10+# define VERSION_project_m36 "<unknown>"

11+#endif

712

813-- this module provides information about the current interpreter

914

src/bin/TutorialD/Interpreter/RODatabaseContextOperator.hs+5−10

@@ -30,20 +30,17 @@ data RODatabaseContextOperator where

3030typeP :: Parser RODatabaseContextOperator

3131typeP = do

3232 reservedOp ":type"

33− expr <- relExprP

34− return $ ShowRelationType expr

33+ ShowRelationType <$> relExprP

3534

3635showRelP :: Parser RODatabaseContextOperator

3736showRelP = do

3837 reservedOp ":showexpr"

39− expr <- relExprP

40− return $ ShowRelation expr

38+ ShowRelation <$> relExprP

4139

4240showPlanP :: Parser RODatabaseContextOperator

4341showPlanP = do

4442 reservedOp ":showplan"

45− expr <- databaseContextExprP

46− return $ ShowPlan expr

43+ ShowPlan <$> databaseContextExprP

4744

4845showTypesP :: Parser RODatabaseContextOperator

4946showTypesP = reserved ":showtypes" >> pure ShowTypes

@@ -59,14 +56,12 @@ quitP = do

5956showConstraintsP :: Parser RODatabaseContextOperator

6057showConstraintsP = do

6158 reservedOp ":constraints"

62− constraintName <- option "" identifier

63− return $ ShowConstraint constraintName

59+ ShowConstraint <$> option "" identifier

6460

6561plotRelExprP :: Parser RODatabaseContextOperator

6662plotRelExprP = do

6763 reserved ":plotexpr"

68− expr <- relExprP

69− return $ PlotRelation expr

64+ PlotRelation <$> relExprP

7065

7166roDatabaseContextOperatorP :: Parser RODatabaseContextOperator

7267roDatabaseContextOperatorP = typeP

src/bin/TutorialD/Interpreter/RelationalExpr.hs+36−29

@@ -18,12 +18,13 @@ instance RelationalMarkerExpr () where

1818 parseMarkerP = pure ()

1919

2020--used in projection

21−attributeListP :: Parser AttributeNames

22−attributeListP = do

23− but <- try (string "all but " <* spaceConsumer) <|> string ""

24− let constructor = if but == "" then AttributeNames else InvertedAttributeNames

25− attrs <- sepBy identifier comma

26− pure $ constructor (S.fromList attrs)

21+attributeListP :: RelationalMarkerExpr a => Parser (AttributeNamesBase a)

22+attributeListP =

23+ (reservedOp "all but" >>

24+ InvertedAttributeNames . S.fromList <$> sepBy identifier comma) <|>

25+ (reservedOp "all from" >>

26+ RelationalExprAttributeNames <$> relExprP) <|>

27+ (AttributeNames . S.fromList <$> sepBy identifier comma)

2728

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

2930makeRelationP = do

@@ -64,7 +65,7 @@ tupleAtomExprP = do

6465 atomExpr <- atomExprP

6566 pure (attributeName, atomExpr)

6667

67−projectP :: Parser (RelationalExprBase a -> RelationalExprBase a)

68+projectP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a)

6869projectP = do

6970 attrs <- braces attributeListP

7071 pure $ Project attrs

@@ -88,14 +89,14 @@ renameP = do

8889whereClauseP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a)

8990whereClauseP = reservedOp "where" *> (Restrict <$> restrictionPredicateP)

9091

91−groupClauseP :: Parser (AttributeNames, T.Text)

92+groupClauseP :: RelationalMarkerExpr a => Parser (AttributeNamesBase a, T.Text)

9293groupClauseP = do

9394 attrs <- braces attributeListP

9495 reservedOp "as"

9596 newAttrName <- identifier

9697 pure (attrs, newAttrName)

9798

98−groupP :: Parser (RelationalExprBase a -> RelationalExprBase a)

99+groupP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a)

99100groupP = do

100101 reservedOp "group"

101102 (groupAttrList, groupAttrName) <- parens groupClauseP

@@ -111,9 +112,21 @@ ungroupP = do

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

112113extendP = do

113114 reservedOp ":"

114− tupleExpr <- braces extendTupleExpressionP

115− return $ Extend tupleExpr

116−

115+ Extend <$> braces extendTupleExpressionP

116+

117+semijoinP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a -> RelationalExprBase a)

118+semijoinP = do

119+ reservedOp "semijoin" <|> reservedOp "matching"

120+ pure (\exprA exprB ->

121+ Project (RelationalExprAttributeNames exprA) (Join exprA exprB))

122+

123+antijoinP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a -> RelationalExprBase a)

124+antijoinP = do

125+ reservedOp "not matching" <|> reservedOp "antijoin"

126+ pure (\exprA exprB ->

127+ Difference exprA (

128+ Project (RelationalExprAttributeNames exprA) (Join exprA exprB)))

129+

117130relOperators :: RelationalMarkerExpr a => [[Operator Parser (RelationalExprBase a)]]

118131relOperators = [

119132 [Postfix projectP],

@@ -122,6 +135,8 @@ relOperators = [

122135 [Postfix groupP],

123136 [Postfix ungroupP],

124137 [InfixL (reservedOp "join" >> return Join)],

138+ [InfixL semijoinP],

139+ [InfixL antijoinP],

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

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

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

@@ -150,26 +165,23 @@ restrictionPredicateP = makeExprParser predicateTerm predicateOperators

150165 predicateTerm = try (parens restrictionPredicateP)

151166 <|> try restrictionAtomExprP

152167 <|> try restrictionAttributeEqualityP

153− <|> try relationalBooleanExprP

154−

168+ <|> relationalBooleanExprP

155169

156170relationalBooleanExprP :: RelationalMarkerExpr a => Parser (RestrictionPredicateExprBase a)

157−relationalBooleanExprP = do

158− relexpr <- parens relExprP <|> relTerm

171+relationalBooleanExprP =

159172 --we can't actually detect if the type is relational boolean, so we just pass it to the next phase

160− return $ RelationalExprPredicate relexpr

173+ RelationalExprPredicate <$> (parens relExprP <|> relTerm)

161174

162175restrictionAttributeEqualityP :: RelationalMarkerExpr a => Parser (RestrictionPredicateExprBase a)

163176restrictionAttributeEqualityP = do

164177 attributeName <- identifier

165178 reservedOp "="

166− atomexpr <- atomExprP

167− return $ AttributeEqualityPredicate attributeName atomexpr

179+ AttributeEqualityPredicate attributeName <$> atomExprP

168180

169181restrictionAtomExprP :: RelationalMarkerExpr a=> Parser (RestrictionPredicateExprBase a) --atoms which are of type "boolean"

170182restrictionAtomExprP = do

171183 _ <- char '^' -- not ideal, but allows me to continue to use a context-free grammar

172− AtomExprPredicate <$> atomExprP

184+ (try (char 't') >> pure TruePredicate) <|> (try (char 'f') >> pure (NotPredicate TruePredicate)) <|> AtomExprPredicate <$> atomExprP

173185

174186multiTupleExpressionP :: RelationalMarkerExpr a => Parser [ExtendTupleExprBase a]

175187multiTupleExpressionP = sepBy extendTupleExpressionP comma

@@ -181,8 +193,7 @@ attributeExtendTupleExpressionP :: RelationalMarkerExpr a => Parser (ExtendTuple

181193attributeExtendTupleExpressionP = do

182194 newAttr <- identifier

183195 reservedOp ":="

184− atom <- atomExprP

185− return $ AttributeExtendTupleExpr newAttr atom

196+ AttributeExtendTupleExpr newAttr <$> atomExprP

186197

187198atomExprP :: RelationalMarkerExpr a => Parser (AtomExprBase a)

188199atomExprP = consumeAtomExprP True

@@ -198,8 +209,7 @@ consumeAtomExprP consume = try functionAtomExprP <|>

198209attributeAtomExprP :: Parser (AtomExprBase a)

199210attributeAtomExprP = do

200211 _ <- string "@"

201− attrName <- identifier

202− return $ AttributeAtomExpr attrName

212+ AttributeAtomExpr <$> identifier

203213

204214nakedAtomExprP :: Parser (AtomExprBase a)

205215nakedAtomExprP = NakedAtomExpr <$> atomP

@@ -219,11 +229,8 @@ atomP = stringAtomP <|>

219229 boolAtomP

220230

221231functionAtomExprP :: RelationalMarkerExpr a => Parser (AtomExprBase a)

222−functionAtomExprP = do

223− funcName <- identifier

224− argList <- parens (sepBy atomExprP comma)

225− marker <- parseMarkerP

226− return $ FunctionAtomExpr funcName argList marker

232+functionAtomExprP =

233+ FunctionAtomExpr <$> identifier <*> parens (sepBy atomExprP comma) <*> parseMarkerP

227234

228235relationalAtomExprP :: RelationalMarkerExpr a => Parser (AtomExprBase a)

229236relationalAtomExprP = RelationAtomExpr <$> relExprP

src/bin/TutorialD/Interpreter/TransactionGraphOperator.hs+5−7

@@ -6,6 +6,7 @@ import Text.Megaparsec

66import ProjectM36.TransactionGraph hiding (autoMergeToHead)

77import ProjectM36.Client

88import ProjectM36.Base

9+import Data.Functor

910

1011data ConvenienceTransactionGraphOperator = AutoMergeToHead MergeStrategy HeadName

1112 deriving (Show)

@@ -21,14 +22,12 @@ autoMergeToHeadP = do

2122jumpToHeadP :: Parser TransactionGraphOperator

2223jumpToHeadP = do

2324 reservedOp ":jumphead"

24− headid <- identifier

25− return $ JumpToHead headid

25+ JumpToHead <$> identifier

2626

2727jumpToTransactionP :: Parser TransactionGraphOperator

2828jumpToTransactionP = do

2929 reservedOp ":jump"

30− uuid <- uuidP

31− return $ JumpToTransaction uuid

30+ JumpToTransaction <$> uuidP

3231

3332walkBackToTimeP :: Parser TransactionGraphOperator

3433walkBackToTimeP = do

@@ -38,8 +37,7 @@ walkBackToTimeP = do

3837branchTransactionP :: Parser TransactionGraphOperator

3938branchTransactionP = do

4039 reservedOp ":branch"

41− branchName <- identifier

42− return $ Branch branchName

40+ Branch <$> identifier

4341

4442deleteBranchP :: Parser TransactionGraphOperator

4543deleteBranchP = do

@@ -62,7 +60,7 @@ showGraphP = do

6260 return ShowGraph

6361

6462mergeTransactionStrategyP :: Parser MergeStrategy

65−mergeTransactionStrategyP = (reserved "union" *> pure UnionMergeStrategy) <|>

63+mergeTransactionStrategyP = (reserved "union" $> UnionMergeStrategy) <|>

6664 (do

6765 reserved "selectedbranch"

6866 branch <- identifier

src/bin/TutorialD/tutd.hs+45−54

@@ -2,41 +2,30 @@

22import TutorialD.Interpreter

33import ProjectM36.Base

44import ProjectM36.Client

5+import ProjectM36.Server.ParseArgs

6+import ProjectM36.Server

57import System.IO

68import Options.Applicative

79import System.Exit

810import Data.Monoid

11+import Data.Maybe

912import qualified Data.Text as T

1013

14+#if !defined(VERSION_project_m36)

15+# warning Failed to discover proper version from cabal_macros.h

16+# define VERSION_project_m36 "<unknown>"

17+#endif

18+

1119parseArgs :: Parser InterpreterConfig

12−parseArgs = LocalInterpreterConfig <$> parsePersistenceStrategy <*> parseHeadName <*> parseTutDExec <*> parseGhcPkgPaths <|>

13− RemoteInterpreterConfig <$> parseNodeId <*> parseDatabaseName <*> parseHeadName <*> parseTutDExec

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

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

1422

15−parsePersistenceStrategy :: Parser PersistenceStrategy

16−parsePersistenceStrategy = CrashSafePersistence <$> (dbdirOpt <* fsyncOpt) <|>

17− MinimalPersistence <$> dbdirOpt <|>

18− pure NoPersistence

19− where

20− dbdirOpt = strOption (short 'd' <>

21− long "database-directory" <>

22− metavar "DIRECTORY" <>

23− showDefaultWith show

24− )

25− fsyncOpt = switch (short 'f' <>

26− long "fsync" <>

27− help "Fsync all new transactions.")

28−

2923parseHeadName :: Parser HeadName

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

3125 help "Start session at head name." <>

3226 value "master"

3327 )

34−

35−parseDatabaseName :: Parser DatabaseName

36−parseDatabaseName = strOption (long "database" <>

37− short 'n' <>

38− help "Remote database name")

39−

28+

4029parseNodeId :: Parser NodeId

4130parseNodeId = createNodeId <$>

4231 strOption (long "host" <>

@@ -54,31 +43,29 @@ parseTutDExec = optional $ strOption (long "exec-tutd" <>

5443 short 'e' <>

5544 help "Execute TutorialD expression and exit"

5645 )

57−

58−parseGhcPkgPaths :: Parser [GhcPkgPath]

59−parseGhcPkgPaths = many (strOption (long "ghc-pkg-dir" <>

60− metavar "GHC_PACKAGE_DIRECTORY"))

6146

6247opts :: ParserInfo InterpreterConfig

6348opts = info parseArgs idm

6449

6550connectionInfoForConfig :: InterpreterConfig -> ConnectionInfo

66−connectionInfoForConfig (LocalInterpreterConfig pStrategy _ _ ghcPkgPaths) = InProcessConnectionInfo pStrategy outputNotificationCallback ghcPkgPaths

67−connectionInfoForConfig (RemoteInterpreterConfig remoteNodeId remoteDBName _ _) = RemoteProcessConnectionInfo remoteDBName remoteNodeId outputNotificationCallback

51+connectionInfoForConfig (LocalInterpreterConfig pStrategy _ _ ghcPkgPaths _) = InProcessConnectionInfo pStrategy outputNotificationCallback ghcPkgPaths

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

6853

6954headNameForConfig :: InterpreterConfig -> HeadName

70−headNameForConfig (LocalInterpreterConfig _ headn _ _) = headn

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

55+headNameForConfig (LocalInterpreterConfig _ headn _ _ _) = headn

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

7257

7358execTutDForConfig :: InterpreterConfig -> Maybe String

74−execTutDForConfig (LocalInterpreterConfig _ _ t _) = t

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

59+execTutDForConfig (LocalInterpreterConfig _ _ t _ _) = t

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

61+

62+checkFSForConfig :: InterpreterConfig -> Bool

63+checkFSForConfig (LocalInterpreterConfig _ _ _ _ c) = c

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

7665

77−{-

78−ghcPkgPathsForConfig :: InterpreterConfig -> [GhcPkgPath]

79−ghcPkgPathsForConfig (LocalInterpreterConfig _ _ paths) = paths

80−ghcPkgPathsForConfig _ = error "Clients cannot configure remote ghc package paths."

81−-}

66+persistenceStrategyForConfig :: InterpreterConfig -> Maybe PersistenceStrategy

67+persistenceStrategyForConfig (LocalInterpreterConfig strat _ _ _ _) = Just strat

68+persistenceStrategyForConfig RemoteInterpreterConfig{} = Nothing

8269

8370errDie :: String -> IO ()

8471errDie err = hPutStrLn stderr err >> exitFailure

@@ -97,21 +84,25 @@ main :: IO ()

9784main = do

9885 interpreterConfig <- execParser opts

9986 let connInfo = connectionInfoForConfig interpreterConfig

100− dbconn <- connectProjectM36 connInfo

101− case dbconn of

102− Left err ->

103− errDie ("Failed to create database connection: " ++ show err)

104− Right conn -> do

105− let connHeadName = headNameForConfig interpreterConfig

106− eSessionId <- createSessionAtHead conn connHeadName

107− case eSessionId of

108− Left err -> errDie ("Failed to create database session at \"" ++ show connHeadName ++ "\": " ++ show err)

109− Right sessionId ->

110− case execTutDForConfig interpreterConfig of

111− Nothing -> do

112− printWelcome

113− _ <- reprLoop interpreterConfig sessionId conn

114− pure ()

115− Just tutdStr ->

116− runTutorialD sessionId conn (T.pack tutdStr)

87+ fscheck <- checkFSType (checkFSForConfig interpreterConfig) (fromMaybe NoPersistence (persistenceStrategyForConfig interpreterConfig))

88+ if not fscheck then

89+ errDie checkFSErrorMsg

90+ else do

91+ dbconn <- connectProjectM36 connInfo

92+ case dbconn of

93+ Left err ->

94+ errDie ("Failed to create database connection: " ++ show err)

95+ Right conn -> do

96+ let connHeadName = headNameForConfig interpreterConfig

97+ eSessionId <- createSessionAtHead conn connHeadName

98+ case eSessionId of

99+ Left err -> errDie ("Failed to create database session at \"" ++ show connHeadName ++ "\": " ++ show err)

100+ Right sessionId ->

101+ case execTutDForConfig interpreterConfig of

102+ Nothing -> do

103+ printWelcome

104+ _ <- reprLoop interpreterConfig sessionId conn

105+ pure ()

106+ Just tutdStr ->

107+ runTutorialD sessionId conn Nothing (T.pack tutdStr)

117108

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

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

11{-# LANGUAGE CPP #-}

22--benchmark test for file handle leaks

33import ProjectM36.Client

4+import ProjectM36.Persist

45import Options.Applicative

56import TutorialD.Interpreter

67import TutorialD.Interpreter.Base

78import qualified Data.Text as T

89import Text.Megaparsec hiding (option)

910import Data.Monoid

10−import System.Directory

1111import Control.Monad

1212

1313data HandlesArgs = HandlesArgs {

@@ -85,24 +85,3 @@ runTransaction tutdIterate' sess conn =

8585 Left err -> error (show err)

8686 Right _ -> printFdCount

8787

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/lib/ProjectM36/AtomType.hs+2−2

@@ -234,8 +234,8 @@ atomTypeVerify x@(ConstructedAtomType tConsNameA tVarMapA) (ConstructedAtomType

234234 | otherwise = Right x

235235

236236atomTypeVerify x@(RelationAtomType attrs1) y@(RelationAtomType attrs2) = do

237− _ <- mapM (\(attr1,attr2) -> let name1 = A.attributeName attr1

238− name2 = A.attributeName attr2 in

237+ mapM_ (\(attr1,attr2) -> let name1 = A.attributeName attr1

238+ name2 = A.attributeName attr2 in

239239 if notElem "_" [name1, name2] && name1 /= name2 then

240240 Left $ AtomTypeMismatchError x y

241241 else

src/lib/ProjectM36/Attribute.hs+16−3

@@ -71,6 +71,16 @@ attributeForName attrName attrs = case V.find (\attr -> attributeName attr == at

7171 Nothing -> Left (NoSuchAttributeNamesError (S.singleton attrName))

7272 Just attr -> Right attr

7373

74+--similar to attributesForNames, but returns error if some names are missing

75+projectionAttributesForNames :: S.Set AttributeName -> Attributes -> Either RelationalError Attributes

76+projectionAttributesForNames names attrsIn =

77+ if not (S.null missingNames) then

78+ Left (NoSuchAttributeNamesError missingNames)

79+ else

80+ Right (attributesForNames names attrsIn)

81+ where

82+ missingNames = attributeNamesNotContained names (S.fromList (V.toList (attributeNames attrsIn)))

83+

7484attributesForNames :: S.Set AttributeName -> Attributes -> Attributes

7585attributesForNames attrNameSet = V.filter filt

7686 where

@@ -99,9 +109,12 @@ matchingAttributeNameSet = S.intersection

99109attributeNamesNotContained :: S.Set AttributeName -> S.Set AttributeName -> S.Set AttributeName

100110attributeNamesNotContained subset superset = S.filter (`S.notMember` superset) subset

101111

102−-- this is sorted so the tuples know in which order to output- the ordering is arbitrary

103−sortedAttributeNameList :: S.Set AttributeName -> [AttributeName]

104−sortedAttributeNameList attrNameSet= L.sort $ S.toList attrNameSet

112+-- useful for display

113+orderedAttributes :: Attributes -> [Attribute]

114+orderedAttributes attrs = L.sortBy (\a b -> attributeName a `compare` attributeName b) (V.toList attrs)

115+

116+orderedAttributeNames :: Attributes -> [AttributeName]

117+orderedAttributeNames attrs = map attributeName (orderedAttributes attrs)

105118

106119-- take two attribute sets and return an attribute set with the attributes which do not match

107120attributesDifference :: Attributes -> Attributes -> Attributes

src/lib/ProjectM36/AttributeNames.hs+1−29

@@ -1,38 +1,10 @@

11module ProjectM36.AttributeNames where

2−import qualified ProjectM36.Attribute as A

32import ProjectM36.Base

4−import ProjectM36.Error

53import qualified Data.Set as S

6−--AttributeNames is a data structure which can represent inverted projection attributes

4+--AttributeNames is a data structure which can represent inverted projection attributes and attribute names derived from relational expressions

86empty :: AttributeNames

97empty = AttributeNames S.empty

108

119all :: AttributeNames

1210all = InvertedAttributeNames S.empty

13−

14−--check that the attribute names are actually in the attributes

15−projectionAttributesForAttributeNames :: Attributes -> AttributeNames -> Either RelationalError Attributes

16−projectionAttributesForAttributeNames attrs (AttributeNames attrNameSet) = do

17− let nonExistentAttributeNames = A.attributeNamesNotContained attrNameSet (A.attributeNameSet attrs)

18− if not $ S.null nonExistentAttributeNames then

19− Left $ AttributeNamesMismatchError nonExistentAttributeNames

20− else

21− return $ A.attributesForNames attrNameSet attrs

22−projectionAttributesForAttributeNames attrs (InvertedAttributeNames unselectedAttrNameSet) = do

23− let nonExistentAttributeNames = A.attributeNamesNotContained unselectedAttrNameSet (A.attributeNameSet attrs)

24− if not $ S.null nonExistentAttributeNames then

25− Left $ AttributeNamesMismatchError nonExistentAttributeNames

26− else

27− return $ A.attributesForNames (A.nonMatchingAttributeNameSet unselectedAttrNameSet (A.attributeNameSet attrs)) attrs

28−projectionAttributesForAttributeNames attrs (UnionAttributeNames namesA namesB) = do

29− attrsA <- projectionAttributesForAttributeNames attrs namesA

30− attrsB <- projectionAttributesForAttributeNames attrs namesB

31− pure (A.union attrsA attrsB)

32−projectionAttributesForAttributeNames attrs (IntersectAttributeNames namesA namesB) = A.intersection <$> projectionAttributesForAttributeNames attrs namesA <*> projectionAttributesForAttributeNames attrs namesB

33−

34−invertAttributeNames :: AttributeNames -> AttributeNames

35−invertAttributeNames (AttributeNames names) = InvertedAttributeNames names

36−invertAttributeNames (InvertedAttributeNames names) = AttributeNames names

37−invertAttributeNames (UnionAttributeNames namesA namesB) = IntersectAttributeNames (invertAttributeNames namesA) (invertAttributeNames namesB)

38−invertAttributeNames (IntersectAttributeNames namesA namesB) = UnionAttributeNames (invertAttributeNames namesA) (invertAttributeNames namesB)

src/lib/ProjectM36/Base.hs+12−10

@@ -58,9 +58,7 @@ instance Hashable Atom where

5858

5959instance Binary UTCTime where

6060 put utc = put $ toRational (utcTimeToPOSIXSeconds utc)

61− get = do

62− r <- get :: Get Rational

63− return (posixSecondsToUTCTime (fromRational r))

61+ get = posixSecondsToUTCTime . fromRational <$> (get :: Get Rational)

6462

6563instance Binary Day where

6664 put day = put $ toGregorian day

@@ -197,7 +195,7 @@ data RelationalExprBase a =

197195 --- | Reference a relation variable by its name.

198196 RelationVariable RelVarName a |

199197 --- | Create a projection over attribute names. (Note that the 'AttributeNames' structure allows for the names to be inverted.)

200− Project AttributeNames (RelationalExprBase a) |

198+ Project (AttributeNamesBase a) (RelationalExprBase a) |

201199 --- | Create a union of two relational expressions. The expressions should have identical attributes.

202200 Union (RelationalExprBase a) (RelationalExprBase a) |

203201 --- | Create a join of two relational expressions. The join occurs on attributes which are identical. If the expressions have no overlapping attributes, the join becomes a cross-product of both tuple sets.

@@ -207,7 +205,7 @@ data RelationalExprBase a =

207205 --- | Return a relation containing all tuples of the first argument which do not appear in the second argument (minus).

208206 Difference (RelationalExprBase a) (RelationalExprBase a) |

209207 --- | Create a sub-relation composed of the first argument's attributes which will become an attribute of the result expression. The unreferenced attributes are not altered in the result but duplicate tuples in the projection of the expression minus the attribute names are compressed into one. For more information, <https://github.com/agentm/project-m36/blob/master/docs/introduction_to_the_relational_algebra.markdown#group read the relational algebra tutorial.>

210− Group AttributeNames AttributeName (RelationalExprBase a) |

208+ Group (AttributeNamesBase a) AttributeName (RelationalExprBase a) |

211209 --- | Create an expression to unwrap a sub-relation contained within at an attribute's name. Note that this is not always an inverse of a group operation.

212210 Ungroup AttributeName (RelationalExprBase a) |

213211 --- | Filter the tuples of the relational expression to only retain the tuples which evaluate against the restriction predicate to true.

@@ -461,11 +459,15 @@ instance Show AtomFunction where

461459 showArgTypes = L.intercalate "->" (map show (atomFuncType aFunc))

462460

463461-- | The 'AttributeNames' structure represents a set of attribute names or the same set of names but inverted in the context of a relational expression. For example, if a relational expression has attributes named "a", "b", and "c", the 'InvertedAttributeNames' of ("a","c") is ("b").

464−data AttributeNames = AttributeNames (S.Set AttributeName) |

465− InvertedAttributeNames (S.Set AttributeName) |

466− UnionAttributeNames AttributeNames AttributeNames |

467− IntersectAttributeNames AttributeNames AttributeNames

468− deriving (Eq, Show, Generic, Binary, NFData)

462+data AttributeNamesBase a = AttributeNames (S.Set AttributeName) |

463+ InvertedAttributeNames (S.Set AttributeName) |

464+ UnionAttributeNames (AttributeNamesBase a) (AttributeNamesBase a) |

465+ IntersectAttributeNames (AttributeNamesBase a) (AttributeNamesBase a) |

466+ RelationalExprAttributeNames (RelationalExprBase a) -- use attribute names from the relational expression's type

467+ deriving (Eq, Show, Generic, NFData)

468+

469+type AttributeNames = AttributeNamesBase ()

470+instance Binary AttributeNames

469471

470472-- | The persistence strategy is a global database option which represents how to persist the database in the filesystem, if at all.

471473data PersistenceStrategy = NoPersistence | -- ^ no filesystem persistence/memory-only database

src/lib/ProjectM36/Client.hs+34−15

@@ -79,7 +79,7 @@ module ProjectM36.Client

7979 TypeConstructor(..),

8080 TypeConstructorDef(..),

8181 DataConstructorDef(..),

82− AttributeNames(..),

82+ AttributeNamesBase(..),

8383 RelVarName,

8484 IncDepName,

8585 InclusionDependency(..),

@@ -110,7 +110,7 @@ import qualified ProjectM36.TransactionGraph as Graph

110110import ProjectM36.TransactionGraph

111111import qualified ProjectM36.Transaction as Trans

112112import ProjectM36.TransactionGraph.Persist

113−import ProjectM36.Attribute hiding (atomTypes)

113+import ProjectM36.Attribute

114114import ProjectM36.TransGraphRelationalExpression (TransGraphRelationalExpr, evalTransGraphRelationalExpr)

115115import ProjectM36.Persist (DiskSync(..))

116116import ProjectM36.FileLock

@@ -543,9 +543,13 @@ executeRelationalExpr sessionId (InProcessConnection conf) expr = excEither $ at

543543 Right expr

544544 case expr' of

545545 Left err -> pure (Left err)

546− Right expr'' -> case runReader (RE.evalRelationalExpr expr'') (RE.mkRelationalExprState (Sess.concreteDatabaseContext session)) of

546+ Right expr'' -> case optimizeRelationalExpr (Sess.concreteDatabaseContext session) expr'' of

547547 Left err -> pure (Left err)

548− Right rel -> pure (force (Right rel)) -- this is necessary so that any undefined/error exceptions are spit out here

548+ Right optExpr -> do

549+ let evald = runReader (RE.evalRelationalExpr optExpr) (RE.mkRelationalExprState (Sess.concreteDatabaseContext session))

550+ case evald of

551+ Left err -> pure (Left err)

552+ Right rel -> pure (force (Right rel)) -- this is necessary so that any undefined/error exceptions are spit out here

549553executeRelationalExpr sessionId conn@(RemoteProcessConnection _) relExpr = remoteCall conn (ExecuteRelationalExpr sessionId relExpr)

550554

551555-- | 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.

@@ -562,10 +566,15 @@ executeDatabaseContextExpr sessionId (InProcessConnection conf) expr = excEither

562566 Schema.processDatabaseContextExprInSchema schema expr

563567 case expr' of

564568 Left err -> pure (Left err)

565− Right expr'' -> case runState (RE.evalDatabaseContextExpr expr'') (RE.freshDatabaseState (Sess.concreteDatabaseContext session)) of

566− (Just err,_) -> pure (Left err)

567− (Nothing, (_,_,False)) -> pure (Right ()) --optimization- if nothing was dirtied, nothing to do

568− (Nothing, (!context',_,True)) -> do

569+ Right expr'' -> case runState (do

570+ eOptExpr <- applyStaticDatabaseOptimization expr''

571+ case eOptExpr of

572+ Left err -> pure (Left err)

573+ Right optExpr ->

574+ RE.evalDatabaseContextExpr optExpr) (RE.freshDatabaseState (Sess.concreteDatabaseContext session)) of

575+ (Left err,_) -> pure (Left err)

576+ (Right (), (_,_,False)) -> pure (Right ()) --optimization- if nothing was dirtied, nothing to do

577+ (Right (), (!context',_,True)) -> do

569578 let newDiscon = DisconnectedTransaction (Sess.parentId session) newSchemas True

570579 newSubschemas = Schema.processDatabaseContextExprSchemasUpdate (Sess.subschemas session) expr

571580 newSchemas = Schemas context' newSubschemas

@@ -574,7 +583,7 @@ executeDatabaseContextExpr sessionId (InProcessConnection conf) expr = excEither

574583 pure (Right ())

575584executeDatabaseContextExpr sessionId conn@(RemoteProcessConnection _) dbExpr = remoteCall conn (ExecuteDatabaseContextExpr sessionId dbExpr)

576585

577−-- | 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).

586+-- | 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.

578587autoMergeToHead :: SessionId -> Connection -> MergeStrategy -> HeadName -> IO (Either RelationalError ())

579588autoMergeToHead sessionId (InProcessConnection conf) strat headName' = do

580589 let sessions = ipSessions conf

@@ -586,11 +595,21 @@ autoMergeToHead sessionId (InProcessConnection conf) strat headName' = do

586595 eSession <- sessionForSessionId sessionId sessions

587596 case eSession of

588597 Left err -> pure (Left err)

589− Right session ->

590− case Graph.autoMergeToHead stamp (id1, id2, id3) (Sess.disconnectedTransaction session) headName' strat graph of

591− Left err -> pure (Left err)

592− Right (discon', graph') ->

593− pure (Right (discon', graph', [id1, id2, id3]))

598+ Right session ->

599+ case Graph.transactionForHead headName' graph of

600+ Nothing -> pure (Left (NoSuchHeadNameError headName'))

601+ Just headTrans -> do

602+ --attempt fast-forward commit, if possible

603+ let graphInfo = if Sess.parentId session == transactionId headTrans then do

604+ ret <- Graph.evalGraphOp stamp id1 (Sess.disconnectedTransaction session) graph Commit

605+ pure (ret, [id1])

606+ else do

607+ ret <- Graph.autoMergeToHead stamp (id1, id2, id3) (Sess.disconnectedTransaction session) headName' strat graph

608+ pure (ret, [id1,id2,id3])

609+ case graphInfo of

610+ Left err -> pure (Left err)

611+ Right ((discon', graph'), transactionIdsAdded) ->

612+ pure (Right (discon', graph', transactionIdsAdded))

594613autoMergeToHead sessionId conn@(RemoteProcessConnection _) strat headName' = remoteCall conn (ExecuteAutoMergeToHead sessionId strat headName')

595614

596615-- | Execute a database context IO-monad-based expression for the given session and connection. `DatabaseContextIOExpr`s modify the DatabaseContext but cannot be purely implemented.

@@ -843,7 +862,7 @@ typeConstructorMapping sessionId (InProcessConnection conf) = do

843862 Right (session, _) -> --warning, no schema support for typeconstructors

844863 pure (Right (B.typeConstructorMapping (Sess.concreteDatabaseContext session)))

845864typeConstructorMapping sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveTypeConstructorMapping sessionId)

846−

865+

847866-- | 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.

848867planForDatabaseContextExpr :: SessionId -> Connection -> DatabaseContextExpr -> IO (Either RelationalError DatabaseContextExpr)

849868planForDatabaseContextExpr sessionId (InProcessConnection conf) dbExpr = do

src/lib/ProjectM36/Client/Simple.hs+2−2

@@ -72,7 +72,7 @@ close (_ , conn) = C.close conn

7272withTransaction :: DbConn -> Db a -> IO (Either DbError a)

7373withTransaction sessconn = withTransactionUsing sessconn UnionMergeStrategy

7474

75−-- | Same a 'withTransaction' except that the merge strategy can be specified.

75+-- | Same as 'withTransaction' except that the merge strategy can be specified.

7676withTransactionUsing :: DbConn -> MergeStrategy -> Db a -> IO (Either DbError a)

7777withTransactionUsing (sess, conn) strat dbm = do

7878 eHeadName <- C.headName sess conn

@@ -84,7 +84,7 @@ withTransactionUsing (sess, conn) strat dbm = do

8484 handler :: TransactionCancelled -> IO (Either DbError a)

8585 handler (TransactionCancelled err) = pure (Left err)

8686 handle handler $ do

87− ret <- C.withTransaction sess conn (block >>= pure . Right) successFunc

87+ ret <- C.withTransaction sess conn (Right <$> block) successFunc

8888 case ret of

8989 Left err -> pure (Left (RelError err))

9090 Right val -> pure (Right val)

src/lib/ProjectM36/DatabaseContextFunctionUtils.hs+2−2

@@ -8,8 +8,8 @@ import Control.Monad.Trans.Reader

99executeDatabaseContextExpr :: DatabaseContextExpr -> DatabaseContext -> Either DatabaseContextFunctionError DatabaseContext

1010executeDatabaseContextExpr expr context = case runState (evalDatabaseContextExpr expr) (freshDatabaseState context) of

11− (Nothing, (context', _, _)) -> pure context'

12− (Just err, _) -> error (show err)

11+ (Right (), (context', _, _)) -> pure context'

12+ (Left err, _) -> error (show err)

1313

1414executeRelationalExpr :: RelationalExpr -> DatabaseContext -> Either RelationalError Relation

1515executeRelationalExpr expr context = runReader (evalRelationalExpr expr) (mkRelationalExprState context)

src/lib/ProjectM36/DateExamples.hs+7−4

@@ -22,10 +22,13 @@ dateExamples = empty { inclusionDependencies = dateIncDeps,

2222 suppliers = suppliersRel

2323 products = productsRel

2424 supplierProducts = supplierProductsRel

25− dateIncDeps = M.fromList [("s_pkey", simplePKey ["s#"] "s"),

26− ("p_pkey", simplePKey ["p#"] "p"),

27− ("sp_pkey", simplePKey ["s#", "p#"] "sp")

28− ]

25+ dateIncDeps = M.fromList [

26+ ("s_pkey", simplePKey ["s#"] "s"),

27+ ("p_pkey", simplePKey ["p#"] "p"),

28+ ("sp_pkey", simplePKey ["s#", "p#"] "sp"),

29+ ("s_sp_fk", inclusionDependencyForForeignKey ("sp", ["s#"]) ("s", ["s#"])),

30+ ("p_sp_fk", inclusionDependencyForForeignKey ("sp", ["p#"]) ("p", ["p#"]))

31+ ]

2932 simplePKey attrNames relvarName = inclusionDependencyForKey (AttributeNames $ S.fromList attrNames) (RelationVariable relvarName ())

3033

3134suppliersRel :: Relation

src/lib/ProjectM36/Error.hs+2

@@ -14,6 +14,8 @@ import Control.Exception

1414

1515data RelationalError = NoSuchAttributeNamesError (S.Set AttributeName)

1616 | TupleAttributeCountMismatchError Int --attribute name

17+ | EmptyAttributesError

18+ | DuplicateAttributeNamesError (S.Set AttributeName)

1719 | TupleAttributeTypeMismatchError Attributes

1820 | AttributeCountMismatchError Int

1921 | AttributeNamesMismatchError (S.Set AttributeName)

src/lib/ProjectM36/FSType.hsnew file+102

@@ -0,0 +1,102 @@

1+{-# LANGUAGE CPP #-}

2+-- confirm that the filesystem type is a journaled FS type expected by Project:M36

3+-- use statfs on Linux and macOS and GetVolumeInformation on Windows

4+-- this could still be fooled with symlinks or by disabling journaling on filesystems that support that

5+module ProjectM36.FSType where

7+#if defined(mingw32_HOST_OS)

8+# if defined(i386_HOST_ARCH)

9+# define WINDOWS_CCONV stdcall

10+# elif defined(x86_64_HOST_ARCH)

11+# define WINDOWS_CCONV ccall

12+# endif

13+import System.Win32.Types

14+import Foreign.ForeignPtr

15+import Data.Word

16+import Data.Bits

17+import Foreign.Storable

18+

19+foreign import WINDOWS_CCONV unsafe "windows.h GetVolumePathNameW"

20+ c_GetVolumePathName :: LPCTSTR -> LPTSTR -> DWORD -> IO BOOL

21+

22+foreign import WINDOWS_CCONV unsafe "windows.h GetVolumeInformationW"

23+ c_GetVolumeInformation :: LPCTSTR -> LPTSTR -> DWORD -> LPDWORD -> LPDWORD -> LPDWORD -> LPTSTR -> DWORD -> IO BOOL

24+

25+#define FILE_SUPPORTS_USN_JOURNAL 0x02000000

26+

27+getVolumePathName :: FilePath -> IO String

28+getVolumePathName path = do

29+ let maxpathlen = 260 --ANSI MAX_PATH- we only care about the drive name anyway

30+ withTString path $ \c_path -> do

31+ fp_pathout <- mallocForeignPtrBytes maxpathlen

32+ withForeignPtr fp_pathout $ \pathout -> do

33+ failIfFalse_ ("GetVolumePathNameW " ++ path) (c_GetVolumePathName c_path pathout (fromIntegral maxpathlen))

34+ peekTString pathout

35+

36+fsTypeSupportsJournaling :: FilePath -> IO Bool

37+fsTypeSupportsJournaling path = do

38+ -- get the drive path of the incoming path

39+ drive <- getVolumePathName path

40+ withTString drive $ \c_drive -> do

41+ foreign_flags <- mallocForeignPtrBytes 8

42+ withForeignPtr foreign_flags $ \ptr_fsFlags -> do

43+ failIfFalse_ (unwords ["GetVolumeInformationW", path]) (c_GetVolumeInformation c_drive nullPtr 0 nullPtr nullPtr ptr_fsFlags nullPtr 0)

44+ fsFlags <- peekByteOff ptr_fsFlags 0 :: IO Word64

45+ pure (fsFlags .&. FILE_SUPPORTS_USN_JOURNAL /= 0)

46+

47+#elif darwin_HOST_OS

48+import Foreign.C.Error

49+import Foreign.C.String

50+import Foreign.C.Types

51+

52+--Darwin reports journaling directly in the fs flags

53+

54+type CStatFS = ()

55+foreign import ccall unsafe "cDarwinFSJournaled"

56+ c_DarwinFSJournaled :: CString -> IO CInt

57+

58+fsTypeSupportsJournaling :: FilePath -> IO Bool

59+fsTypeSupportsJournaling path =

60+ withCString path $ \c_path -> do

61+ ret <- throwErrnoIfMinus1 "statfs" (c_DarwinFSJournaled c_path)

62+ pure (ret > (0 :: CInt))

63+

64+#elif linux_HOST_OS

65+import Foreign

66+import Foreign.C.Error

67+import Foreign.C.String

68+import Foreign.C.Types

69+

70+#include "MachDeps.h"

71+--Linux cannot report journaling, so we just check the filesystem type as a proxy

72+type CStatFS = ()

73+foreign import ccall unsafe "sys/vfs.h statfs"

74+ c_statfs :: CString -> Ptr CStatFS -> IO CInt

75+

76+#if WORD_SIZE_IN_BITS == 64

77+type CFSType = Word64

78+sizeofStructStatFS :: Int

79+sizeofStructStatFS = 120

80+#else

81+#error 32-bit not supported due to sizeof struct statfs missing

82+type CFSType = Word32

83+sizeofStructStatFS :: Int

84+sizeofStructStatFS = undefined

85+#endif

86+

87+fsTypeSupportsJournaling :: FilePath -> IO Bool

88+fsTypeSupportsJournaling path = do

89+ struct_statfs <- mallocForeignPtrBytes sizeofStructStatFS

90+ withCString path $ \c_path -> do

91+ withForeignPtr struct_statfs $ \ptr_statfs -> do

92+ throwErrnoIfMinus1_ "statfs" (c_statfs c_path ptr_statfs)

93+ cfstype <- peekByteOff ptr_statfs 0 :: IO CFSType

94+ let journaledFS = [0xEF53, --EXT3+4

95+ 0x5346544e, --NTFS

96+ 0x52654973, --REISERFS

97+ 0x58465342, --XFS

98+ 0x3153464a --JFS

99+ ]

100+ pure (elem cfstype journaledFS)

101+#endif

102+

src/lib/ProjectM36/FileLock.hs+19−24

@@ -2,11 +2,9 @@

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

5−import System.IO

87#if defined(mingw32_HOST_OS)

9−import ProjectM36.Win32Handle

108import System.Win32.Types

119import Foreign.Marshal.Alloc

1210import System.Win32.File

@@ -24,19 +22,24 @@ foreign import WINDOWS_CCONV "LockFileEx" c_lockFileEx :: HANDLE -> DWORD -> DWO

2422

2523foreign import WINDOWS_CCONV "UnlockFileEx" c_unlockFileEx :: HANDLE -> DWORD -> DWORD -> DWORD -> LPOVERLAPPED -> IO BOOL

2624

27−type LockFile = Handle

25+type LockFile = HANDLE

2826

2927openLockFile :: FilePath -> IO LockFile

30−openLockFile path = openFile path ReadMode

28+openLockFile path = createFile path

29+ (gENERIC_READ .|. gENERIC_WRITE)

30+ (fILE_SHARE_READ .|. fILE_SHARE_WRITE)

31+ Nothing

32+ oPEN_ALWAYS

33+ fILE_ATTRIBUTE_NORMAL

34+ Nothing

3135

3236closeLockFile :: LockFile -> IO ()

3337closeLockFile file = do

34− unlockFile file

35− hClose file

38+ closeHandle file

3639

3740--swiped from System.FileLock package

38−lockFile :: Handle -> LockType -> IO ()

39−lockFile handle lock = withHandleToHANDLE handle $ \winHandle -> do

41+lockFile :: HANDLE -> LockType -> IO ()

42+lockFile winHandle lock = do

4043 let exFlag = case lock of

4144 WriteLock -> 2

4245 ReadLock -> 0

@@ -45,28 +48,21 @@ lockFile handle lock = withHandleToHANDLE handle $ \winHandle -> do

4548

4649 allocaBytes sizeof_OVERLAPPED $ \op -> do

4750 zeroMemory op $ fromIntegral sizeof_OVERLAPPED

48− res <- c_lockFileEx winHandle (exFlag .|. blockFlag) 0 1 0 op

49− if res then

50− pure ()

51− else

52− error "failed to wait for database lock"

53−

54−unlockFile :: Handle -> IO ()

55−unlockFile handle = withHandleToHANDLE handle $ \winHandle -> do

51+ failIfFalse_ "LockFileEx" $ c_lockFileEx winHandle (exFlag .|. blockFlag) 0 1 0 op

52+

53+unlockFile :: HANDLE -> IO ()

54+unlockFile winHandle = do

5655 let sizeof_OVERLAPPED = 32

5756 allocaBytes sizeof_OVERLAPPED $ \op -> do

5857 zeroMemory op $ fromIntegral sizeof_OVERLAPPED

59− res <- c_unlockFileEx winHandle 0 1 0 op

60− if res then

61− pure ()

62− else

63− error ("failed to unlock database lock: " ++ show res)

58+ failIfFalse_ "UnlockFileEx" $ c_unlockFileEx winHandle 0 1 0 op

6459

6560#else

6661--all of this complicated nonsense is fixed if we switch to GHC 8.2 which includes native flock support on handles

6762import qualified System.Posix.IO as P

6863import System.Posix.Types

6964import System.Posix.Files

65+import System.IO

7066

7167lockStruct :: P.LockRequest -> P.FileLock

7268lockStruct req = (req, AbsoluteSeek, 0, 0)

@@ -79,8 +75,7 @@ openLockFile path =

7975 LockFile <$> P.createFile path ownerWriteMode

8076

8177closeLockFile :: LockFile -> IO ()

82−closeLockFile l@(LockFile fd) = do

83− unlockFile l

78+closeLockFile (LockFile fd) =

8479 P.closeFd fd

8580

8681--blocks on lock, if necessary

@@ -96,6 +91,6 @@ unlockFile (LockFile fd) =

9691 P.waitToSetLock fd (lockStruct P.Unlock)

9792#endif

9893

99−data LockType = ReadLock | WriteLock

94+data LockType = ReadLock | WriteLock deriving (Show)

10095

10196

src/lib/ProjectM36/IsomorphicSchema.hs+10−10

@@ -1,4 +1,4 @@

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

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

22module ProjectM36.IsomorphicSchema where

33import ProjectM36.Base

44import ProjectM36.Error

@@ -82,9 +82,9 @@ isomorphsOutRelVarNames morphs = S.fromList (foldr rvnames [] morphs)

8282

8383-- | Check that all mentioned relvars are actually present in the current schema.

8484validateRelationalExprInSchema :: Schema -> RelationalExpr -> Either RelationalError ()

85−validateRelationalExprInSchema schema relExprIn = relExprMogrify (\expr -> case expr of

86− RelationVariable rv () | S.notMember rv validRelVarNames -> Left (RelVarNotDefinedError rv)

87− ex -> Right ex) relExprIn >> pure ()

85+validateRelationalExprInSchema schema relExprIn = relExprMogrify (\case

86+ RelationVariable rv () | S.notMember rv validRelVarNames -> Left (RelVarNotDefinedError rv)

87+ ex -> Right ex) relExprIn >> pure ()

8888 where

8989 validRelVarNames = isomorphsInRelVarNames (isomorphs schema)

9090

@@ -133,16 +133,16 @@ applySchemaToInclusionDependencies (Schema morphs) incDeps =

133133

134134-- | Morph a relational expression in one schema to another isomorphic schema.

135135relExprMorph :: SchemaIsomorph -> (RelationalExpr -> Either RelationalError RelationalExpr)

136−relExprMorph (IsoRestrict relIn _ (relOutTrue, relOutFalse)) = \expr -> case expr of

136+relExprMorph (IsoRestrict relIn _ (relOutTrue, relOutFalse)) = \case

137137 RelationVariable rv () | rv == relIn -> Right (Union (RelationVariable relOutTrue ()) (RelationVariable relOutFalse ()))

138138 orig -> Right orig

139−relExprMorph (IsoUnion (relInT, relInF) predi relTarget) = \expr -> case expr of

139+relExprMorph (IsoUnion (relInT, relInF) predi relTarget) = \case

140140 --only the true predicate portion appears in the virtual schema

141141 RelationVariable rv () | rv == relInT -> Right (Restrict predi (RelationVariable relTarget ()))

142142

143143 RelationVariable rv () | rv == relInF -> Right (Restrict (NotPredicate predi) (RelationVariable relTarget ()))

144144 orig -> Right orig

145−relExprMorph (IsoRename relIn relOut) = \expr -> case expr of

145+relExprMorph (IsoRename relIn relOut) = \case

146146 RelationVariable rv () | rv == relIn -> Right (RelationVariable relOut ())

147147 orig -> Right orig

148148

@@ -254,7 +254,7 @@ inclusionDependencyInSchema schema (InclusionDependency rexprA rexprB) = do

254254-- also, it's inverse to IsoRestrict which adds two constraints at the base level

255255-- for IsoRestrict, consider hiding the two, generated constraints since they can never be thrown in the isomorphic schema

256256inclusionDependenciesInSchema :: Schema -> InclusionDependencies -> Either RelationalError InclusionDependencies

257−inclusionDependenciesInSchema schema incDeps = mapM (\(depName, dep) -> inclusionDependencyInSchema schema dep >>= \newDep -> pure (depName, newDep)) (M.toList incDeps) >>= pure . M.fromList

257+inclusionDependenciesInSchema schema incDeps = M.fromList <$> mapM (\(depName, dep) -> inclusionDependencyInSchema schema dep >>= \newDep -> pure (depName, newDep)) (M.toList incDeps)

258258

259259relationVariablesInSchema :: Schema -> DatabaseContext -> Either RelationalError RelationVariables

260260relationVariablesInSchema schema@(Schema morphs) context = foldM transform M.empty morphs

@@ -324,8 +324,8 @@ evalSchemaExpr (AddSubschema sname morphs) context sschemas =

324324 incDepExprs = MultipleExpr (map (uncurry AddInclusionDependency) (M.toList moreIncDeps))

325325 in

326326 case runState (evalDatabaseContextExpr incDepExprs) (context, M.empty, False) of

327− (Just err, _) -> Left err

328− (Nothing, (newContext,_,_)) -> pure (newSchemas, newContext) --need to propagate dirty flag here

327+ (Left err, _) -> Left err

328+ (Right (), (newContext,_,_)) -> pure (newSchemas, newContext) --need to propagate dirty flag here

329329 where

330330 newSchema = Schema morphs

331331 valid = validateSchema newSchema context

src/lib/ProjectM36/Key.hs+20−7

@@ -39,16 +39,29 @@ databaseContextExprForUniqueKey rvName attrNames = AddInclusionDependency (rvNam

3939

4040-- | Create a foreign key constraint from the first relation variable and attributes to the second.

4141databaseContextExprForForeignKey :: IncDepName -> (RelVarName, [AttributeName]) -> (RelVarName, [AttributeName]) -> DatabaseContextExpr

42−databaseContextExprForForeignKey fkName (rvA, attrsA) (rvB, attrsB) =

43− AddInclusionDependency fkName (InclusionDependency

44− (renameIfNecessary attrsB attrsA (Project (attrsL attrsA)

45− (RelationVariable rvA ())))

46− (Project (attrsL attrsB)

47− (RelationVariable rvB ())))

42+databaseContextExprForForeignKey fkName infoA infoB =

43+ AddInclusionDependency fkName (inclusionDependencyForForeignKey infoA infoB)

44+

45+inclusionDependencyForForeignKey :: (RelVarName, [AttributeName]) -> (RelVarName, [AttributeName]) -> InclusionDependency

46+inclusionDependencyForForeignKey (rvA, attrsA) (rvB, attrsB) =

47+ InclusionDependency (

48+ renameIfNecessary attrsB attrsA (Project (attrsL attrsA)

49+ (RelationVariable rvA ()))) (

50+ Project (attrsL attrsB) (RelationVariable rvB ()))

4851 where

4952 attrsL = AttributeNames . S.fromList

5053 renameIfNecessary attrsExpected attrsExisting expr = foldr folder expr (zip attrsExpected attrsExisting)

5154 folder (attrExpected, attrExisting) expr = if attrExpected == attrExisting then

5255 expr

5356 else

54− Rename attrExisting attrExpected expr

57+ Rename attrExisting attrExpected expr

58+

59+-- if the constraint is a foreign key constraint, then return the relations and attributes involved - this only detects foreign keys created with `databaseContextExprForForeignKey`

60+isForeignKeyFor :: InclusionDependency -> (RelVarName, [AttributeName]) -> (RelVarName, [AttributeName]) -> Bool

61+isForeignKeyFor incDep infoA infoB = incDep == checkIncDep

62+ where

63+ checkIncDep = inclusionDependencyForForeignKey infoA infoB

64+

65+

66+

67+

src/lib/ProjectM36/MiscUtils.hs+6

@@ -7,3 +7,9 @@ dupes [_] = []

77dupes [x,y] = [x | x == y]

88dupes (x:y:xs) = dupes(x:[y]) ++ dupes(y : xs)

10+--Data.Vector.indexed but for lists

11+indexed :: [a] -> [(Int, a)]

12+indexed = go 0

13+ where

14+ go _ [] = []

15+ go i (v:ys) = (i,v):go (i+1) ys

src/lib/ProjectM36/Persist.hs+53−7

@@ -2,11 +2,27 @@

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

89import qualified Data.Text.IO as TIO

9−import Data.Text

10+import qualified Data.Text as T

11+

12+#if defined(linux_HOST_OS)

13+# define FDCOUNTSUPPORTED 1

14+# define FDDIR "/proc/self/fd"

15+#elif defined(darwin_HOST_OS)

16+# define FDCOUNTSUPPORTED 1

17+# define FDDIR "/dev/fd"

18+#else

19+# define FDCOUNTSUPPORTED 0

20+#endif

21+

22+#if FDCOUNTSUPPORTED

23+import System.Directory

24+#endif

25+

1026#if defined(mingw32_HOST_OS)

1127import qualified System.Win32 as Win32

1228#else

@@ -16,7 +32,7 @@ import System.Posix.Unistd (fileSynchroniseDataOnly)

1632#else

1733import System.Posix.Unistd (fileSynchronise)

1834#endif

19−import System.Posix.IO (handleToFd)

35+import System.Posix.IO (handleToFd, closeFd)

2036import Foreign.C

2137#endif

2238

@@ -31,7 +47,8 @@ foreign import ccall unsafe "cDirectoryFsync" cHSDirectoryFsync :: CString -> IO

3147

3248data DiskSync = NoDiskSync | FsyncDiskSync

3349

34−writeFileSync :: DiskSync -> FilePath -> Text -> IO()

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

51+writeFileSync :: DiskSync -> FilePath -> T.Text -> IO()

3552writeFileSync sync path strOut = withFile path WriteMode handler

3653 where

3754 handler handle = do

@@ -58,11 +75,18 @@ syncHandle FsyncDiskSync handle =

5875#if defined(mingw32_HOST_OS)

5976 withHandleToHANDLE handle (\h -> Win32.flushFileBuffers h)

6077#elif defined(linux_HOST_OS)

78+ do

6179 --fdatasync doesn't exist on macOS

62− handleToFd handle >>= fileSynchroniseDataOnly

63−#else

64− handleToFd handle >>= fileSynchronise

80+ fd <- handleToFd handle

81+ fileSynchroniseDataOnly fd

82+ closeFd fd

83+#else

84+ do

85+ fd <- handleToFd handle

86+ fileSynchronise fd

87+ closeFd fd

6588#endif

89+

6690syncHandle NoDiskSync _ = pure ()

6791

6892syncDirectory :: DiskSync -> FilePath -> IO ()

@@ -82,3 +106,25 @@ directoryFsync _ = pure () -- on Windows directory metadata cannot be synchroniz

82106directoryFsync path = throwErrnoIfMinus1Retry_ "directoryFsync" (withCString path $ \cpath -> cHSDirectoryFsync cpath)

83107#endif

84108

109+--prints out number of consumed file descriptors

110+printFdCount :: IO ()

111+printFdCount =

112+#if FDCOUNTSUPPORTED

113+ do

114+ fdc <- fdCount

115+ putStrLn ("Fd count: " ++ show fdc)

116+ --getLine >> pure ()

117+#else

118+ putStrLn "Fd count not supported on this OS."

119+#endif

120+

121+

122+fdCount :: IO Int

123+#if FDCOUNTSUPPORTED

124+fdCount = do

125+ fds <- getDirectoryContents FDDIR

126+ pure ((length fds) - 2)

127+#else

128+--not supported on non-linux

129+fdCount = pure 0

130+#endif

src/lib/ProjectM36/Relation.hs+29−27

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

99import ProjectM36.Base

1010import ProjectM36.Tuple

1111import qualified ProjectM36.Attribute as A

12−import qualified ProjectM36.AttributeNames as AS

1312import ProjectM36.TupleSet

1413import ProjectM36.Error

14+import ProjectM36.MiscUtils

1515--import qualified Control.Parallel.Strategies as P

1616import qualified ProjectM36.TypeConstructorDef as TCD

1717import qualified ProjectM36.DataConstructorDef as DCD

@@ -19,6 +19,7 @@ import qualified Data.Text as T

1919import Data.Either (isRight)

2020import System.Random.Shuffle

2121import Control.Monad.Random

22+import Data.List (sort)

2223

2324attributes :: Relation -> Attributes

2425attributes (Relation attrs _ ) = attrs

@@ -36,20 +37,24 @@ atomTypeForName :: AttributeName -> Relation -> Either RelationalError AtomType

3637atomTypeForName attrName (Relation attrs _) = A.atomTypeForAttributeName attrName attrs

3738

3839mkRelationFromList :: Attributes -> [[Atom]] -> Either RelationalError Relation

39−mkRelationFromList attrs atomMatrix = do

40− tupSet <- mkTupleSetFromList attrs atomMatrix

41− return $ Relation attrs tupSet

40+mkRelationFromList attrs atomMatrix =

41+ Relation attrs <$> mkTupleSetFromList attrs atomMatrix

4242

4343emptyRelationWithAttrs :: Attributes -> Relation

4444emptyRelationWithAttrs attrs = Relation attrs emptyTupleSet

4545

4646mkRelation :: Attributes -> RelationTupleSet -> Either RelationalError Relation

47−mkRelation attrs tupleSet =

48− --check that all tuples have the same keys

49− --check that all tuples have keys (1-N) where N is the attribute count

50− case verifyTupleSet attrs tupleSet of

51− Left err -> Left err

52− Right verifiedTupleSet -> return $ Relation attrs verifiedTupleSet

47+mkRelation attrs tupleSet =

48+ --check that all attributes are unique- this cannot be done when creating attributes because the check can become expensive

49+ let duplicateAttrNames = dupes (sort (map A.attributeName (V.toList attrs))) in

50+ if not (null duplicateAttrNames) then

51+ Left (DuplicateAttributeNamesError (S.fromList duplicateAttrNames))

52+ else

53+ --check that all tuples have the same keys

54+ --check that all tuples have keys (1-N) where N is the attribute count

55+ case verifyTupleSet attrs tupleSet of

56+ Left err -> Left err

57+ Right verifiedTupleSet -> return $ Relation attrs verifiedTupleSet

5358

5459--less safe version of mkRelation skips verifyTupleSet

5560--useful for infinite or thunked tuple sets

@@ -78,6 +83,7 @@ singletonTuple rel@(Relation _ tupleSet) = if cardinality rel == Finite 1 then

7883 else

7984 Nothing

8085

86+-- 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)

8187union :: Relation -> Relation -> Either RelationalError Relation

8288union (Relation attrs1 tupSet1) (Relation attrs2 tupSet2) =

8389 if not (A.attributesEqual attrs1 attrs2)

@@ -86,16 +92,13 @@ union (Relation attrs1 tupSet1) (Relation attrs2 tupSet2) =

8692 Right $ Relation attrs1 newtuples

8793 where

8894 newtuples = RelationTupleSet $ HS.toList . HS.fromList $ asList tupSet1 ++ map (reorderTuple attrs1) (asList tupSet2)

89−

90−project :: AttributeNames -> Relation -> Either RelationalError Relation

91−project projectionAttrNames rel =

92− case AS.projectionAttributesForAttributeNames (attributes rel) projectionAttrNames of

93− Left err -> Left err

94− Right newAttrs -> relFold (folder newAttrs) (Right $ Relation newAttrs emptyTupleSet) rel

95− where

96− folder newAttrs tupleToProject acc = case acc of

97− Left err -> Left err

98− Right acc2 -> acc2 `union` Relation newAttrs (RelationTupleSet [tupleProject (A.attributeNameSet newAttrs) tupleToProject])

95+

96+project :: S.Set AttributeName -> Relation -> Either RelationalError Relation

97+project attrNames rel@(Relation _ tupSet) = do

98+ newAttrs <- A.projectionAttributesForNames attrNames (attributes rel)

99+ let newAttrNameSet = A.attributeNameSet newAttrs

100+ newTupleList = map (tupleProject newAttrNameSet) (asList tupSet)

101+ pure (Relation newAttrs (RelationTupleSet (HS.toList (HS.fromList newTupleList))))

99102

100103rename :: AttributeName -> AttributeName -> Relation -> Either RelationalError Relation

101104rename oldAttrName newAttrName rel@(Relation oldAttrs oldTupSet)

@@ -142,11 +145,11 @@ group groupAttrNames newAttrName rel@(Relation oldAttrs tupleSet) = do

142145-}

143146

144147--algorithm: self-join with image relation

145−group :: AttributeNames -> AttributeName -> Relation -> Either RelationalError Relation

148+group :: S.Set AttributeName -> AttributeName -> Relation -> Either RelationalError Relation

146149group groupAttrNames newAttrName rel = do

147− let nonGroupAttrNames = AS.invertAttributeNames groupAttrNames

148− nonGroupProjectionAttributes <- AS.projectionAttributesForAttributeNames (attributes rel) nonGroupAttrNames

149− groupProjectionAttributes <- AS.projectionAttributesForAttributeNames (attributes rel) groupAttrNames

150+ let nonGroupAttrNames = A.nonMatchingAttributeNameSet groupAttrNames (S.fromList (V.toList (A.attributeNames (attributes rel))))

151+ nonGroupProjectionAttributes <- A.projectionAttributesForNames nonGroupAttrNames (attributes rel)

152+ groupProjectionAttributes <- A.projectionAttributesForNames groupAttrNames (attributes rel)

150153 let groupAttr = Attribute newAttrName (RelationAtomType groupProjectionAttributes)

151154 matchingRelTuple tupIn = case imageRelationFor tupIn rel of

152155 Right rel2 -> RelationTuple (V.singleton groupAttr) (V.singleton (RelationAtom rel2))

@@ -216,8 +219,7 @@ join (Relation attrs1 tupSet1) (Relation attrs2 tupSet2) = do

216219 joinedTupSet <- singleTupleSetJoin newAttrs tuple1 tupSet2

217220 return $ joinedTupSet ++ accumulator

218221 newTupSetList <- foldM tupleSetJoiner [] (asList tupSet1)

219− newTupSet <- mkTupleSet newAttrs newTupSetList

220− return $ Relation newAttrs newTupSet

222+ Relation newAttrs <$> mkTupleSet newAttrs newTupSetList

221223

222224-- | 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.

223225difference :: Relation -> Relation -> Either RelationalError Relation

@@ -267,7 +269,7 @@ toList rel = do

267269imageRelationFor :: RelationTuple -> Relation -> Either RelationalError Relation

268270imageRelationFor matchTuple rel = do

269271 restricted <- restrictEq matchTuple rel --restrict across matching tuples

270− let projectionAttrNames = AttributeNames $ A.nonMatchingAttributeNameSet (attributeNames rel) (tupleAttributeNameSet matchTuple)

272+ let projectionAttrNames = A.nonMatchingAttributeNameSet (attributeNames rel) (tupleAttributeNameSet matchTuple)

271273 project projectionAttrNames restricted --project across attributes not in rel

272274

273275--returns a relation-valued attribute image relation for each tuple in rel1

src/lib/ProjectM36/Relation/Parse/CSV.hs+1−1

@@ -57,7 +57,7 @@ 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

6363parseCSVAtomP _ _ TextAtomType = do

src/lib/ProjectM36/Relation/Show/HTML.hs+33−10

@@ -3,22 +3,42 @@ import ProjectM36.Base

33import ProjectM36.Relation

44import ProjectM36.Tuple

55import ProjectM36.Atom

6+import ProjectM36.AtomType

67import qualified Data.List as L

7−import ProjectM36.Attribute

8−import Data.Text (append, Text, pack)

8+import Data.Text (Text, pack)

99import qualified Data.Text as T

1010import qualified Data.Text.IO as TIO

11+import Data.Monoid

12+import qualified Data.Vector as V

1113

1214attributesAsHTML :: Attributes -> Text

13−attributesAsHTML attrs = "<tr>" `append` T.concat (map oneAttrHTML attrNameList) `append` "</tr>"

15+attributesAsHTML attrs = "<tr>" <> T.concat (map oneAttrHTML (V.toList attrs)) <> "</tr>"

1416 where

15− oneAttrHTML attrName = "<th>" `append` attrName `append` "</th>"

16− attrNameList = sortedAttributeNameList (attributeNameSet attrs)

17+ oneAttrHTML attr = "<th>" <> prettyAttribute attr <> "</th>"

1718

1819relationAsHTML :: Relation -> Text

19−relationAsHTML rel@(Relation attrNameSet tupleSet) = "<table border=\"1\">" `append` attributesAsHTML attrNameSet `append` tupleSetAsHTML tupleSet `append` "<tfoot>" `append` tablefooter `append` "</tfoot></table>"

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

21+relationAsHTML rel@(Relation attrNameSet tupleSet)

22+ | rel == relationTrue = pm36relcss <>

23+ tablestart <>

24+ "<tr><th></th></tr>" <>

25+ "<tr><td></td></tr>" <>

26+ tablefooter <> "</table>"

27+ | rel == relationFalse = pm36relcss <>

28+ tablestart <>

29+ "<tr><th></th></tr>" <>

30+ tablefooter <>

31+ "</table>"

32+ | otherwise = pm36relcss <>

33+ tablestart <>

34+ attributesAsHTML attrNameSet <>

35+ tupleSetAsHTML tupleSet <>

36+ tablefooter <>

37+ "</table>"

2038 where

21− tablefooter = "<tr><td colspan=\"100%\">" `append` pack (show (cardinality rel)) `append` " tuples</td></tr>"

39+ pm36relcss = "<style>.pm36relation {empty-cells: show;} .pm36relation tbody td, .pm36relation th { border: 1px solid black;}</style>"

40+ tablefooter = "<tfoot><tr><td colspan=\"100%\">" <> pack (show (cardinality rel)) <> " tuples</td></tr></tfoot>"

41+ tablestart = "<table class=\"pm36relation\"\">"

2242

2343writeHTML :: Text -> IO ()

2444writeHTML = TIO.writeFile "/home/agentm/rel.html"

@@ -27,11 +47,14 @@ writeRel :: Relation -> IO ()

2747writeRel = writeHTML . relationAsHTML

2848

2949tupleAsHTML :: RelationTuple -> Text

30−tupleAsHTML tuple = "<tr>" `append` T.concat (L.map tupleFrag (tupleSortedAssocs tuple)) `append` "</tr>"

50+tupleAsHTML tuple = "<tr>" <> T.concat (L.map tupleFrag (tupleAssocs tuple)) <> "</tr>"

3151 where

32− tupleFrag tup = "<td>" `append` atomToText (snd tup) `append` "</td>"

52+ tupleFrag tup = "<td>" <> atomAsHTML (snd tup) <> "</td>"

53+ atomAsHTML (RelationAtom rel) = relationAsHTML rel

54+ atomAsHTML atom = atomToText atom

3355

3456tupleSetAsHTML :: RelationTupleSet -> Text

3557tupleSetAsHTML tupSet = foldr folder "" (asList tupSet)

3658 where

37− folder tuple acc = acc `append` tupleAsHTML tuple

59+ folder tuple acc = acc <> tupleAsHTML tuple

60+

src/lib/ProjectM36/Relation/Show/Term.hs+2−9

@@ -8,7 +8,6 @@ import ProjectM36.Relation

88import ProjectM36.Attribute hiding (null)

99import qualified Data.List as L

1010import qualified Data.Text as T

11−import qualified Data.Vector as V

1211import Control.Arrow hiding (left)

1312

1413boxV :: StringType

@@ -84,8 +83,8 @@ cellSizes (header, body) = map (map maxRowWidth &&& map (length . breakLines)) a

8483relationAsTable :: Relation -> Table

8584relationAsTable rel@(Relation _ tupleSet) = (header, body)

8685 where

87− oAttrs = orderedAttributes rel

88− oAttrNames = orderedAttributeNames rel

86+ oAttrs = orderedAttributes (attributes rel)

87+ oAttrNames = orderedAttributeNames (attributes rel)

8988 header = map prettyAttribute oAttrs

9089 body :: [[Cell]]

9190 body = L.foldl' tupleFolder [] (asList tupleSet)

@@ -143,12 +142,6 @@ renderBody cellMatrix cellLocs = renderRows `T.append` renderBottomBar

143142 rowHeightMatrix = zip cellMatrix (tail rowLocations)

144143 renderBottomBar = renderHBar boxBL boxBB boxBR columnLocations

145144

146−orderedAttributes :: Relation -> [Attribute]

147−orderedAttributes rel = L.sortBy (\a b -> attributeName a `compare` attributeName b) (V.toList (attributes rel))

148−

149−orderedAttributeNames :: Relation -> [AttributeName]

150−orderedAttributeNames rel = map attributeName (orderedAttributes rel)

151−

152145repeatString :: Int -> StringType -> StringType

153146repeatString c s = T.concat (replicate c s)

154147

src/lib/ProjectM36/RelationalExpression.hs+122−65

@@ -14,6 +14,7 @@ import ProjectM36.DatabaseContextFunction

1414import qualified ProjectM36.Attribute as A

1515import qualified Data.Map as M

1616import qualified Data.HashSet as HS

17+import qualified Data.Set as S

1718import Control.Monad.State hiding (join)

1819import Control.Exception

1920import Data.Maybe

@@ -113,10 +114,14 @@ evalRelationalExpr (RelationVariable name _) = do

113114 Nothing -> Left $ RelVarNotDefinedError name

114115

115116evalRelationalExpr (Project attrNames expr) = do

116− rel <- evalRelationalExpr expr

117− case rel of

118− Right rel2 -> return $ project attrNames rel2

119− Left err -> return $ Left err

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

120125

121126evalRelationalExpr (Union exprA exprB) = do

122127 relA <- evalRelationalExpr exprA

@@ -173,11 +178,15 @@ evalRelationalExpr (Rename oldAttrName newAttrName relExpr) = do

173178 Right rel -> return $ rename oldAttrName newAttrName rel

174179 Left err -> return $ Left err

175180

176−evalRelationalExpr (Group oldAttrNameSet newAttrName relExpr) = do

177− evald <- evalRelationalExpr relExpr

178− case evald of

179− Right rel -> return $ group oldAttrNameSet newAttrName rel

180− Left err -> return $ Left err

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

181190

182191evalRelationalExpr (Ungroup attrName relExpr) = do

183192 evald <- evalRelationalExpr relExpr

@@ -228,43 +237,43 @@ evalRelationalExpr (Extend tupleExpression relExpr) = do

228237 Right (newAttrs, tupProc') -> pure $ relMogrify tupProc' newAttrs rel

229238

230239--helper function to process relation variable creation/assignment

231−setRelVar :: RelVarName -> Relation -> DatabaseState (Maybe RelationalError)

240+setRelVar :: RelVarName -> Relation -> DatabaseState (Either RelationalError ())

232241setRelVar relVarName rel = do

233242 currentContext <- getStateContext

234243 let newRelVars = M.insert relVarName rel $ relationVariables currentContext

235244 potentialContext = currentContext { relationVariables = newRelVars }

236245

237246 case checkConstraints potentialContext of

238− Left err -> pure (Just err)

247+ Left err -> pure (Left err)

239248 Right _ -> do

240249 putStateContext potentialContext

241− return Nothing

250+ return (Right ())

242251

243252-- 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

244−deleteRelVar :: RelVarName -> DatabaseState (Maybe RelationalError)

253+deleteRelVar :: RelVarName -> DatabaseState (Either RelationalError ())

245254deleteRelVar relVarName = do

246255 currContext <- getStateContext

247256 let relVars = relationVariables currContext

248257 if M.notMember relVarName relVars then

249− pure Nothing

258+ pure (Right ())

250259 else do

251260 let newRelVars = M.delete relVarName relVars

252261 newContext = currContext { relationVariables = newRelVars }

253262 putStateContext newContext

254− pure Nothing

263+ pure (Right ())

255264

256−evalDatabaseContextExpr :: DatabaseContextExpr -> DatabaseState (Maybe RelationalError)

257−evalDatabaseContextExpr NoOperation = pure Nothing

265+evalDatabaseContextExpr :: DatabaseContextExpr -> DatabaseState (Either RelationalError ())

266+evalDatabaseContextExpr NoOperation = pure (Right ())

258267

259268evalDatabaseContextExpr (Define relVarName attrExprs) = do

260269 relvars <- fmap relationVariables getStateContext

261270 tConss <- fmap typeConstructorMapping getStateContext

262271 let eAttrs = map (evalAttrExpr tConss) attrExprs

263272 case lefts eAttrs of

264− err:_ -> pure (Just err)

273+ err:_ -> pure (Left err)

265274 [] -> case M.member relVarName relvars of

266− True -> return (Just (RelVarAlreadyDefinedError relVarName))

267− False -> setRelVar relVarName emptyRelation >> pure Nothing

275+ True -> pure (Left (RelVarAlreadyDefinedError relVarName))

276+ False -> setRelVar relVarName emptyRelation >> pure (Right ())

268277 where

269278 attrs = A.attributesFromList (rights eAttrs)

270279 emptyRelation = Relation attrs emptyTupleSet

@@ -278,7 +287,7 @@ evalDatabaseContextExpr (Assign relVarName expr) = do

278287 relVarTable = relationVariables context

279288 value = runReader (evalRelationalExpr expr) (RelationalExprStateElems context)

280289 case value of

281− Left err -> return $ Just err

290+ Left err -> pure (Left err)

282291 Right rel -> case existingRelVar of

283292 Nothing -> setRelVar relVarName rel

284293 Just existingRel -> let expectedAttributes = attributes existingRel

@@ -286,7 +295,7 @@ evalDatabaseContextExpr (Assign relVarName expr) = do

286295 if A.attributesEqual expectedAttributes foundAttributes then

287296 setRelVar relVarName rel

288297 else

289− pure (Just (RelationTypeMismatchError expectedAttributes foundAttributes))

298+ pure (Left (RelationTypeMismatchError expectedAttributes foundAttributes))

290299

291300evalDatabaseContextExpr (Insert relVarName relExpr) = do

292301 context <- getStateContext

@@ -295,11 +304,11 @@ evalDatabaseContextExpr (Insert relVarName relExpr) = do

295304 unioned = runReader (evalRelationalExpr unionexp) (RelationalExprStateElems context)

296305 origRel = runReader (evalRelationalExpr rv) (RelationalExprStateElems context)

297306 case unioned of

298− Left err -> pure (Just err)

307+ Left err -> pure (Left err)

299308 Right unioned' -> case origRel of

300− Left err -> pure (Just err)

309+ Left err -> pure (Left err)

301310 Right origRel' -> if cardinality unioned' == cardinality origRel' then --no tuples actually inserted

302− pure Nothing

311+ pure (Right ())

303312 else

304313 evalDatabaseContextExpr $ Assign relVarName (ExistingRelation unioned')

305314

@@ -309,11 +318,11 @@ evalDatabaseContextExpr (Delete relVarName predicate) = do

309318 let updatedRel = runReader (evalRelationalExpr (Restrict (NotPredicate predicate) rv)) (RelationalExprStateElems context)

310319 origRel = runReader (evalRelationalExpr rv) (RelationalExprStateElems context)

311320 case updatedRel of

312− Left err -> pure (Just err)

321+ Left err -> pure (Left err)

313322 Right updatedRel' -> case origRel of

314− Left err -> pure (Just err)

323+ Left err -> pure (Left err)

315324 Right origRel' -> if cardinality origRel' == cardinality updatedRel' then

316− pure Nothing

325+ pure (Right ())

317326 else

318327 setRelVar relVarName updatedRel'

319328

@@ -322,10 +331,10 @@ evalDatabaseContextExpr (Update relVarName atomExprMap restrictionPredicateExpr)

322331 context <- getStateContext

323332 let relVarTable = relationVariables context

324333 case M.lookup relVarName relVarTable of

325− Nothing -> return $ Just (RelVarNotDefinedError relVarName)

334+ Nothing -> pure (Left (RelVarNotDefinedError relVarName))

326335 Just rel ->

327336 case runReader (predicateRestrictionFilter (attributes rel) restrictionPredicateExpr) (RelationalExprStateElems context) of

328− Left err -> return $ Just err

337+ Left err -> pure (Left err)

329338 Right predicateFunc -> do

330339 let ret = do

331340 restrictedPortion <- restrict predicateFunc rel

@@ -337,8 +346,8 @@ evalDatabaseContextExpr (Update relVarName atomExprMap restrictionPredicateExpr)

337346 updatedRel <- updatedPortion `union` unrestrictedPortion

338347 pure (Just updatedRel)

339348 case ret of

340− Left err -> pure (Just err)

341− Right Nothing -> pure Nothing

349+ Left err -> pure (Left err)

350+ Right Nothing -> pure (Right ())

342351 Right (Just updatedRel) -> setRelVar relVarName updatedRel

343352

344353evalDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do

@@ -346,48 +355,48 @@ evalDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do

346355 let currDeps = inclusionDependencies currContext

347356 newDeps = M.insert newDepName newDep currDeps

348357 if M.member newDepName currDeps then

349− return $ Just (InclusionDependencyNameInUseError newDepName)

358+ pure (Left (InclusionDependencyNameInUseError newDepName))

350359 else do

351360 let potentialContext = currContext { inclusionDependencies = newDeps }

352361 case checkConstraints potentialContext of

353− Left err -> pure (Just err)

362+ Left err -> pure (Left err)

354363 Right _ -> do

355364 putStateContext potentialContext

356− return Nothing

365+ return (Right ())

357366

358367evalDatabaseContextExpr (RemoveInclusionDependency depName) = do

359368 currContext <- getStateContext

360369 let currDeps = inclusionDependencies currContext

361370 newDeps = M.delete depName currDeps

362371 if M.notMember depName currDeps then

363− return $ Just (InclusionDependencyNameNotInUseError depName)

372+ pure (Left (InclusionDependencyNameNotInUseError depName))

364373 else do

365374 putStateContext $ currContext {inclusionDependencies = newDeps }

366− return Nothing

375+ return (Right ())

367376

368377-- | Add a notification which will send the resultExpr when triggerExpr changes between commits.

369378evalDatabaseContextExpr (AddNotification notName triggerExpr resultOldExpr resultNewExpr) = do

370379 currentContext <- getStateContext

371380 let nots = notifications currentContext

372381 if M.member notName nots then

373− return $ Just (NotificationNameInUseError notName)

382+ pure (Left (NotificationNameInUseError notName))

374383 else do

375384 let newNotifications = M.insert notName newNotification nots

376385 newNotification = Notification { changeExpr = triggerExpr,

377386 reportOldExpr = resultOldExpr,

378387 reportNewExpr = resultNewExpr}

379388 putStateContext $ currentContext { notifications = newNotifications }

380− return Nothing

389+ return (Right ())

381390

382391evalDatabaseContextExpr (RemoveNotification notName) = do

383392 currentContext <- getStateContext

384393 let nots = notifications currentContext

385394 if M.notMember notName nots then

386− return $ Just (NotificationNameNotInUseError notName)

395+ pure (Left (NotificationNameNotInUseError notName))

387396 else do

388397 let newNotifications = M.delete notName nots

389398 putStateContext $ currentContext { notifications = newNotifications }

390− return Nothing

399+ pure (Right ())

391400

392401-- | Adds type and data constructors to the database context.

393402-- validate that the type *and* constructor names are unique! not yet implemented!

@@ -397,57 +406,56 @@ evalDatabaseContextExpr (AddTypeConstructor tConsDef dConsDefList) = do

397406 tConsName = TCD.name tConsDef

398407 -- validate that the constructor's types exist

399408 case validateTypeConstructorDef tConsDef dConsDefList of

400− errs@(_:_) -> pure $ Just (someErrors errs)

401− [] | T.null tConsName || not (isUpper (T.head tConsName)) -> pure $ Just (InvalidAtomTypeName tConsName)

402− | isJust (findTypeConstructor tConsName oldTypes) -> pure $ Just (AtomTypeNameInUseError tConsName)

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

403412 | otherwise -> do

404413 let newTypes = oldTypes ++ [(tConsDef, dConsDefList)]

405414 putStateContext $ currentContext { typeConstructorMapping = newTypes }

406− pure Nothing

415+ pure (Right ())

407416

408417-- | 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.

409418evalDatabaseContextExpr (RemoveTypeConstructor tConsName) = do

410419 currentContext <- getStateContext

411420 let oldTypes = typeConstructorMapping currentContext

412421 if isNothing (findTypeConstructor tConsName oldTypes) then

413− pure $ Just (AtomTypeNameNotInUseError tConsName)

422+ pure (Left (AtomTypeNameNotInUseError tConsName))

414423 else do

415424 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes

416425 putStateContext $ currentContext { typeConstructorMapping = newTypes }

417− pure Nothing

426+ pure (Right ())

418427

419428evalDatabaseContextExpr (MultipleExpr exprs) = do

420429 --the multiple expressions must pass the same context around- not the old unmodified context

421430 evald <- forM exprs evalDatabaseContextExpr

422431 --some lifting magic needed here

423− case catMaybes evald of

424− [] -> pure Nothing

425− err:_ -> pure (Just err)

432+ case lefts evald of

433+ [] -> pure (Right ())

434+ errs -> pure (Left (someErrors errs))

426435

427436evalDatabaseContextExpr (RemoveAtomFunction funcName) = do

428437 currentContext <- getStateContext

429438 let atomFuncs = atomFunctions currentContext

430439 case atomFunctionForName funcName atomFuncs of

431− Left err -> pure (Just err)

440+ Left err -> pure (Left err)

432441 Right realFunc -> if isScriptedAtomFunction realFunc then do

433442 let updatedFuncs = HS.delete realFunc atomFuncs

434443 putStateContext (currentContext {atomFunctions = updatedFuncs })

435− pure Nothing

444+ pure (Right ())

436445 else

437− pure (Just (PrecompiledFunctionRemoveError funcName))

438−

446+ pure (Left (PrecompiledFunctionRemoveError funcName))

439447

440448evalDatabaseContextExpr (RemoveDatabaseContextFunction funcName) = do

441449 context <- getStateContext

442450 let dbcFuncs = dbcFunctions context

443451 case databaseContextFunctionForName funcName dbcFuncs of

444− Left err -> pure (Just err)

452+ Left err -> pure (Left err)

445453 Right realFunc -> if isScriptedDatabaseContextFunction realFunc then do

446454 let updatedFuncs = HS.delete realFunc dbcFuncs

447455 putStateContext (context { dbcFunctions = updatedFuncs })

448− pure Nothing

456+ pure (Right ())

449457 else

450− pure (Just (PrecompiledFunctionRemoveError funcName))

458+ pure (Left (PrecompiledFunctionRemoveError funcName))

451459

452460evalDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) = do

453461 context <- getStateContext

@@ -456,16 +464,16 @@ evalDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) =

456464 eAtomTypes = map (\atomExpr -> runReader (typeFromAtomExpr emptyAttributes atomExpr) relExprState) atomArgExprs

457465 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)

458466 case eFunc of

459− Left err -> pure (Just err)

467+ Left err -> pure (Left err)

460468 Right func -> do

461469 let expectedArgCount = length (dbcFuncType func)

462470 actualArgCount = length atomArgExprs

463471 if expectedArgCount /= actualArgCount then

464− pure (Just (FunctionArgumentCountMismatchError expectedArgCount actualArgCount))

472+ pure (Left (FunctionArgumentCountMismatchError expectedArgCount actualArgCount))

465473 else

466474 --check that the atom types are valid

467475 case lefts eAtomTypes of

468− _:_ -> pure (Just (someErrors (lefts eAtomTypes)))

476+ _:_ -> pure (Left (someErrors (lefts eAtomTypes)))

469477 [] -> do

470478 let atomTypes = rights eAtomTypes

471479 let mValidTypes = map (\(expType, actType) -> case atomTypeVerify expType actType of

@@ -474,13 +482,13 @@ evalDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) =

474482 typeErrors = catMaybes mValidTypes

475483 eAtomArgs = map (\arg -> runReader (evalAtomExpr emptyTuple arg) relExprState) atomArgExprs

476484 if length (lefts eAtomArgs) > 1 then

477− pure (Just (someErrors (lefts eAtomArgs)))

485+ pure (Left (someErrors (lefts eAtomArgs)))

478486 else if not (null typeErrors) then

479− pure (Just (someErrors typeErrors))

487+ pure (Left (someErrors typeErrors))

480488 else

481489 case evalDatabaseContextFunction func (rights eAtomArgs) context of

482− Left err -> pure (Just err)

483− Right newContext -> putStateContext newContext >> pure Nothing

490+ Left err -> pure (Left err)

491+ Right newContext -> putStateContext newContext >> pure (Right ())

484492

485493evalDatabaseContextIOExpr :: Maybe ScriptSession -> DatabaseContext -> DatabaseContextIOExpr -> IO (Either RelationalError DatabaseContext)

486494evalDatabaseContextIOExpr mScriptSession currentContext (AddAtomFunction funcName funcType script) =

@@ -742,7 +750,7 @@ evalAtomExpr tupIn (FunctionAtomExpr funcName arguments ()) = do

742750 if expectedArgCount /= actualArgCount then

743751 throwE (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)

744752 else do

745− _ <- mapM (\(expType, actType) -> either throwE pure (atomTypeVerify expType actType)) (safeInit (zip (atomFuncType func) argTypes))

753+ mapM_ (\(expType, actType) -> either throwE pure (atomTypeVerify expType actType)) (safeInit (zip (atomFuncType func) argTypes))

746754 evaldArgs <- mapM (liftE . evalAtomExpr tupIn) arguments

747755 case evalAtomFunction func evaldArgs of

748756 Left err -> throwE (AtomFunctionUserError err)

@@ -876,3 +884,52 @@ evalTupleExpr attrs (TupleExpr tupMap) = do

876884 _ <- either throwE pure (validateTuple tup' tConss)

877885 pure tup'

878886

887+evalAttributeNames :: AttributeNames -> RelationalExpr -> RelationalExprState (Either RelationalError (S.Set AttributeName))

888+evalAttributeNames attrNames expr = do

889+ eExprType <- typeForRelationalExpr expr

890+ case eExprType of

891+ Left err -> pure (Left err)

892+ Right exprTyp -> do

893+ let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))

894+ case attrNames of

895+ AttributeNames names ->

896+ case A.projectionAttributesForNames names (attributes exprTyp) of

897+ Left err -> pure (Left err)

898+ Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))

899+

900+ InvertedAttributeNames names -> do

901+ let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet

902+ if not (S.null nonExistentAttributeNames) then

903+ pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))

904+ else

905+ pure (Right (A.nonMatchingAttributeNameSet names typeNameSet))

906+

907+ UnionAttributeNames namesA namesB -> do

908+ eNameSetA <- evalAttributeNames namesA expr

909+ case eNameSetA of

910+ Left err -> pure (Left err)

911+ Right nameSetA -> do

912+ eNameSetB <- evalAttributeNames namesB expr

913+ case eNameSetB of

914+ Left err -> pure (Left err)

915+ Right nameSetB ->

916+ pure (Right (S.union nameSetA nameSetB))

917+

918+ IntersectAttributeNames namesA namesB -> do

919+ eNameSetA <- evalAttributeNames namesA expr

920+ case eNameSetA of

921+ Left err -> pure (Left err)

922+ Right nameSetA -> do

923+ eNameSetB <- evalAttributeNames namesB expr

924+ case eNameSetB of

925+ Left err -> pure (Left err)

926+ Right nameSetB ->

927+ pure (Right (S.intersection nameSetA nameSetB))

928+

929+ RelationalExprAttributeNames attrExpr -> do

930+ eAttrExprType <- typeForRelationalExpr attrExpr

931+ case eAttrExprType of

932+ Left err -> pure (Left err)

933+ Right attrExprType -> pure (Right (A.attributeNameSet (attributes attrExprType)))

934+

935+

src/lib/ProjectM36/ScriptSession.hs+6−2

@@ -53,7 +53,11 @@ initScriptSession ghcPkgPaths = do

5353

5454 sandboxPkgPaths <- liftIO $ concat <$> mapM glob [

5555 "./dist-newstyle/packagedb/ghc-" ++ ghcVersion,

56− ".cabal-sandbox/*ghc-" ++ ghcVersion ++ "-packages.conf.d",

56+ ".cabal-sandbox/*ghc-" ++ ghcVersion ++ "-packages.conf.d",

57+ ".stack-work/install/*/*/" ++ ghcVersion ++ "/pkgdb",

58+ ".stack-work/install/*/pkgdb/", --windows stack build

59+ "C:/sr/snapshots/b201cfe6/pkgdb", --windows stack build- ideally, we could run `stack path --snapshot-pkg-db, but this is sufficient to pass CI

60+ homeDir </> ".stack/snapshots/*/*/" ++ ghcVersion ++ "/pkgdb",

5761 homeDir </> ".cabal/store/ghc-" ++ ghcVersion ++ "/package.db"

5862 ]

5963

@@ -196,4 +200,4 @@ typeCheckScript expectedType inp = do

196200 pure Nothing

197201 else

198202 pure (Just (TypeCheckCompilationError (showType dflags expectedType) (showType dflags funcType)))

199−

203+

src/lib/ProjectM36/Server.hs+24−2

@@ -5,6 +5,7 @@ import ProjectM36.Client

55import ProjectM36.Server.EntryPoints

66import ProjectM36.Server.RemoteCallTypes

77import ProjectM36.Server.Config (ServerConfig(..))

8+import ProjectM36.FSType

910import Control.Monad.IO.Class (liftIO)

1011import Network.Transport.TCP (createTransport, defaultTCPParameters)

@@ -15,6 +16,8 @@ import Control.Distributed.Process (Process, register, getSelfPid)

1516import Control.Distributed.Process.ManagedProcess (defaultProcess, UnhandledMessagePolicy(..), ProcessDefinition(..), handleCall, serve, InitHandler, InitResult(..))

1617import Control.Concurrent.MVar (putMVar, MVar)

1718import System.IO (stderr, hPutStrLn)

19+import System.FilePath (takeDirectory)

20+import System.Directory (doesDirectoryExist)

1821

1922-- 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

2023--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

@@ -70,11 +73,31 @@ registerDB dbname = do

7073 let dbname' = remoteDBLookupName dbname

7174 register dbname' self

7275 --liftIO $ putStrLn $ "registered " ++ (show self) ++ " " ++ dbname'

73−

76+

7477-- | A notification callback which logs the notification to stderr and does nothing else.

7578loggingNotificationCallback :: NotificationCallback

7679loggingNotificationCallback notName evaldNot = hPutStrLn stderr $ "Notification received \"" ++ show notName ++ "\": " ++ show evaldNot

7780

81+checkFSType :: Bool -> PersistenceStrategy -> IO Bool

82+checkFSType performCheck strat =

83+ case strat of

84+ NoPersistence -> pure True

85+ MinimalPersistence _ -> pure True

86+ CrashSafePersistence path ->

87+ if performCheck then do

88+ -- if the path does not (yet) exist, then walk back a step- the db directory may not yet have been created

89+ fullpathexists <- doesDirectoryExist path

90+ let fscheckpath = if fullpathexists then

91+ path

92+ else

93+ takeDirectory path

94+ fsTypeSupportsJournaling fscheckpath

95+ else

96+ pure True

97+

98+checkFSErrorMsg :: String

99+checkFSErrorMsg = "The filesystem does not support journaling so writes may not be crash-safe. Use --disable-fscheck to disable this fatal error."

100+

78101-- | 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.

79102launchServer :: ServerConfig -> Maybe (MVar EndPointAddress) -> IO Bool

80103launchServer daemonConfig mAddressMVar = do

@@ -102,4 +125,3 @@ launchServer daemonConfig mAddressMVar = do

102125 serve (conn, databaseName daemonConfig, mAddressMVar, address endpoint) initServer (serverDefinition testBool reqTimeout)

103126 liftIO $ putStrLn "serve returned"

104127 pure True

105−

src/lib/ProjectM36/Server/Config.hs+3−1

@@ -1,7 +1,8 @@

11module ProjectM36.Server.Config where

22import ProjectM36.Client

4−data ServerConfig = ServerConfig { persistenceStrategy :: PersistenceStrategy,

4+data ServerConfig = ServerConfig { persistenceStrategy :: PersistenceStrategy,

5+ checkFS :: Bool,

56 databaseName :: DatabaseName,

67 bindHost :: Hostname,

78 bindPort :: Port,

@@ -13,6 +14,7 @@ data ServerConfig = ServerConfig { persistenceStrategy :: PersistenceStrategy,

1314

1415defaultServerConfig :: ServerConfig

1516defaultServerConfig = ServerConfig { persistenceStrategy = NoPersistence,

17+ checkFS = True,

1618 databaseName = "base",

1719 bindHost = "127.0.0.1",

1820 bindPort = 6543,

src/lib/ProjectM36/Server/ParseArgs.hs+8−3

@@ -8,10 +8,11 @@ import Data.Monoid

88parseArgsWithDefaults :: ServerConfig -> Parser ServerConfig

99parseArgsWithDefaults defaults = ServerConfig <$>

1010 parsePersistenceStrategy <*>

11+ parseCheckFS <*>

1112 parseDatabaseName <*>

1213 parseHostname (bindHost defaults) <*>

1314 parsePort (bindPort defaults) <*>

14− many parseGhcPkgPaths <*>

15+ many parseGhcPkgPath <*>

1516 parseTimeout (perRequestTimeout defaults) <*>

1617 pure False

1718

@@ -29,6 +30,10 @@ parsePersistenceStrategy = CrashSafePersistence <$> (dbdirOpt <* fsyncOpt) <|>

2930 long "fsync" <>

3031 help "Fsync all new transactions.")

3132

33+parseCheckFS :: Parser Bool

34+parseCheckFS = flag True False (long "disable-fscheck" <>

35+ help "Disable filesystem check for journaling.")

36+

3237parseDatabaseName :: Parser DatabaseName

3338parseDatabaseName = strOption (short 'n' <>

3439 long "database" <>

@@ -46,8 +51,8 @@ parsePort defPort = option auto (short 'p' <>

4651 metavar "PORT_NUMBER" <>

4752 value defPort)

4853

49−parseGhcPkgPaths :: Parser String

50−parseGhcPkgPaths = strOption (long "ghc-pkg-dir" <>

54+parseGhcPkgPath :: Parser String

55+parseGhcPkgPath = strOption (long "ghc-pkg-dir" <>

5156 metavar "GHC_PACKAGE_DIRECTORY")

5257

5358parseTimeout :: Int -> Parser Int

src/lib/ProjectM36/StaticOptimizer.hs+327−62

@@ -3,31 +3,46 @@ import ProjectM36.Base

33import ProjectM36.RelationalExpression

44import ProjectM36.Relation

55import ProjectM36.Error

6+import qualified ProjectM36.Attribute as A

67import qualified ProjectM36.AttributeNames as AS

78import ProjectM36.TupleSet

8−import Control.Monad.State hiding (join)

9+import Control.Monad.State

910import Data.Either (rights, lefts)

1011import Control.Monad.Trans.Reader

1112import qualified Data.Map as M

13+import qualified Data.Set as S

1214

1315-- 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

22+ case eOptExpr of

23+ Left err -> pure (Left err)

24+ Right optExpr ->

25+ applyStaticJoinElimination (applyStaticRestrictionPushdown (applyStaticRestrictionCollapse optExpr))

26+

27+optimizeDatabaseContextExpr :: DatabaseContext -> DatabaseContextExpr -> Either RelationalError DatabaseContextExpr

28+optimizeDatabaseContextExpr context dbExpr = evalState (applyStaticDatabaseOptimization dbExpr) (freshDatabaseState context)

1429-- apply optimizations which merely remove steps to become no-ops: example: projection of a relation across all of its attributes => original relation

1530

16−--should optimizations offer the possibility to return errors? If they perform the up-front type-checking, maybe so

31+--should optimizations offer the possibility to pure errors? If they perform the up-front type-checking, maybe so

1732applyStaticRelationalOptimization :: RelationalExpr -> RelationalExprState (Either RelationalError RelationalExpr)

18−applyStaticRelationalOptimization e@(MakeStaticRelation _ _) = return $ Right e

19−

20−applyStaticRelationalOptimization e@(MakeRelationFromExprs _ _) = return $ Right e

33+applyStaticRelationalOptimization e@(MakeStaticRelation _ _) = pure $ Right e

2134

22−applyStaticRelationalOptimization e@(ExistingRelation _) = return $ Right e

35+applyStaticRelationalOptimization e@(MakeRelationFromExprs _ _) = pure $ Right e

2336

24−applyStaticRelationalOptimization e@(RelationVariable _ _) = return $ Right e

37+applyStaticRelationalOptimization e@(ExistingRelation _) = pure $ Right e

2538

39+applyStaticRelationalOptimization e@(RelationVariable _ _) = pure $ Right e

40+

2641--remove project of attributes which removes no attributes

2742applyStaticRelationalOptimization (Project attrNameSet expr) = do

2843 relType <- typeForRelationalExpr expr

2944 case relType of

30− Left err -> return $ Left err

45+ Left err -> pure $ Left err

3146 Right relType2

3247 | AS.all == attrNameSet ->

3348 applyStaticRelationalOptimization expr

@@ -37,78 +52,87 @@ applyStaticRelationalOptimization (Project attrNameSet expr) = do

3752 optimizedSubExpression <- applyStaticRelationalOptimization expr

3853 case optimizedSubExpression of

3954 Left err -> pure $ Left err

40− Right optSubExpr -> pure $ Right $ Project attrNameSet optSubExpr

55+ Right optSubExpr -> pure (Right (Project attrNameSet optSubExpr))

4156

4257applyStaticRelationalOptimization (Union exprA exprB) = do

43− optExprA <- applyStaticRelationalOptimization exprA

44− optExprB <- applyStaticRelationalOptimization exprB

45− case optExprA of

46− Left err -> return $ Left err

47− Right optExprAx -> case optExprB of

48− Left err -> return $ Left err

49− Right optExprBx -> if optExprAx == optExprBx then

50− return (Right optExprAx)

51− else

52− return $ Right $ Union optExprAx optExprBx

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

68+ _ -> if optExprA == optExprB then

69+ pure (Right optExprA)

70+ else

71+ pure $ Right $ Union optExprA optExprB

5372

5473applyStaticRelationalOptimization (Join exprA exprB) = do

55− optExprA <- applyStaticRelationalOptimization exprA

56− optExprB <- applyStaticRelationalOptimization exprB

57− case optExprA of

58− Left err -> return $ Left err

59− Right optExprA2 -> case optExprB of

60− Left err -> return $ Left err

61− Right optExprB2 -> if optExprA == optExprB then --A join A == A

62− return optExprA

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

85+ _ -> if optExprA == optExprB then --A join A == A

86+ pure (Right optExprA)

6387 else

64− return $ Right (Join optExprA2 optExprB2)

88+ pure (Right (Join optExprA optExprB))

6589

6690applyStaticRelationalOptimization (Difference exprA exprB) = do

6791 optExprA <- applyStaticRelationalOptimization exprA

6892 optExprB <- applyStaticRelationalOptimization exprB

6993 case optExprA of

70− Left err -> return $ Left err

94+ Left err -> pure $ Left err

7195 Right optExprA2 -> case optExprB of

72− Left err -> return $ Left err

96+ Left err -> pure $ Left err

7397 Right optExprB2 -> if optExprA == optExprB then do --A difference A == A where false

7498 eEmptyRel <- typeForRelationalExpr optExprA2

7599 case eEmptyRel of

76100 Left err -> pure (Left err)

77101 Right emptyRel -> pure (Right (ExistingRelation emptyRel))

78102 else

79− return $ Right (Difference optExprA2 optExprB2)

103+ pure $ Right (Difference optExprA2 optExprB2)

80104

81−applyStaticRelationalOptimization e@Rename{} = return $ Right e

105+applyStaticRelationalOptimization e@Rename{} = pure $ Right e

82106

83107applyStaticRelationalOptimization (Group oldAttrNames newAttrName expr) =

84− return $ Right $ Group oldAttrNames newAttrName expr

108+ pure $ Right $ Group oldAttrNames newAttrName expr

85109

86110applyStaticRelationalOptimization (Ungroup attrName expr) =

87− return $ Right $ Ungroup attrName expr

111+ pure $ Right $ Ungroup attrName expr

88112

89113--remove restriction of nothing

90114applyStaticRelationalOptimization (Restrict predicate expr) = do

91115 optimizedPredicate <- applyStaticPredicateOptimization predicate

92116 case optimizedPredicate of

93− Left err -> return $ Left err

117+ Left err -> pure $ Left err

94118 Right optimizedPredicate2

95− | optimizedPredicate2 == TruePredicate -> applyStaticRelationalOptimization expr

96− | optimizedPredicate2 == NotPredicate TruePredicate -> do

119+ | isTrueExpr optimizedPredicate2 -> applyStaticRelationalOptimization expr -- remove predicate entirely

120+ | isFalseExpr optimizedPredicate2 -> do -- replace where false predicate with empty relation with attributes from relexpr

97121 attributesRel <- typeForRelationalExpr expr

98122 case attributesRel of

99− Left err -> return $ Left err

100− Right attributesRelA -> return $ Right $ MakeStaticRelation (attributes attributesRelA) emptyTupleSet

123+ Left err -> pure $ Left err

124+ Right attributesRelA -> pure $ Right $ MakeStaticRelation (attributes attributesRelA) emptyTupleSet

101125 | otherwise -> do

102126 optimizedSubExpression <- applyStaticRelationalOptimization expr

103127 case optimizedSubExpression of

104− Left err -> return $ Left err

105− Right optSubExpr -> return $ Right $ Restrict optimizedPredicate2 optSubExpr

128+ Left err -> pure $ Left err

129+ Right optSubExpr -> pure $ Right $ Restrict optimizedPredicate2 optSubExpr

106130

107−applyStaticRelationalOptimization e@(Equals _ _) = return $ Right e

131+applyStaticRelationalOptimization e@(Equals _ _) = pure $ Right e

108132

109−applyStaticRelationalOptimization e@(NotEquals _ _) = return $ Right e

133+applyStaticRelationalOptimization e@(NotEquals _ _) = pure $ Right e

110134

111−applyStaticRelationalOptimization e@(Extend _ _) = return $ Right e

135+applyStaticRelationalOptimization e@(Extend _ _) = pure $ Right e

112136

113137applyStaticDatabaseOptimization :: DatabaseContextExpr -> DatabaseState (Either RelationalError DatabaseContextExpr)

114138applyStaticDatabaseOptimization x@NoOperation = pure $ Right x

@@ -118,39 +142,46 @@ applyStaticDatabaseOptimization x@(Undefine _) = pure $ Right x

118142

119143applyStaticDatabaseOptimization (Assign name expr) = do

120144 context <- getStateContext

121− let optimizedExpr = runReader (applyStaticRelationalOptimization expr) (RelationalExprStateElems context)

145+ let optimizedExpr = optimizeRelationalExpr context expr

122146 case optimizedExpr of

123− Left err -> return $ Left err

124− Right optimizedExpr2 -> return $ Right (Assign name optimizedExpr2)

147+ Left err -> pure $ Left err

148+ Right optimizedExpr2 -> pure $ Right (Assign name optimizedExpr2)

125149

126−applyStaticDatabaseOptimization (Insert name expr) = do

150+applyStaticDatabaseOptimization (Insert targetName expr) = do

127151 context <- getStateContext

128− let optimizedExpr = runReader (applyStaticRelationalOptimization expr) (RelationalExprStateElems context)

152+ let optimizedExpr = optimizeRelationalExpr context expr

129153 case optimizedExpr of

130− Left err -> return $ Left err

131− Right optimizedExpr2 -> return $ Right (Insert name optimizedExpr2)

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)

132163

133164applyStaticDatabaseOptimization (Delete name predicate) = do

134165 context <- getStateContext

135166 let optimizedPredicate = runReader (applyStaticPredicateOptimization predicate) (RelationalExprStateElems context)

136167 case optimizedPredicate of

137− Left err -> return $ Left err

138− Right optimizedPredicate2 -> return $ Right (Delete name optimizedPredicate2)

168+ Left err -> pure $ Left err

169+ Right optimizedPredicate2 -> pure $ Right (Delete name optimizedPredicate2)

139170

140171applyStaticDatabaseOptimization (Update name upmap predicate) = do

141172 context <- getStateContext

142173 let optimizedPredicate = runReader (applyStaticPredicateOptimization predicate) (RelationalExprStateElems context)

143174 case optimizedPredicate of

144− Left err -> return $ Left err

145− Right optimizedPredicate2 -> return $ Right (Update name upmap optimizedPredicate2)

175+ Left err -> pure $ Left err

176+ Right optimizedPredicate2 -> pure $ Right (Update name upmap optimizedPredicate2)

146177

147−applyStaticDatabaseOptimization dep@(AddInclusionDependency _ _) = return $ Right dep

178+applyStaticDatabaseOptimization dep@(AddInclusionDependency _ _) = pure $ Right dep

148179

149−applyStaticDatabaseOptimization (RemoveInclusionDependency name) = return $ Right (RemoveInclusionDependency name)

180+applyStaticDatabaseOptimization (RemoveInclusionDependency name) = pure $ Right (RemoveInclusionDependency name)

150181

151182applyStaticDatabaseOptimization (AddNotification name triggerExpr resultOldExpr resultNewExpr) = do

152183 context <- getStateContext

153− let eTriggerExprOpt = runReader (applyStaticRelationalOptimization triggerExpr) (RelationalExprStateElems context)

184+ let eTriggerExprOpt = optimizeRelationalExpr context triggerExpr

154185 case eTriggerExprOpt of

155186 Left err -> pure $ Left err

156187 Right triggerExprOpt -> --it doesn't make sense to optimize queries when we don't have their proper contexts

@@ -166,16 +197,16 @@ applyStaticDatabaseOptimization c@(ExecuteDatabaseContextFunction _ _) = pure (R

166197

167198--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

168199

169−--applyStaticDatabaseOptimization (MultipleExpr exprs) = return $ Right $ MultipleExpr exprs

200+--applyStaticDatabaseOptimization (MultipleExpr exprs) = pure $ Right $ MultipleExpr exprs

170201--for multiple expressions, we must evaluate

171202applyStaticDatabaseOptimization (MultipleExpr exprs) = do

172203 context <- getStateContext

173204 let optExprs = evalState substateRunner (contextWithEmptyTupleSets context, M.empty, False)

174205 let errors = lefts optExprs

175206 if not (null errors) then

176− return $ Left (head errors)

207+ pure $ Left (head errors)

177208 else

178− return $ Right $ MultipleExpr (rights optExprs)

209+ pure $ Right $ MultipleExpr (rights optExprs)

179210 where

180211 substateRunner = forM exprs $ \expr -> do

181212 --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

@@ -185,4 +216,238 @@ applyStaticDatabaseOptimization (MultipleExpr exprs) = do

185216 --restore original context

186217

187218applyStaticPredicateOptimization :: RestrictionPredicateExpr -> RelationalExprState (Either RelationalError RestrictionPredicateExpr)

188−applyStaticPredicateOptimization predicate = return $ Right predicate

219+applyStaticPredicateOptimization predi = do

220+ eOptPred <- case predi of

221+-- where x and x => where x

222+ 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))

235+-- where x or x => where x

236+ 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))

248+ AttributeEqualityPredicate attrNameA (AttributeAtomExpr attrNameB) ->

249+ if attrNameA == attrNameB then

250+ pure (Right TruePredicate)

251+ 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))

263+

264+--determines if an atom expression is tautologically true

265+isTrueExpr :: RestrictionPredicateExpr -> Bool

266+isTrueExpr TruePredicate = True

267+isTrueExpr (AtomExprPredicate (NakedAtomExpr (BoolAtom True))) = True

268+isTrueExpr _ = False

269+

270+--determines if an atom expression is tautologically false

271+isFalseExpr :: RestrictionPredicateExpr -> Bool

272+isFalseExpr (NotPredicate expr) = isTrueExpr expr

273+isFalseExpr (AtomExprPredicate (NakedAtomExpr (BoolAtom False))) = True

274+isFalseExpr _ = False

275+

276+-- determine if the created relation can statically be determined to be empty

277+isEmptyRelationExpr :: RelationalExpr -> Bool

278+isEmptyRelationExpr (MakeRelationFromExprs _ []) = True

279+isEmptyRelationExpr (MakeStaticRelation _ tupSet) = null (asList tupSet)

280+isEmptyRelationExpr (ExistingRelation rel) = rel == emptyRelationWithAttrs (attributes rel)

281+isEmptyRelationExpr _ = False

282+

283+--transitive static variable optimization

284+replaceStaticAtomExprs :: RestrictionPredicateExpr -> M.Map AttributeName AtomExpr -> RestrictionPredicateExpr

285+replaceStaticAtomExprs predIn replaceMap = case predIn of

286+ AttributeEqualityPredicate newAttrName (AttributeAtomExpr matchName) -> case M.lookup matchName replaceMap of

287+ Nothing -> predIn

288+ Just newVal -> AttributeEqualityPredicate newAttrName newVal

289+ AttributeEqualityPredicate{} -> predIn

290+ AndPredicate pred1 pred2 -> AndPredicate (replaceStaticAtomExprs pred1 replaceMap) (replaceStaticAtomExprs pred2 replaceMap)

291+ OrPredicate pred1 pred2 -> OrPredicate (replaceStaticAtomExprs pred1 replaceMap) (replaceStaticAtomExprs pred2 replaceMap)

292+ NotPredicate pred1 -> NotPredicate (replaceStaticAtomExprs pred1 replaceMap)

293+ TruePredicate -> predIn

294+ RelationalExprPredicate{} -> predIn

295+ AtomExprPredicate{} -> predIn

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

298+findStaticRestrictionPredicates (AttributeEqualityPredicate attrName atomExpr) =

299+ case atomExpr of

300+ val@NakedAtomExpr{} -> M.singleton attrName val

301+ val@ConstructedAtomExpr{} -> M.singleton attrName val

302+ _ -> M.empty

303+

304+findStaticRestrictionPredicates (AndPredicate pred1 pred2) =

305+ M.union (findStaticRestrictionPredicates pred1) (findStaticRestrictionPredicates pred2)

306+findStaticRestrictionPredicates (OrPredicate pred1 pred2) =

307+ M.union (findStaticRestrictionPredicates pred1) (findStaticRestrictionPredicates pred2)

308+findStaticRestrictionPredicates (NotPredicate predi) = findStaticRestrictionPredicates predi

309+findStaticRestrictionPredicates TruePredicate = M.empty

310+findStaticRestrictionPredicates RelationalExprPredicate{} = M.empty

311+findStaticRestrictionPredicates AtomExprPredicate{} = M.empty

312+

313+isStaticAtomExpr :: AtomExpr -> Bool

314+isStaticAtomExpr NakedAtomExpr{} = True

315+isStaticAtomExpr ConstructedAtomExpr{} = True

316+isStaticAtomExpr AttributeAtomExpr{} = False

317+isStaticAtomExpr FunctionAtomExpr{} = False

318+isStaticAtomExpr RelationAtomExpr{} = False

319+

320+--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)

322+applyStaticJoinElimination 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))

360+ ))

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)

369+

370+applyStaticJoinElimination expr = pure (Right expr)

371+

372+--restriction collapse converts chained restrictions into (Restrict (And pred1 pred2 pred3...))

373+ --this optimization should be fairly uncontroversial- performing a tuple scan once is cheaper than twice- parallelization can still take place

374+applyStaticRestrictionCollapse :: RelationalExpr -> RelationalExpr

375+applyStaticRestrictionCollapse expr =

376+ case expr of

377+ MakeRelationFromExprs _ _ -> expr

378+ MakeStaticRelation _ _ -> expr

379+ ExistingRelation _ -> expr

380+ RelationVariable _ _ -> expr

381+ Project attrs subexpr ->

382+ Project attrs (applyStaticRestrictionCollapse subexpr)

383+ Union sub1 sub2 ->

384+ Union (applyStaticRestrictionCollapse sub1) (applyStaticRestrictionCollapse sub2)

385+ Join sub1 sub2 ->

386+ Join (applyStaticRestrictionCollapse sub1) (applyStaticRestrictionCollapse sub2)

387+ Rename n1 n2 sub ->

388+ Rename n1 n2 (applyStaticRestrictionCollapse sub)

389+ Difference sub1 sub2 ->

390+ Difference (applyStaticRestrictionCollapse sub1) (applyStaticRestrictionCollapse sub2)

391+ Group n1 n2 sub ->

392+ Group n1 n2 (applyStaticRestrictionCollapse sub)

393+ Ungroup n1 sub ->

394+ Ungroup n1 (applyStaticRestrictionCollapse sub)

395+ Equals sub1 sub2 ->

396+ Equals (applyStaticRestrictionCollapse sub1) (applyStaticRestrictionCollapse sub2)

397+ NotEquals sub1 sub2 ->

398+ NotEquals (applyStaticRestrictionCollapse sub1) (applyStaticRestrictionCollapse sub2)

399+ Extend n sub ->

400+ Extend n (applyStaticRestrictionCollapse sub)

401+ Restrict firstPred _ ->

402+ let restrictions = sequentialRestrictions expr

403+ finalExpr = last restrictions

404+ optFinalExpr = case finalExpr of

405+ Restrict _ subexpr -> applyStaticRestrictionCollapse subexpr

406+ otherExpr -> otherExpr

407+ andPreds = foldr (\(Restrict subpred _) acc -> AndPredicate acc subpred) firstPred (tail restrictions) in

408+ Restrict andPreds optFinalExpr

409+

410+sequentialRestrictions :: RelationalExpr -> [RelationalExpr]

411+sequentialRestrictions expr@(Restrict _ subexpr) = expr:sequentialRestrictions subexpr

412+sequentialRestrictions _ = []

413+

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

415+-- x{proj} where c1 -> (x where c1){proj} #project on fewer tuples

416+-- (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

418+applyStaticRestrictionPushdown expr = case expr of

419+ MakeRelationFromExprs _ _ -> expr

420+ MakeStaticRelation _ _ -> expr

421+ ExistingRelation _ -> expr

422+ RelationVariable _ _ -> expr

423+ Project _ _ -> expr

424+ --this transformation cannot be inverted because the projection attributes might not exist in the inverted version

425+ Restrict restrictAttrs (Project projAttrs subexpr) ->

426+ Project projAttrs (Restrict restrictAttrs (applyStaticRestrictionPushdown subexpr))

427+ Restrict restrictAttrs (Union subexpr1 subexpr2) ->

428+ let optSub1 = applyStaticRestrictionPushdown subexpr1

429+ optSub2 = applyStaticRestrictionPushdown subexpr2 in

430+ Union (Restrict restrictAttrs optSub1) (Restrict restrictAttrs optSub2)

431+ Restrict attrs subexpr ->

432+ Restrict attrs (applyStaticRestrictionPushdown subexpr)

433+

434+ Union sub1 sub2 ->

435+ Union (applyStaticRestrictionPushdown sub1) (applyStaticRestrictionPushdown sub2)

436+ Join sub1 sub2 ->

437+ Join (applyStaticRestrictionPushdown sub1) (applyStaticRestrictionPushdown sub2)

438+ Rename n1 n2 sub ->

439+ Rename n1 n2 (applyStaticRestrictionPushdown sub)

440+ Difference sub1 sub2 ->

441+ Difference (applyStaticRestrictionPushdown sub1) (applyStaticRestrictionPushdown sub2)

442+ Group n1 n2 sub ->

443+ Group n1 n2 (applyStaticRestrictionPushdown sub)

444+ Ungroup n1 sub ->

445+ Ungroup n1 (applyStaticRestrictionPushdown sub)

446+ Equals sub1 sub2 ->

447+ Equals (applyStaticRestrictionPushdown sub1) (applyStaticRestrictionPushdown sub2)

448+ NotEquals sub1 sub2 ->

449+ NotEquals (applyStaticRestrictionPushdown sub1) (applyStaticRestrictionPushdown sub2)

450+ Extend n sub ->

451+ Extend n (applyStaticRestrictionPushdown sub)

452+

453+

src/lib/ProjectM36/TransGraphRelationalExpression.hs+24−3

@@ -18,6 +18,10 @@ type TransGraphRelationalExpr = RelationalExprBase TransactionIdLookup

1818

1919instance Binary TransGraphRelationalExpr

2020

21+type TransGraphAttributeNames = AttributeNamesBase TransactionIdLookup

22+

23+instance Binary TransGraphAttributeNames

24+

2125type TransGraphExtendTupleExpr = ExtendTupleExprBase TransactionIdLookup

2226

2327instance Binary TransGraphExtendTupleExpr

@@ -51,13 +55,14 @@ evalTransGraphRelationalExpr (RelationVariable rvname transLookup) graph = do

5155 trans <- lookupTransaction graph transLookup

5256 rel <- runReader (evalRelationalExpr (RelationVariable rvname ())) (RelationalExprStateElems (concreteDatabaseContext trans))

5357 pure (ExistingRelation rel)

54−evalTransGraphRelationalExpr (Project attrNames expr) graph = do

58+evalTransGraphRelationalExpr (Project transAttrNames expr) graph = do

5559 expr' <- evalTransGraphRelationalExpr expr graph

60+ attrNames <- evalTransAttributeNames transAttrNames graph

5661 pure (Project attrNames expr')

5762evalTransGraphRelationalExpr (Union exprA exprB) graph = do

5863 exprA' <- evalTransGraphRelationalExpr exprA graph

5964 exprB' <- evalTransGraphRelationalExpr exprB graph

60− pure (Union exprA' exprB')

65+ pure (Union exprA' exprB')

6166evalTransGraphRelationalExpr (Join exprA exprB) graph = do

6267 exprA' <- evalTransGraphRelationalExpr exprA graph

6368 exprB' <- evalTransGraphRelationalExpr exprB graph

@@ -69,8 +74,9 @@ evalTransGraphRelationalExpr (Difference exprA exprB) graph = do

6974 exprA' <- evalTransGraphRelationalExpr exprA graph

7075 exprB' <- evalTransGraphRelationalExpr exprB graph

7176 pure (Difference exprA' exprB')

72−evalTransGraphRelationalExpr (Group attrNames attrName expr) graph = do

77+evalTransGraphRelationalExpr (Group transAttrNames attrName expr) graph = do

7378 expr' <- evalTransGraphRelationalExpr expr graph

79+ attrNames <- evalTransAttributeNames transAttrNames graph

7480 pure (Group attrNames attrName expr')

7581evalTransGraphRelationalExpr (Ungroup attrName expr) graph = do

7682 expr' <- evalTransGraphRelationalExpr expr graph

@@ -152,3 +158,18 @@ evalTransGraphAttributeExpr graph (AttributeAndTypeNameExpr attrName tCons tLook

152158 aType <- atomTypeForTypeConstructor tCons (typeConstructorMapping (concreteDatabaseContext trans)) M.empty

153159 pure (NakedAttributeExpr (Attribute attrName aType))

154160evalTransGraphAttributeExpr _ (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)

src/lib/ProjectM36/Transaction/Persist.hs+8−9

@@ -23,9 +23,9 @@ import qualified Data.ByteString as BS

2323import qualified Data.ByteString.Lazy as BSL

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

@@ -109,10 +109,10 @@ readRelVars :: FilePath -> IO (M.Map RelVarName Relation)

109109readRelVars transDir = do

110110 let relvarsPath = relvarsDir transDir

111111 relvarNames <- getDirectoryNames relvarsPath

112− relvars <- mapM (\name -> do

112+ let relvars = mapM (\name -> do

113113 rel <- B.decode . decompress . BSL.fromStrict <$> BS.readFile (relvarsPath </> name)

114114 return (T.pack name, rel)) relvarNames

115− return $ M.fromList relvars

115+ M.fromList <$> relvars

116116

117117writeAtomFuncs :: DiskSync -> FilePath -> AtomFunctions -> IO ()

118118writeAtomFuncs sync transDir funcs = do

@@ -191,8 +191,8 @@ readDBCFuncs 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

197197readDBCFunc :: FilePath -> DatabaseContextFunctionName -> Maybe ScriptSession -> DatabaseContextFunctions -> IO DatabaseContextFunction

198198readDBCFunc transDir funcName mScriptSession precompiledFuncs = do

@@ -232,8 +232,7 @@ readIncDeps :: FilePath -> IO (M.Map IncDepName InclusionDependency)

232232readIncDeps transDir = do

233233 let incDepsPath = incDepsDir transDir

234234 incDepNames <- getDirectoryNames incDepsPath

235− incDeps <- mapM (readIncDep transDir . T.pack) incDepNames

236− return $ M.fromList incDeps

235+ M.fromList <$> mapM (readIncDep transDir . T.pack) incDepNames

237236

238237readSubschemas :: FilePath -> IO Subschemas

239238readSubschemas transDir = do

src/lib/ProjectM36/TransactionGraph.hs+7−8

@@ -98,9 +98,8 @@ transactionForId tid graph

9898 matchingTrans = S.filter (\(Transaction idMatch _ _) -> idMatch == tid) (transactionsForGraph graph)

9999

100100transactionsForIds :: 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)

101+transactionsForIds idSet graph =

102+ S.fromList <$> forM (S.toList idSet) (`transactionForId` graph)

104103

105104isRootTransaction :: Transaction -> TransactionGraph -> Bool

106105isRootTransaction (Transaction _ (TransactionInfo pId _ _) _) _ = U.null pId

@@ -108,9 +107,9 @@ isRootTransaction (Transaction _ MergeTransactionInfo{} _) _ = False

108107

109108-- the first transaction has no parent - all other do have parents- merges have two parents

110109parentTransactions :: Transaction -> TransactionGraph -> Either RelationalError (S.Set Transaction)

111−parentTransactions (Transaction _ (TransactionInfo pId _ _) _) graph = do

112− trans <- transactionForId pId graph

113− return (S.singleton trans)

110+parentTransactions (Transaction _ (TransactionInfo pId _ _) _) graph =

111+ S.singleton <$> transactionForId pId graph

112+

114113

115114parentTransactions (Transaction _ (MergeTransactionInfo pId1 pId2 _ _) _ ) graph = transactionsForIds (S.fromList [pId1, pId2]) graph

116115

@@ -164,7 +163,7 @@ validateGraph graph@(TransactionGraph _ transSet) = do

164163 --uuids = map transactionId transSet

165164 --check that all heads appear in the transSet

166165 --check that all forward and backward links are in place

167− _ <- mapM (walkParentTransactions S.empty graph) (S.toList transSet)

166+ mapM_ (walkParentTransactions S.empty graph) (S.toList transSet)

168167 mapM (walkChildTransactions S.empty graph) (S.toList transSet)

169168

170169--verify that all parent links exist and that all children exist

@@ -509,7 +508,7 @@ backtrackGraph graph currentTid (TransactionIdHeadBranchBacktrack steps) = do

509508backtrackGraph graph currentTid btrack@(TransactionStampHeadBacktrack stamp) = do

510509 trans <- transactionForId currentTid graph

511510 let parents = transactionParentIds trans

512− if transactionTimestamp trans < stamp then

511+ if transactionTimestamp trans <= stamp then

513512 pure currentTid

514513 else if S.null parents then

515514 Left RootTransactionTraversalError

src/lib/ProjectM36/TransactionGraph/Persist.hs+2−4

@@ -89,7 +89,7 @@ setupDatabaseDir sync dbdir bootstrapGraph = do

8989 else

9090 pure (Left (InvalidDirectoryError dbdir))

9191{-

92−initialize a database directory with the graph from which to bootstrap- return lock file handle

92+initialize a database directory with the graph from which to bootstrap- return lock file handle which must be closed by the caller

9393-}

9494bootstrapDatabaseDir :: DiskSync -> FilePath -> TransactionGraph -> IO (LockFile, LockFileHash)

9595bootstrapDatabaseDir sync dbdir bootstrapGraph = do

@@ -211,7 +211,5 @@ readGraphTransactionIdFile dbdir = do

211211 (readUUID tid, readEpoch epochText, map readUUID parentIds)

212212 readUUID uuidText = fromMaybe (error "failed to read uuid") (U.fromText uuidText)

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

214+ Right . map grapher . T.lines <$> TIO.readFile (transactionLogPath dbdir)

217215

src/lib/ProjectM36/Tuple.hs+11−8

@@ -29,6 +29,14 @@ tupleAttributes (RelationTuple tupAttrs _) = tupAttrs

2929tupleAssocs :: RelationTuple -> [(AttributeName, Atom)]

3030tupleAssocs (RelationTuple attrVec tupVec) = V.toList $ V.map (first attributeName) (V.zip attrVec tupVec)

3131

32+orderedTupleAssocs :: RelationTuple -> [(AttributeName, Atom)]

33+orderedTupleAssocs tup@(RelationTuple attrVec _) = map (\attr -> (attributeName attr, atomForAttr (attributeName attr))) oAttrs

34+ where

35+ oAttrs = orderedAttributes attrVec

36+ atomForAttr nam = case atomForAttributeName nam tup of

37+ Left _ -> TextAtom "<?>"

38+ Right val -> val

39+

3240-- return atoms in some arbitrary but consistent key order

3341tupleAtoms :: RelationTuple -> V.Vector Atom

3442tupleAtoms (RelationTuple _ tupVec) = tupVec

@@ -48,9 +56,8 @@ atomTypeForAttributeName attrName tup = do

4856-}

4957

5058atomsForAttributeNames :: V.Vector AttributeName -> RelationTuple -> Either RelationalError (V.Vector Atom)

51−atomsForAttributeNames attrNames tuple = do

52− vindices <- vectorIndicesForAttributeNames attrNames (tupleAttributes tuple)

53− return $ V.map (\index -> tupleAtoms tuple V.! index) vindices

59+atomsForAttributeNames attrNames tuple =

60+ V.map (\index -> tupleAtoms tuple V.! index) <$> vectorIndicesForAttributeNames attrNames (tupleAttributes tuple)

5461

5562vectorIndicesForAttributeNames :: V.Vector AttributeName -> Attributes -> Either RelationalError (V.Vector Int)

5663vectorIndicesForAttributeNames attrNameVec attrs = if not $ V.null unknownAttrNames then

@@ -146,10 +153,6 @@ tupleAtomExtend newAttrName atom tupIn = tupleExtend tupIn newTup

146153 where

147154 newTup = RelationTuple (V.singleton $ Attribute newAttrName (atomTypeForAtom atom)) (V.singleton atom)

148155

149−{- sort the associative list to match the header sorting -}

150−tupleSortedAssocs :: RelationTuple -> [(AttributeName, Atom)]

151−tupleSortedAssocs (RelationTuple tupAttrs tupVec) = V.toList $ V.map (\(index,attr) -> (attributeName attr, tupVec V.! index)) $ V.indexed tupAttrs

152−

153156--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)]

154157tupleProject :: S.Set AttributeName -> RelationTuple -> RelationTuple

155158tupleProject projectAttrs (RelationTuple attrs tupVec) = RelationTuple newAttrs newTupVec

@@ -206,7 +209,7 @@ reorderTuple attrs tupIn = if tupleAttributes tupIn == attrs then

206209 RelationTuple attrs (V.map mapper attrs)

207210 where

208211 mapper attr = case atomForAttributeName (attributeName attr) tupIn of

209− Left _ -> error "logic failure in reorderTuple"

212+ Left err -> error ("logic bug in reorderTuple: " ++ show err)

210213 Right atom -> atom

211214

212215--used in Generics derivation for ADTs without named attributes

src/lib/ProjectM36/Tupleable.hs+108−40

@@ -1,18 +1,28 @@

1−{-# LANGUAGE FlexibleInstances, FlexibleContexts, TypeOperators, UndecidableInstances, ScopedTypeVariables, DefaultSignatures #-}

1+{-# LANGUAGE DefaultSignatures #-}

2+{-# LANGUAGE FlexibleContexts #-}

3+{-# LANGUAGE FlexibleInstances #-}

4+{-# LANGUAGE ScopedTypeVariables #-}

5+{-# LANGUAGE TypeOperators #-}

6+{-# LANGUAGE UndecidableInstances #-}

28module ProjectM36.Tupleable where

3−import ProjectM36.Base

4−import ProjectM36.Error

5−import ProjectM36.TupleSet

6−import ProjectM36.Tuple

7−import ProjectM36.Atomable

8−import ProjectM36.DataTypes.Primitive

9−import ProjectM36.Attribute hiding (null)

10−import GHC.Generics

11−import qualified Data.Vector as V

12−import qualified Data.Text as T

13−import Data.Monoid

14−import Data.Proxy

15−import Data.Foldable

10+import Data.Foldable

11+import Data.List (partition)

12+import qualified Data.Map as Map

13+import Data.Monoid

14+import Data.Proxy

15+import qualified Data.Text as T

16+import qualified Data.Vector as V

17+import GHC.Generics

18+import ProjectM36.Atomable

19+import ProjectM36.Attribute hiding (null)

20+import ProjectM36.Base

21+import ProjectM36.DataTypes.Primitive

22+import ProjectM36.Error

23+import ProjectM36.Tuple

24+import ProjectM36.TupleSet

25+import qualified Data.Set as S

1626

1727{-import Data.Binary

1828import Control.DeepSeq

@@ -21,27 +31,27 @@ data Test1T = Test1C {

2131 attrA :: Int

2232 }

2333 deriving (Generic, Show)

24−

34+

2535data Test2T a b = Test2C {

2636 attrB :: a,

2737 attrC :: b

2838 }

2939 deriving (Generic, Show)

30−

40+

3141instance (Atomable a, Atomable b, Show a, Show b) => Tupleable (Test2T a b)

3242

3343instance Tupleable Test1T

3444

3545data TestUnnamed1 = TestUnnamed1 Int Double T.Text

3646 deriving (Show,Eq, Generic)

37−

38−instance Tupleable TestUnnamed1

47+

48+instance Tupleable TestUnnamed1

3949

4050data Test7A = Test7AC Integer

4151 deriving (Generic, Show, Eq, Atomable, NFData, Binary)

42−

43−

44−data Test7T = Test7C Test7A

52+

53+

54+data Test7T = Test7C Test7A

4555 deriving (Generic, Show, Eq)

4656

4757instance Tupleable Test7T

@@ -52,41 +62,91 @@ toInsertExpr :: forall a t. (Tupleable a, Traversable t) => t a -> RelVarName ->

5262toInsertExpr vals rvName = do

5363 let attrs = toAttributes (Proxy :: Proxy a)

5464 tuples <- mkTupleSet attrs $ toList (fmap toTuple vals)

55− let rel = MakeStaticRelation attrs tuples

65+ let rel = MakeStaticRelation attrs tuples

5666 pure (Insert rvName rel)

57−

67+

5868-- | 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'.

5969toDefineExpr :: forall a proxy. Tupleable a => proxy a -> RelVarName -> DatabaseContextExpr

6070toDefineExpr _ rvName = Define rvName (map NakedAttributeExpr (V.toList attrs))

61− where

71+ where

6272 attrs = toAttributes (Proxy :: Proxy a)

6373

74+tupleAssocsEqualityPredicate :: [(AttributeName, Atom)] -> RestrictionPredicateExpr

75+tupleAssocsEqualityPredicate [] = TruePredicate

76+tupleAssocsEqualityPredicate pairs =

77+ foldr1 AndPredicate $

78+ map

79+ (\(name, atom) -> AttributeEqualityPredicate name (NakedAtomExpr atom))

80+ pairs

81+

82+partitionByAttributes ::

83+ Tupleable a

84+ => [AttributeName]

85+ -> a

86+ -> ([(AttributeName, Atom)], [(AttributeName, Atom)])

87+partitionByAttributes attrs =

88+ partition ((`elem` attrs) . fst) . tupleAssocs . toTuple

89+

90+-- | Convert a list of key attributes and a 'Tupleable' value to an 'Update'

91+-- expression. This expression flushes the non-key attributes of the value to

92+-- a tuple with the matching key attributes.

93+toUpdateExpr ::

94+ forall a. Tupleable a => RelVarName -> [AttributeName] -> a -> Either RelationalError DatabaseContextExpr

95+toUpdateExpr rvName keyAttrs a = validateAttributes (S.fromList keyAttrs) expectedAttrSet (Update rvName updateMap keyRestriction)

96+ where

97+ (keyPairs, updatePairs) = partitionByAttributes keyAttrs a

98+ updateMap = Map.fromList $ fmap NakedAtomExpr <$> updatePairs

99+ keyRestriction = tupleAssocsEqualityPredicate keyPairs

100+ expectedAttrSet = attributeNameSet (toAttributes (Proxy :: Proxy a))

101+

102+-- | Convert a list of key attributes and a 'Tupleable' value to a 'Delete'

103+-- expression. This expression deletes tuples matching the key attributes from

104+-- the value.

105+toDeleteExpr ::

106+ forall a. Tupleable a => RelVarName -> [AttributeName] -> a -> Either RelationalError DatabaseContextExpr

107+toDeleteExpr rvName keyAttrs val = validateAttributes (S.fromList keyAttrs) expectedAttrSet (Delete rvName keyRestriction)

108+ where

109+ keyPairs = fst $ partitionByAttributes keyAttrs val

110+ keyRestriction = tupleAssocsEqualityPredicate keyPairs

111+ expectedAttrSet = attributeNameSet (toAttributes (Proxy :: Proxy a))

112+

113+validateAttributes :: S.Set AttributeName -> S.Set AttributeName -> a -> Either RelationalError a

114+validateAttributes actualAttrs expectedAttrs val

115+ | S.null actualAttrs = Left EmptyAttributesError

116+ | not (S.null nonMatchingAttrs) = Left (NoSuchAttributeNamesError nonMatchingAttrs)

117+ | otherwise = Right val

118+ where

119+ nonMatchingAttrs = attributeNamesNotContained actualAttrs expectedAttrs

120+

121+

64122class Tupleable a where

65123 toTuple :: a -> RelationTuple

66−

124+

67125 fromTuple :: RelationTuple -> Either RelationalError a

68−

126+

69127 toAttributes :: proxy a -> Attributes

70128

71129 default toTuple :: (Generic a, TupleableG (Rep a)) => a -> RelationTuple

72130 toTuple v = toTupleG (from v)

73−

131+

74132 default fromTuple :: (Generic a, TupleableG (Rep a)) => RelationTuple -> Either RelationalError a

75133 fromTuple tup = to <$> fromTupleG tup

76−

134+

77135 default toAttributes :: (Generic a, TupleableG (Rep a)) => proxy a -> Attributes

78136 toAttributes _ = toAttributesG (from (undefined :: a))

79−

80−class TupleableG g where

137+

138+class TupleableG g where

81139 toTupleG :: g a -> RelationTuple

82140 toAttributesG :: g a -> Attributes

83141 fromTupleG :: RelationTuple -> Either RelationalError (g a)

84−

142+ isRecordTypeG :: g a -> Bool

143+

85144--data type metadata

86145instance (Datatype c, TupleableG a) => TupleableG (M1 D c a) where

87146 toTupleG (M1 v) = toTupleG v

88147 toAttributesG (M1 v) = toAttributesG v

89148 fromTupleG v = M1 <$> fromTupleG v

149+ isRecordTypeG (M1 v) = isRecordTypeG v

90150

91151--constructor metadata

92152instance (Constructor c, TupleableG a, AtomableG a) => TupleableG (M1 C c a) where

@@ -94,19 +154,26 @@ instance (Constructor c, TupleableG a, AtomableG a) => TupleableG (M1 C c a) whe

94154 where

95155 attrsToCheck = toAttributesG v

96156 counter = V.generate (V.length attrsToCheck) id

97− attrs = V.zipWith (\num attr@(Attribute name typ) -> if T.null name then

98− Attribute ("attr" <> T.pack (show (num + 1))) typ

157+ attrs = V.zipWith (\num attr@(Attribute name typ) -> if T.null name then

158+ Attribute ("attr" <> T.pack (show (num + 1))) typ

99159 else

100− attr) counter attrsToCheck

160+ attr) counter attrsToCheck

101161 atoms = V.fromList (toAtomsG v)

102162 toAttributesG (M1 v) = toAttributesG v

103163 fromTupleG tup = M1 <$> fromTupleG tup

104−

164+ isRecordTypeG (M1 v) = isRecordTypeG v

165+

105166-- product types

106167instance (TupleableG a, TupleableG b) => TupleableG (a :*: b) where

107168 toTupleG = error "toTupleG"

108169 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

109− fromTupleG tup = (:*:) <$> fromTupleG tup <*> fromTupleG (trimTuple 1 tup)

170+ fromTupleG tup = (:*:) <$> fromTupleG tup <*> fromTupleG processedTuple

171+ where

172+ processedTuple = if isRecordTypeG (undefined :: a x) then

173+ tup

174+ else

175+ trimTuple 1 tup

176+ isRecordTypeG ~(x :*: y) = isRecordTypeG x || isRecordTypeG y

110177

111178--selector/record

112179instance (Selector c, AtomableG a) => TupleableG (M1 S c a) where

@@ -123,17 +190,18 @@ instance (Selector c, AtomableG a) => TupleableG (M1 S c a) where

123190 pure (M1 val)

124191 where

125192 expectedAtomType = atomType (V.head (toAttributesG (undefined :: M1 S c a x)))

126− atomv atom = maybe (Left (AtomTypeMismatchError

193+ atomv atom = maybe (Left (AtomTypeMismatchError

127194 expectedAtomType

128195 (atomTypeForAtom atom)

129196 )) Right (fromAtomG atom [atom])

130197 name = selName (undefined :: M1 S c a x)

198+ isRecordTypeG _ = not (null (selName (undefined :: M1 S c a x)))

131199

132−--constructors with no arguments

200+--constructors with no arguments

133201--basically useless but orthoganal to relationTrue

134202instance TupleableG U1 where

135203 toTupleG _= emptyTuple

136204 toAttributesG _ = emptyAttributes

137205 fromTupleG _ = pure U1

138−

139−

206+ isRecordTypeG _ = False

207+

stack.ghc7.10.yamlnew file+50

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

1+# This file was automatically generated by stack init

2+# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/

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-6.35

7+# Local packages, usually specified by relative directory name

8+packages:

9+- '.'

10+# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)

11+extra-deps:

12+- data-accessor-transformers-0.2.1.7

13+- data-interval-1.2.0

14+- extended-reals-0.2.1.0

15+- gnuplot-0.5.4.1

16+- text-1.2.2.1

17+- aeson-1.2.1.00

18+- distributed-process-0.6.6

19+- distributed-process-async-0.2.4

20+- distributed-process-client-server-0.2.3

21+- distributed-process-extras-0.3.2

22+- cryptohash-sha256-0.11.100.1

23+- megaparsec-5.3.1

24+

25+# Override default flag values for local packages and extra-deps

26+flags: {}

27+

28+# Extra package databases containing global packages

29+extra-package-dbs: []

30+

31+# Control whether we use the GHC we find on the path

32+# system-ghc: true

33+

34+# Require a specific version of stack, using version ranges

35+# require-stack-version: -any # Default

36+# require-stack-version: >= 1.0.0

37+

38+# Override the architecture used by stack, especially useful on Windows

39+# arch: i386

40+# arch: x86_64

41+

42+# Extra directories used by stack for building

43+# extra-include-dirs: [/path/to/dir]

44+# extra-lib-dirs: [/path/to/dir]

45+

46+# Allow a newer minor version of GHC than the snapshot specifies

47+# compiler-check: newer-minor

48+

49+allow-newer: true

50+

test/Client/Simple.hs+14−8

@@ -3,11 +3,14 @@ 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

1012import qualified Data.Vector as V

13+import qualified Data.Map as M

1114

1215main :: IO ()

1316main = do

@@ -15,7 +18,7 @@ main = do

1518 if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess

1619

1720testList :: Test

18−testList = TestList [testSimpleCommitSuccess, testSimpleCommitFailure]

21+testList = TestList [testSimpleCommitSuccess, testSimpleCommitFailure, testSimpleUpdate]

1922

2023assertEither :: (Show a) => IO (Either a b) -> IO b

2124assertEither x = do

@@ -45,6 +48,7 @@ testSimpleCommitSuccess = TestCase $

4548 eRes <- C.executeRelationalExpr sess conn relExpr

4649 assertEqual "x and y" (Right relationTrue) eRes

4750

51+

4852testSimpleCommitFailure :: Test

4953testSimpleCommitFailure = TestCase $ do

5054 let failAttrs = attributesFromList [Attribute "fail" IntAtomType]

@@ -57,11 +61,13 @@ testSimpleCommitFailure = TestCase $ do

5761 execute $ Assign "x" (MakeStaticRelation failAttrs emptyTupleSet)

5862 let expectedErr = Left (RelError (RelationTypeMismatchError V.empty failAttrs))

5963 assertEqual "dbc error" expectedErr err

60−

61−

62−

6364

64−

65−

66−

67−

65+-- #176 default merge couldn't handle Update

66+testSimpleUpdate :: Test

67+testSimpleUpdate = TestCase $ do

68+ let connInfo = InProcessConnectionInfo NoPersistence emptyNotificationCallback []

69+ dbconn <- assertEither (simpleConnectProjectM36 connInfo)

70+ assertEither $ withTransaction dbconn $

71+ execute $ databaseContextAsDatabaseContextExpr dateExamples

72+ assertEither $ withTransaction dbconn $

73+ execute $ Update "s" (M.singleton "sname" (C.NakedAtomExpr (C.TextAtom "Blakey"))) (C.AttributeEqualityPredicate "sname" (C.NakedAtomExpr (C.TextAtom "Blake")))

test/Relation/Basic.hs+12−1

@@ -3,6 +3,8 @@ import ProjectM36.Base

33import ProjectM36.Relation

44import ProjectM36.Error

55import ProjectM36.DateExamples

6+import ProjectM36.TupleSet

7+import ProjectM36.Attribute hiding (null, attributeNames)

68import ProjectM36.DataTypes.Primitive

79import ProjectM36.RelationalExpression

810import ProjectM36.Tuple

@@ -22,7 +24,9 @@ testList = TestList [testRelation "relationTrue" relationTrue, testRelation "rel

2224 testRelation "suppliers" suppliersRel,

2325 testRelation "products" productsRel,

2426 testRelation "supplierProducts" supplierProductsRel,

25− testMkRelationFromExprsBadAttrs]

27+ testMkRelationFromExprsBadAttrs,

28+ testDuplicateAttributes

29+ ]

2630

2731main :: IO ()

2832main = do

@@ -93,3 +97,10 @@ testMkRelationFromExprsBadAttrs = TestCase $ do

9397 case runReader (evalRelationalExpr (MakeRelationFromExprs (Just [AttributeAndTypeNameExpr "badAttr1" (PrimitiveTypeConstructor "Int" IntAtomType) ()]) [TupleExpr (M.singleton "badAttr2" (NakedAtomExpr (IntAtom 1)))])) (mkRelationalExprState context) of

9498 Left err -> assertEqual "tuple type mismatch" (TupleAttributeTypeMismatchError (A.attributesFromList [Attribute "badAttr2" IntAtomType])) err

9599 Right _ -> assertFailure "expected tuple type mismatch"

100+

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

test/Relation/StaticOptimizer.hs+111−4

@@ -2,19 +2,25 @@ import ProjectM36.Base

22import ProjectM36.Relation

33import ProjectM36.RelationalExpression

44import ProjectM36.DateExamples

5+import ProjectM36.Error

56import ProjectM36.TupleSet

67import ProjectM36.StaticOptimizer

78import System.Exit

89import Control.Monad.State

910import Control.Monad.Trans.Reader

1011import Test.HUnit

12+import qualified Data.Set as S

1113

1214main :: IO ()

1315main = do

1416 tcounts <- runTestTT (TestList tests)

1517 if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess

1618 where

17− tests = relationOptTests ++ databaseOptTests

19+ tests = relationOptTests ++ databaseOptTests ++ [testTransitiveOptimization,

20+ testImpossiblePredicates,

21+ testJoinElimination,

22+ testRestrictionPredicateCollapse,

23+ testPushDownRestrictionPredicate]

1824 optDBCTest = map (\(name, expr, unopt) -> TestCase $ assertEqual name expr (evalState (applyStaticDatabaseOptimization unopt) (freshDatabaseState dateExamples)))

1925 relvar nam = RelationVariable nam ()

2026 startState = mkRelationalExprState dateExamples

@@ -22,9 +28,7 @@ main = do

2228 relationOptTests = optRelTest [

2329 ("StaticProject", Right $ relvar "s", Project (AttributeNames (attributeNames suppliersRel)) (relvar "s")),

2430 ("StaticUnion", Right $ relvar "s", Union (relvar "s") (relvar "s")),

25− ("StaticJoin", Right $ relvar "s", Join (relvar "s") (relvar "s")),

26− ("StaticRestrictTrue", Right $ relvar "s", Restrict TruePredicate (relvar "s")),

27− ("StaticRestrictFalse", Right $ MakeStaticRelation (attributes suppliersRel) emptyTupleSet, Restrict (NotPredicate TruePredicate) (relvar "s"))

31+ ("StaticJoin", Right $ relvar "s", Join (relvar "s") (relvar "s"))

2832 ]

2933 databaseOptTests = optDBCTest [

3034 ("StaticAssign",

@@ -37,3 +41,106 @@ main = do

3741 MultipleExpr [Assign "z" (Restrict TruePredicate (relvar "s")),

3842 Assign "z" (Restrict TruePredicate (relvar "s"))])

3943 ]

44+

45+testTransitiveOptimization :: Test

46+testTransitiveOptimization = TestCase $ do

47+ let expr atomexpr = AndPredicate (AttributeEqualityPredicate "a" (NakedAtomExpr (IntegerAtom 300))) (AttributeEqualityPredicate "b" atomexpr)

48+ exprIn = expr (AttributeAtomExpr "a")

49+ exprOut = expr (NakedAtomExpr (IntegerAtom 300))

50+ assertEqual "transitive property" (Right exprOut) (runReader (applyStaticPredicateOptimization exprIn) (RelationalExprStateElems dateExamples))

51+

52+optRelExpr :: RelationalExpr -> Either RelationalError RelationalExpr

53+optRelExpr expr = runReader (applyStaticRelationalOptimization expr) (RelationalExprStateElems dateExamples)

54+

55+testImpossiblePredicates :: Test

56+testImpossiblePredicates = TestCase $ do

57+ let tautTrue = Restrict (AtomExprPredicate (NakedAtomExpr (BoolAtom True))) rel

58+ tautTrue2 = Restrict TruePredicate rel

59+ tautFalse = Restrict (AtomExprPredicate (NakedAtomExpr (BoolAtom False))) rel

60+ tautFalse2 = Restrict (NotPredicate TruePredicate) rel

61+ emptyRel = MakeStaticRelation (attributes suppliersRel) emptyTupleSet

62+ rel = RelationVariable "s" ()

63+ assertEqual "remove tautology where true" (Right rel) (optRelExpr tautTrue)

64+ assertEqual "remove tautology where true2" (Right rel) (optRelExpr tautTrue2)

65+ assertEqual "remove tautology where false" (Right emptyRel) (optRelExpr tautFalse)

66+ assertEqual "remove tautology where false2" (Right emptyRel) (optRelExpr tautFalse2)

67+

68+optJoinExpr :: RelationalExpr -> Either RelationalError RelationalExpr

69+optJoinExpr expr = runReader (applyStaticJoinElimination expr) (RelationalExprStateElems dateExamples)

70+

71+testJoinElimination :: Test

72+testJoinElimination = TestCase $ do

73+ -- (s join sp){s#,qty,p#} == sp

74+ let unoptExpr = Project (AttributeNames (S.fromList ["p#", "qty", "s#"])) (Join (RelationVariable "sp" ()) (RelationVariable "s" ()))

75+ assertEqual "remove extraneous join" (Right (RelationVariable "sp" ())) (optJoinExpr unoptExpr)

76+

77+-- (sp join s){s#,qty,p#} == sp --flip relvar names

78+ let unoptExpr2 = Project (AttributeNames (S.fromList ["p#", "qty", "s#"])) (Join (RelationVariable "s" ()) (RelationVariable "sp" ()))

79+ assertEqual "remove extraneous join2" (Right (RelationVariable "sp" ())) (optJoinExpr unoptExpr2)

80+

81+-- (sp join s){s#,qty,sname} != sp - attribute from s included

82+ let expr3 = Project (AttributeNames (S.fromList ["p#", "qty", "sname"])) (Join (RelationVariable "sp" ()) (RelationVariable "s" ()))

83+ assertEqual "retain join" (Right expr3) (optJoinExpr expr3)

84+

85+ -- (sp join s){qty} != sp --projection does not include foreign key attribute

86+ let expr4 = Project (AttributeNames (S.singleton "qty")) (Join (RelationVariable "sp" ()) (RelationVariable "s" ()))

87+ assertEqual "retain join2" (Right expr4) (optJoinExpr expr4)

88+

89+ -- (sp join s){s#,qty} == sp - a subset of attributes in the projection are in the foreign key

90+ let expr5 = Project (AttributeNames (S.fromList ["s#", "qty"])) (Join (RelationVariable "sp" ()) (RelationVariable "s" ()))

91+ let expect5 = Project (AttributeNames (S.fromList ["s#", "qty"])) (RelationVariable "sp" ())

92+ assertEqual "remove extraneous join (attribute subset)" (Right expect5) (optJoinExpr expr5)

93+

94+ -- (s join p){s#,p#} != sp -- no foreign key

95+ let expr6 = Project (AttributeNames (S.fromList ["s#", "p#"])) (Join (RelationVariable "s" ()) (RelationVariable "p" ()))

96+ assertEqual "retain join- no foreign key" (Right expr6) (optJoinExpr expr6)

97+

98+ -- (s join p){s#,qty,p#,sname} != sp -- all sp attributes plus one s attributes

99+ let expr7 = Project (AttributeNames (S.fromList ["s#", "p#", "qty", "sname"])) (Join (RelationVariable "s" ()) (RelationVariable "sp" ()))

100+ assertEqual "retain join- attributes from both relvars" (Right expr7) (optJoinExpr expr7)

101+

102+testRestrictionPredicateCollapse :: Test

103+testRestrictionPredicateCollapse = TestCase $ do

104+ let expr1 = Restrict (NotPredicate TruePredicate) rv

105+ rv = RelationVariable "a" ()

106+ assertEqual "one restriction" expr1 (applyStaticRestrictionCollapse expr1)

107+

108+ let attrEqualsPred = AttributeEqualityPredicate "x" (NakedAtomExpr (IntAtom 3))

109+ expr2 = Restrict TruePredicate (Restrict attrEqualsPred (RelationVariable "a" ()))

110+ assertEqual "two restrictions" (Restrict (AndPredicate TruePredicate attrEqualsPred) (RelationVariable "a" ())) (applyStaticRestrictionCollapse expr2)

111+

112+ let expr3 = Restrict pred1 (Restrict pred2 (Restrict pred3 (RelationVariable "a" ())))

113+ pred1 = NotPredicate TruePredicate

114+ pred2 = attrEqualsPred

115+ pred3 = AtomExprPredicate (NakedAtomExpr (BoolAtom True))

116+ assertEqual "three restrictions" (Restrict (AndPredicate (AndPredicate pred1 pred3) pred2) rv) (applyStaticRestrictionCollapse expr3)

117+

118+ let expr4 = Restrict pred1 (Restrict pred2 (Project projAttrs (Restrict pred3 (Restrict pred3 rv))))

119+ projAttrs = AttributeNames (S.singleton "spam")

120+ expectedExpr = Restrict (AndPredicate pred1 pred2) (Project projAttrs (Restrict (AndPredicate pred3 pred3) rv))

121+ assertEqual "nested subexpr restrictions" expectedExpr (applyStaticRestrictionCollapse expr4)

122+

123+testPushDownRestrictionPredicate :: Test

124+testPushDownRestrictionPredicate = TestCase $ do

125+ -- (s union relation{tuple{city "Boston", s# "S6", sname "Stevens", status 50}}) where status = 30 == (s where status=30) union (relation{tuple{city "Boston", s# "S6", sname "Stevens", status 50}} where status=30)

126+ let rvs = RelationVariable "s" ()

127+ let status30 = AttributeEqualityPredicate "status" (NakedAtomExpr (IntAtom 30))

128+ relationsOrError = do

129+ stevens <- mkRelationFromList (attributes suppliersRel) [[TextAtom "S6", TextAtom "Stevens", IntegerAtom 50, TextAtom "Boston"]]

130+ let expectedExpr1 = Union (Restrict status30 rvs) (Restrict status30 (ExistingRelation stevens))

131+ expr1 = Restrict status30 (Union rvs (ExistingRelation stevens))

132+

133+ pure (expectedExpr1, applyStaticRestrictionPushdown expr1)

134+ either (assertFailure . (++) "stevens relation: " . show) (uncurry $ assertEqual "union restriction pushdown") relationsOrError

135+

136+ -- s{sname,city} where city="London" == (s where city="London"){sname,city}

137+ let expr2 = Restrict whereLondon (Project projAttrs2 rvs)

138+ projAttrs2 = AttributeNames (S.fromList ["sname", "city"])

139+ whereLondon = AttributeEqualityPredicate "city" (NakedAtomExpr (TextAtom "London"))

140+ expectedExpr2 = Project projAttrs2 (Restrict whereLondon rvs)

141+ assertEqual "projection restriction pushdown" expectedExpr2 (applyStaticRestrictionPushdown expr2)

142+

143+ -- (s where city="London"){sname} != s{sname} where city="London" (no "city" attribute at projection time)

144+ let expr3 = Project projAttrs3 (Restrict whereLondon rvs)

145+ projAttrs3 = AttributeNames (S.singleton "sname")

146+ assertEqual "projection restriction no-pushdown" expr3 (applyStaticRestrictionPushdown expr3)

test/Relation/Tupleable.hs+86−3

@@ -3,6 +3,7 @@ import Test.HUnit

33import ProjectM36.Tupleable

44import ProjectM36.Atomable

55import ProjectM36.Attribute

6+import ProjectM36.Error

67import Data.Binary

78import ProjectM36.Base

89import Control.DeepSeq (NFData)

@@ -10,6 +11,7 @@ import GHC.Generics

1011import qualified Data.Vector as V

1112import qualified Data.Map as M

1213import qualified Data.Text as T

14+import qualified Data.Set as S

1315import System.Exit

1416import Data.Proxy

1517

@@ -48,6 +50,14 @@ data Test7T = Test7C Test7A

4850

4951data Test8T = Test8C

5052 deriving (Generic, Show, Eq)

53+

54+data Test9T = Test9C

55+ {

56+ attr9A :: Integer,

57+ attr9B :: T.Text,

58+ attr9C :: Double

59+ }

60+ deriving (Generic, Show, Eq)

5161

5262instance Tupleable Test1T

5363

@@ -65,20 +75,21 @@ instance Tupleable Test7T

6575

6676instance Tupleable Test8T

6777

78+instance Tupleable Test9T

79+

6880main :: IO ()

6981main = do

7082 tcounts <- runTestTT testList

7183 if errors tcounts + failures tcounts > 0 then exitFailure else exitSuccess

7284

7385testList :: Test

74−testList = TestList [testADT1, testADT2, testADT3, testADT4, testADT6, testADT7, testADT8]

86+testList = TestList [testADT1, testADT2, testADT3, testADT4, testADT6, testADT7, testADT8, testInsertExpr, testDefineExpr, testUpdateExpr, testUpdateExprEmptyAttrs, testDeleteExpr, testUpdateExprWrongAttr, testReorderedTuple]

7587

7688testADT1 :: Test

7789testADT1 = TestCase $ assertEqual "one record constructor" (Right example) (fromTuple (toTuple example))

7890 where

7991 example = Test1C {attrA = 3}

8092

81−

8293testADT2 :: Test

8394testADT2 = TestCase $ do

8495 let example = Test2C { attrB = 4, attrC = 6 }

@@ -116,4 +127,76 @@ testADT7 = TestCase $ do

116127testADT8 :: Test

117128testADT8 = TestCase $ assertEqual "single value" (Right example) (fromTuple (toTuple example))

118129 where

119− example = Test8C

130+ example = Test8C

131+

132+testInsertExpr :: Test

133+testInsertExpr = TestCase $ assertEqual "insert expr" expected (toInsertExpr [Test9C {

134+ attr9A = 4,

135+ attr9B = "a",

136+ attr9C = 3.4}] "rv")

137+ where expected = Right (Insert "rv" (MakeStaticRelation attrs tuples))

138+ attrs = attributesFromList [Attribute "attr9A" IntegerAtomType,

139+ Attribute "attr9B" TextAtomType,

140+ Attribute "attr9C" DoubleAtomType]

141+ tuples = RelationTupleSet [RelationTuple attrs (V.fromList [IntegerAtom 4,

142+ TextAtom "a",

143+ DoubleAtom 3.4])]

144+

145+testDefineExpr :: Test

146+testDefineExpr = TestCase $ assertEqual "define expr" expected actual

147+ where

148+ expected = Define "rv" (map NakedAttributeExpr attrs)

149+ attrs = [Attribute "attr9A" IntegerAtomType,

150+ Attribute "attr9B" TextAtomType,

151+ Attribute "attr9C" DoubleAtomType]

152+ actual = toDefineExpr (Proxy :: Proxy Test9T) "rv"

153+

154+testUpdateExpr :: Test

155+testUpdateExpr = TestCase $ do

156+ let expected = Right (Update "rv" updateMap restriction)

157+ updateMap = M.fromList [("attr9B", NakedAtomExpr (TextAtom "b")),

158+ ("attr9C", NakedAtomExpr (DoubleAtom 5.5))]

159+ restriction = AttributeEqualityPredicate "attr9A" (NakedAtomExpr (IntegerAtom 5))

160+ actual = toUpdateExpr "rv" ["attr9A"] Test9C {attr9A = 5,

161+ attr9B = "b",

162+ attr9C = 5.5}

163+

164+ assertEqual "update expr1" expected actual

165+

166+testUpdateExprEmptyAttrs :: Test

167+testUpdateExprEmptyAttrs = TestCase $ do

168+ let expected = Left EmptyAttributesError

169+ actual = toUpdateExpr "rv" [] Test9C {attr9A = 5,

170+ attr9B = "b",

171+ attr9C = 5.5}

172+ assertEqual "update with empty attrs" expected actual

173+

174+testUpdateExprWrongAttr :: Test

175+testUpdateExprWrongAttr = TestCase $ do

176+ --currently, passing in the wrong attribute replaces the whole relvar with a single tuple- is this what we want?

177+ let expected = Left (NoSuchAttributeNamesError (S.singleton "nonexistentattr"))

178+ actual = toUpdateExpr "rv" ["nonexistentattr"] Test9C {attr9A = 5,

179+ attr9B = "b",

180+ attr9C = 5.5}

181+ assertEqual "update with wrong attr" expected actual

182+

183+testDeleteExpr :: Test

184+testDeleteExpr = TestCase $ do

185+ let expected = Right (Delete "rv" (AndPredicate (AttributeEqualityPredicate "attr9A"

186+ (NakedAtomExpr (IntegerAtom 5)))

187+ (AttributeEqualityPredicate "attr9B"

188+ (NakedAtomExpr (TextAtom "b")))))

189+ actual = toDeleteExpr "rv" ["attr9A", "attr9B"] Test9C {attr9A = 5,

190+ attr9B = "b",

191+ attr9C = 5.5}

192+ assertEqual "delete expr" expected actual

193+

194+--discovered in #184 by ruhatch

195+testReorderedTuple :: Test

196+testReorderedTuple = TestCase $ do

197+ let tupleRev :: RelationTuple -> RelationTuple

198+ tupleRev (RelationTuple v1 v2) = RelationTuple (V.reverse v1) (V.reverse v2)

199+ expected = Test2C {attrB = 3,

200+ attrC = 4}

201+ actual = fromTuple . tupleRev . toTuple $ expected

202+ assertEqual "reordered tuple" (Right expected) actual

test/Server/Main.hs+1−1

@@ -217,7 +217,7 @@ testFileDescriptorCount = TestCase $ do

217217 Right (_, testConn) <- testConnection serverAddress unusedMVar

218218 close testConn

219219 endCount <- fdCount

220− assertEqual "fd leak" startCount endCount

220+ assertBool "fd leak" (endCount - startCount <= 1)

221221 killThread serverTid

222222

223223-- returns the number of open file descriptors -- linux only /proc usage

test/Server/WebSocket.hs+10−7

@@ -5,6 +5,8 @@ import ProjectM36.Server.WebSocket

55import ProjectM36.Server.Config

66import ProjectM36.Server

77import ProjectM36.Client

8+import ProjectM36.Base

810import Network.Socket

911import Control.Exception

1012import Control.Concurrent

@@ -12,7 +14,6 @@ import System.Exit

1214import Data.Typeable

1315import Data.Text hiding (map)

1416import Data.Aeson

15−import ProjectM36.Base

1617import qualified Data.Map as M

1718import qualified Data.ByteString.Lazy as BS

1819import ProjectM36.Relation

@@ -90,14 +91,16 @@ testTutorialD port dbname = TestCase $ basicConnectionWithDatabase port dbname t

9091

9192 testtutd conn = do

9293 discardPromptInfo conn

93− WS.sendTextData conn ("executetutd:" `append` ":showexpr true")

94+ WS.sendTextData conn ("executetutd/json:" `append` ":showexpr true")

9495 discardPromptInfo conn

9596 discardPromptInfo conn

9697

9798 --receive relation response

9899 response <- WS.receiveData conn :: IO BS.ByteString

99− let decoded = decode response :: Maybe (M.Map Text Relation)

100−

101− case decoded of

102− Just val -> assertEqual "round-trip true relation" (M.lookup "displayrelation" val) (Just relationTrue) >> WS.sendClose conn ("test close"::Text)

103− Nothing -> assertFailure ("failed to decode relation from: " ++ show response)

100+ let decoded = decode response :: Maybe (M.Map Text (M.Map Text Relation))

101+ case decoded of

102+ Nothing -> assertFailure "failed to decode"

103+ Just decoded' -> do

104+ assertEqual "round-trip true relation" ((decoded' M.! "displayrelation") M.! "json") relationTrue

105+ WS.sendClose conn ("test close" :: Text)

106+

test/TransactionGraph/Merge.hs+5−5

@@ -21,7 +21,7 @@ import Data.Maybe

2121import Data.Time.Clock

2222import Data.Time.Calendar

2323

24−import Control.Monad.State hiding (join)

24+import Control.Monad.State

2525

2626{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-}

2727

@@ -122,8 +122,8 @@ testSubGraphToFirstAncestorMoreTransactions = TestCase $ do

122122-- add another relvar to branchB

123123 branchBTrans <- assertMaybe (transactionForHead "branchB" graph) "failed to get branchB head"

124124 (updatedBranchBContext,_,_) <- case runState (evalDatabaseContextExpr (Assign "branchBOnlyRelvar" (ExistingRelation relationTrue))) (freshDatabaseState (concreteDatabaseContext branchBTrans)) of

125− (Just err, _) -> assertFailure (show err) >> undefined

126− (Nothing, context) -> pure context

125+ (Left err, _) -> assertFailure (show err) >> undefined

126+ (Right (), context) -> pure context

127127 (_, graph') <- addTransaction "branchB" (createTrans (fakeUUID 3) (TransactionInfo (transactionId branchBTrans) S.empty testTime) updatedBranchBContext) graph

128128 branchBTrans' <- assertMaybe (transactionForHead "branchB" graph') "failed to get branchB head"

129129 assertEqual "branchB id 3" (fakeUUID 3) (transactionId branchBTrans')

@@ -149,8 +149,8 @@ testSelectedBranchMerge = TestCase $ do

149149 -- add another relvar to branchB

150150 branchBTrans <- assertMaybe (transactionForHead "branchB" graph) "failed to get branchB head"

151151 (updatedBranchBContext,_,_) <- case runState (evalDatabaseContextExpr (Assign "branchBOnlyRelvar" (ExistingRelation relationTrue))) (freshDatabaseState (concreteDatabaseContext branchBTrans)) of

152− (Just err, _) -> assertFailure (show err) >> undefined

153− (Nothing, context) -> pure context

152+ (Left err, _) -> assertFailure (show err) >> undefined

153+ (Right (), context) -> pure context

154154 (_, graph') <- addTransaction "branchB" (createTrans (fakeUUID 3) (TransactionInfo (transactionId branchBTrans) S.empty testTime) updatedBranchBContext) graph

155155 --create the merge transaction in the graph

156156 let eGraph' = mergeTransactions testTime (fakeUUID 4) (fakeUUID 10) (SelectedBranchMergeStrategy "branchA") ("branchA", "branchB") graph'

test/TransactionGraph/Persist.hs+13−7

@@ -77,22 +77,28 @@ testFunctionPersistence :: Test

7777testFunctionPersistence = TestCase $ withSystemTempDirectory "m36testdb" $ \tempdir -> do

7878 let dbdir = tempdir </> "dbdir"

7979 connInfo = InProcessConnectionInfo (MinimalPersistence dbdir) emptyNotificationCallback []

80− Right conn <- connectProjectM36 connInfo

81− Right sess <- createSessionAtHead conn "master"

80+ conn <- assertIOEither $ connectProjectM36 connInfo

81+ sess <- assertIOEither $ createSessionAtHead conn "master"

8282 let intTCons = PrimitiveTypeConstructor "Int" IntAtomType

8383 addfunc = AddAtomFunction "testdisk" [

8484 intTCons,

8585 ADTypeConstructor "Either" [ADTypeConstructor "AtomFunctionError" [],

8686 intTCons]] "(\\(x:_) -> pure x) :: [Atom] -> Either AtomFunctionError Atom"

87− Right () <- executeDatabaseContextIOExpr sess conn addfunc

88− Right () <- commit sess conn

87+ _ <- assertIOEither $ executeDatabaseContextIOExpr sess conn addfunc

88+

89+ _ <- assertIOEither $ commit sess conn

8990 close conn

9091 --re-open the connection to reload the graph

91− Right conn2 <- connectProjectM36 connInfo

92− Right sess2 <- createSessionAtHead conn2 "master"

92+ conn2 <- assertIOEither $ connectProjectM36 connInfo

93+ sess2 <- assertIOEither $ createSessionAtHead conn2 "master"

9394

9495 res <- executeRelationalExpr sess2 conn2 (MakeRelationFromExprs Nothing [TupleExpr (M.singleton "a" (FunctionAtomExpr "testdisk" [NakedAtomExpr (IntAtom 3)] ()))])

9596 let expectedRel = mkRelationFromList (attributesFromList [Attribute "a" IntAtomType]) [[IntAtom 3]]

9697 assertEqual "testdisk dbc function run" expectedRel res

9798

98−

99+assertIOEither :: (Show a) => IO (Either a b) -> IO b

100+assertIOEither x = do

101+ ret <- x

102+ case ret of

103+ Left err -> assertFailure (show err) >> undefined

104+ Right val -> pure val

test/TutorialD/Interpreter.hs+52−2

@@ -55,7 +55,11 @@ main = do

5555 testEmptyCommits,

5656 testIntervalAtom,

5757 testListConstructedAtom,

58− testTypeChecker

58+ testTypeChecker,

59+ testRestrictionPredicateExprs,

60+ testRelationalAttributeNames,

61+ testSemijoin,

62+ testAntijoin

5963 ]

6064 simpleRelTests = [("x:=true", Right relationTrue),

6165 ("x:=false", Right relationFalse),

@@ -76,6 +80,8 @@ main = do

7680 ("x:=true where true or false", Right relationTrue),

7781 ("x:=true where false or false", Right relationFalse),

7882 ("x:=true where true and false", Right relationFalse),

83+ ("x:=true where false and true", Right relationFalse),

84+ ("x:=true where ^t and ^f", Right relationFalse),

7985 ("x:=true where true and true", Right relationTrue),

8086 ("x:=true=true", Right relationTrue),

8187 ("x:=true=false", Right relationFalse),

@@ -486,4 +492,48 @@ testTypeChecker = TestCase $ do

486492 (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback

487493 let err1 = "AtomFunctionTypeError \"max\" 1 (RelationAtomType [Attribute \"_\" IntegerAtomType]) IntegerAtomType"

488494 expectTutorialDErr sessionId dbconn (T.isPrefixOf err1) "x:=relation{tuple{a 0}}:{b:=max(@a)}"

489−

495+

496+--exercise expression parser

497+testRestrictionPredicateExprs :: Test

498+testRestrictionPredicateExprs = TestCase $ do

499+ (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback

500+ -- or

501+ executeTutorialD sessionId dbconn "x:=s where status=20 or status=10"

502+ eRvOr <- executeRelationalExpr sessionId dbconn (RelationVariable "x" ())

503+ let expectedRelOr = restrict (\tuple ->

504+ pure (atomForAttributeName "status" tuple `elem` [Right (IntegerAtom 10), Right (IntegerAtom 20)])) suppliersRel

505+ assertEqual "status 20 or 10" expectedRelOr eRvOr

506+ -- and

507+ executeTutorialD sessionId dbconn "x:=s where status=20 and status=10"

508+ eRvAnd <- executeRelationalExpr sessionId dbconn (RelationVariable "x" ())

509+ let expectedRelAnd = Right (emptyRelationWithAttrs (attributes suppliersRel))

510+ assertEqual "status 20 and 10" expectedRelAnd eRvAnd

511+

512+testRelationalAttributeNames :: Test

513+testRelationalAttributeNames = TestCase $ do

514+ (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback

515+ executeTutorialD sessionId dbconn "x:=(s join sp){all from sp}"

516+ eRv <- executeRelationalExpr sessionId dbconn (RelationVariable "x" ())

517+ case eRv of

518+ Left err -> assertFailure (show err)

519+ Right rel ->

520+ assertEqual "attributes from sp" (attributes supplierProductsRel) (attributes rel)

521+

522+testSemijoin :: Test

523+testSemijoin = TestCase $ do

524+ (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback

525+ executeTutorialD sessionId dbconn "x:=s semijoin sp"

526+ executeTutorialD sessionId dbconn "y:=s where not (sname = \"Adams\")"

527+ eX <- executeRelationalExpr sessionId dbconn (RelationVariable "x" ())

528+ eY <- executeRelationalExpr sessionId dbconn (RelationVariable "y" ())

529+ assertEqual "semijoin missing Adams" eX eY

530+

531+testAntijoin :: Test

532+testAntijoin = TestCase $ do

533+ (sessionId, dbconn) <- dateExamplesConnection emptyNotificationCallback

534+ executeTutorialD sessionId dbconn "x:=s antijoin sp"

535+ executeTutorialD sessionId dbconn "y:=s where sname = \"Adams\""

536+ eX <- executeRelationalExpr sessionId dbconn (RelationVariable "x" ())

537+ eY <- executeRelationalExpr sessionId dbconn (RelationVariable "y" ())

538+ assertEqual "antijoin only Adams" eX eY

539+