From 9b80c8fc17094d4925139a9fcf10f0c5658d4c5a Mon Sep 17 00:00:00 2001 From: Ellen Spertus Date: Tue, 17 Jul 2018 13:25:59 -0700 Subject: Installed scalastyle and created configuration file. Run with: sbt scalastyle --- scalding/project/plugins.sbt | 1 + scalding/scalastyle-config.xml | 117 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 scalding/scalastyle-config.xml (limited to 'scalding') diff --git a/scalding/project/plugins.sbt b/scalding/project/plugins.sbt index 084d4bf..a339892 100644 --- a/scalding/project/plugins.sbt +++ b/scalding/project/plugins.sbt @@ -1,2 +1,3 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0") +addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") diff --git a/scalding/scalastyle-config.xml b/scalding/scalastyle-config.xml new file mode 100644 index 0000000..7e3596f --- /dev/null +++ b/scalding/scalastyle-config.xml @@ -0,0 +1,117 @@ + + Scalastyle standard configuration + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 28b309dcd41e88a3e43f470ca2ab0e4cf2b3fd2c Mon Sep 17 00:00:00 2001 From: Ellen Spertus Date: Tue, 17 Jul 2018 13:31:10 -0700 Subject: Fixed style errors. --- scalding/src/main/scala/sandcrawler/HBaseBuilder.scala | 2 +- scalding/src/main/scala/sandcrawler/HBaseCountJob.scala | 2 +- scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scalding') diff --git a/scalding/src/main/scala/sandcrawler/HBaseBuilder.scala b/scalding/src/main/scala/sandcrawler/HBaseBuilder.scala index 85766d6..b271def 100644 --- a/scalding/src/main/scala/sandcrawler/HBaseBuilder.scala +++ b/scalding/src/main/scala/sandcrawler/HBaseBuilder.scala @@ -44,7 +44,7 @@ object HBaseBuilder { (families, groupedColNames.map({fields => new Fields(fields : _*)})) } - def build(table: String, server: String, colSpecs: List[String], sourceMode: SourceMode, keyList: List[String] = List("key")) = { + def build(table: String, server: String, colSpecs: List[String], sourceMode: SourceMode, keyList: List[String] = List("key")) : HBaseSource = { val (families, fields) = parseColSpecs(colSpecs) new HBaseSource(table, server, new Fields("key"), families, fields, sourceMode = sourceMode, keyList = keyList) } diff --git a/scalding/src/main/scala/sandcrawler/HBaseCountJob.scala b/scalding/src/main/scala/sandcrawler/HBaseCountJob.scala index 863c16f..1ebc261 100644 --- a/scalding/src/main/scala/sandcrawler/HBaseCountJob.scala +++ b/scalding/src/main/scala/sandcrawler/HBaseCountJob.scala @@ -24,7 +24,7 @@ class HBaseCountJob(args: Args, colSpec: String) extends JobBase(args) with HBas } object HBaseCountJob { - def getHBaseSource(hbaseTable: String, zookeeperHosts: String, colSpec: String) = HBaseBuilder.build( + def getHBaseSource(hbaseTable: String, zookeeperHosts: String, colSpec: String) : HBaseSource = HBaseBuilder.build( hbaseTable, // HBase Table Name zookeeperHosts, // HBase Zookeeper server (to get runtime config info; can be array?) List(colSpec), diff --git a/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala b/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala index 334b7a6..ba3b9cd 100644 --- a/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala +++ b/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala @@ -22,9 +22,9 @@ class HBaseRowCountJob(args: Args) extends JobBase(args) with HBasePipeConversio object HBaseRowCountJob { - // eg, "wbgrp-journal-extract-0-qa", "mtrcs-zk1.us.archive.org:2181" + // eg, "wbgrp-journal-extract-0-qa",7 "mtrcs-zk1.us.archive.org:2181" def getHBaseSource(hbaseTable: String, zookeeperHosts: String) : HBaseSource = { - return HBaseBuilder.build( + HBaseBuilder.build( hbaseTable, zookeeperHosts, List("file:size"), -- cgit v1.2.3 From a02a10d98759015ee200a456ad13b6143cd7fde6 Mon Sep 17 00:00:00 2001 From: Ellen Spertus Date: Tue, 17 Jul 2018 13:35:41 -0700 Subject: Turned off header checking. --- scalding/scalastyle-config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scalding') diff --git a/scalding/scalastyle-config.xml b/scalding/scalastyle-config.xml index 7e3596f..2f20677 100644 --- a/scalding/scalastyle-config.xml +++ b/scalding/scalastyle-config.xml @@ -6,7 +6,7 @@ - + - \ No newline at end of file + -- cgit v1.2.3