You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@rya.apache.org by GitBox <gi...@apache.org> on 2020/06/30 08:28:19 UTC
[GitHub] [rya] brushworth opened a new pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
brushworth opened a new pull request #315:
URL: https://github.com/apache/rya/pull/315
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
## Description
I've upgrade the RDF4J dependencies to the latest. I've upgraded other dependencies including Accumulo.
### Tests
Yes, tests have been updates where required by dependency changes.
### Links
[RYA-534](https://issues.apache.org/jira/browse/RYA-534)
[RYA-496](https://issues.apache.org/jira/browse/RYA-496)
### Checklist
- [ X ] Code Review
- [ X ] Squash Commits
#### People To Reivew
[Add those who should review this]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] DLotts commented on pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
DLotts commented on pull request #315:
URL: https://github.com/apache/rya/pull/315#issuecomment-732360460
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
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] brushworth edited a comment on pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
brushworth edited a comment on pull request #315:
URL: https://github.com/apache/rya/pull/315#issuecomment-756602566
> 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.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] brushworth commented on a change in pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
brushworth commented on a change in pull request #315:
URL: https://github.com/apache/rya/pull/315#discussion_r523909106
##########
File path: extras/rya.streams/api/src/test/java/org/apache/rya/streams/api/queries/InMemoryQueryRepositoryTest.java
##########
@@ -83,7 +82,7 @@ public void initializedWithPopulatedChangeLog() throws Exception {
final QueryChangeLog changeLog = new InMemoryQueryChangeLog();
final QueryRepository queries = new InMemoryQueryRepository( changeLog, SCHEDULE );
try {
- queries.startAndWait();
+ queries.startAsync();
Review comment:
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.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] brushworth commented on a change in pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
brushworth commented on a change in pull request #315:
URL: https://github.com/apache/rya/pull/315#discussion_r452125874
##########
File path: pom.xml
##########
@@ -247,7 +250,7 @@ under the License.
</repository>
<repository>
<id>LocationTech - Third Party</id>
- <url>https://repo.locationtech.org/content/repositories/thirdparty/</url>
+ <url>https://repo.eclipse.org/content/repositories/thirdparty/</url>
Review comment:
Thanks, will do.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] brushworth commented on a change in pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
brushworth commented on a change in pull request #315:
URL: https://github.com/apache/rya/pull/315#discussion_r523878555
##########
File path: pom.xml
##########
@@ -69,38 +69,38 @@ under the License.
<module>web</module>
</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>
Review comment:
Haha, its already 3.4.4, working on it now.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] scorpius77 removed a comment on pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
scorpius77 removed a comment on pull request #315:
URL: https://github.com/apache/rya/pull/315#issuecomment-735756252
I'll see what I can do. I appears I didn't build the project with the optional components.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] brushworth commented on a change in pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
brushworth commented on a change in pull request #315:
URL: https://github.com/apache/rya/pull/315#discussion_r523878278
##########
File path: extras/rya.streams/api/src/test/java/org/apache/rya/streams/api/queries/InMemoryQueryRepositoryTest.java
##########
@@ -83,7 +82,7 @@ public void initializedWithPopulatedChangeLog() throws Exception {
final QueryChangeLog changeLog = new InMemoryQueryChangeLog();
final QueryRepository queries = new InMemoryQueryRepository( changeLog, SCHEDULE );
try {
- queries.startAndWait();
+ queries.startAsync();
Review comment:
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()
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] brushworth commented on pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
brushworth commented on pull request #315:
URL: https://github.com/apache/rya/pull/315#issuecomment-727747698
Changes made
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] brushworth commented on a change in pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
brushworth commented on a change in pull request #315:
URL: https://github.com/apache/rya/pull/315#discussion_r452128149
##########
File path: extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/api/conf/AccumuloMergeConfiguration.java
##########
@@ -18,7 +18,7 @@
*/
package org.apache.rya.export.api.conf;
-import org.apache.http.annotation.Immutable;
+import jdk.nashorn.internal.ir.annotations.Immutable;
Review comment:
The old annotation disappeared from the available dependencies. My IDE suggested I replace it with the one above, so I did. It didn't break anything so I moved on. Doing a bit more research now, it looks like this was a bad choice. I'll go back and investigate why the org.apache.http.annotation package is no longer available.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] brushworth edited a comment on pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
brushworth edited a comment on pull request #315:
URL: https://github.com/apache/rya/pull/315#issuecomment-756602566
> 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.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] DLotts commented on a change in pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
DLotts commented on a change in pull request #315:
URL: https://github.com/apache/rya/pull/315#discussion_r521659861
##########
File path: pom.xml
##########
@@ -69,38 +69,38 @@ under the License.
<module>web</module>
</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>
- <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>
Review comment:
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.
##########
File path: pom.xml
##########
@@ -69,38 +69,38 @@ under the License.
<module>web</module>
</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>
Review comment:
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)?
##########
File path: extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Property.java
##########
@@ -18,21 +18,21 @@
*/
package org.apache.rya.indexing.entity.model;
-import static java.util.Objects.requireNonNull;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
+import org.apache.rya.api.domain.RyaIRI;
+import org.apache.rya.api.domain.RyaType;
import java.util.Objects;
-import org.apache.http.annotation.Immutable;
-import org.apache.rya.api.domain.RyaType;
-import org.apache.rya.api.domain.RyaIRI;
-
-import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
-import edu.umd.cs.findbugs.annotations.NonNull;
+import static java.util.Objects.requireNonNull;
/**
* A value that has been set for an {@link TypedEntity}.
*/
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
Review comment:
Explainer: https://dev-aux.com/java/org-apache-http-annotation-threadsafe-class-not-found
##########
File path: extras/rya.streams/api/src/test/java/org/apache/rya/streams/api/queries/InMemoryQueryRepositoryTest.java
##########
@@ -83,7 +82,7 @@ public void initializedWithPopulatedChangeLog() throws Exception {
final QueryChangeLog changeLog = new InMemoryQueryChangeLog();
final QueryRepository queries = new InMemoryQueryRepository( changeLog, SCHEDULE );
try {
- queries.startAndWait();
+ queries.startAsync();
Review comment:
Why? Did you have a source article for these changes?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] DLotts commented on a change in pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
DLotts commented on a change in pull request #315:
URL: https://github.com/apache/rya/pull/315#discussion_r450309368
##########
File path: pom.xml
##########
@@ -247,7 +250,7 @@ under the License.
</repository>
<repository>
<id>LocationTech - Third Party</id>
- <url>https://repo.locationtech.org/content/repositories/thirdparty/</url>
+ <url>https://repo.eclipse.org/content/repositories/thirdparty/</url>
Review comment:
This should be: https://repo.eclipse.org/content/repositories/locationtech-thirdparty/
(Thanks to Adina's comment on PR #314 )
##########
File path: extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/api/conf/AccumuloMergeConfiguration.java
##########
@@ -18,7 +18,7 @@
*/
package org.apache.rya.export.api.conf;
-import org.apache.http.annotation.Immutable;
+import jdk.nashorn.internal.ir.annotations.Immutable;
Review comment:
What is happening here?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] brushworth commented on pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
brushworth commented on pull request #315:
URL: https://github.com/apache/rya/pull/315#issuecomment-756602566
> 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.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] scorpius77 commented on pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
scorpius77 commented on pull request #315:
URL: https://github.com/apache/rya/pull/315#issuecomment-735756252
I'll see what I can do. I appears I didn't build the project with the optional components.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] wollefitz edited a comment on pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
wollefitz edited a comment on pull request #315:
URL: https://github.com/apache/rya/pull/315#issuecomment-724955669
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 https://github.com/apache/accumulo/pull/942 and https://issues.apache.org/jira/browse/RYA-471)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] wollefitz commented on pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
wollefitz commented on pull request #315:
URL: https://github.com/apache/rya/pull/315#issuecomment-724955669
This PR has been open for a while already - is there any possibility that this could be merged soon (once the conflicts are resolved)? This is needed for making Rya compatible with Java 11 (see https://github.com/apache/accumulo/pull/942 and https://issues.apache.org/jira/browse/RYA-471)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] brushworth commented on a change in pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
brushworth commented on a change in pull request #315:
URL: https://github.com/apache/rya/pull/315#discussion_r523908863
##########
File path: pom.xml
##########
@@ -69,38 +69,38 @@ under the License.
<module>web</module>
</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>
- <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>
Review comment:
Done
##########
File path: pom.xml
##########
@@ -69,38 +69,38 @@ under the License.
<module>web</module>
</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>
Review comment:
Done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rya] brushworth commented on a change in pull request #315: RYA-534 Upgrade to RDF4J 3.2 and RYA-496 Upgrading to Accumulo 1.9.3
Posted by GitBox <gi...@apache.org>.
brushworth commented on a change in pull request #315:
URL: https://github.com/apache/rya/pull/315#discussion_r454151818
##########
File path: extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/api/conf/AccumuloMergeConfiguration.java
##########
@@ -18,7 +18,7 @@
*/
package org.apache.rya.export.api.conf;
-import org.apache.http.annotation.Immutable;
+import jdk.nashorn.internal.ir.annotations.Immutable;
Review comment:
Look like this explains the correct solution: https://dev-aux.com/java/org-apache-http-annotation-threadsafe-class-not-found
I'll push up a commit that fixes this. Do you want me to squash the commits, or just leave it with two commits?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org