RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3 by brushworth · Pull Request #315 · apache/rya

brushworth · 2020-06-30T08:28:12Z

Description

I've upgrade the RDF4J dependencies to the latest. I've upgraded other dependencies including Accumulo.

This PR needs to be merged before #316

Tests

Yes, tests have been updates where required by dependency changes.

Links

RYA-534
RYA-496

Checklist

Code Review
Squash Commits

People To Reivew

@adinancr
@jdasch
@amihalik

pom.xml

...export.accumulo/src/main/java/org/apache/rya/export/api/conf/AccumuloMergeConfiguration.java

wollefitz · 2020-11-10T20:44:10Z

This PR has been open for a while already - is there any possibility that it could be merged soon (once the conflicts are resolved)? This is needed for making Rya compatible with Java 11 (see apache/accumulo#942 and https://issues.apache.org/jira/browse/RYA-471)

DLotts

Thanks for all this hard work. Note that even though I marked this review as "request changes", the requests are not fixes, but asking for more upgrades: latest accumulate and latest rdf4j. Several updates have come thru for both of them over the summer. I am happy taking this as-is since it still a big jump for our dependencies upgrades. :-) So just mark them "resolved" and we'll catch the increments later.

DLotts · 2020-11-11T21:50:40Z

pom.xml


-        <accumulo.version>1.6.4</accumulo.version> <!-- Newest: 1.7.0 -->
-        <hadoop.version>2.5.0</hadoop.version> <!-- Newest: 2.7.1 -->
+        <accumulo.version>1.9.3</accumulo.version>


1.9.3 was probably the latest when you did this. How difficult would be to go to Accumulo version to 1.10.0 -- their LTM release? I'm perfectly fine with accepting this as is, as you did lots of working getting this done. Perhaps you have already done this, so I thought I would bring it up.

DLotts · 2020-11-11T21:57:31Z

pom.xml

    </modules>
    <properties>
-        <org.eclipse.rdf4j.version>2.3.1</org.eclipse.rdf4j.version> <!-- Newest: 2.3.1 -->
+        <org.eclipse.rdf4j.version>3.2.2</org.eclipse.rdf4j.version>


Wow, RDF4J is moving fast. It is now at 3.4.3. I believe that you used the latest version when you did this work. How hard would it be to use the latest (again)?

Haha, its already 3.4.4, working on it now.

DLotts · 2020-11-11T22:18:33Z

extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Property.java

 * A value that has been set for an {@link TypedEntity}.
 */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)


Explainer: https://dev-aux.com/java/org-apache-http-annotation-threadsafe-class-not-found

DLotts · 2020-11-11T22:31:52Z

...treams/api/src/test/java/org/apache/rya/streams/api/queries/InMemoryQueryRepositoryTest.java

        final QueryRepository queries = new InMemoryQueryRepository( changeLog, SCHEDULE );
        try {
-            queries.startAndWait();
+            queries.startAsync();


Why? Did you have a source article for these changes?

The old method was removed by Guava, it was previously deprecated: https://guava.dev/releases/16.0/api/docs/com/google/common/util/concurrent/Service.html#startAndWait()

I didn't bother with awaitRunning() etc for test code because it didn't seem to need it, but I included it for all production code.

…readingBehavior.IMMUTABLE) per the advice at https://dev-aux.com/java/org-apache-http-annotation-threadsafe-class-not-found

RYA-496 Upgrading to Accumulo 1.10.0

brushworth · 2020-11-16T05:40:28Z

Changes made

DLotts · 2020-11-23T18:59:10Z

It looks like org.locationtech.spatial4j has been refactored. I renamed from com.spatial4j to org.locationtech.spatial4j but it seems there is more changes. Can you take a look?

 `package org.locationtech.spatial4j.core.context does not exist`

Here is more:

[ERROR] /home/vagrant/rya/extras/rya.pcj.fluo/rya.pcj.functions.geo/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/function/geosp
arql/SpatialSupportInitializer.java:[23,47] package org.locationtech.spatial4j.core.context does not exist
[ERROR] /home/vagrant/rya/extras/rya.pcj.fluo/rya.pcj.functions.geo/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/function/geosp
arql/SpatialSupportInitializer.java:[24,51] package org.locationtech.spatial4j.core.context.jts does not exist
[ERROR] /home/vagrant/rya/extras/rya.pcj.fluo/rya.pcj.functions.geo/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/function/geosp
arql/SpatialSupportInitializer.java:[25,45] package org.locationtech.spatial4j.core.shape does not exist
[ERROR] /home/vagrant/rya/extras/rya.pcj.fluo/rya.pcj.functions.geo/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/function/geosparql/SpatialSupportInitializer.java:[35,15] cannot find symbol
  symbol:   class SpatialContext
  location: class org.eclipse.rdf4j.query.algebra.evaluation.function.geosparql.SpatialSupportInitializer

…ash_2

… dependency upgrade.

brushworth · 2021-01-08T07:39:47Z

It looks like org.locationtech.spatial4j has been refactored. I renamed from com.spatial4j to org.locationtech.spatial4j but it seems there is more changes. Can you take a look?

This should all be fixed now.

Apologies if merging in the latest master branch changes was a bad idea but I noticed a bug which I discovered had already been fixed by yourself late last year, so I pulled it in. I'm not sure what Rya's merging vs rebasing etc policy might be.

brushworth marked this pull request as ready for review June 30, 2020 08:37

DLotts requested changes Jul 7, 2020

View reviewed changes

pom.xml Outdated Show resolved Hide resolved

...export.accumulo/src/main/java/org/apache/rya/export/api/conf/AccumuloMergeConfiguration.java Outdated Show resolved Hide resolved

brushworth mentioned this pull request Jul 22, 2020

RYA-532 Assign specific interface types for Subject, Predicate, Object and Context and just generally clean up the code. #316

Open

2 tasks

DLotts requested changes Nov 11, 2020

View reviewed changes

brushworth added 3 commits November 16, 2020 16:27

RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3

1ba1402

Replacing the old @immutable annotation with @contract(threading = Th…

6bdd629

…readingBehavior.IMMUTABLE) per the advice at https://dev-aux.com/java/org-apache-http-annotation-threadsafe-class-not-found

RYA-534 Upgrade to RDF4J 3.4.4

dc8896d

RYA-496 Upgrading to Accumulo 1.10.0

brushworth force-pushed the RYA-534_rdf4j_squash_2 branch from a365376 to dc8896d Compare November 16, 2020 05:30

brushworth added 2 commits January 8, 2021 12:27

Merge branch 'master' of github.com:apache/rya into RYA-534_rdf4j_squ…

db14378

…ash_2

RYA-534 The geoindexing profile needed some refactoring following its…

6a988ac

… dependency upgrade.

Conversation

brushworth commented Jun 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Tests

Links

Checklist

People To Reivew

Uh oh!

Uh oh!

Uh oh!

wollefitz commented Nov 10, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DLotts left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

brushworth commented Nov 16, 2020

Uh oh!

DLotts commented Nov 23, 2020

Uh oh!

brushworth commented Jan 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

brushworth commented Jun 30, 2020 •

edited

Loading

wollefitz commented Nov 10, 2020 •

edited

Loading

brushworth commented Jan 8, 2021 •

edited

Loading