Skip to content

Remove IncludeV field from table API structs and make include_v optional in schemas #65

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

Open
xuantuan58 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove IncludeV field from table API structs and make include_v optional in schemas #65

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
7 changes: 2 additions & 5 deletions api_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ type ListTablesResultElement struct {
ExpireDays int
PrimaryKey string
PrimaryKeyType string
IncludeV bool
}

var showTableSchema = map[string]interface{}{
Expand All @@ -62,7 +61,7 @@ var showTableSchema = map[string]interface{}{
"expire_days": Optional{0, 0},
"primary_key": Optional{"", ""},
"primary_key_type": Optional{"", ""},
"include_v": false,
"include_v": Optional{false, false},
}

// ListTablesResult is a collection of ListTablesResultElement
Expand All @@ -86,7 +85,7 @@ var listTablesSchema = map[string]interface{}{
"expire_days": Optional{0, 0},
"primary_key": Optional{"", ""},
"primary_key_type": Optional{"", ""},
"include_v": false,
"include_v": Optional{false, false},
},
},
}
Expand Down Expand Up @@ -124,7 +123,6 @@ func (client *TDClient) ShowTable(db, table string) (*ListTablesResultElement, e
ExpireDays: js["expire_days"].(int),
PrimaryKey: js["primary_key"].(string),
PrimaryKeyType: js["primary_key_type"].(string),
IncludeV: js["include_v"].(bool),
}, nil
}

Expand Down Expand Up @@ -158,7 +156,6 @@ func (client *TDClient) ListTables(db string) (*ListTablesResult, error) {
ExpireDays: v["expire_days"].(int),
PrimaryKey: v["primary_key"].(string),
PrimaryKeyType: v["primary_key_type"].(string),
IncludeV: v["include_v"].(bool),
}
}
return &retval, nil
Expand Down
157 changes: 149 additions & 8 deletions api_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,80 @@ func TestDeleteTable(t *testing.T) {

func TestTail(t *testing.T) {}

func TestShowTableWithIncludeV(t *testing.T) {
client, err := NewTDClient(Settings{
Transport: &DummyTransport{[]byte(showTableResponseWithIncludeV)},
})
if err != nil {
t.Fatalf("failed create client: %s", err.Error())
}
table, err := client.ShowTable("test_database", "test_table")
if err != nil {
t.Fatalf("bad request: %s", err.Error())
}
if table.Name != "test_table" {
t.Fatal("unexpected table name")
}
if table.Id != 999999 {
t.Fatal("unexpected table id")
}
t.Log("ShowTable works with include_v field in response:", table)
}

func TestShowTableWithoutIncludeV(t *testing.T) {
client, err := NewTDClient(Settings{
Transport: &DummyTransport{[]byte(showTableResponse)},
})
if err != nil {
t.Fatalf("failed create client: %s", err.Error())
}
table, err := client.ShowTable("test_database", "test_table")
if err != nil {
t.Fatalf("bad request: %s", err.Error())
}
if table.Name != "test_table" {
t.Fatal("unexpected table name")
}
if table.Id != 999999 {
t.Fatal("unexpected table id")
}
t.Log("ShowTable works without include_v field in response:", table)
}

func TestListTablesWithIncludeV(t *testing.T) {
client, err := NewTDClient(Settings{
Transport: &DummyTransport{[]byte(listTablesResponseWithIncludeV)},
})
if err != nil {
t.Fatalf("failed create client: %s", err.Error())
}
tableList, err := client.ListTables("test")
if err != nil {
t.Fatalf("bad request: %s", err.Error())
}
if len(*tableList) != 3 {
t.Fatal("not expected database count")
}
t.Log("ListTables works with include_v field in response")
}

func TestListTablesWithoutIncludeV(t *testing.T) {
client, err := NewTDClient(Settings{
Transport: &DummyTransport{[]byte(listTablesResponse)},
})
if err != nil {
t.Fatalf("failed create client: %s", err.Error())
}
tableList, err := client.ListTables("test")
if err != nil {
t.Fatalf("bad request: %s", err.Error())
}
if len(*tableList) != 3 {
t.Fatal("not expected database count")
}
t.Log("ListTables works without include_v field in response")
}

const showTableResponse = `
{
"id":999999,
Expand All @@ -133,8 +207,7 @@ const showTableResponse = `
"type":"log",
"count":0,
"schema":"[[\"col1\",\"string\"]]",
"expire_days":10,
"include_v":true
"expire_days":10
}
`

Expand All @@ -154,8 +227,7 @@ const listTablesResponse = `
"type":"log",
"count":1751,
"schema":"[[\"id\",\"long\"],[\"fizz\",\"string\"],[\"buzz\",\"string\"],[\"fizzbuzz\",\"string\"],[\"created_at\",\"string\"],[\"created_by\",\"long\"],[\"updated_at\",\"string\"],[\"updated_by\",\"long\"],[\"deleted_at\",\"string\"],[\"deleted_by\",\"long\"]]",
"expire_days":null,
"include_v":true
"expire_days":null
},
{
"id":99999992,
Expand All @@ -169,8 +241,7 @@ const listTablesResponse = `
"type":"log",
"count":2539,
"schema":"[[\"id\",\"long\"],[\"hogehoge\",\"string\"],[\"fugafuga\",\"long\"],[\"created_at\",\"string\"],[\"updated_at\",\"string\"],[\"created_by\",\"long\"],[\"updated_by\",\"long\"]]",
"expire_days":null,
"include_v":true
"expire_days":null
},
{
"id":99999993,
Expand All @@ -184,8 +255,7 @@ const listTablesResponse = `
"type":"log",
"count":76,
"schema":"[[\"id\",\"long\"],[\"foo\",\"string\"],[\"var\",\"string\"],[\"created_at\",\"string\"],[\"created_by\",\"long\"],[\"updated_at\",\"string\"],[\"updated_by\",\"long\"],[\"deleted_at\",\"string\"],[\"deleted_by\",\"long\"]]",
"expire_days":null,
"include_v":true
"expire_days":null
}
]
}
Expand Down Expand Up @@ -243,3 +313,74 @@ const deleteTableResponse = `
"database":"test_database"
}
`

