Relaxed linting

.circleci/config.yml

@@ -17,7 +17,6 @@ jobs:
       - run: make
 
       - run: go get github.com/alecthomas/gometalinter
-      - run: go get github.com/bradleyfalzon/revgrep/cmd/revgrep
       - run:
           name: Run linters
           command: |

.gometalinter.json

@@ -0,0 +1,5 @@
+{
+  "Exclude": [
+    "TableBlock..getIntInfo"
+  ]
+}

Makefile

@@ -40,9 +40,8 @@ test:
 lint:
 	gometalinter -t --disable-all \
 		--enable=vet \
-		--enable=golint \
 		--enable=megacheck \
-		--deadline=3m ./... 2>&1 | revgrep origin/master
+		--deadline=3m ./... 2>&1
 
 testv:
 	${GOBIN} test ./src/sybil/ -race -v -debug

src/cmd/cmd_digest.go

@@ -22,7 +22,7 @@ func RunDigestCmdLine() {
 	sybil.DELETE_BLOCKS_AFTER_QUERY = false
 
 	t := sybil.GetTable(*sybil.FLAGS.TABLE)
-	if t.LoadTableInfo() == false {
+	if !t.LoadTableInfo() {
 		sybil.Warn("Couldn't read table info, exiting early")
 		return
 	}

src/cmd/cmd_ingest.go

@@ -33,7 +33,7 @@ func ingestDictionary(r *sybil.Record, recordmap *Dictionary, prefix string) {
 		prefixName := fmt.Sprint(keyName, "_")
 		switch iv := v.(type) {
 		case string:
-			if INT_CAST[keyName] == true {
+			if INT_CAST[keyName] {
 				val, err := strconv.ParseInt(iv, 10, 64)
 				if err == nil {
 					r.AddIntField(keyName, int64(val))
@@ -125,9 +125,7 @@ func importCsvRecords() {
 }
 
 func jsonQuery(obj *interface{}, path []string) []interface{} {
-
-	var ret interface{}
-	ret = *obj
+	ret := *obj
 
 	for _, key := range path {
 		if key == "$" {
@@ -222,7 +220,7 @@ func RunIngestCmdLine() {
 
 	flag.Parse()
 
-	digestfile := fmt.Sprintf("%s", *ingestfile)
+	digestfile := *ingestfile
 
 	if *sybil.FLAGS.TABLE == "" {
 		flag.PrintDefaults()
@@ -265,21 +263,21 @@ func RunIngestCmdLine() {
 	var loadedTable = false
 	for i := 0; i < TABLE_INFO_GRABS; i++ {
 		loaded := t.LoadTableInfo()
-		if loaded == true || t.HasFlagFile() == false {
+		if loaded || !t.HasFlagFile() {
 			loadedTable = true
 			break
 		}
 		time.Sleep(time.Millisecond * 10)
 	}
 
-	if loadedTable == false {
+	if !loadedTable {
 		if t.HasFlagFile() {
 			sybil.Warn("INGESTOR COULDNT READ TABLE INFO, LOSING SAMPLES")
 			return
 		}
 	}
 
-	if *fCsv == false {
+	if !*fCsv {
 		importJSONRecords()
 	} else {
 		importCsvRecords()

src/cmd/cmd_query.go

@@ -110,7 +110,7 @@ func RunQueryCmdLine() {
 		sybil.OPTS.DISTINCT = distinct
 	}
 
-	if *NO_RECYCLE_MEM == true {
+	if *NO_RECYCLE_MEM {
 		sybil.FLAGS.RECYCLE_MEM = sybil.NewFalseFlag()
 	}
 
@@ -272,7 +272,7 @@ func RunQueryCmdLine() {
 		start := time.Now()
 		// We can load and query at the same time
 		if *sybil.FLAGS.LOAD_AND_QUERY {
-			count = t.LoadAndQueryRecords(&loadSpec, &querySpec)
+			t.LoadAndQueryRecords(&loadSpec, &querySpec)
 
 			end := time.Now()
 			sybil.Debug("LOAD AND QUERY RECORDS TOOK", end.Sub(start))

src/cmd/cmd_rebuild.go

@@ -23,7 +23,7 @@ func RunRebuildCmdLine() {
 
 	t := sybil.GetTable(*sybil.FLAGS.TABLE)
 
-	loaded := t.LoadTableInfo() && *FORCE_UPDATE == false
+	loaded := t.LoadTableInfo() && !*FORCE_UPDATE
 	if loaded {
 		sybil.Print("TABLE INFO ALREADY EXISTS, NOTHING TO REBUILD!")
 		return
@@ -33,7 +33,7 @@ func RunRebuildCmdLine() {
 
 	// TODO: prompt to see if this table info looks good and then write it to
 	// original info.db
-	if *REPLACE_INFO == true {
+	if *REPLACE_INFO {
 		sybil.Print("REPLACING info.db WITH DATA COMPUTED ABOVE")
 		lock := sybil.Lock{Table: t, Name: "info"}
 		lock.ForceDeleteFile()

src/cmd/cmd_trim.go

@@ -51,7 +51,7 @@ func RunTrimCmdLine() {
 	sybil.DELETE_BLOCKS_AFTER_QUERY = false
 
 	t := sybil.GetTable(*sybil.FLAGS.TABLE)
-	if t.LoadTableInfo() == false {
+	if !t.LoadTableInfo() {
 		sybil.Warn("Couldn't read table info, exiting early")
 		return
 	}
@@ -73,10 +73,10 @@ func RunTrimCmdLine() {
 	}
 
 	if *DELETE {
-		if *REALLY != true {
+		if !*REALLY {
 			// TODO: prompt for deletion
 			fmt.Println("DELETE THE ABOVE BLOCKS? (Y/N)")
-			if askConfirmation() == false {
+			if !askConfirmation() {
 				sybil.Debug("ABORTING")
 				return
 			}

src/sybil/aggregate.go

@@ -101,7 +101,7 @@ func FilterAndAggRecords(querySpec *QuerySpec, recordsPtr *RecordList) int {
 		// {{{ FILTERING
 		for j := 0; j < len(querySpec.Filters); j++ {
 			// returns True if the record matches!
-			ret := querySpec.Filters[j].Filter(r) != true
+			ret := !querySpec.Filters[j].Filter(r)
 			if ret {
 				add = false
 				break

src/sybil/aggregate_test.go

@@ -162,8 +162,7 @@ func TestHistograms(t *testing.T) {
 
 	prevCount := int64(math.MaxInt64)
 	// testing that a histogram with single value looks uniform
-	for k, v := range querySpec.Results {
-		k = strings.Replace(k, GROUP_DELIMITER, "", 1)
+	for _, v := range querySpec.Results {
 		percentiles := v.Hists["age"].GetPercentiles()
 
 		if v.Count > prevCount {
@@ -194,16 +193,12 @@ func TestHistograms(t *testing.T) {
 
 	prevAvg := float64(0)
 	// testing that a histogram with single value looks uniform
-	for k, v := range querySpec.Results {
-		k = strings.Replace(k, GROUP_DELIMITER, "", 1)
+	for _, v := range querySpec.Results {
 		avg := v.Hists["age"].Mean()
 
 		if avg < prevAvg {
 			t.Error("RESULTS CAME BACK OUT OF COUNT ORDER")
 		}
-
-		prevCount = v.Count
-
 	}
 }
 
@@ -325,8 +320,7 @@ func TestOrderBy(t *testing.T) {
 		t.Error("NO RESULTS RETURNED FOR QUERY!")
 	}
 
-	for k, v := range querySpec.Results {
-		k = strings.Replace(k, GROUP_DELIMITER, "", 1)
+	for _, v := range querySpec.Results {
 		avg := v.Hists["age"].Mean()
 
 		if avg < prevAvg {

src/sybil/column_store_io.go

@@ -426,7 +426,7 @@ func (tb *TableBlock) SaveToColumns(filename string) bool {
 	tb.Name = dirname
 
 	defer tb.table.ReleaseBlockLock(filename)
-	if tb.table.GrabBlockLock(filename) == false {
+	if !tb.table.GrabBlockLock(filename) {
 		Debug("Can't grab lock to save block", filename)
 		return false
 	}
@@ -519,7 +519,7 @@ func (tb *TableBlock) unpackStrCol(dec FileDecoder, info SavedColumnInfo) {
 	bucketReplace := make(map[int32]int32)
 	var re *regexp.Regexp
 	if ok {
-		re, err = regexp.Compile(strReplace.Pattern)
+		re, _ = regexp.Compile(strReplace.Pattern)
 	}
 
 	for k, v := range into.StringTable {

src/sybil/file_decoder_test.go

@@ -59,7 +59,7 @@ func TestOpenCompressedInfoDB(t *testing.T) {
 	loadSpec.LoadAllColumns = true
 
 	loaded := nt.LoadTableInfo()
-	if loaded == false {
+	if !loaded {
 		t.Error("COULDNT LOAD ZIPPED TABLE INFO!")
 	}
 
@@ -138,7 +138,7 @@ func TestOpenCompressedColumn(t *testing.T) {
 	loadSpec.LoadAllColumns = true
 
 	loaded := bt.LoadTableInfo()
-	if loaded == false {
+	if !loaded {
 		t.Error("COULDNT LOAD ZIPPED TABLE INFO!")
 	}
 

src/sybil/file_encoder.go

@@ -17,14 +17,6 @@ type FileEncoder interface {
 	CloseFile() bool
 }
 
-func encodeInto(filename string, obj interface{}) error {
-	enc := GetFileEncoder(filename)
-	defer enc.CloseFile()
-
-	err := enc.Encode(obj)
-	return err
-}
-
 func GetFileEncoder(filename string) FileEncoder {
 	// otherwise, we just return vanilla decoder for this file
 

src/sybil/filter.go

@@ -42,7 +42,7 @@ func BuildFilters(t *Table, loadSpec *LoadSpec, filterSpec FilterSpec) []Filter
 		op := tokens[1]
 		val, _ := strconv.ParseInt(tokens[2], 10, 64)
 
-		if checkTable(tokens, t) != true {
+		if !checkTable(tokens, t) {
 			continue
 		}
 
@@ -67,7 +67,7 @@ func BuildFilters(t *Table, loadSpec *LoadSpec, filterSpec FilterSpec) []Filter
 		op := tokens[1]
 		val := tokens[2]
 
-		if checkTable(tokens, t) != true {
+		if !checkTable(tokens, t) {
 			continue
 		}
 		loadSpec.Set(col)
@@ -82,7 +82,7 @@ func BuildFilters(t *Table, loadSpec *LoadSpec, filterSpec FilterSpec) []Filter
 		op := tokens[1]
 		val := tokens[2]
 
-		if checkTable(tokens, t) != true {
+		if !checkTable(tokens, t) {
 			continue
 		}
 

src/sybil/filter_test.go

@@ -190,9 +190,6 @@ func testStrNeq(t *testing.T, tableName string) {
 	aggs := []Aggregation{}
 	aggs = append(aggs, nt.Aggregation("age", "avg"))
 
-	groupings := []Grouping{}
-	groupings = append(groupings, nt.Grouping("age"))
-
 	querySpec := QuerySpec{QueryParams: QueryParams{Filters: filters, Aggregations: aggs}}
 
 	nt.MatchAndAggregate(&querySpec)

src/sybil/hist_basic.go

@@ -219,7 +219,7 @@ func (h *BasicHist) GetStdDev() float64 {
 }
 
 func (h *BasicHist) GetSparseBuckets() map[int64]int64 {
-	ret := make(map[int64]int64, 0)
+	ret := make(map[int64]int64)
 
 	for k, v := range h.Values {
 		if v > 0 {
@@ -239,7 +239,7 @@ func (h *BasicHist) GetSparseBuckets() map[int64]int64 {
 }
 
 func (h *BasicHist) GetStrBuckets() map[string]int64 {
-	ret := make(map[string]int64, 0)
+	ret := make(map[string]int64)
 
 	for k, v := range h.Values {
 		ret[strconv.FormatInt(int64(k)*int64(h.BucketSize)+h.Min, 10)] = v

src/sybil/hist_multi.go

@@ -171,7 +171,7 @@ func (h *MultiHist) GetNonZeroBuckets() map[string]int64 {
 }
 
 func (h *MultiHist) GetStrBuckets() map[string]int64 {
-	allBuckets := make(map[string]int64, 0)
+	allBuckets := make(map[string]int64)
 	for _, subhist := range h.Subhists {
 		for key, count := range subhist.GetStrBuckets() {
 			allBuckets[key] = count
@@ -182,7 +182,7 @@ func (h *MultiHist) GetStrBuckets() map[string]int64 {
 }
 
 func (h *MultiHist) GetSparseBuckets() map[int64]int64 {
-	allBuckets := make(map[int64]int64, 0)
+	allBuckets := make(map[int64]int64)
 	for _, subhist := range h.Subhists {
 		for key, count := range subhist.GetSparseBuckets() {
 			_, ok := allBuckets[key]

src/sybil/node_aggregator.go

@@ -65,9 +65,7 @@ func (vt *VTable) AggregateSamples(dirs []string) {
 	samples := make([]*Sample, 0)
 
 	for _, res := range allResults {
-		for _, s := range res.Samples {
-			samples = append(samples, s)
-		}
+		samples = append(samples, res.Samples...)
 	}
 
 	if len(samples) > limit {
@@ -85,7 +83,7 @@ func (vt *VTable) AggregateTables(dirs []string) {
 	allResults := vt.findResultsInDirs(dirs)
 	Debug("FOUND", len(allResults), "SPECS TO AGG")
 
-	allTables := make(map[string]int, 0)
+	allTables := make(map[string]int)
 
 	for _, res := range allResults {
 		for _, table := range res.Tables {
@@ -119,7 +117,7 @@ func (vt *VTable) AggregateInfo(dirs []string) {
 			size += block.Size
 		}
 
-		res.Table.BlockList = make(map[string]*TableBlock, 0)
+		res.Table.BlockList = make(map[string]*TableBlock)
 
 		res.Table.initLocks()
 		res.Table.populateStringIDLookup()
@@ -179,17 +177,17 @@ func (vt *VTable) AggregateSpecs(dirs []string) {
 func (vt *VTable) StitchResults(dirs []string) {
 	vt.initDataStructures()
 
-	if FLAGS.LIST_TABLES != nil && *FLAGS.LIST_TABLES == true {
+	if FLAGS.LIST_TABLES != nil && *FLAGS.LIST_TABLES {
 		vt.AggregateTables(dirs)
 		return
 	}
 
-	if FLAGS.PRINT_INFO != nil && *FLAGS.PRINT_INFO == true {
+	if FLAGS.PRINT_INFO != nil && *FLAGS.PRINT_INFO {
 		vt.AggregateInfo(dirs)
 		return
 	}
 
-	if FLAGS.SAMPLES != nil && *FLAGS.SAMPLES == true {
+	if FLAGS.SAMPLES != nil && *FLAGS.SAMPLES {
 		vt.AggregateSamples(dirs)
 		return
 	}