From 4d4f64a33989a1e782a19e0515b57686ddd5ca4d Mon Sep 17 00:00:00 2001 From: Todd Gruben Date: Tue, 12 Oct 2021 11:21:14 -0500 Subject: [PATCH] address ben's comments --- pg/type.go | 10 ---------- rbf/cfg/cfg.go | 2 +- server/pg.go | 7 ++++--- storage/config.go | 2 +- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pg/type.go b/pg/type.go index 9952f5acd..98ea4348f 100644 --- a/pg/type.go +++ b/pg/type.go @@ -32,15 +32,6 @@ var TypeINT4OID = Type{Id: 23, Typelen: 4} var TypeTEXTOID = Type{Id: 25, Typelen: -1} var TypeFLOAT8OID = Type{Id: 701, Typelen: 8} -// TypeData is a type containing raw postgres wire type information. -/* -type TypeData struct { - TypeID int32 - TypeLen int16 - TypeModifier int32 -} -*/ - // TypeEngine is a system for managing types. // This is necessary for compound types like arrays which need ID generation. type TypeEngine interface { @@ -71,7 +62,6 @@ func (pte PrimitiveTypeEngine) TranslateType(t Type) (message.ColumnDescription, case TypeFLOAT8OID: TypeID = TypeFLOAT8OID.Id TypeLen = TypeFLOAT8OID.Typelen - //case default: // treat like TypeCharoid: TypeID = TypeCharoid.Id TypeLen = TypeCharoid.Typelen diff --git a/rbf/cfg/cfg.go b/rbf/cfg/cfg.go index fb0c034f2..5f8cd9345 100644 --- a/rbf/cfg/cfg.go +++ b/rbf/cfg/cfg.go @@ -56,7 +56,7 @@ func NewDefaultConfig() *Config { MaxWALSize: DefaultMaxWALSize, MinWALCheckpointSize: DefaultMinWALCheckpointSize, MaxWALCheckpointSize: DefaultMaxWALCheckpointSize, - FsyncEnabled: false, + FsyncEnabled: true, // CI passed with 20. 50 was too big for CI, even on X-large instances. // For now we default to 0, which means use sync.Pool. diff --git a/server/pg.go b/server/pg.go index 672a07d77..c2522f286 100644 --- a/server/pg.go +++ b/server/pg.go @@ -419,12 +419,13 @@ func pgWriteStmtRows(w pg.QueryResultWriter, rows *pilosa.StmtRows) error { return nil } func getPgTypeFromColumnInfo(sql2type string) pg.Type { - ret := pg.TypeCharoid switch sql2type { case sql2.DataTypeInt: - ret = pg.TypeINT4OID + return pg.TypeINT4OID + default: + return pg.TypeCharoid + } - return ret } var _ = getPgTypeFromColumnInfo //make linter happy for this function will be needed in future diff --git a/storage/config.go b/storage/config.go index 05882db04..e578ab9b9 100644 --- a/storage/config.go +++ b/storage/config.go @@ -37,6 +37,6 @@ type Config struct { func NewDefaultConfig() *Config { return &Config{ Backend: DefaultBackend, - FsyncEnabled: false, + FsyncEnabled: true, } }