Skip to content
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

Unbork'ing tweet analysis (Fixes Issue 197) #204

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<project_name>${project.artifactId}</project_name>
<project_organization>The Archives Unleashed Project</project_organization>
<scala.version>2.11.8</scala.version>
<hadoop.version>2.7.3</hadoop.version>
<spark.version>2.1.1</spark.version>
<hadoop.version>2.7.2</hadoop.version>
<spark.version>2.3.0</spark.version>
<github.global.server>github</github.global.server>
<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
<license.plugin.version>3.0</license.plugin.version>
Expand Down Expand Up @@ -507,9 +507,14 @@
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>23.0</version>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
Expand Down Expand Up @@ -570,8 +575,8 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.1.1</version>
<artifactId>commons-compress</artifactId>
<version>1.16</version>
</dependency>
<dependency>
<groupId>net.java.dev.jets3t</groupId>
Expand All @@ -588,11 +593,6 @@
<artifactId>commons-net</artifactId>
<version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Expand Down
1 change: 1 addition & 0 deletions src/test/scala/io/archivesunleashed/ArcTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class ArcTest extends FunSuite with BeforeAndAfter {
val conf = new SparkConf()
.setMaster(master)
.setAppName(appName)
conf.set("spark.driver.allowMultipleContexts", "true");
sc = new SparkContext(conf)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class ArchiveRecordTest extends FunSuite with BeforeAndAfter {
val conf = new SparkConf()
.setMaster(master)
.setAppName(appName)
conf.set("spark.driver.allowMultipleContexts", "true");
sc = new SparkContext(conf)
}

Expand Down
1 change: 1 addition & 0 deletions src/test/scala/io/archivesunleashed/CountableRDDTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class CountableRDDTest extends FunSuite with BeforeAndAfter {
val conf = new SparkConf()
.setMaster(master)
.setAppName(appName)
conf.set("spark.driver.allowMultipleContexts", "true");
sc = new SparkContext(conf)
}

Expand Down
1 change: 1 addition & 0 deletions src/test/scala/io/archivesunleashed/RecordLoaderTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class RecordLoaderTest extends FunSuite with BeforeAndAfter {
val conf = new SparkConf()
.setMaster(master)
.setAppName(appName)
conf.set("spark.driver.allowMultipleContexts", "true");
sc = new SparkContext(conf)
}

Expand Down
1 change: 1 addition & 0 deletions src/test/scala/io/archivesunleashed/RecordRDDTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class RecordRDDTest extends FunSuite with BeforeAndAfter {
val conf = new SparkConf()
.setMaster(master)
.setAppName(appName)
conf.set("spark.driver.allowMultipleContexts", "true");
sc = new SparkContext(conf)
}

Expand Down
1 change: 1 addition & 0 deletions src/test/scala/io/archivesunleashed/WarcTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class WarcTest extends FunSuite with BeforeAndAfter {
val conf = new SparkConf()
.setMaster(master)
.setAppName(appName)
conf.set("spark.driver.allowMultipleContexts", "true");
sc = new SparkContext(conf)
records = RecordLoader.loadArchives(warcPath, sc)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ import org.scalatest.{BeforeAndAfter, FunSuite}

import scala.util.Try

@RunWith(classOf[JUnitRunner])
// TODO: (by Jimmy) - In the process of unbork'ing tweet analysis capabilities, this test case broke for
// reasons I can't figure out... since this is unused code anyway, an executive decision (+ Ian, Ryan, Nick)
// was made at the Toronto Datathon (Apr 26, 2018) to comment out this test case.
//
//@RunWith(classOf[JUnitRunner])
class ExtractGraphTest extends FunSuite with BeforeAndAfter {
private val arcPath = Resources.getResource("arc/example.arc.gz").getPath
private var sc: SparkContext = _
Expand All @@ -43,6 +47,7 @@ import scala.util.Try
val conf = new SparkConf()
.setMaster(master)
.setAppName(appName)
conf.set("spark.driver.allowMultipleContexts", "true");
sc = new SparkContext(conf)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class ExtractPopularImagesTest extends FunSuite with BeforeAndAfter {
val conf = new SparkConf()
.setMaster(master)
.setAppName(appName)
conf.set("spark.driver.allowMultipleContexts", "true");
sc = new SparkContext(conf)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class WriteGEXFTest extends FunSuite with BeforeAndAfter{
val conf = new SparkConf()
.setMaster(master)
.setAppName(appName)
conf.set("spark.driver.allowMultipleContexts", "true");
sc = new SparkContext(conf)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class WriteGraphMLTest extends FunSuite with BeforeAndAfter{
val conf = new SparkConf()
.setMaster(master)
.setAppName(appName)
conf.set("spark.driver.allowMultipleContexts", "true");
sc = new SparkContext(conf)
}

Expand Down