-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Feat][Spark] Split datasources and core, prepare for support of mult…
…iple spark versions (#369) * Refactoring of the GraphAr Spark - split datasources and core GraphAr - introduce Maven profiles for different versions of Spark - small fixes of PySpark part due to new naming and paths - new pom.xml files for subprojects
- Loading branch information
1 parent
4158bb8
commit bdcf367
Showing
59 changed files
with
568 additions
and
269 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,6 +76,7 @@ jobs: | |
| - name: Generate Doc | ||
| run: | | ||
| export JAVA_HOME=${JAVA_HOME_11_X64} | ||
| pushd docs | ||
| make html | ||
| popd | ||
|
|
||
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../.scalafmt.conf |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Copyright 2022-2023 Alibaba Group Holding Limited. | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| --> | ||
|
|
||
| <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>com.alibaba</groupId> | ||
| <artifactId>graphar</artifactId> | ||
| <version>${graphar.version}</version> | ||
| </parent> | ||
|
|
||
| <groupId>com.alibaba</groupId> | ||
| <artifactId>graphar-datasources</artifactId> | ||
| <version>${graphar.version}</version> | ||
| <packaging>jar</packaging> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.spark</groupId> | ||
| <artifactId>spark-core_${scala.binary.version}</artifactId> | ||
| <version>${spark.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.spark</groupId> | ||
| <artifactId>spark-streaming_${scala.binary.version}</artifactId> | ||
| <version>${spark.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.spark</groupId> | ||
| <artifactId>spark-mllib_${scala.binary.version}</artifactId> | ||
| <version>${spark.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.spark</groupId> | ||
| <artifactId>spark-sql_${scala.binary.version}</artifactId> | ||
| <version>${spark.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.spark</groupId> | ||
| <artifactId>spark-hive_${scala.binary.version}</artifactId> | ||
| <version>${spark.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.scala-tools</groupId> | ||
| <artifactId>maven-scala-plugin</artifactId> | ||
| <version>2.15.2</version> | ||
| <configuration> | ||
| <scalaVersion>${scala.version}</scalaVersion> | ||
| <args> | ||
| <arg>-target:jvm-1.8</arg> | ||
| </args> | ||
| <jvmArgs> | ||
| <jvmArg>-Xss4096K</jvmArg> | ||
| </jvmArgs> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>scala-compile</id> | ||
| <goals> | ||
| <goal>compile</goal> | ||
| </goals> | ||
| <configuration> | ||
| <excludes> | ||
| <exclude>META-INF/*.SF</exclude> | ||
| <exclude>META-INF/*.DSA</exclude> | ||
| <exclude>META-INF/*.RSA</exclude> | ||
| </excludes> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>scala-test-compile</id> | ||
| <goals> | ||
| <goal>testCompile</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| <version>4.8.0</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>compile</goal> | ||
| <goal>testCompile</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <jvmArgs> | ||
| <jvmArg>-Xms64m</jvmArg> | ||
| <jvmArg>-Xmx1024m</jvmArg> | ||
| </jvmArgs> | ||
| <args> | ||
| <arg>-Ywarn-unused</arg> | ||
| </args> | ||
| <compilerPlugins> | ||
| <compilerPlugin> | ||
| <groupId>org.scalameta</groupId> | ||
| <artifactId>semanticdb-scalac_2.12.10</artifactId> | ||
| <version>4.3.24</version> | ||
| </compilerPlugin> | ||
| </compilerPlugins> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>com.diffplug.spotless</groupId> | ||
| <artifactId>spotless-maven-plugin</artifactId> | ||
| <version>2.20.0</version> | ||
| <configuration> | ||
| <!-- define a language-specific format --> | ||
| <java> | ||
| <!-- no need to specify files, inferred automatically, but you can if you want --> | ||
| <!-- apply a specific flavor of google-java-format and reflow long strings --> | ||
| <googleJavaFormat> | ||
| <version>1.13.0</version> | ||
| <style>AOSP</style> | ||
| </googleJavaFormat> | ||
| </java> | ||
| <scala> | ||
| <scalafmt> | ||
| <file>${project.basedir}/.scalafmt.conf</file> <!-- optional --> | ||
| </scalafmt> | ||
| </scala> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>io.github.evis</groupId> | ||
| <artifactId>scalafix-maven-plugin_2.13</artifactId> | ||
| <version>0.1.8_0.11.0</version> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-source-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-sources</id> | ||
| <goals> | ||
| <goal>jar</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-javadoc-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-javadocs</id> | ||
| <goals> | ||
| <goal>jar</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-site-plugin</artifactId> | ||
| <version>3.7.1</version> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
1 change: 1 addition & 0 deletions
1
spark/datasources-32/src/main/java/com/alibaba/graphar/GeneralParams.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../../../../../../graphar/src/main/java/com/alibaba/graphar/GeneralParams.java |
File renamed without changes.
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../.scalafmt.conf |
Oops, something went wrong.