Fdans has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342486 )
Change subject: Switch table pointer to v2 in per project endpoint
......................................................................
Switch table pointer to v2 in per project endpoint
Deploying this change will make the per project endpoint use the
new v2 keyspace with corrected timestamps. It also removes old per
project code from pageviews.js
Bug: T156312
Change-Id: I47cee1f2c1455d329f1ba9fc579677acca420fd6
---
M sys/pageviews.js
1 file changed, 2 insertions(+), 28 deletions(-)
Approvals:
Milimetric: Looks good to me, approved
Fdans: Verified
diff --git a/sys/pageviews.js b/sys/pageviews.js
index 2845db3..930b56b 100644
--- a/sys/pageviews.js
+++ b/sys/pageviews.js
@@ -26,7 +26,6 @@
var tables = {
articleFlat: 'pageviews.per.article.flat',
- project: 'pageviews.per.project',
project_v2: 'pageviews.per.project.v2',
tops: 'top.pageviews',
};
@@ -49,27 +48,6 @@
index: [
{ attribute: 'project', type: 'hash' },
{ attribute: 'article', type: 'hash' },
- { attribute: 'granularity', type: 'hash' },
- { attribute: 'timestamp', type: 'range', order: 'asc' },
- ]
- },
- project: {
- table: tables.project,
- version: 3,
- attributes: {
- project: 'string',
- access: 'string',
- agent: 'string',
- granularity: 'string',
- // the hourly timestamp will be stored as YYYYMMDDHH
- timestamp: 'string',
- views: 'int',
- v: 'long'
- },
- index: [
- { attribute: 'project', type: 'hash' },
- { attribute: 'access', type: 'hash' },
- { attribute: 'agent', type: 'hash' },
{ attribute: 'granularity', type: 'hash' },
{ attribute: 'timestamp', type: 'range', order: 'asc' },
]
@@ -248,9 +226,9 @@
});
var dataRequest = hyper.get({
- uri: tableURI(rp.domain, tables.project),
+ uri: tableURI(rp.domain, tables.project_v2),
body: {
- table: tables.project,
+ table: tables.project_v2,
attributes: {
project: rp.project,
access: rp.access,
@@ -349,10 +327,6 @@
// table where per-project data will be stored with fixed
timestamps (T156312)
uri: '/{domain}/sys/table/' + tables.project_v2,
body: tableSchemas.project_v2,
- }, {
- // pageviews per project table
- uri: '/{domain}/sys/table/' + tables.project,
- body: tableSchemas.project,
}, {
// top pageviews table
uri: '/{domain}/sys/table/' + tables.tops,
--
To view, visit https://gerrit.wikimedia.org/r/342486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47cee1f2c1455d329f1ba9fc579677acca420fd6
Gerrit-PatchSet: 2
Gerrit-Project: analytics/aqs
Gerrit-Branch: master
Gerrit-Owner: Fdans <[email protected]>
Gerrit-Reviewer: Fdans <[email protected]>
Gerrit-Reviewer: Joal <[email protected]>
Gerrit-Reviewer: Milimetric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
