Page MenuHomePhabricator

[Recurring task] Upstream changes to Blazegraph that we have in our own fork
Open, MediumPublic

Description

So have a number of changes in our own fork of Blazegraph that have not been upstreamed. It is also unclear if there are upstream changes that we haven't merged into our fork. We need to do some cleanup, and go back to a situation where changes are obvious.

We probably have different categories of changes:

  • bug fixes that are easy to upstream
  • added functionalities that might be controversial (and we might need to keep those only in our fork)

Next

(Please add below the changes applied to our own blazegraph repo: https://gerrit.wikimedia.org/r/q/project:wikidata/query/blazegraph)

Previous:

Shipped with Blazegraph 2.1.6 RC

Short list of changes compiled by @Igorkim78 (full details P10815)

T218801: Updated dependencies to later versions
T223711: Blazegraph explain does not produce anything useful for requests that time out
NO TICKET: Fix classifier for vocabularies/pom.xml opened on Jul 12 by smalyshev https://gerrit.wikimedia.org/r/plugins/gitiles/wikidata/query/blazegraph/+/bc6e3d71a443f0a23fcdf8f08c8c7280d0132f62 https://jira.blazegraph.com/browse/BLZG-9196
T223946: Fix handling of numbers that convert to negative longs opened on Jul 12 by smalyshev
T196858: ServiceRegistry.java: allow wildcards in service whitelist https://gerrit.wikimedia.org/r/#/c/wikidata/query/blazegraph/+/514630/ https://jira.blazegraph.com/browse/BLZG-9187
T225996: JSON results serializer in Wikidata Query Service generates an extra "datatype" field https://gerrit.wikimedia.org/r/#/c/wikidata/query/blazegraph/+/502311/
T226603: Blazegraph federated call does not properly work with URLs containing parameters https://gerrit.wikimedia.org/r/#/c/wikidata/query/blazegraph/+/519272/
NO TICKET: Support for TempTripleStore in GeoSpatialServiceFactory https://gerrit.wikimedia.org/r/#/c/wikidata/query/blazegraph/+/520647/
T219406: Fix XSS in result display opened on Jul 16 by lucaswerkmeister https://gerrit.wikimedia.org/r/plugins/gitiles/wikidata/query/blazegraph/+/98ecd77d7cf1aa72468e9274b6a888c81ab8f5d3
NO TICKET: https://gerrit.wikimedia.org/r/#/c/wikidata/query/blazegraph/+/468484/ https://github.com/blazegraph/database/pull/147
NO TICKET: Upgrade zookeeper version https://gerrit.wikimedia.org/r/#/c/wikidata/query/blazegraph/+/502653/
T172113 ConcurrentModificationException on non-grouping query with aggregates in SELECT https://gerrit.wikimedia.org/r/#/c/wikidata/query/blazegraph/+/533108/
T173243: UnsupportedOperationException on property path in EXISTS https://gerrit.wikimedia.org/r/#/c/wikidata/query/blazegraph/+/533110/
T168741 SELECT * on query with no variables and property path results in NotMaterializedException https://gerrit.wikimedia.org/r/#/c/wikidata/query/blazegraph/+/533109/
T165559 HAVING in named subquery results in “non-aggregate variable in select expression” error https://gerrit.wikimedia.org/r/#/c/wikidata/query/blazegraph/+/533107/

Event Timeline

Gehel triaged this task as Medium priority.Oct 30 2019, 10:15 AM
Gehel updated the task description. (Show Details)
Gehel updated the task description. (Show Details)
dcausse moved this task from Incoming to Epics on the Discovery-Search (Current work) board.
dcausse added a project: Epic.

I'd suggest to transform this task as a tracking & recurring task and submit upstream once we have a consistent batch of patches.

dcausse renamed this task from Upstream changes to Blazegraph that we have in our own fork to [Recurring task] Upstream changes to Blazegraph that we have in our own fork.Mar 30 2020, 3:26 PM
dcausse updated the task description. (Show Details)

T169862 is a security issue (still not public) that was fixed in our instance, but I have no idea where the fix lives or whether it should be upstreamed.

T169862 is a security issue (still not public) that was fixed in our instance, but I have no idea where the fix lives or whether it should be upstreamed.

I think it was upstreamed in https://github.com/blazegraph/database/pull/145 and should have been released under https://github.com/blazegraph/database/releases/tag/BLAZEGRAPH_2_1_6_RC

Apparently your contribution was copied and applied in https://github.com/blazegraph/database/commit/7bad8c40d608f57dc1f47cbf88c87d3029caf31d not sure how they plan to manage the public PRs like the one you opened if they simply copy the contribution to what seems to be a private repo...

T169862 is a security issue (still not public) that was fixed in our instance, but I have no idea where the fix lives or whether it should be upstreamed.

I think it was upstreamed in https://github.com/blazegraph/database/pull/145 and should have been released under https://github.com/blazegraph/database/releases/tag/BLAZEGRAPH_2_1_6_RC

No, that’s a different task. T169862 was not fixed by me, that’s why I’m curious to see the fix myself :)

T169862 is a security issue (still not public) that was fixed in our instance, but I have no idea where the fix lives or whether it should be upstreamed.

I think it was upstreamed in https://github.com/blazegraph/database/pull/145 and should have been released under https://github.com/blazegraph/database/releases/tag/BLAZEGRAPH_2_1_6_RC

No, that’s a different task. T169862 was not fixed by me, that’s why I’m curious to see the fix myself :)

oh sorry for the confusion, I have no clue what's behind T169862 could you add me as a viewer of it?

Sure, sorry, I didn’t realize you wouldn’t be able to see it.