Navigation Menu

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Dev/transform-next aka query2 #46

Merged
merged 58 commits into from Jan 22, 2018
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
3dcb381
Moved transform to seperate module
johan-bjareholt Sep 27, 2017
4869ae1
Initial shitty version of new query language
johan-bjareholt Sep 30, 2017
76b3814
Rewrote q2 check,parsing,interpretation and did misc improvments
johan-bjareholt Oct 1, 2017
70af44c
Added merge_events_by_keys, fixed variables/functions with numbers an…
johan-bjareholt Oct 1, 2017
556aec9
Added sort by duration and sort by timestamp to query2
johan-bjareholt Oct 1, 2017
cf44290
Misc refactoring and readability fixes
johan-bjareholt Oct 1, 2017
b185524
Added aw_transform to coverage
johan-bjareholt Oct 1, 2017
1c4020c
Fixed sorted merged keys query2 unittest
johan-bjareholt Oct 1, 2017
e200ccb
More query2 and transform testing
johan-bjareholt Oct 1, 2017
c0b2efc
Fixed metadata parsing, removed views, preparations for aw-server
johan-bjareholt Oct 7, 2017
ea2db27
Improved query logging, added limit q2 function and improved strucure…
johan-bjareholt Oct 7, 2017
9dfade9
Removed chunking and added merge_events_by_keys test
johan-bjareholt Oct 7, 2017
db68659
Removed query1
johan-bjareholt Oct 7, 2017
4828ee0
Added split_url_events function to query2
johan-bjareholt Oct 7, 2017
eaffce3
Removed 'www.' from url domains
johan-bjareholt Oct 8, 2017
e733f70
Replaced custom url parsing with urllib.parse
johan-bjareholt Oct 8, 2017
4dc3831
Fixed cache with query2
johan-bjareholt Oct 14, 2017
8c6c0b6
More query2 functions tests and merge_events_by_keys is now a single …
johan-bjareholt Oct 14, 2017
745945e
Noted that a JavaScript equivalent used to exist
ErikBjare Oct 14, 2017
0bec586
Replaced newlines with semicolons in query syntax
johan-bjareholt Nov 19, 2017
1069361
Single quote strings and no more meta variables
johan-bjareholt Nov 19, 2017
b5eda50
Moved transform to seperate module
johan-bjareholt Sep 27, 2017
4b86515
Initial shitty version of new query language
johan-bjareholt Sep 30, 2017
d6053ae
Rewrote q2 check,parsing,interpretation and did misc improvments
johan-bjareholt Oct 1, 2017
79cec06
Added merge_events_by_keys, fixed variables/functions with numbers an…
johan-bjareholt Oct 1, 2017
a2c8f60
Added sort by duration and sort by timestamp to query2
johan-bjareholt Oct 1, 2017
528f106
Misc refactoring and readability fixes
johan-bjareholt Oct 1, 2017
78af764
Added aw_transform to coverage
johan-bjareholt Oct 1, 2017
541c5fc
Fixed sorted merged keys query2 unittest
johan-bjareholt Oct 1, 2017
6953207
More query2 and transform testing
johan-bjareholt Oct 1, 2017
251d8ee
Fixed metadata parsing, removed views, preparations for aw-server
johan-bjareholt Oct 7, 2017
fee50e1
Improved query logging, added limit q2 function and improved strucure…
johan-bjareholt Oct 7, 2017
a3ab5ce
Removed chunking and added merge_events_by_keys test
johan-bjareholt Oct 7, 2017
3fa22a4
Removed query1
johan-bjareholt Oct 7, 2017
349d6fe
Added split_url_events function to query2
johan-bjareholt Oct 7, 2017
b0e4b50
Removed 'www.' from url domains
johan-bjareholt Oct 8, 2017
0f375a5
Replaced custom url parsing with urllib.parse
johan-bjareholt Oct 8, 2017
43a3e98
Fixed cache with query2
johan-bjareholt Oct 14, 2017
1c61c87
More query2 functions tests and merge_events_by_keys is now a single …
johan-bjareholt Oct 14, 2017
a6b65ca
Noted that a JavaScript equivalent used to exist
ErikBjare Oct 14, 2017
86def21
Replaced newlines with semicolons in query syntax
johan-bjareholt Nov 19, 2017
7f40de8
Single quote strings and no more meta variables
johan-bjareholt Nov 19, 2017
44660f1
Merge branch 'dev/transform-next' of github.com:ActivityWatch/aw-core…
johan-bjareholt Nov 21, 2017
f2d775a
Added check that bucket exists in query2
johan-bjareholt Nov 26, 2017
bfd470f
Added multiple key filter transform and added separare exclude transform
johan-bjareholt Dec 22, 2017
1d8b94b
Added eventcount datastore function
johan-bjareholt Jan 1, 2018
cb6d329
query2: Added dict token
johan-bjareholt Jan 13, 2018
6b37cbe
Fixed bug when strings in function calls contains a )
johan-bjareholt Jan 13, 2018
50b390c
Fixed bug when strings in dicts containing } characters
johan-bjareholt Jan 13, 2018
ab17984
query2: simplified Function.check
johan-bjareholt Jan 13, 2018
537af00
query2: added query_bucket_eventcount
johan-bjareholt Jan 13, 2018
fe597e1
Fixed mypy issue
johan-bjareholt Jan 17, 2018
bda35f7
query2: more coverage
johan-bjareholt Jan 17, 2018
f4e445a
Removed cached queries, should be implemented in aw-server instead
johan-bjareholt Jan 17, 2018
a7d04a9
query2: multiline test
johan-bjareholt Jan 20, 2018
95e2f2e
Moved query2 to aw_analysis
johan-bjareholt Jan 21, 2018
7510b03
Split transforms into multiple files
johan-bjareholt Jan 21, 2018
c05aacb
removed cache dir
johan-bjareholt Jan 21, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -10,7 +10,7 @@ build:
pip3 install $(pip_install_args)

test:
python3 -m pytest tests -v --cov=aw_core --cov=aw_datastore
python3 -m pytest tests -v --cov=aw_core --cov=aw_datastore --cov=aw_transform

benchmark:
python3 -m aw_datastore.benchmark
Expand Down
5 changes: 0 additions & 5 deletions aw_core/__init__.py
Expand Up @@ -16,8 +16,3 @@

from . import models
from . import schema

from . import transforms

from . import cached_views
from . import views
176 changes: 0 additions & 176 deletions aw_core/query.py

This file was deleted.