Merge pull request #476 from m-lab/ss-sandbox-fix-starttime

Combine StartTimeStamp with StartTimeUsec as int64 value

Author: stephen-soltesz

parser/ss.go

@@ -152,25 +152,36 @@ func ParseOneLine(snapshot string, var_names []string) (map[string]string, error
 
 func PopulateSnap(ss_value map[string]string) (schema.Web100Snap, error) {
 	var snap = &schema.Web100Snap{}
+	var startTimeUsec int64
+
+	// First, extract StartTimeUsec value before all others so we can combine
+	// it with StartTimeStamp below.
+	if valueStr, ok := ss_value["StartTimeUsec"]; ok {
+		value, err := strconv.ParseInt(valueStr, 10, 64)
+		if err == nil {
+			startTimeUsec = value
+		}
+	}
+
+	// Process every other snap key.
 	for key := range ss_value {
 		// Skip cid and PollTime. They are SideStream-specific fields, not web100 variables.
 		if key == "cid" || key == "PollTime" {
 			continue
 		}
-		// We do special handling for this variable
+		// Skip StartTimeUsec because this is not part of the Web100Snap struct.
 		if key == "StartTimeUsec" {
-			// TODO: func CalculateStartTimeStamp() to get correct StartTimeStamp value.
 			continue
 		}
 		x := reflect.ValueOf(snap).Elem().FieldByName(key)
 
 		switch x.Type().String() {
 		case "int64":
-			value, err := strconv.Atoi(ss_value[key])
+			value, err := strconv.ParseInt(ss_value[key], 10, 64)
 			if err != nil {
 				return *snap, err
 			}
-			x.SetInt(int64(value))
+			x.SetInt(value)
 		case "string":
 			x.Set(reflect.ValueOf(ss_value[key]))
 		case "bool":
@@ -183,6 +194,9 @@ func PopulateSnap(ss_value map[string]string) (schema.Web100Snap, error) {
 			}
 		}
 	}
+	// Combine the StartTimeStamp and StartTimeUsec values.
+	snap.StartTimeStamp = snap.StartTimeStamp*1000000 + startTimeUsec
+
 	// TODO: check whether snap has valid LocalAddress, RemAddress. Return error if not.
 	return *snap, nil
 }

parser/ss_test.go

@@ -21,10 +21,26 @@ func TestPopulateSnap(t *testing.T) {
 	ss_value["CERcvd"] = "22"
 	ss_value["RemAddress"] = "abcd"
 	ss_value["TimeStampRcvd"] = "0"
-	_, err := parser.PopulateSnap(ss_value)
+	ss_value["StartTimeStamp"] = "2222"
+	ss_value["StartTimeUsec"] = "1111"
+	snap, err := parser.PopulateSnap(ss_value)
 	if err != nil {
 		t.Fatalf("Snap fields not populated correctly.")
 	}
+
+	if snap.TimeStampRcvd != false {
+		t.Errorf("TimeStampRcvd; got %t; want false", snap.TimeStampRcvd)
+	}
+	if snap.RemAddress != "abcd" {
+		t.Errorf("RemAddress; got %q; want 'abcd'", snap.RemAddress)
+	}
+	if snap.CERcvd != 22 {
+		t.Errorf("CERcvd; got %d; want 22", snap.CERcvd)
+	}
+	// Verify StartTimeStamp is combined correctly with StartTimeUsec.
+	if snap.StartTimeStamp != 2222001111 {
+		t.Errorf("StartTimeStamp; got %d; want 222001111", snap.StartTimeStamp)
+	}
 }
 
 func TestParseOneLine(t *testing.T) {