-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Updated my base version of the project #3
Open
cbobed
wants to merge
31
commits into
Rothamsted:master
Choose a base branch
from
cbobed:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Committer: cbobedli <[email protected]>
There were some problems with the versions of java when using gremlin profiler, but the queries are there though to be used with the main branch.
- Purge of the gremlin directories
Conflicts: .gitignore results/gdb_benchmark_results - 2021.xlsx src/main/assembly/resources/cypher/0020_cntType.csv src/main/assembly/resources/cypher/0040_cntRelType.csv src/main/assembly/resources/cypher/0080_joinFilter.csv src/main/assembly/resources/cypher/0090_joinRe.csv src/main/assembly/resources/cypher/0120_2union.cypher src/main/assembly/resources/cypher/0130_2union1Nest.cypher src/main/assembly/resources/cypher/0140_pway.cypher src/main/assembly/resources/cypher/0170_grpAg.cypher src/main/assembly/resources/cypher/0180_mulGrpAg.cypher src/main/assembly/resources/cypher/0190_nestAg.cypher src/main/assembly/resources/cypher/0210_existAg.cypher src/main/assembly/resources/gremlin/0250_geneBioProMotif.gremlin src/main/assembly/resources/gremlin/0260_geneProteinBioProcMotif.gremlin src/main/assembly/resources/gremlin/0270_geneProteinPublicationMotif.gremlin src/main/assembly/resources/gremlin/0290_geneSNPTraitMotif.gremlin src/main/assembly/resources/sparql/0010_cnt.sparql src/main/assembly/resources/sparql/0020_cntType.csv src/main/assembly/resources/sparql/0020_cntType.sparql src/main/assembly/resources/sparql/0030_cntRel.sparql src/main/assembly/resources/sparql/0040_cntRelType.csv src/main/assembly/resources/sparql/0040_cntRelType.sparql src/main/assembly/resources/sparql/0050_sel.sparql src/main/assembly/resources/sparql/0060_join.sparql src/main/assembly/resources/sparql/0070_joinRel.sparql src/main/assembly/resources/sparql/0080_joinFilter.csv src/main/assembly/resources/sparql/0080_joinFilter.sparql src/main/assembly/resources/sparql/0090_joinRe.csv src/main/assembly/resources/sparql/0090_joinRe.sparql src/main/assembly/resources/sparql/0095_joinReif.sparql src/main/assembly/resources/sparql/0100_varPathC.sparql src/main/assembly/resources/sparql/0110_varPath.sparql src/main/assembly/resources/sparql/0120_2union.sparql src/main/assembly/resources/sparql/0130_2union1Nest.sparql src/main/assembly/resources/sparql/0140_pway.sparql src/main/assembly/resources/sparql/0150_grp.sparql src/main/assembly/resources/sparql/0170_grpAg.sparql src/main/assembly/resources/sparql/0180_mulGrpAg.sparql src/main/assembly/resources/sparql/0190_nestAg.sparql src/main/assembly/resources/sparql/0200_exist.sparql src/main/assembly/resources/sparql/0210_existAg.sparql src/main/java/uk/ac/rothamsted/rdf/benchmarks/AbstractProfiler.java src/main/java/uk/ac/rothamsted/rdf/benchmarks/SparqlProfiler.java src/test/java/uk/ac/rothamsted/rdf/benchmarks/CypherProfilerTest.java src/test/java/uk/ac/rothamsted/rdf/benchmarks/GremlinProfilerTest.java src/test/java/uk/ac/rothamsted/rdf/benchmarks/SparqlProfilerTest.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've merged both versions to work with 1.8 (I had to get rid of some autotyping); however, the pull request cannot be merged automatically as there is a lot of queries that have been slighlty updated (namespaces mainly), thus, I create the pull request and it might be to be checked from the other project point of view.