GitHub user cuent opened a pull request: https://github.com/apache/marmotta/pull/31
MARMOTTA-659: Port Marmotta to Eclipse RDF4J Marmotta is compiling with RDF4J. Before merging, I'd like to make a consensus about the following problems: 1. Create issues for managing special data types such as NaN, -INF, and INF, and find an alternative for LDP Test suite. Have this issues to be created after merging into the branch develop or before? 2. What's going to happen with experimental backends that use TinkerPop 2.x? 3. Name conventions, change Sesame for RDF4J in modules, class names, and dependencies. 4. Should we ignore two new tests in RDF4J for large transactions; they are passing but take too long. Once that it's solved, I think we're ready to go at least that anyone has other suggestions. - [x] Make sure the PR title is formatted like: `MARMOTTA-XXX: title of pull request` (replace `XXX` in the title with the actual Jira issue number; if there is no one, please [create one](https://issues.apache.org/jira/browse/MARMOTTA) before). - [x] Make sure tests pass via mvn clean verify (even better, enable Travis-CI on your fork and ensure the whole test suite passes). - [x] If this contribution is large, please file an [Apache's Individual Contributor License Agreement](https://www.apache.org/licenses/icla.txt). --- You can merge this pull request into a Git repository by running: $ git pull https://github.com/gmora1223/marmotta MARMOTTA-659 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/marmotta/pull/31.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #31 ---- commit 0d643e8479b30412bfe446d769dfb071be02489e Author: ajs6f <aj...@virginia.edu> Date: 2017-03-31T21:08:01Z Moving to Java 8 commit 51fed1a31ac9b361e21b7eaa51b739d96088ade2 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-05-06T23:40:38Z Ignore mac and netbeans configuration files commit dcb6d88cc9bf88941a6f99ac9738998cd86af310 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-05-06T23:43:51Z Merge branch 'develop' of https://github.com/apache/marmotta into MARMOTTA-660 commit 5bbbc61e1826636299f810d6f805586c1c1df829 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-05-07T00:08:03Z Add marmotta-660 branch to ci commit 15b3165752d2e4b0c521f5c291ea3a031336607f Author: Xavier Sumba <c.u...@hotmail.com> Date: 2017-05-17T18:55:24Z Add databases to execute all tests Add MYSQL and postreSQL with its respective tables. Signed-off-by: Xavier Sumba commit 6fb58080f54edc78c4811f2782ee4804eda3bed7 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-05-20T23:54:04Z Solve compilation errors in KiWi Triplestore: Core. 1. KiWiSailConnection make use of EvaluationStrategyImpl which now needs FederatedServiceResolver to manage FederatedServices. 2. RepositoryConnectionTest needs an IsolationLevel, using SNAPSHOT_READ level by default. Sesame 2.8.11 intruduces Isolation Levels, so is not necessary to test testReadOfAddedStatement1 and testReadOfAddedStatement2. 3. Constructor SailConcurrencyTest does not accepts arguments. Signed-off-by: Gustavo Mora commit 50b4bca213b44a8c2843618c97d9115ad1505919 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-05-21T00:09:12Z KiWiEvaluationStrategy uses default FederatedServiceResolver Signed-off-by: Gustavo. commit b700969eb25249184f6da2b5f98ce454ae95e95c Author: gmora1223 <gmora1...@gmail.com> Date: 2017-05-21T00:11:13Z Upgrade sesame from 2.7.16 to 2.8.11. Signed-off-by: Gustavo commit 8bd9620199e9f0959fe81e1df20870837e3b260b Author: gmora1223 <gmora1...@gmail.com> Date: 2017-05-21T22:36:23Z Delete unused tests and add Isolation level: SNAPSHOT_READ. Signed-off-by: Gustavo commit 18f42a2336a079ff61de90ca1f3ecbd11347c488 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-05-21T23:10:44Z In Sesame 2.8.0, the class RDFJSONUtility is not accesible [1]. The visibily of the class was changed to default [2]. [1] http://archive.rdf4j.org/javadoc/sesame-2.8.0/ [2] http://grepcode.com/file/repo1.maven.org/maven2/org.openrdf.sesame/sesame-rio-rdfjson/2.8.0/org/openrdf/rio/rdfjson/RDFJSONUtility.java?av=f Signed-off-by: Gustavo commit c788648eced7c5e27a42f9ae03b22a24a79ee64a Author: gmora1223 <gmora1...@gmail.com> Date: 2017-05-21T23:16:43Z Implement missing abstract methods and add FederatedServiceResolver to EvaluationStrategyImpl. Signed-off-by: Gustavo. commit 15c28f80830710b26ad45b0d6f238eaa873e3bf3 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-05-30T03:53:02Z Implement missing abstract methods and add FederatedServiceResolver to EvaluationStrategyImpl. commit 23e6e0d785e74ad1ad32896face755f1376b0a94 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-05T00:39:02Z Solved compatibility with new methods in marmotta-commons. In Sesame 2.8 all literals should have a default value [1], and MemValueFactory does not allow null language tags in the method createLiteral. [1] https://web.archive.org/web/20160412201829/http://rdf4j.org:80/sesame/2.8/docs/articles/upgrade-notes.docbook?view Signed-off-by: Gustavo commit 724edb9330c1a73dea8dd88c74fc7101744aef30 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-05T00:43:23Z Merge branch 'MARMOTTA-659' of https://github.com/gmora1223/marmotta into MARMOTTA-659 commit ee604590fdb61ae4344a302557c4c3c1183dcfaf Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-07T18:40:14Z Merge branch 'develop' of https://github.com/apache/marmotta into MARMOTTA-660 commit 8fdf525255d54bf98e9ad0d49149dcaca2406700 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-05T00:43:23Z New changes in KiWi TripleStore: Core and solves MARMOTTA-39. KiWiValueFactory and RepositoryTest: - A context is stored in a org.openrdf.query.Dataset variable so is not necessary to send default context in createStatement method. - All literals are datatyped, so it is necessary to replace for default values (xsd:string or rdf:langString) in case of datatype null [1]. - This changes solves MARMOTTA-39 [2] and as a result, testDeleteTriple in RepositoryTest is passing. KiWiLiteral - There is a new implementation of hashCode of literals in Sesame 2.8, which includes language and datatype. Old implementation in [3], new implementation in [4]. [1] https://web.archive.org/web/20160412201829/http://rdf4j.org:80/sesame/2.8/docs/articles/upgrade-notes.docbook?view [2] https://issues.apache.org/jira/browse/MARMOTTA-39 [3] https://bitbucket.org/openrdf/sesame/src/11f1f0e681cea47e167bd79929873370e199a19f/core/model/src/main/java/org/openrdf/model/impl/LiteralImpl.java?at=2.7.x&fileviewer=file-view-default [4] https://bitbucket.org/openrdf/sesame/src/aa292b3bee427c1a549b89a099a58d7edbe22d5a/core/model/src/main/java/org/openrdf/model/impl/LiteralImpl.java?at=2.8.x&fileviewer=file-view-default Signed-off-by: Gustavo commit fcb01b36851d63526ff986d710802495454fff70 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-08T02:52:32Z Merge branch 'MARMOTTA-659' of https://github.com/gmora1223/marmotta into MARMOTTA-659 commit 3ecff1fbe021c302d0f98873b3a0ee84bde5046d Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-08T03:10:34Z Merge branch 'develop' of https://github.com/apache/marmotta into MARMOTTA-659 commit 74a20dc117b8ca514ee3d1d59d8025c2e9cec21e Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-10T02:55:24Z Add statements and compare size before commit. There was an error while adding two equally statements, but do not commit last addition. The result should be 1, but instead, show 2. This was because method getSize() returned database size + a batch, and because these two statements were the same, result was 2 instead of 1. Solution: make a flushBatch before each call to getSize() method. Signed-off-by: Gustavo. commit 710d7df83149855298af2dd4890924ccb6b79809 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-10T03:30:22Z Merge remote-tracking branch 'upstream/develop' into MARMOTTA-659 commit 213b6e5b2d35d5aa32c651d32051886ec546e3c4 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-10T03:38:19Z Merge branch 'develop' of https://github.com/apache/marmotta into MARMOTTA-660 commit 54800131d16643c18a7f93e2b8619b5e2e5fc361 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-15T01:30:56Z Modify query to verify statements with null values. Modification of select query in order to check if the statement exists. This was failing due that value=null is not valid in SQL it should be checked as value is null when a null value is passed. More info about the agreement to modify query: https://lists.apache.org/list.html?dev@marmotta.apache.org Signed-of-by: Gustavo. commit 6f2570778b1a25186a6f5ca0696e1869067b94b9 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-15T01:35:45Z Merge branch 'develop' of https://github.com/apache/marmotta into MARMOTTA-659 commit ff99f700a32d97432c228cd4f6a37bfa8869391e Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-15T19:13:43Z No necessary calculate different hash for objects. For the changes made in [1] is not necessary generate other hash. Signed-off-by: Gustavo [1] https://github.com/gmora1223/marmotta/commit/8fdf525255d54bf98e9ad0d49149dcaca2406700 commit d019053cd8517ea52f7a386591622374d4699ac8 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-16T01:42:33Z Merge branch 'develop' of https://github.com/apache/marmotta into MARMOTTA-660 commit f769cd2696e838b1d246430c215f99600531f247 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-16T03:07:47Z Merge remote-tracking branch 'pr/MARMOTTA-660' into MARMOTTA-660 commit 377b016cdecfed275bc55662308d745eeeadaf3d Author: Xavier Sumba <c.u...@hotmail.com> Date: 2017-06-16T03:34:32Z Add sudo to get and ignore MySQL. Sudo `sudo: required` is necessary to get a beefier execution environment and build is failing from branch develop; tried with versions of MySQL 5.5, 5.6, and 5.7. commit ba67c346cbc35cc234e0e7d84b8a7b6b524d58a1 Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-16T03:35:06Z Merge branch 'MARMOTTA-660' of https://github.com/gmora1223/marmotta into MARMOTTA-660 commit cff80a09cc08ba187d572aec5bc6dc5bbc524bdf Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-16T03:36:21Z Ignore NetBeans conf files. Signed-off-by: Gustavo commit e3095320b8a542574bec47f56825e6f375fe504d Author: gmora1223 <gmora1...@gmail.com> Date: 2017-06-17T02:39:52Z Since all values are data typed, tests should also test data type. Signed-off-by: Gustavo. ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---