Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix gitignore vi #3

Merged
merged 2 commits into from
Jul 19, 2013
Merged

Fix gitignore vi #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
043a163
bug fix: Use cachePool.IsClosed to check if rowcache is enabled
sougou Jul 19, 2013
5b149ff
Fix .gitignore for vim and go
sougou Jul 19, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,12 @@ _test
*.[568vq]
[568vq].out

*.cgo1.go
*.cgo2.c
_cgo_defun.c
_cgo_gotypes.go
_cgo_export.*

_testmain.go

build
dist

*.out
*.output
.swp
*.swp
.DS_Store

third_party/mysql
Expand Down
4 changes: 2 additions & 2 deletions go/vt/tabletserver/cache_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ func (cache *Cache) Recycle() {

func CacheCreator(dbconfig dbconfigs.DBConfig) CreateCacheFunc {
if dbconfig.Memcache == "" {
relog.Info("Row cache not enabled")
relog.Info("rowcache not enabled")
return nil
}
relog.Info("Row cache is enabled")
relog.Info("rowcache is enabled")
return func() (*memcache.Connection, error) {
return memcache.Connect(dbconfig.Memcache)
}
Expand Down
2 changes: 1 addition & 1 deletion go/vt/tabletserver/schema_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func (si *SchemaInfo) override(schemaOverrides []SchemaOverride) {
continue
}
}
if si.cachePool == nil || override.Cache == nil {
if si.cachePool.IsClosed() || override.Cache == nil {
continue
}
switch override.Cache.Type {
Expand Down