CQL storage backend #166
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,314 @@ | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.janusgraph</groupId> | ||
| <artifactId>janusgraph</artifactId> | ||
| <version>0.2.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>janusgraph-cql</artifactId> | ||
| <name>JanusGraph-CQL: Distributed Graph Database</name> | ||
| <url>http://janusgraph.org</url> | ||
|
|
||
| <properties> | ||
| <cassandra-driver.version>3.1.4</cassandra-driver.version> | ||
| <javaslang.version>2.0.5</javaslang.version> | ||
|
|
||
| <test.byteorderedpartitioner>byteorderedpartitioner</test.byteorderedpartitioner> | ||
| <test.murmur>murmur</test.murmur> | ||
| <test.murmur-ssl>murmur-ssl</test.murmur-ssl> | ||
| <test.jvm.opts>-Xms256m -Xmx1280m -ea -XX:+HeapDumpOnOutOfMemoryError -javaagent:${com.github.jbellis:jamm:jar}</test.jvm.opts> | ||
| <test.excluded.groups>org.janusgraph.testcategory.MemoryTests,org.janusgraph.testcategory.PerformanceTests,org.janusgraph.testcategory.BrittleTests</test.excluded.groups> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <!-- Compile Dependencies --> | ||
| <dependency> | ||
| <groupId>org.janusgraph</groupId> | ||
| <artifactId>janusgraph-core</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.datastax.cassandra</groupId> | ||
| <artifactId>cassandra-driver-core</artifactId> | ||
| <version>${cassandra-driver.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.guava</groupId> | ||
| <artifactId>guava</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.javaslang</groupId> | ||
| <artifactId>javaslang</artifactId> | ||
| <version>${javaslang.version}</version> | ||
| </dependency> | ||
|
|
||
| <!-- Test Dependencies --> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-log4j12</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.janusgraph</groupId> | ||
| <artifactId>janusgraph-cassandra</artifactId> | ||
| <version>${project.version}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.janusgraph</groupId> | ||
| <artifactId>janusgraph-cassandra</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>tests</classifier> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.janusgraph</groupId> | ||
| <artifactId>janusgraph-test</artifactId> | ||
| <version>${project.version}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.mockito</groupId> | ||
| <artifactId>mockito-all</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <testResources> | ||
| <testResource> | ||
| <directory>src/test/resources</directory> | ||
| <excludes> | ||
| <exclude>cassandra/</exclude> | ||
| <exclude>keystores/</exclude> | ||
| <exclude>properties/</exclude> | ||
| </excludes> | ||
| <filtering>true</filtering> | ||
| </testResource> | ||
| </testResources> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>set-dependency-properties</id> | ||
| <phase>process-test-classes</phase> | ||
| <goals> | ||
| <goal>properties</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-resources-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>filter-${test.byteorderedpartitioner}</id> | ||
| <phase>process-test-resources</phase> | ||
| <goals> | ||
| <goal>copy-resources</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${project.build.directory}/cassandra/${test.byteorderedpartitioner}/conf</outputDirectory> | ||
| <filters> | ||
| <filter>${project.build.testResources[0].directory}/properties/${test.byteorderedpartitioner}.properties</filter> | ||
| </filters> | ||
| <resources> | ||
| <resource> | ||
| <directory>${project.build.testResources[0].directory}/cassandra</directory> | ||
| <filtering>true</filtering> | ||
| </resource> | ||
| </resources> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>filter-${test.murmur}</id> | ||
| <phase>process-test-resources</phase> | ||
| <goals> | ||
| <goal>copy-resources</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${project.build.directory}/cassandra/${test.murmur}/conf</outputDirectory> | ||
| <filters> | ||
| <filter>${project.build.testResources[0].directory}/properties/${test.murmur}.properties</filter> | ||
| </filters> | ||
| <resources> | ||
| <resource> | ||
| <directory>${project.build.testResources[0].directory}/cassandra</directory> | ||
| <filtering>true</filtering> | ||
| </resource> | ||
| </resources> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>filter-${test.murmur-ssl}</id> | ||
| <phase>process-test-resources</phase> | ||
| <goals> | ||
| <goal>copy-resources</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${project.build.directory}/cassandra/${test.murmur-ssl}/conf</outputDirectory> | ||
| <filters> | ||
| <filter>${project.build.testResources[0].directory}/properties/${test.murmur-ssl}.properties</filter> | ||
| </filters> | ||
| <resources> | ||
| <resource> | ||
| <directory>${project.build.testResources[0].directory}/cassandra</directory> | ||
| <filtering>true</filtering> | ||
| </resource> | ||
| </resources> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>filter-${test.murmur-ssl}-static</id> | ||
| <phase>process-test-resources</phase> | ||
| <goals> | ||
| <goal>copy-resources</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${project.build.directory}/cassandra/${test.murmur-ssl}/conf</outputDirectory> | ||
| <resources> | ||
| <resource> | ||
| <directory>${project.build.testResources[0].directory}/keystores</directory> | ||
| <filtering>false</filtering> | ||
| </resource> | ||
| </resources> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <configuration> | ||
| <argLine>${test.jvm.opts}</argLine> | ||
| <forkCount>1</forkCount> | ||
| <reuseForks>false</reuseForks> | ||
| <parallel>classes</parallel> | ||
| <perCoreThreadCount>true</perCoreThreadCount> | ||
| <threadCount>2</threadCount> | ||
| <runOrder>random</runOrder> | ||
| <systemPropertyVariables> | ||
| <log4j.configuration>file:${project.build.testOutputDirectory}/log4j.properties</log4j.configuration> | ||
| </systemPropertyVariables> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>default-test</id> | ||
| <phase>none</phase> | ||
| </execution> | ||
| <execution> | ||
| <id>${test.byteorderedpartitioner}-test</id> | ||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| <phase>test</phase> | ||
| <configuration> | ||
| <excludedGroups>${test.excluded.groups},org.janusgraph.testcategory.UnorderedKeyStoreTests,org.janusgraph.testcategory.SerialTests,org.janusgraph.testcategory.CassandraSSLTests</excludedGroups> | ||
| <groups /> | ||
| <reportNameSuffix>${test.byteorderedpartitioner}</reportNameSuffix> | ||
| <systemProperties> | ||
| <property> | ||
| <name>test.cassandra.confdir</name> | ||
| <value>${project.build.directory}/cassandra/${test.byteorderedpartitioner}/conf</value> | ||
| </property> | ||
| <property> | ||
| <name>test.cassandra.datadir</name> | ||
| <value>${project.build.directory}/cassandra/${test.byteorderedpartitioner}/data</value> | ||
| </property> | ||
| </systemProperties> | ||
| <skip>${test.skip.byteorderedpartitioner}</skip> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>${test.murmur}-test</id> | ||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| <phase>test</phase> | ||
| <configuration> | ||
| <excludedGroups>${test.excluded.groups},org.janusgraph.testcategory.OrderedKeyStoreTests,org.janusgraph.testcategory.SerialTests,org.janusgraph.testcategory.CassandraSSLTests</excludedGroups> | ||
| <groups /> | ||
| <reportNameSuffix>${test.murmur}</reportNameSuffix> | ||
| <systemProperties> | ||
| <property> | ||
| <name>test.cassandra.confdir</name> | ||
| <value>${project.build.directory}/cassandra/${test.murmur}/conf</value> | ||
| </property> | ||
| <property> | ||
| <name>test.cassandra.datadir</name> | ||
| <value>${project.build.directory}/cassandra/${test.murmur}/data</value> | ||
| </property> | ||
| </systemProperties> | ||
| <skip>${test.skip.murmur}</skip> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>${test.murmur}-serial-test</id> | ||
|
Contributor
There was a problem hiding this comment. This is run by default in janusgraph-cql but not under janusgraph-cassandra. Expect default test executions to be consistent (though maybe it should be enabled by default in janusgraph-cassandra?) |
||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| <phase>test</phase> | ||
| <configuration> | ||
| <excludedGroups /> | ||
| <groups>org.janusgraph.testcategory.SerialTests</groups> | ||
| <parallel>none</parallel> | ||
| <perCoreThreadCount>false</perCoreThreadCount> | ||
| <threadCount>1</threadCount> | ||
| <runOrder>alphabetical</runOrder> | ||
| <reportNameSuffix>${test.murmur}-serial</reportNameSuffix> | ||
| <systemProperties> | ||
| <property> | ||
| <name>test.cassandra.confdir</name> | ||
| <value>${project.build.directory}/cassandra/${test.murmur}/conf</value> | ||
| </property> | ||
| <property> | ||
| <name>test.cassandra.datadir</name> | ||
| <value>${project.build.directory}/cassandra/${test.murmur}/data</value> | ||
| </property> | ||
| </systemProperties> | ||
| <skip>${test.skip.murmur-serial}</skip> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>${test.murmur-ssl}-test</id> | ||
|
Contributor
There was a problem hiding this comment. Same as above ... this test execution is run by default in janusgraph-cql but not under janusgraph-cassandra There was a problem hiding this comment. Regarding the serial and SSL tests, it appears to me that they both run by default in janusgraph-cassandra unless the appropriate skip property is defined. I believe the janusgraph-cql module has the same behaviour but happy to change if this isn't correct.
Contributor
There was a problem hiding this comment. Ah sorry about that. I was comparing to a cassandra log I had on hand but now I see in that case there was a failure in the bop-test execution so the others didn't run. |
||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| <phase>test</phase> | ||
| <configuration> | ||
| <excludedGroups /> | ||
| <groups>org.janusgraph.testcategory.CassandraSSLTests</groups> | ||
| <!-- The TP3 JUnit Suite/Runner ignores groups/@Category and I'm not sure why. Redundant excludes to keep TP3 tests from using non-SSL configs on SSL --> | ||
| <excludes> | ||
| <exclude>**/*ComputerTest.java</exclude> | ||
| <exclude>**/*StructureTest.java</exclude> | ||
| <exclude>**/*ProcessTest.java</exclude> | ||
| </excludes> | ||
| <threadCount>1</threadCount> | ||
| <reportNameSuffix>${test.murmur-ssl}</reportNameSuffix> | ||
| <systemProperties> | ||
| <property> | ||
| <name>test.cassandra.confdir</name> | ||
| <value>${project.build.directory}/cassandra/${test.murmur-ssl}/conf</value> | ||
| </property> | ||
| <property> | ||
| <name>test.cassandra.datadir</name> | ||
| <value>${project.build.directory}/cassandra/${test.murmur-ssl}/data</value> | ||
| </property> | ||
| </systemProperties> | ||
| <skip>${test.skip.murmur-ssl}</skip> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This one has been changed to vavr.io so not sure if you want to change it now given potential naming conflict from Oracle.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've updated ticked #271 with a link to a branch in our repo with this migration. I'll create a PR once this is merged.