Skip to content

Commit

Permalink
Ensure Scylla driver is used for scylla-hadoop
Browse files Browse the repository at this point in the history
I don't know why this exclusion is necessary because
`cassandra-driver-core` is only an optional dependency of
`janusgraph-cql` and should therefore not be included in the classpath
of `janusgraph-scylla` any way, but it looks like that is not the case.

At least we got failing Scylla Hadoop tests after trying to update the
Scylla driver to 3.11.5. They fail with a `NoSuchMethodError` on
`ResultSet.one()` which was removed in the Scylla driver.

@Bouncheck mentioned that this error should only be possible if we
actually have another version of the driver on our classpath which let
to this (hopefully) fix.

So it should now be possible to update the Scylla driver again.

Signed-off-by: Florian Hockmann <[email protected]>
  • Loading branch information
FlorianHockmann committed Aug 1, 2024
1 parent ff323da commit 7552195
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions janusgraph-scylla/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@
<groupId>com.datastax.oss</groupId>
<artifactId>java-driver-query-builder</artifactId>
</exclusion>
<exclusion>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion scylla-hadoop-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependency>
<groupId>com.scylladb</groupId>
<artifactId>scylla-driver-core</artifactId>
<version>3.11.2.4</version>
<version>3.11.5.3</version>
<exclusions>
<exclusion>
<groupId>com.github.jnr</groupId>
Expand Down

1 comment on commit 7552195

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: 7552195 Previous: 232a3ca Ratio
org.janusgraph.JanusGraphSpeedBenchmark.basicAddAndDelete 12879.581229020885 ms/op 12956.787543346796 ms/op 0.99
org.janusgraph.GraphCentricQueryBenchmark.getVertices 907.9195998346066 ms/op 902.1703069801889 ms/op 1.01
org.janusgraph.MgmtOlapJobBenchmark.runClearIndex 216.16329797862318 ms/op 216.24256983913043 ms/op 1.00
org.janusgraph.MgmtOlapJobBenchmark.runReindex 349.20709297 ms/op 334.9591941392857 ms/op 1.04
org.janusgraph.JanusGraphSpeedBenchmark.basicCount 233.72658682927647 ms/op 209.00021040347767 ms/op 1.12
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesAllPropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 5014.018186993197 ms/op 5037.0925838105195 ms/op 1.00
org.janusgraph.CQLMultiQueryBenchmark.getElementsWithUsingEmitRepeatSteps 16867.374442456126 ms/op 16657.718093551666 ms/op 1.01
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesMultiplePropertiesWithSmallBatch 20135.369511390305 ms/op 21065.000455233134 ms/op 0.96
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.vertexCentricPropertiesFetching 55835.82933163333 ms/op 58456.6589335 ms/op 0.96
org.janusgraph.CQLMultiQueryDropBenchmark.dropVertices 1586.057771315828 ms/op 1562.8454594797659 ms/op 1.01
org.janusgraph.CQLMultiQueryBenchmark.getAllElementsTraversedFromOuterVertex 8141.07405491842 ms/op 7957.58089929328 ms/op 1.02
org.janusgraph.CQLMultiQueryBenchmark.getVerticesWithDoubleUnion 383.2589119627296 ms/op 378.7484547022495 ms/op 1.01
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesAllPropertiesWithUnlimitedBatch 4308.760684895797 ms/op 4337.537304374108 ms/op 0.99
org.janusgraph.CQLMultiQueryBenchmark.getNames 8288.845406116963 ms/op 8008.8382583107905 ms/op 1.03
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesThreePropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 5532.800148320408 ms/op 6210.610506507202 ms/op 0.89
org.janusgraph.CQLMultiQueryBenchmark.getLabels 7136.364067904415 ms/op 7088.398645351861 ms/op 1.01
org.janusgraph.CQLMultiQueryBenchmark.getVerticesFilteredByAndStep 435.63174724051237 ms/op 421.43212310684606 ms/op 1.03
org.janusgraph.CQLMultiQueryBenchmark.getVerticesFromMultiNestedRepeatStepStartingFromSingleVertex 12766.173271640277 ms/op 11822.11288646013 ms/op 1.08
org.janusgraph.CQLMultiQueryBenchmark.getVerticesWithCoalesceUsage 363.13092607566654 ms/op 363.2128115602137 ms/op 1.00
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesMultiplePropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 14923.045757180238 ms/op 15104.220894219523 ms/op 0.99
org.janusgraph.CQLMultiQueryBenchmark.getIdToOutVerticesProjection 250.13744332817126 ms/op 245.19139725925493 ms/op 1.02
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesMultiplePropertiesWithUnlimitedBatch 15021.413442548332 ms/op 15177.351274470668 ms/op 0.99
org.janusgraph.CQLMultiQueryBenchmark.getNeighborNames 8513.125015962454 ms/op 7978.568882459052 ms/op 1.07
org.janusgraph.CQLMultiQueryBenchmark.getElementsWithUsingRepeatUntilSteps 9128.65599557908 ms/op 8827.772842934128 ms/op 1.03
org.janusgraph.CQLMultiQueryBenchmark.getAdjacentVerticesLocalCounts 8388.611719513618 ms/op 8352.248955390452 ms/op 1.00

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.