Skip to content

Commit

Permalink
Rename spark-cypher-* modules to morpheus-*
Browse files Browse the repository at this point in the history
  • Loading branch information
s1ck committed Apr 30, 2019
1 parent cf8d833 commit 94cbe58
Show file tree
Hide file tree
Showing 12 changed files with 35 additions and 41 deletions.
10 changes: 5 additions & 5 deletions .build/releaseTemplate.md
@@ -1,26 +1,26 @@
### `spark-cypher-%RELEASE_VERSION%`
### `morpheus-spark-cypher-%RELEASE_VERSION%`

#### Release notes

<!--put release notes here-->

#### Using CAPS in your system

The artifact is released to [Maven Central](https://search.maven.org/#artifactdetails%7Corg.opencypher%7Cspark-cypher%7C%RELEASE_VERSION%%7Cjar).
The artifact is released to [Maven Central](https://search.maven.org/#artifactdetails%7Corg.opencypher%7Cmorpheus-spark-cypher%7C%RELEASE_VERSION%%7Cjar).
To use it in a Maven project, add the following dependency to your pom:

```
<dependency>
<groupId>org.opencypher</groupId>
<artifactId>spark-cypher</artifactId>
<artifactId>morpheus-spark-cypher</artifactId>
<version>%RELEASE_VERSION%</version>
</dependency>
```

For SBT:
```
libraryDependencies += "org.opencypher" % "spark-cypher" % "%RELEASE_VERSION%"
libraryDependencies += "org.opencypher" % "morpheus-spark-cypher" % "%RELEASE_VERSION%"
```

### `spark-cypher-%RELEASE_VERSION%-all`
### `morpheus-spark-cypher-%RELEASE_VERSION%-all`
This is a fat jar that does not include the Spark dependencies. It is intended to be used in environments where Spark is already present, for example, a Spark cluster or a notebook.
16 changes: 8 additions & 8 deletions README.md
@@ -1,4 +1,4 @@
[![Maven Central](https://img.shields.io/badge/Maven_Central-0.3.2-blue.svg?label=Maven%20Central)](https://search.maven.org/#artifactdetails%7Corg.opencypher%7Cspark-cypher%7C0.3.2%7Cjar)
[![Maven Central](https://img.shields.io/badge/Maven_Central-0.3.2-blue.svg?label=Maven%20Central)](https://search.maven.org/#artifactdetails%7Corg.opencypher%7Cmorpheus-spark-cypher%7C0.3.2%7Cjar)
# CAPS: Cypher for Apache Spark

CAPS extends [Apache Spark™](https://spark.apache.org) with [Cypher](https://neo4j.com/docs/developer-manual/current/cypher/), the industry's most widely used [property graph](https://github.com/opencypher/openCypher/blob/master/docs/property-graph-model.adoc) query language defined and maintained by the [openCypher](http://www.opencypher.org) project.
Expand All @@ -12,7 +12,7 @@ CAPS allows you to develop complex processing pipelines orchestrated by a powerf
In addition to **developers** and **big data integration specialists**, CAPS is also of practical use to **data scientists**, offering tools allowing for disparate data sources to be integrated into a single graph. From this graph, queries can extract subgraphs of interest into new result graphs, which can be conveniently exported for further processing.

CAPS builds on the Spark SQL DataFrame API, offering integration with standard Spark SQL processing and also allows
integration with GraphX. To learn more about this, please see our [examples](https://github.com/opencypher/cypher-for-apache-spark/tree/master/spark-cypher-examples).
integration with GraphX. To learn more about this, please see our [examples](https://github.com/opencypher/cypher-for-apache-spark/tree/master/morpheus-examples).

<!-- TODO: WIKI How does it relate to GraphFrames -->
<!--- **Data Analysts**: -->
Expand Down Expand Up @@ -87,14 +87,14 @@ Maven:
```
<dependency>
<groupId>org.opencypher</groupId>
<artifactId>spark-cypher</artifactId>
<artifactId>morpheus-spark-cypher</artifactId>
<version>0.3.2</version>
</dependency>
```

sbt:
```
libraryDependencies += "org.opencypher" % "spark-cypher" % "0.3.2"
libraryDependencies += "org.opencypher" % "morpheus-spark-cypher" % "0.3.2"
```

Remember to add `fork in run := true` in your `build.sbt` for scala projects; this is not CAPS
Expand All @@ -108,7 +108,7 @@ Both nodes and relationships are uniquely identified by an ID (in CAPS this is o

The following example shows how to convert a social network represented as Scala case classes to a `PropertyGraph` representation.
The `PropertyGraph` representation is internally transformed into Spark data frames.
If you have existing data frames which you would like to treat as a graph, have a look at our [DataFrameInputExample](spark-cypher-examples/src/main/scala/org/opencypher/morpheus/examples/DataFrameInputExample.scala).
If you have existing data frames which you would like to treat as a graph, have a look at our [DataFrameInputExample](morpheus-examples/src/main/scala/org/opencypher/morpheus/examples/DataFrameInputExample.scala).

Once the property graph is constructed, it supports Cypher queries via its `cypher` method.

Expand Down Expand Up @@ -163,15 +163,15 @@ The above program prints:
Set(Alice, Bob, Eve)
```

More examples, including [multiple graph features](spark-cypher-examples/src/main/scala/org/opencypher/morpheus/examples/MultipleGraphExample.scala), can be found [in the examples module](spark-cypher-examples).
More examples, including [multiple graph features](morpheus-examples/src/main/scala/org/opencypher/morpheus/examples/MultipleGraphExample.scala), can be found [in the examples module](morpheus-examples).

### Run example Scala apps via command line

You can use Gradle to run a specific Scala application from command line. For example, to run the `CaseClassExample`
within the `spark-cypher-examples` module, we just call:
within the `morpheus-examples` module, we just call:

```
./gradlew spark-cypher-examples:runApp -PmainClass=org.opencypher.morpheus.examples.CaseClassExample
./gradlew morpheus-examples:runApp -PmainClass=org.opencypher.morpheus.examples.CaseClassExample
```

### Loading CSV Data
Expand Down
8 changes: 4 additions & 4 deletions build.licenses.gradle
Expand Up @@ -156,10 +156,10 @@ subprojects {
['okapi-tck',
'okapi-testing',
'okapi-neo4j-io-testing',
'spark-cypher-examples',
'spark-cypher-tck',
'spark-cypher-testing',
'spark-cypher-jmh',
'morpheus-examples',
'morpheus-tck',
'morpheus-testing',
'morpheus-jmh',
'documentation',
].each {
project(it).tasks.validateLicenses.enabled = false
Expand Down
2 changes: 1 addition & 1 deletion documentation/asciidoc/examples/index.adoc
@@ -1,6 +1,6 @@
[[examples]]
= Examples
:caps-examples-repo-uri: https://github.com/opencypher/cypher-for-apache-spark/tree/master/spark-cypher-examples/src/main/scala/org/opencypher/morpheus/examples
:caps-examples-repo-uri: https://github.com/opencypher/cypher-for-apache-spark/tree/master/morpheus-examples/src/main/scala/org/opencypher/morpheus/examples

[abstract]
--
Expand Down
4 changes: 2 additions & 2 deletions documentation/build.gradle
Expand Up @@ -10,8 +10,8 @@ task asciidocJar(type: Jar) {
task aggregatedScalaDoc(type: ScalaDoc) {
ext.fromProjects = [
project(':okapi-api'),
project(':spark-cypher'),
project(':spark-cypher-examples'),
project(':morpheus-spark-cypher'),
project(':morpheus-examples'),
]

classpath = project.sourceSets.main.compileClasspath
Expand Down
4 changes: 2 additions & 2 deletions morpheus-examples/build.gradle
@@ -1,8 +1,8 @@
description = 'Collection of examples for Cypher for Apache Spark'

dependencies {
compile project(':spark-cypher')
compile project(':spark-cypher-testing')
compile project(':morpheus-spark-cypher')
compile project(':morpheus-testing')

compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: ver.log4j.main
compile group: 'org.apache.spark', name: "spark-graphx".scala(), version: ver.spark
Expand Down
2 changes: 1 addition & 1 deletion morpheus-jmh/build.gradle
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'me.champeau.gradle.jmh'
description = 'Micro benchmarks for Cypher for Apache Spark'

dependencies {
compile project(':spark-cypher')
compile project(':morpheus-spark-cypher')

compile(group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark) {
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
Expand Down
4 changes: 2 additions & 2 deletions morpheus-tck/build.gradle
Expand Up @@ -7,9 +7,9 @@ sourceSets{

dependencies {
testCompile project(':okapi-tck')
testCompile project(':spark-cypher-testing')
testCompile project(':morpheus-testing')
generatorCompile project(':okapi-tck')
generatorCompile project(':spark-cypher-testing')
generatorCompile project(':morpheus-testing')
}

// split scenario name / key-words with | --> debugTCKScenarios -Pscenarios = 'sc1|sc2|..'
Expand Down
Expand Up @@ -44,8 +44,8 @@ object MorpheusTestGenerator extends App {
checkSideEffects = false)

if (args.isEmpty) {
val defaultOutDir = new File("spark-cypher-tck/src/test/scala/org/opencypher/morpheus/testing/")
val defaultResFiles = new File("spark-cypher-tck/src/test/resources/").listFiles()
val defaultOutDir = new File("morpheus-tck/src/test/scala/org/opencypher/morpheus/testing/")
val defaultResFiles = new File("morpheus-tck/src/test/resources/").listFiles()
generator.generateAllScenarios(defaultOutDir, defaultResFiles)
}
else {
Expand Down
2 changes: 1 addition & 1 deletion morpheus-testing/build.gradle
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'ch.kk7.spawn'
description = 'Cypher for Apache Spark - Test Utilities'

dependencies {
compile project(':spark-cypher')
compile project(':morpheus-spark-cypher')
compile project(':okapi-testing')
compile project(':okapi-neo4j-io-testing')

Expand Down
Expand Up @@ -27,7 +27,6 @@
package org.opencypher.okapi.relational.api.table

import org.opencypher.okapi.api.table.CypherTable
import org.opencypher.okapi.api.types.CypherType
import org.opencypher.okapi.api.value.CypherValue.CypherMap
import org.opencypher.okapi.ir.api.expr.{Aggregator, Expr, Var}
import org.opencypher.okapi.relational.impl.planning.{JoinType, Order}
Expand All @@ -36,9 +35,9 @@ import org.opencypher.okapi.relational.impl.table.RecordHeader
/**
* Main abstraction of a relational backend. A table represents a relation in terms of relational algebra and exposes
* relational and additional auxiliary operators. Operators need to be implemented by the specific backend
* (e.g. spark-cypher).
* (e.g. morpheus-spark-cypher).
*
* @tparam T backend-specific representation of that table (e.g. DataFrame for spark-cypher)
* @tparam T backend-specific representation of that table (e.g. DataFrame for morpheus-spark-cypher)
*/
trait Table[T <: Table[T]] extends CypherTable {

Expand Down
15 changes: 5 additions & 10 deletions settings.gradle
Expand Up @@ -8,15 +8,10 @@ include(':okapi-logical')
include(':okapi-relational')
include(':okapi-tck')
include(':okapi-trees')
include(':spark-cypher')
project(':spark-cypher').projectDir = file('morpheus-spark-cypher')
include(':spark-cypher-examples')
project(':spark-cypher-examples').projectDir = file('morpheus-examples')
include(':spark-cypher-tck')
project(':spark-cypher-tck').projectDir = file('morpheus-tck')
include(':spark-cypher-testing')
project(':spark-cypher-testing').projectDir = file('morpheus-testing')
include(':spark-cypher-jmh')
project(':spark-cypher-jmh').projectDir = file('morpheus-jmh')
include(':morpheus-spark-cypher')
include(':morpheus-examples')
include(':morpheus-tck')
include(':morpheus-testing')
include(':morpheus-jmh')
include(':graph-ddl')
include(':documentation')

0 comments on commit 94cbe58

Please sign in to comment.