Skip to content

Commit e7fc80d

Browse files
nicpottiernicpottier
committed
move to go module, dont ignore any keywords
1 parent 789ac44 commit e7fc80d

File tree

6 files changed

+73
-190
lines changed

6 files changed

+73
-190
lines changed

Diff for: ‎.travis.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ addons:
88
- postgresql-client-10
99

1010
go:
11-
- "1.10"
11+
- "1.11"
12+
13+
env:
14+
global:
15+
- GO111MODULE=on
1216

1317
before_install:
1418
- wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.2.3.deb && sudo dpkg -i --force-confnew elasticsearch-6.2.3.deb

Diff for: ‎Gopkg.lock

-129
This file was deleted.

Diff for: ‎Gopkg.toml

-50
This file was deleted.

Diff for: ‎go.mod

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
module github.com/nyaruka/rp-indexer
2+
3+
require (
4+
github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261
5+
github.com/davecgh/go-spew v1.1.0
6+
github.com/evalphobia/logrus_sentry v0.4.5
7+
github.com/fatih/structs v1.0.0
8+
github.com/fortytw2/leaktest v1.3.0 // indirect
9+
github.com/getsentry/raven-go v0.0.0-20180405121644-d1470f50d3a3
10+
github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2
11+
github.com/mailru/easyjson v0.0.0-20180323154445-8b799c424f57
12+
github.com/naoina/go-stringutil v0.1.0
13+
github.com/naoina/toml v0.1.1
14+
github.com/nyaruka/ezconf v0.2.1
15+
github.com/olivere/elastic v6.1.14+incompatible
16+
github.com/pkg/errors v0.8.0
17+
github.com/pmezard/go-difflib v1.0.0
18+
github.com/sirupsen/logrus v1.0.5
19+
github.com/stretchr/testify v1.2.1
20+
golang.org/x/crypto v0.0.0-20180322175230-88942b9c40a4
21+
golang.org/x/sys v0.0.0-20180326154331-13d03a9a82fb
22+
gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
23+
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
24+
)

Diff for: ‎go.sum

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261 h1:6/yVvBsKeAw05IUj4AzvrxaCnDjN4nUqKjW9+w5wixg=
2+
github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4=
3+
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
4+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5+
github.com/evalphobia/logrus_sentry v0.4.5 h1:weRoBjojMYPp57TLDjPEkP58JVHHSiqNrxG+h3ODdPM=
6+
github.com/evalphobia/logrus_sentry v0.4.5/go.mod h1:pKcp+vriitUqu9KiWj/VRFbRfFNUwz95/UkgG8a6MNc=
7+
github.com/fatih/structs v1.0.0 h1:BrX964Rv5uQ3wwS+KRUAJCBBw5PQmgJfJ6v4yly5QwU=
8+
github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
9+
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
10+
github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
11+
github.com/getsentry/raven-go v0.0.0-20180405121644-d1470f50d3a3 h1:md1zEr2oSVWYNfQj+6TL/nmAFf5gY3Tp44lzskzK9QU=
12+
github.com/getsentry/raven-go v0.0.0-20180405121644-d1470f50d3a3/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
13+
github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2 h1:hRGSmZu7j271trc9sneMrpOW7GN5ngLm8YUZIPzf394=
14+
github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
15+
github.com/mailru/easyjson v0.0.0-20180323154445-8b799c424f57 h1:qhv1ir3dIyOFmFU+5KqG4dF3zSQTA4nn1DFhu2NQC44=
16+
github.com/mailru/easyjson v0.0.0-20180323154445-8b799c424f57/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
17+
github.com/naoina/go-stringutil v0.1.0 h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks=
18+
github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
19+
github.com/naoina/toml v0.1.1 h1:PT/lllxVVN0gzzSqSlHEmP8MJB4MY2U7STGxiouV4X8=
20+
github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
21+
github.com/nyaruka/ezconf v0.2.1 h1:TDXWoqjqYya1uhou1mAJZg7rgFYL98EB0Tb3+BWtUh0=
22+
github.com/nyaruka/ezconf v0.2.1/go.mod h1:ey182kYkw2MIi4XiWe1FR/mzI33WCmTWuceDYYxgnQw=
23+
github.com/olivere/elastic v6.1.14+incompatible h1:X7PDDou5+WuNrh5WgtS5+gKzbUmSNXvF0mQZ++VsZYU=
24+
github.com/olivere/elastic v6.1.14+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
25+
github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
26+
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
27+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
28+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
29+
github.com/sirupsen/logrus v1.0.5 h1:8c8b5uO0zS4X6RPl/sd1ENwSkIc0/H2PaHxE3udaE8I=
30+
github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
31+
github.com/stretchr/testify v1.2.1 h1:52QO5WkIUcHGIR7EnGagH88x1bUzqGXTC5/1bDTUQ7U=
32+
github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
33+
golang.org/x/crypto v0.0.0-20180322175230-88942b9c40a4 h1:AJCW0rhPjFKEAoValWpqnRKxX8YV0Xvqfw+dOexCTPc=
34+
golang.org/x/crypto v0.0.0-20180322175230-88942b9c40a4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
35+
golang.org/x/sys v0.0.0-20180326154331-13d03a9a82fb h1:w1eDrzbtlRsu1SyjnZZFUBVuhRN2Rn6DlrHCx9s4ud0=
36+
golang.org/x/sys v0.0.0-20180326154331-13d03a9a82fb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
37+
gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=
38+
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
39+
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0=
40+
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=

Diff for: ‎indexer.go

+4-10
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ const indexSettings = `
474474
"type": "truncate",
475475
"length": 8
476476
}
477-
}
477+
}
478478
}
479479
},
480480
@@ -492,7 +492,6 @@ const indexSettings = `
492492
},
493493
"text": {
494494
"type": "keyword",
495-
"ignore_above": 64,
496495
"normalizer": "lowercase"
497496
},
498497
"number": {
@@ -508,26 +507,23 @@ const indexSettings = `
508507
},
509508
"state_keyword": {
510509
"type": "keyword",
511-
"normalizer": "lowercase",
512-
"ignore_above": 64
510+
"normalizer": "lowercase"
513511
},
514512
"district": {
515513
"type": "text",
516514
"analyzer": "locations"
517515
},
518516
"district_keyword": {
519517
"type": "keyword",
520-
"normalizer": "lowercase",
521-
"ignore_above": 64
518+
"normalizer": "lowercase"
522519
},
523520
"ward": {
524521
"type": "text",
525522
"analyzer": "locations"
526523
},
527524
"ward_keyword": {
528525
"type": "keyword",
529-
"normalizer": "lowercase",
530-
"ignore_above": 64
526+
"normalizer": "lowercase"
531527
}
532528
}
533529
},
@@ -540,7 +536,6 @@ const indexSettings = `
540536
"fields": {
541537
"keyword": {
542538
"type": "keyword",
543-
"ignore_above": 64,
544539
"normalizer": "lowercase"
545540
}
546541
}
@@ -577,7 +572,6 @@ const indexSettings = `
577572
"fields": {
578573
"keyword": {
579574
"type": "keyword",
580-
"ignore_above": 64,
581575
"normalizer": "lowercase"
582576
}
583577
}

0 commit comments

Comments
 (0)