Skip to content

Fix 462 #463

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.

Sign up for GitHub

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

Merged
gusmith merged 17 commits into from
Nov 12, 2019
Merged

Fix 462 #463

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
13bdbc0
Single method to get and set the upload status in db.
gusmith Nov 11, 2019
bbadadd
4 states for uploaded in the dataprovider table.
gusmith Nov 11, 2019
784ef41
Use the state `done` instead of the boolean TRUE.
gusmith Nov 11, 2019
3d8890b
Two new tests related to this new feature.
gusmith Nov 11, 2019
56b5fc1
The main change when posting clks to a project, check that we can pos…
gusmith Nov 11, 2019
104f49e
Tiny cleanup of a variable.
gusmith Nov 11, 2019
08fc85b
Some comments in the tests.
gusmith Nov 11, 2019
db74fc0
Update changelo
gusmith Nov 11, 2019
0680f36
Typo in changelog
gusmith Nov 11, 2019
83263ba
Clean test and modifying variable name.
gusmith Nov 11, 2019
5474008
Rename method to update upload state and add nicer documentation.
gusmith Nov 12, 2019
ce02a82
Change dur to remanimg
gusmith Nov 12, 2019
13e65da
Rename the test methods to be more explicit.
gusmith Nov 12, 2019
e5a7b7b
Rename an enum and add documentation about them.
gusmith Nov 12, 2019
3a30ad2
Typos.
gusmith Nov 12, 2019
7216f31
Rename again a test method.
gusmith Nov 12, 2019
6a68f18
Documentation correction from PR review.
gusmith Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
4 states for uploaded in the dataprovider table. 
 - not_started when we haven't started uploading the clks
 - in_progress when we start uploading them (lock the resource)
 - done when completed
 - error when an error occured.
  • Loading branch information
@gusmith
gusmith committed Nov 11, 2019
commit bbadaddf56c4f66331730766b2b02d745ee89645
8 changes: 7 additions & 1 deletion backend/entityservice/init-db-schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ RETURNS bool AS $$
SELECT $1.state = 'completed'
$$ STABLE LANGUAGE SQL;

CREATE TYPE UPLOADEDSTATE AS ENUM (
Copy link
Collaborator

@wilko77 wilko77 Nov 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow, now we have UPLOADEDSTATE and UPLOADSTATE. This is very confusing.
After looking at those for a bit, I think we should rename UPLOADSTATE to PROCESSEDSTATE.
It would also be nice to add a bit of an explanation what all those states are for.
In my view,
UPLOADSTATE describes the state of the processing of the uploaded clks. This is only set after CLKs have been uploaded. 'pending' means we are waiting for some processing to be done, 'ready' means done and 'error' if something fails.
UPLOADEDSTATE describes the state of the CLK upload.

Copy link
Contributor Author

@gusmith gusmith Nov 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was indeed a pickle. I will add comments on the UPLOADEDSTATE.
I didn't want to touch the UPLOADSTATE as I wasn't sure what it was made for (as you mentioned, this is not well documented). But I'll also add some documentation around it and rename it. In which case I will also rename UPLOADEDSTATE to UPLOADSTATE which sounds better :)

Copy link
Contributor Author

@gusmith gusmith Nov 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll finally keep UPLOADEDSTATE instead of renaming it because the value in the table is uploaded. But renamed the UPLOADSTATE to PROCESSEDSTATE, adding some documentation.

'not_started',
'in_progress',
'done',
'error'
);
Copy link
Collaborator

@wilko77 wilko77 Nov 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice


CREATE TABLE dataproviders (
id SERIAL PRIMARY KEY,
Expand All @@ -93,7 +99,7 @@ CREATE TABLE dataproviders (
token CHAR(48) NOT NULL UNIQUE,

-- Set after the bloom filter data has been added
uploaded BOOL NOT NULL DEFAULT FALSE,
uploaded UPLOADEDSTATE NOT NULL,

project CHAR(48) REFERENCES projects (project_id) on DELETE CASCADE
);
Expand Down