You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spot.apache.org by nl...@apache.org on 2017/06/17 15:28:42 UTC
[2/3] incubator-spot git commit: gettingItRightWithTheCamalCase
gettingItRightWithTheCamalCase
Project: http://git-wip-us.apache.org/repos/asf/incubator-spot/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spot/commit/b2f0d7d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spot/tree/b2f0d7d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spot/diff/b2f0d7d2
Branch: refs/heads/master
Commit: b2f0d7d298ed66f29e85d9f6358d37f567de1e69
Parents: d7c21b5
Author: Brandon Edwards <br...@intel.com>
Authored: Fri Jun 16 15:25:40 2017 -0700
Committer: Brandon Edwards <br...@intel.com>
Committed: Fri Jun 16 15:25:40 2017 -0700
----------------------------------------------------------------------
.../scala/org/apache/spot/dns/DNSSchema.scala | 8 +++----
.../dns/DNSSuspiciousConnectsAnalysis.scala | 22 ++++++++++----------
.../org/apache/spot/dns/DNSWordCreation.scala | 20 +++++++++---------
.../dns/model/DNSSuspiciousConnectsModel.scala | 4 ++--
.../dns/DNSSuspiciousConnectsAnalysisTest.scala | 8 +++----
.../apache/spot/dns/DNSWordCreationTest.scala | 8 +++----
6 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/b2f0d7d2/spot-ml/src/main/scala/org/apache/spot/dns/DNSSchema.scala
----------------------------------------------------------------------
diff --git a/spot-ml/src/main/scala/org/apache/spot/dns/DNSSchema.scala b/spot-ml/src/main/scala/org/apache/spot/dns/DNSSchema.scala
index f14042e..37091d0 100644
--- a/spot-ml/src/main/scala/org/apache/spot/dns/DNSSchema.scala
+++ b/spot-ml/src/main/scala/org/apache/spot/dns/DNSSchema.scala
@@ -26,11 +26,11 @@ object DNSSchema {
// input fields
- val Timestamp = "frame_time"
- val TimestampField = StructField(Timestamp, StringType, nullable= true)
+ val TimeStamp = "frame_time"
+ val TimeStampField = StructField(TimeStamp, StringType, nullable= true)
- val UnixTimestamp = "unix_tstamp"
- val UnixTimestampField = StructField(UnixTimestamp, LongType, nullable= true)
+ val UnixTimeStamp = "unix_tstamp"
+ val UnixTimeStampField = StructField(UnixTimeStamp, LongType, nullable= true)
val FrameLength = "frame_len"
val FrameLengthField = StructField(FrameLength, IntegerType, nullable= true)
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/b2f0d7d2/spot-ml/src/main/scala/org/apache/spot/dns/DNSSuspiciousConnectsAnalysis.scala
----------------------------------------------------------------------
diff --git a/spot-ml/src/main/scala/org/apache/spot/dns/DNSSuspiciousConnectsAnalysis.scala b/spot-ml/src/main/scala/org/apache/spot/dns/DNSSuspiciousConnectsAnalysis.scala
index a764ec5..d1c87ed 100644
--- a/spot-ml/src/main/scala/org/apache/spot/dns/DNSSuspiciousConnectsAnalysis.scala
+++ b/spot-ml/src/main/scala/org/apache/spot/dns/DNSSuspiciousConnectsAnalysis.scala
@@ -40,12 +40,12 @@ object DNSSuspiciousConnectsAnalysis {
val DefaultQueryClass = "unknown"
val DefaultQueryType = -1
val DefaultQueryResponseCode = -1
- val InStructType = StructType(List(TimestampField, UnixTimestampField, FrameLengthField, ClientIPField,
+ val InStructType = StructType(List(TimeStampField, UnixTimeStampField, FrameLengthField, ClientIPField,
QueryNameField, QueryClassField, QueryTypeField, QueryResponseCodeField))
val InSchema = InStructType.fieldNames.map(col)
val OutSchema = StructType(
- List(TimestampField,
- UnixTimestampField,
+ List(TimeStampField,
+ UnixTimeStampField,
FrameLengthField,
ClientIPField,
QueryNameField,
@@ -106,10 +106,10 @@ object DNSSuspiciousConnectsAnalysis {
*/
def filterRecords(inputDNSRecords: DataFrame): DataFrame = {
- val cleanDNSRecordsFilter = inputDNSRecords(Timestamp).isNotNull &&
- inputDNSRecords(Timestamp).notEqual("") &&
- inputDNSRecords(Timestamp).notEqual("-") &&
- inputDNSRecords(UnixTimestamp).geq(0) &&
+ val cleanDNSRecordsFilter = inputDNSRecords(TimeStamp).isNotNull &&
+ inputDNSRecords(TimeStamp).notEqual("") &&
+ inputDNSRecords(TimeStamp).notEqual("-") &&
+ inputDNSRecords(UnixTimeStamp).geq(0) &&
inputDNSRecords(FrameLength).geq(0) &&
inputDNSRecords(QueryName).isNotNull &&
inputDNSRecords(QueryName).notEqual("") &&
@@ -135,10 +135,10 @@ object DNSSuspiciousConnectsAnalysis {
*/
def filterInvalidRecords(inputDNSRecords: DataFrame): DataFrame = {
- val invalidDNSRecordsFilter = inputDNSRecords(Timestamp).isNull ||
- inputDNSRecords(Timestamp).equalTo("") ||
- inputDNSRecords(Timestamp).equalTo("-") ||
- inputDNSRecords(UnixTimestamp).isNull ||
+ val invalidDNSRecordsFilter = inputDNSRecords(TimeStamp).isNull ||
+ inputDNSRecords(TimeStamp).equalTo("") ||
+ inputDNSRecords(TimeStamp).equalTo("-") ||
+ inputDNSRecords(UnixTimeStamp).isNull ||
inputDNSRecords(FrameLength).isNull ||
inputDNSRecords(QueryName).isNull ||
inputDNSRecords(QueryName).equalTo("") ||
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/b2f0d7d2/spot-ml/src/main/scala/org/apache/spot/dns/DNSWordCreation.scala
----------------------------------------------------------------------
diff --git a/spot-ml/src/main/scala/org/apache/spot/dns/DNSWordCreation.scala b/spot-ml/src/main/scala/org/apache/spot/dns/DNSWordCreation.scala
index cb54f53..6834a77 100644
--- a/spot-ml/src/main/scala/org/apache/spot/dns/DNSWordCreation.scala
+++ b/spot-ml/src/main/scala/org/apache/spot/dns/DNSWordCreation.scala
@@ -39,7 +39,7 @@ class DNSWordCreation(topDomainsBC: Broadcast[Set[String]], userDomain: String)
* Create a new UDF for adding a word column to a dataframe.
* The dataframe must provide the following columns:
*
- * A string timestamp, a long unixtimestamp, an integer framelength,
+ * A string timeStamp, a long unixtimeStamp, an integer framelength,
* a string client IP, a string query name, a string query class, an integer query type
* and an integer query response code.
*
@@ -48,15 +48,15 @@ class DNSWordCreation(topDomainsBC: Broadcast[Set[String]], userDomain: String)
* queryName: String, queryClass: String, dnsQueryType: Int, dnsQueryRCode :Int) => Word: String
*/
def wordCreationUDF =
- udf((timestamp: String,
- unixTimestamp: Long,
+ udf((timeStamp: String,
+ unixTimeStamp: Long,
frameLength: Int,
clientIP: String,
queryName: String,
queryClass: String,
dnsQueryType: Int,
- dnsQueryRcode: Int) => dnsWord(timestamp,
- unixTimestamp,
+ dnsQueryRcode: Int) => dnsWord(timeStamp,
+ unixTimeStamp,
frameLength,
clientIP,
queryName,
@@ -68,8 +68,8 @@ class DNSWordCreation(topDomainsBC: Broadcast[Set[String]], userDomain: String)
/**
* Simplify a DNS log entry into a word.
*
- * @param timestamp Timestamp as a string.
- * @param unixTimestamp Unix timestamp as a 64 bit integer
+ * @param timeStamp Time stamp as a string.
+ * @param unixTimeStamp Unix time stamp as a 64 bit integer
* @param frameLength Framelength as an integer.
* @param clientIP IP of client making DNS query as string.
* @param queryName URL being queried.
@@ -79,8 +79,8 @@ class DNSWordCreation(topDomainsBC: Broadcast[Set[String]], userDomain: String)
* @return The word representation of the DNS entry.
*/
- def dnsWord(timestamp: String,
- unixTimestamp: Long,
+ def dnsWord(timeStamp: String,
+ unixTimeStamp: Long,
frameLength: Int,
clientIP: String,
queryName: String,
@@ -94,7 +94,7 @@ class DNSWordCreation(topDomainsBC: Broadcast[Set[String]], userDomain: String)
Seq(topDomain,
MathUtils.logBaseXInt(frameLength.toDouble, 2),
- TimeUtilities.getTimeAsHour(timestamp.split(" +")(3)).toString,
+ TimeUtilities.getTimeAsHour(timeStamp.split(" +")(3)).toString,
MathUtils.logBaseXInt(subdomainLength.toDouble, 2),
MathUtils.bin(subdomainEntropy, EntropyCuts),
MathUtils.logBaseXInt(numPeriods.toDouble, 2),
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/b2f0d7d2/spot-ml/src/main/scala/org/apache/spot/dns/model/DNSSuspiciousConnectsModel.scala
----------------------------------------------------------------------
diff --git a/spot-ml/src/main/scala/org/apache/spot/dns/model/DNSSuspiciousConnectsModel.scala b/spot-ml/src/main/scala/org/apache/spot/dns/model/DNSSuspiciousConnectsModel.scala
index fcb2fca..c0c4303 100644
--- a/spot-ml/src/main/scala/org/apache/spot/dns/model/DNSSuspiciousConnectsModel.scala
+++ b/spot-ml/src/main/scala/org/apache/spot/dns/model/DNSSuspiciousConnectsModel.scala
@@ -121,8 +121,8 @@ class DNSSuspiciousConnectsModel(inTopicCount: Int,
*/
object DNSSuspiciousConnectsModel {
- val ModelSchema = StructType(List(TimestampField,
- UnixTimestampField,
+ val ModelSchema = StructType(List(TimeStampField,
+ UnixTimeStampField,
FrameLengthField,
ClientIPField,
QueryNameField,
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/b2f0d7d2/spot-ml/src/test/scala/org/apache/spot/dns/DNSSuspiciousConnectsAnalysisTest.scala
----------------------------------------------------------------------
diff --git a/spot-ml/src/test/scala/org/apache/spot/dns/DNSSuspiciousConnectsAnalysisTest.scala b/spot-ml/src/test/scala/org/apache/spot/dns/DNSSuspiciousConnectsAnalysisTest.scala
index 421a36d..892f2db 100644
--- a/spot-ml/src/test/scala/org/apache/spot/dns/DNSSuspiciousConnectsAnalysisTest.scala
+++ b/spot-ml/src/test/scala/org/apache/spot/dns/DNSSuspiciousConnectsAnalysisTest.scala
@@ -253,8 +253,8 @@ class DNSSuspiciousConnectsAnalysisTest extends TestingSparkContextFlatSpec with
.map(row => Row.fromSeq(row))))
val inputDNSRecordsSchema = StructType(
- Array(TimestampField,
- UnixTimestampField,
+ Array(TimeStampField,
+ UnixTimeStampField,
FrameLengthField,
ClientIPField,
QueryNameField,
@@ -273,8 +273,8 @@ class DNSSuspiciousConnectsAnalysisTest extends TestingSparkContextFlatSpec with
.map(row => Row.fromSeq(row))))
val scoredDNSRecordsSchema = StructType(
- Array(TimestampField,
- UnixTimestampField,
+ Array(TimeStampField,
+ UnixTimeStampField,
FrameLengthField,
ClientIPField,
QueryNameField,
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/b2f0d7d2/spot-ml/src/test/scala/org/apache/spot/dns/DNSWordCreationTest.scala
----------------------------------------------------------------------
diff --git a/spot-ml/src/test/scala/org/apache/spot/dns/DNSWordCreationTest.scala b/spot-ml/src/test/scala/org/apache/spot/dns/DNSWordCreationTest.scala
index d1e4942..d6508ba 100644
--- a/spot-ml/src/test/scala/org/apache/spot/dns/DNSWordCreationTest.scala
+++ b/spot-ml/src/test/scala/org/apache/spot/dns/DNSWordCreationTest.scala
@@ -36,8 +36,8 @@ class DNSWordCreationTest extends TestingSparkContextFlatSpec with Matchers {
val topDomainsBC = sparkContext.broadcast(Set("google", "youtube"))
val userDomain = "apache"
- val timestamp = "May 12 2015 11:32:45.543421000 UTC"
- val unixTimestamp = 1494326461L
+ val timeStamp = "May 12 2015 11:32:45.543421000 UTC"
+ val unixTimeStamp = 1494326461L
val frameLength = 213
val clientIP = "122.52.206.191"
val queryName = "abcdefg.apache.com"
@@ -47,8 +47,8 @@ class DNSWordCreationTest extends TestingSparkContextFlatSpec with Matchers {
val DWC = new DNSWordCreation(topDomainsBC, userDomain)
- val result = DWC.dnsWord(timestamp,
- unixTimestamp,
+ val result = DWC.dnsWord(timeStamp,
+ unixTimeStamp,
frameLength,
clientIP,
queryName,