-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: alter partition table tag column (#1304)
## Rationale
Fix adding column in `partition table` bug.
## Detailed Changes
1. Checking the schema inconsistency error in the write process, caused
by adding columns.
- Note: This only works for grpc write
3. Add a Go SDK test to check adding a column in a "partition table".
4. Start ceresdb cluster to run go-sdk tests.
## Test Plan
GO SDK test.- Loading branch information
1 parent
d1f3349
commit 718c230
Showing
11 changed files
with
260 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/CeresDB/ceresdb-client-go/ceresdb" | ||
| ) | ||
|
|
||
| const fieldName = "b" | ||
| const tagName = "btag" | ||
| const timestampName = "t" | ||
|
|
||
| func checkPartitionTableAddColumn(ctx context.Context, client ceresdb.Client) error { | ||
| err := dropTable(ctx, client, partitionTable) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| _, err = ddl(ctx, client, partitionTable, fmt.Sprintf( | ||
| "CREATE TABLE `%s`( "+ | ||
| "`name`string TAG,"+ | ||
| "`id` int TAG,"+ | ||
| "`value` int64 NOT NULL,"+ | ||
| "`t` timestamp NOT NULL,"+ | ||
| "TIMESTAMP KEY(t)) "+ | ||
| "PARTITION BY KEY(name) PARTITIONS 4 ENGINE = Analytic", partitionTable)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| _, err = ddl(ctx, client, partitionTable, fmt.Sprintf("ALTER TABLE `%s` ADD COLUMN (%s string);", partitionTable, fieldName)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| ts := currentMS() | ||
|
|
||
| // First write will fail, because the schema is not updated yet. | ||
| // Currently, ceresdb will update the schema when write failed. | ||
| err = writePartitionTableNewField(ctx, client, ts, fieldName) | ||
| if err == nil { | ||
| panic("first write should fail") | ||
| } | ||
|
|
||
| if err := writePartitionTableNewField(ctx, client, ts, fieldName); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| _, err = ddl(ctx, client, partitionTable, fmt.Sprintf("ALTER TABLE `%s` ADD COLUMN (%s string TAG);", partitionTable, tagName)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // First write will fail, because the schema is not updated yet. | ||
| // Currently, write failed will update the schema. | ||
| err = writePartitionTableNewTag(ctx, client, ts, tagName) | ||
| if err == nil { | ||
| panic("first write should fail") | ||
| } | ||
|
|
||
| if err := writePartitionTableNewTag(ctx, client, ts, tagName); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := queryPartitionTable(ctx, client, ts, timestampName); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func writePartitionTableNewField(ctx context.Context, client ceresdb.Client, ts int64, fieldName string) error { | ||
| points := make([]ceresdb.Point, 0, 2) | ||
| for i := 0; i < 2; i++ { | ||
| builder := ceresdb.NewPointBuilder(partitionTable). | ||
| SetTimestamp(ts). | ||
| AddTag("name", ceresdb.NewStringValue(fmt.Sprintf("tag-%d", i))). | ||
| AddField("value", ceresdb.NewInt64Value(int64(i))). | ||
| AddField(fieldName, ceresdb.NewStringValue("ss")) | ||
|
|
||
| point, err := builder.Build() | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
| points = append(points, point) | ||
| } | ||
|
|
||
| resp, err := client.Write(ctx, ceresdb.WriteRequest{ | ||
| Points: points, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if resp.Success != 2 { | ||
| return fmt.Errorf("write failed, resp: %+v", resp) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func writePartitionTableNewTag(ctx context.Context, client ceresdb.Client, ts int64, tagName string) error { | ||
| points := make([]ceresdb.Point, 0, 2) | ||
| for i := 0; i < 2; i++ { | ||
| builder := ceresdb.NewPointBuilder(partitionTable). | ||
| SetTimestamp(ts). | ||
| AddTag("name", ceresdb.NewStringValue(fmt.Sprintf("tag-%d", i))). | ||
| AddField("value", ceresdb.NewInt64Value(int64(i))). | ||
| AddTag(tagName, ceresdb.NewStringValue("sstag")). | ||
| AddField(fieldName, ceresdb.NewStringValue("ss")) | ||
|
|
||
| point, err := builder.Build() | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
| points = append(points, point) | ||
| } | ||
|
|
||
| resp, err := client.Write(ctx, ceresdb.WriteRequest{ | ||
| Points: points, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if resp.Success != 2 { | ||
| return fmt.Errorf("write failed, resp: %+v", resp) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func queryPartitionTable(ctx context.Context, client ceresdb.Client, ts int64, timestampName string) error { | ||
| sql := fmt.Sprintf("select t, name, value,%s,%s from %s where %s = %d order by name,%s", fieldName, tagName, partitionTable, timestampName, ts, tagName) | ||
|
|
||
| resp, err := client.SQLQuery(ctx, ceresdb.SQLQueryRequest{ | ||
| Tables: []string{partitionTable}, | ||
| SQL: sql, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if len(resp.Rows) != 4 { | ||
| return fmt.Errorf("expect 2 rows, current: %+v", len(resp.Rows)) | ||
| } | ||
|
|
||
| row0 := []ceresdb.Value{ | ||
| ceresdb.NewInt64Value(ts), | ||
| ceresdb.NewStringValue("tag-0"), | ||
| ceresdb.NewInt64Value(0), | ||
| ceresdb.NewStringValue("ss"), | ||
| ceresdb.NewStringValue("sstag"), | ||
| } | ||
|
|
||
| row1 := []ceresdb.Value{ | ||
| ceresdb.NewInt64Value(ts), | ||
| ceresdb.NewStringValue("tag-0"), | ||
| ceresdb.NewInt64Value(0), | ||
| ceresdb.NewStringValue("ss"), | ||
| } | ||
|
|
||
| row2 := []ceresdb.Value{ | ||
| ceresdb.NewInt64Value(ts), | ||
| ceresdb.NewStringValue("tag-1"), | ||
| ceresdb.NewInt64Value(1), | ||
| ceresdb.NewStringValue("ss"), | ||
| ceresdb.NewStringValue("sstag"), | ||
| } | ||
|
|
||
| row3 := []ceresdb.Value{ | ||
| ceresdb.NewInt64Value(ts), | ||
| ceresdb.NewStringValue("tag-1"), | ||
| ceresdb.NewInt64Value(1), | ||
| ceresdb.NewStringValue("ss"), | ||
| } | ||
|
|
||
| if err := ensureRow(row0, | ||
| resp.Rows[0].Columns()); err != nil { | ||
| return err | ||
| } | ||
| if err := ensureRow(row1, | ||
| resp.Rows[1].Columns()); err != nil { | ||
| return err | ||
| } | ||
| if err := ensureRow(row2, | ||
| resp.Rows[2].Columns()); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return ensureRow(row3, resp.Rows[3].Columns()) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.