Skip to content

Commit

Permalink
/testing/logictest/harness/doltgres_server_harness.go: wip, debugging…
Browse files Browse the repository at this point in the history 
… busted harness (#334)
  • Loading branch information
@coffeegoddd
coffeegoddd authored Jun 14, 2024
1 parent 44d8385 commit 4dca8c5
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 41 deletions.
26 changes: 22 additions & 4 deletions server/analyzer/type_sanitizer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,28 @@ func typeSanitizerLiterals(gmsLiteral *expression.Literal) (sql.Expression, tran
if err != nil {
return nil, transform.NewTree, err
}
if newVal == nil {
return pgexprs.NewNullLiteral(), transform.NewTree, nil
}
return pgexprs.NewRawLiteralInt64(newVal.(int64)), transform.NewTree, nil
case query.Type_UINT8, query.Type_UINT16, query.Type_UINT24, query.Type_UINT32, query.Type_UINT64, query.Type_SET:
newVal, _, err := types.Uint64.Convert(gmsLiteral.Value())
if err != nil {
return nil, transform.NewTree, err
}
if newVal == nil {
return pgexprs.NewNullLiteral(), transform.NewTree, nil
}
newLiteral, err := pgexprs.NewNumericLiteral(strconv.FormatUint(newVal.(uint64), 10))
return newLiteral, transform.NewTree, err
case query.Type_FLOAT32, query.Type_FLOAT64:
newVal, _, err := types.Float64.Convert(gmsLiteral.Value())
if err != nil {
return nil, transform.NewTree, err
}
if newVal == nil {
return pgexprs.NewNullLiteral(), transform.NewTree, nil
}
return pgexprs.NewRawLiteralFloat64(newVal.(float64)), transform.NewTree, nil
case query.Type_DECIMAL:
dec, ok := gmsLiteral.Value().(decimal.Decimal)
Expand All @@ -122,6 +131,9 @@ func typeSanitizerLiterals(gmsLiteral *expression.Literal) (sql.Expression, tran
if err != nil {
return nil, transform.NewTree, err
}
if newVal == nil {
return pgexprs.NewNullLiteral(), transform.NewTree, nil
}
return pgexprs.NewRawLiteralTimestamp(newVal.(time.Time)), transform.NewTree, nil
case query.Type_CHAR, query.Type_VARCHAR, query.Type_TEXT:
str, ok := gmsLiteral.Value().(string)
Expand All @@ -130,15 +142,21 @@ func typeSanitizerLiterals(gmsLiteral *expression.Literal) (sql.Expression, tran
}
return pgexprs.NewStringLiteral(str), transform.NewTree, nil
case query.Type_BINARY, query.Type_VARBINARY, query.Type_BLOB:
if str, ok := gmsLiteral.Value().(string); ok {
newVal := gmsLiteral.Value()
if newVal == nil {
return pgexprs.NewNullLiteral(), transform.NewTree, nil
} else if str, ok := newVal.(string); ok {
return pgexprs.NewStringLiteral(str), transform.NewTree, nil
}
if b, ok := gmsLiteral.Value().([]byte); ok {
} else if b, ok := newVal.([]byte); ok {
return pgexprs.NewStringLiteral(string(b)), transform.NewTree, nil
}
return nil, transform.NewTree, fmt.Errorf("SANITIZER: invalid binary type: %T", gmsLiteral.Value())
case query.Type_JSON:
str, ok := gmsLiteral.Value().(string)
newVal := gmsLiteral.Value()
if newVal == nil {
return pgexprs.NewNullLiteral(), transform.NewTree, nil
}
str, ok := newVal.(string)
if !ok {
return nil, transform.NewTree, fmt.Errorf("SANITIZER: expected string type: %T", gmsLiteral.Value())
}
Expand Down
91 changes: 54 additions & 37 deletions testing/logictest/harness/doltgres_server_harness.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@ import (
)

const (
dsn = "postgresql://postgres:password@localhost:5432/sqllogictest?sslmode=disable"
doltgresDBDir = "doltgresDatabases"
serverLogFile = "server.log"
harnessLogFile = "harness.log"
dsn = "postgresql://postgres:password@localhost:5432/sqllogictest?sslmode=disable"
doltgresNoDbDsn = "postgresql://doltgres:[email protected]:5432/?sslmode=disable"
doltgresWithDbDsn = "postgresql://doltgres:[email protected]:5432/sqllogictest?sslmode=disable"
doltgresDBDir = "doltgresDatabases"
serverLogFile = "server.log"
harnessLogFile = "harness.log"
)

var _ logictest.Harness = &DoltgresHarness{}
Expand All @@ -58,7 +60,23 @@ type DoltgresHarness struct {
// NewDoltgresHarness returns a new Doltgres test harness for the data source name given.
// It starts doltgres server and handles every connection to it.
func NewDoltgresHarness(doltgresExec string, t int64) *DoltgresHarness {
serverDir := prepareSqlLogicTestDBAndGetServerDir(context.Background(), doltgresExec)
cwd, err := os.Getwd()
if err != nil {
logErr(err, "getting cwd")
}

serverDir := filepath.Join(cwd, doltgresDBDir)
// remove this dir to make sure it doesn't exist from previous run
err = os.RemoveAll(serverDir)
if err != nil {
logErr(err, fmt.Sprintf("running `RemoveAll` for '%s'", serverDir))
}
// make this dir to prepare for the current run
err = os.MkdirAll(serverDir, os.ModePerm)
if err != nil {
logErr(err, fmt.Sprintf("running `MkdirAll` for '%s'", serverDir))
}
// open harness.log file
hl, err := os.OpenFile(harnessLogFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
if err != nil {
log.Fatal(err)
Expand All @@ -82,11 +100,39 @@ func (h *DoltgresHarness) EngineStr() string {

func (h *DoltgresHarness) Init() error {
h.startNewDoltgresServer(context.Background(), logictest.GetCurrentFileName())
db, err := sql.Open("pgx", dsn)
db, err := sql.Open("pgx", doltgresNoDbDsn)
if err != nil {
logErr(err, "opening connection to pgx")
return err
}
err = db.Ping()
if err != nil {
return err
}

// create 'sqllogictest' database
_, err = db.ExecContext(context.Background(), "CREATE DATABASE sqllogictest")
if err != nil {
logErr(err, "creating database")
return err
}

err = db.Close()
if err != nil {
logErr(err, "closing database connection")
return err
}

db, err = sql.Open("pgx", doltgresWithDbDsn)
if err != nil {
logErr(err, "opening connection to pgx")
return err
}
err = db.Ping()
if err != nil {
return err
}

h.db = db

if err := h.dropAllTables(); err != nil {
Expand Down Expand Up @@ -148,7 +194,8 @@ func (h *DoltgresHarness) GetTimeout() int64 {
func (h *DoltgresHarness) dropAllTables() error {
var rows *sql.Rows
var err error
rows, err = h.db.QueryContext(context.Background(), "SELECT table_name FROM information_schema.tables WHERE table_schema = 'sqllogictest' AND table_type = 'BASE TABLE';")
// TODO: once we support ENUM type and comparison, add `AND table_type = 'BASE TABLE'`
rows, err = h.db.QueryContext(context.Background(), "SELECT table_name FROM information_schema.tables WHERE table_schema = 'sqllogictest';")
if rows != nil {
defer rows.Close()
}
Expand Down Expand Up @@ -280,36 +327,6 @@ func (h *DoltgresHarness) ClearServer() {
}
}

func prepareSqlLogicTestDBAndGetServerDir(ctx context.Context, doltgresExec string) string {
cwd, err := os.Getwd()
if err != nil {
logErr(err, "getting cwd")
}

serverDir := filepath.Join(cwd, doltgresDBDir)
// remove this dir to make sure it doesn't exist from previous run
err = os.RemoveAll(serverDir)
if err != nil {
logErr(err, "running `RemoveAll`")
}

// this creates db named 'sqllogictest'
logicTestDbDir := filepath.Join(serverDir, "sqllogictest")
err = os.MkdirAll(logicTestDbDir, os.ModePerm)
if err != nil {
logErr(err, "running `MkdirAll`")
}

testInit := exec.CommandContext(ctx, doltgresExec, "init")
testInit.Dir = logicTestDbDir
err = testInit.Run()
if err != nil {
logErr(err, "running `doltgres init`")
}

return serverDir
}

type DoltgresServer struct {
dir string
quit chan os.Signal
Expand Down

0 comments on commit 4dca8c5

Please sign in to comment.