Nuria has uploaded a new change for review.
https://gerrit.wikimedia.org/r/190139
Change subject: [WIP] Parqued code. Changes needed for backfilling 201502
......................................................................
[WIP] Parqued code. Changes needed for backfilling 201502
Change-Id: Ie02845da011cbaede5e3adc0b4dcbcfa5f3bb275
---
M server/eventlogging/handlers.py
M server/eventlogging/jrm.py
M server/eventlogging/schema.py
3 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/39/190139/1
diff --git a/server/eventlogging/handlers.py b/server/eventlogging/handlers.py
index 6571b6f..b6ef86a 100644
--- a/server/eventlogging/handlers.py
+++ b/server/eventlogging/handlers.py
@@ -88,7 +88,8 @@
"""Writes to an RDBMS, creating tables for SCIDs and rows for events."""
# Don't pass 'replace' parameter to SQLAlchemy.
uri = uri_delete_query_item(uri, 'replace')
-
+
+ print "Backfilling started, replace {0}".format(replace)
engine = sqlalchemy.create_engine(uri)
meta = sqlalchemy.MetaData(bind=engine)
events = collections.deque()
diff --git a/server/eventlogging/jrm.py b/server/eventlogging/jrm.py
index 134def3..bfe1e9d 100644
--- a/server/eventlogging/jrm.py
+++ b/server/eventlogging/jrm.py
@@ -215,11 +215,11 @@
queue = [flatten(events.pop()) for _ in range(len(events))]
queue.sort(key=insert_sort_key)
- if (getattr(meta.bind.dialect, 'supports_multivalues_insert', False)
- or getattr(meta.bind.dialect, 'supports_multirow_insert', False)):
- insert = _insert_multi
- else:
- insert = _insert_sequential
+ # use always insert sequential for backfilling as
+ # some of the events will exist and we want to make sure
+ # the ones that do not are enter
+ # rather than bundled and ignored
+ insert = _insert_sequential
for (scid, _), events in itertools.groupby(queue, insert_sort_key):
prepared_events = [prepare(event) for event in events]
diff --git a/server/eventlogging/schema.py b/server/eventlogging/schema.py
index 0fb8400..e5f45a7 100644
--- a/server/eventlogging/schema.py
+++ b/server/eventlogging/schema.py
@@ -34,8 +34,7 @@
schema_cache = {}
# SCID of the metadata object which wraps each event.
-CAPSULE_SCID = ('EventCapsule', 10981547)
-
+CAPSULE_SCID = ('EventCapsule', 8326736)
def get_schema(scid, encapsulate=False):
"""Get schema from memory or HTTP."""
--
To view, visit https://gerrit.wikimedia.org/r/190139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie02845da011cbaede5e3adc0b4dcbcfa5f3bb275
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Nuria <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
