Skip to content

feat(compression): enabled by default #7

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

Merged
danielebriggi merged 1 commit into from
Jun 14, 2024
Merged

feat(compression): enabled by default #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion cli/sqlc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ func parseParameters() (Parameter, error) {
p["--host"] = getFirstNoneEmptyString([]string{dropError(p.String("--host")), "localhost"})
p["--port"] = getFirstNoneEmptyString([]string{dropError(p.String("--port")), "8860"})
p["--timeout"] = getFirstNoneEmptyString([]string{dropError(p.String("--timeout")), "10"})
p["--compress"] = getFirstNoneEmptyString([]string{dropError(p.String("--compress")), "NO"})
p["--compress"] = getFirstNoneEmptyString([]string{dropError(p.String("--compress")), sqlitecloud.CompressModeLZ4})
p["--tls"] = getFirstNoneEmptyString([]string{dropError(p.String("--tls")), "YES"})
p["--separator"] = getFirstNoneEmptyString([]string{dropError(p.String("--separator")), dropError(sqlitecloud.GetDefaultSeparatorForOutputFormat(outputformat)), "|"})
p["--maxdata"] = getFirstNoneEmptyString([]string{dropError(p.String("--maxdata")), "0"})
Expand Down Expand Up @@ -420,6 +420,7 @@ func main() {
Password: parameter.Password,
Database: parameter.Database,
Timeout: time.Duration(parameter.Timeout) * time.Second,
Compression: parameter.Compress == sqlitecloud.CompressModeLZ4,
CompressMode: parameter.Compress,
Zerotext: parameter.Zerotext,
Memory: parameter.Memory,
Expand Down
32 changes: 18 additions & 14 deletions connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ func ParseConnectionString(ConnectionString string) (config *SQCloudConfig, err
config.Password, _ = u.User.Password()
config.Database = strings.TrimPrefix(u.Path, "/")
config.Timeout = 0
config.Compression = false
config.CompressMode = CompressModeNo
config.Compression = true // enabled by default
config.CompressMode = CompressModeLZ4
config.Zerotext = false
config.Memory = false
config.Create = false
Expand Down Expand Up @@ -146,14 +146,18 @@ func ParseConnectionString(ConnectionString string) (config *SQCloudConfig, err
}

case "compress":
config.CompressMode = strings.ToUpper(lastLiteral)
if config.CompressMode == CompressModeLZ4 {
config.Compression = true
mode := strings.ToUpper(lastLiteral)
if mode == CompressModeNo {
config.CompressMode = CompressModeNo
config.Compression = false
} else if enable, err := parseBool(mode, config.Compression); err == nil && !enable {
config.CompressMode = CompressModeNo
config.Compression = false
}
case "compression":
if b, err := parseBool(lastLiteral, config.Compression); err == nil && b {
config.Compression = true
config.CompressMode = CompressModeLZ4
if enable, err := parseBool(lastLiteral, config.Compression); err == nil && !enable {
config.Compression = false
config.CompressMode = CompressModeNo
}
case "zerotext":
if b, err := parseBool(lastLiteral, config.Zerotext); err == nil {
Expand Down Expand Up @@ -239,12 +243,12 @@ func (this *SQCloud) CheckConnectionParameter() error {
return fmt.Errorf("Invalid hostname (%s)", this.Host)
}

ip := net.ParseIP(this.Host)
if ip == nil {
if _, err := net.LookupHost(this.Host); err != nil {
return errors.New(fmt.Sprintf("Can't resolve hostname (%s)", this.Host))
}
}
// ip := net.ParseIP(this.Host)
// if ip == nil {
// if _, err := net.LookupHost(this.Host); err != nil {
// return errors.New(fmt.Sprintf("Can't resolve hostname (%s)", this.Host))
// }
// }

if this.Port == 0 {
this.Port = 8860
Expand Down
16 changes: 16 additions & 0 deletions test/commons_test.go → test/commons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import (
"flag"
"log"
"os"
"testing"

"github.com/joho/godotenv"
sqlitecloud "github.com/sqlitecloud/go-sdk"
)

func init() {
Expand All @@ -25,3 +27,17 @@ func contains[T comparable](s []T, e T) bool {
}
return false
}

func setupDatabase(t *testing.T) (*sqlitecloud.SQCloud, func()) {
connectionString, _ := os.LookupEnv("SQLITE_CONNECTION_STRING")
apikey, _ := os.LookupEnv("SQLITE_API_KEY")

db, err := sqlitecloud.Connect(connectionString + "?apikey=" + apikey)
if err != nil {
t.Fatal("Connection error: ", err.Error())
}

return db, func() {
db.Close()
}
}
14 changes: 14 additions & 0 deletions test/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"testing"

sqlitecloud "github.com/sqlitecloud/go-sdk"
"github.com/stretchr/testify/assert"
)

const testDbnameServer = "test-gosdk-server-db.sqlite"
Expand Down Expand Up @@ -213,3 +214,16 @@ func TestServer(t *testing.T) {
// }
// fmt.Printf( "ok.\r\n" )
}

func TestCompressionEnabledByDefault(t *testing.T) {
db, cleaup := setupDatabase(t)
defer cleaup()

result, _ := db.Select("GET CLIENT KEY COMPRESSION")
value, err := result.GetString()
if err != nil {
t.Fatal(err.Error())
}

assert.Equal(t, "1", value)
}
108 changes: 104 additions & 4 deletions test/unit/connection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ func TestParseConnectionString(t *testing.T) {
Password: "",
Database: "mydatabase",
Timeout: time.Duration(11) * time.Second,
CompressMode: "YES",
Compression: true,
CompressMode: sqlitecloud.CompressModeLZ4,
Secure: true,
TlsInsecureSkipVerify: false,
Pem: "",
Expand Down Expand Up @@ -50,7 +51,8 @@ func TestParseConnectionStringWithAPIKey(t *testing.T) {
Password: "pass",
Database: "dbname",
Timeout: time.Duration(11) * time.Second,
CompressMode: "TRUE",
Compression: true,
CompressMode: sqlitecloud.CompressModeLZ4,
Secure: true,
TlsInsecureSkipVerify: false,
Pem: "",
Expand Down Expand Up @@ -104,8 +106,8 @@ func TestParseConnectionStringWithParameters(t *testing.T) {
{
param: "compression",
configParam: "Compression",
value: "true",
expectedValue: true,
value: "false",
expectedValue: false,
},
{
param: "zerotext",
Expand Down Expand Up @@ -203,6 +205,104 @@ func TestParseConnectionStringWithParameters(t *testing.T) {
}
}

func TestParseConnectionStringCompressionCombinations(t *testing.T) {
tests := []struct {
param string
configParam string
value string
expectedValue any
}{
{
param: "compression",
configParam: "Compression",
value: "false",
expectedValue: false,
},
{
param: "compression",
configParam: "Compression",
value: "disabled",
expectedValue: false,
},
{
param: "compression",
configParam: "Compression",
// value not supported
value: "no",
expectedValue: true,
},
{
param: "compression",
configParam: "Compression",
value: "0",
expectedValue: false,
},
{
param: "compression",
configParam: "Compression",
value: "true",
expectedValue: true,
},
{
param: "compression",
configParam: "Compression",
value: "enabled",
expectedValue: true,
},
{
param: "compression",
configParam: "Compression",
value: "yes",
expectedValue: true,
},
{
param: "compression",
configParam: "Compression",
value: "1",
expectedValue: true,
},
{
param: "compress",
configParam: "CompressMode",
value: "lz4",
expectedValue: sqlitecloud.CompressModeLZ4,
},
{
param: "compress",
configParam: "Compression",
value: "lz4",
expectedValue: true,
},
{
param: "compress",
configParam: "CompressMode",
value: "no",
expectedValue: sqlitecloud.CompressModeNo,
},
{
param: "compress",
configParam: "Compression",
value: "no",
expectedValue: false,
},
}

for _, tt := range tests {
t.Run(tt.param, func(t *testing.T) {
config, err := sqlitecloud.ParseConnectionString("sqlitecloud://myhost.sqlite.cloud/mydatabase?" + tt.param + "=" + tt.value)

assert.NoError(t, err)

actualValue := reflect.ValueOf(*config).FieldByName(tt.configParam)
if !actualValue.IsValid() {
t.Fatalf("Field %s not found in config", tt.configParam)
} else {
assert.Equal(t, tt.expectedValue, actualValue.Interface())
}
})
}
}

func TestParseConnectionStringWithTLSParameter(t *testing.T) {
tests := []struct {
tlsValue string
Expand Down