const showTableResponseWithIncludeV = `
{
"id":999999,
"name":"test_table",
"estimated_storage_size":0,
"counter_updated_at":null,
"last_log_timestamp":null,
"delete_protected":false,
"created_at":"2017-05-14 12:19:37 UTC",
"updated_at":"2017-05-14 15:53:17 UTC",
"type":"log",
"count":0,
"schema":"[[\"col1\",\"string\"]]",
"expire_days":10,
"include_v":true
}
`

const listTablesResponseWithIncludeV = `
{
"database":"nh4_test",
"tables":[
{
"id":99999991,
"name":"test_table_1",
"estimated_storage_size":67158,
"counter_updated_at":"2017-05-13T11:39:53Z",
"last_log_timestamp":"2017-05-07T08:59:35Z",
"delete_protected":false,
"created_at":"2017-03-30 09:00:14 UTC",
"updated_at":"2017-05-07 08:59:40 UTC",
"type":"log",
"count":1751,
"schema":"[[\"id\",\"long\"],[\"fizz\",\"string\"],[\"buzz\",\"string\"],[\"fizzbuzz\",\"string\"],[\"created_at\",\"string\"],[\"created_by\",\"long\"],[\"updated_at\",\"string\"],[\"updated_by\",\"long\"],[\"deleted_at\",\"string\"],[\"deleted_by\",\"long\"]]",
"expire_days":null,
"include_v":true
},
{
"id":99999992,
"name":"test_table_2",
"estimated_storage_size":84251,
"counter_updated_at":"2017-05-13T11:39:53Z",
"last_log_timestamp":"2016-12-28T20:59:52Z",
"delete_protected":false,
"created_at":"2016-11-07 11:57:15 UTC",
"updated_at":"2017-05-07 08:52:15 UTC",
"type":"log",
"count":2539,
"schema":"[[\"id\",\"long\"],[\"hogehoge\",\"string\"],[\"fugafuga\",\"long\"],[\"created_at\",\"string\"],[\"updated_at\",\"string\"],[\"created_by\",\"long\"],[\"updated_by\",\"long\"]]",
"expire_days":null,
"include_v":false
},
{
"id":99999993,
"name":"test_table_3",
"estimated_storage_size":1609,
"counter_updated_at":"2017-05-13T11:39:53Z",
"last_log_timestamp":"2017-05-07T08:52:24Z",
"delete_protected":false,
"created_at":"2016-11-07 11:56:58 UTC",
"updated_at":"2017-05-07 08:52:27 UTC",
"type":"log",
"count":76,
"schema":"[[\"id\",\"long\"],[\"foo\",\"string\"],[\"var\",\"string\"],[\"created_at\",\"string\"],[\"created_by\",\"long\"],[\"updated_at\",\"string\"],[\"updated_by\",\"long\"],[\"deleted_at\",\"string\"],[\"deleted_by\",\"long\"]]",
"expire_days":null,
"include_v":true
}
]
}
`