-
Notifications
You must be signed in to change notification settings - Fork 205
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: timestamp column should not be auto added (#787)
* fix: fix issue 779 * refactor by CR * modify ci
- Loading branch information
1 parent
72f1701
commit 6205de9
Showing
7 changed files
with
216 additions
and
151 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/CeresDB/ceresdb-client-go/ceresdb" | ||
| ) | ||
|
|
||
| func checkAutoAddColumns(ctx context.Context, client ceresdb.Client) error { | ||
| timestampName := "timestamp" | ||
| err := dropTable(ctx, client) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| err = writeAndQuery(ctx, client, timestampName) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return writeAndQueryWithNewColumns(ctx, client, timestampName) | ||
| } |
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,28 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/CeresDB/ceresdb-client-go/ceresdb" | ||
| ) | ||
|
|
||
| func checkAutoAddColumnsWithCreateTable(ctx context.Context, client ceresdb.Client) error { | ||
| timestampName := "t" | ||
|
|
||
| err := dropTable(ctx, client) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| err = createTable(ctx, client, timestampName) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| err = writeAndQuery(ctx, client, timestampName) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return writeAndQueryWithNewColumns(ctx, client, timestampName) | ||
| } |
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,151 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/CeresDB/ceresdb-client-go/ceresdb" | ||
| ) | ||
|
|
||
| const table = "godemo" | ||
|
|
||
| func createTable(ctx context.Context, client ceresdb.Client, timestampName string) error { | ||
| _, err := ddl(ctx, client, fmt.Sprintf("create table %s (%s timestamp not null, name string tag, value int64,TIMESTAMP KEY(t))", table, timestampName)) | ||
| return err | ||
| } | ||
|
|
||
| func write(ctx context.Context, client ceresdb.Client, ts int64, addNewColumn bool) error { | ||
| points := make([]ceresdb.Point, 0, 2) | ||
| for i := 0; i < 2; i++ { | ||
| builder := ceresdb.NewPointBuilder(table). | ||
| SetTimestamp(ts). | ||
| AddTag("name", ceresdb.NewStringValue(fmt.Sprintf("tag-%d", i))). | ||
| AddField("value", ceresdb.NewInt64Value(int64(i))) | ||
|
|
||
| if addNewColumn { | ||
| builder = builder.AddTag("new_tag", ceresdb.NewStringValue(fmt.Sprintf("new-tag-%d", i))). | ||
| AddField("new_field", ceresdb.NewInt64Value(int64(i))) | ||
| } | ||
|
|
||
| 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 ensureRow(expectedVals []ceresdb.Value, actualRow []ceresdb.Column) error { | ||
| for i, expected := range expectedVals { | ||
| if actual := actualRow[i].Value(); actual != expected { | ||
| return fmt.Errorf("expected: %+v, actual: %+v", expected, actual) | ||
| } | ||
| } | ||
| return nil | ||
|
|
||
| } | ||
|
|
||
| func query(ctx context.Context, client ceresdb.Client, ts int64, timestampName string, addNewColumn bool) error { | ||
| resp, err := client.SQLQuery(ctx, ceresdb.SQLQueryRequest{ | ||
| Tables: []string{table}, | ||
| SQL: fmt.Sprintf("select * from %s where %s = %d order by name", table, timestampName, ts), | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if len(resp.Rows) != 2 { | ||
| return fmt.Errorf("expect 2 rows, current: %+v", len(resp.Rows)) | ||
| } | ||
|
|
||
| row0 := []ceresdb.Value{ | ||
| ceresdb.NewUint64Value(4024844655630594205), | ||
| ceresdb.NewInt64Value(ts), | ||
| ceresdb.NewStringValue("tag-0"), | ||
| ceresdb.NewInt64Value(0)} | ||
|
|
||
| row1 := []ceresdb.Value{ | ||
| ceresdb.NewUint64Value(14230010170561829440), | ||
| ceresdb.NewInt64Value(ts), | ||
| ceresdb.NewStringValue("tag-1"), | ||
| ceresdb.NewInt64Value(1), | ||
| } | ||
|
|
||
| if addNewColumn { | ||
| row0[0] = ceresdb.NewUint64Value(8341999341185504339) | ||
| row1[0] = ceresdb.NewUint64Value(4452331151453582498) | ||
| row0 = append(row0, ceresdb.NewInt64Value(0), ceresdb.NewStringValue("new-tag-0")) | ||
| row1 = append(row1, ceresdb.NewInt64Value(1), ceresdb.NewStringValue("new-tag-1")) | ||
| } | ||
|
|
||
| if err := ensureRow(row0, | ||
| resp.Rows[0].Columns()); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return ensureRow(row1, resp.Rows[1].Columns()) | ||
| } | ||
|
|
||
| func ddl(ctx context.Context, client ceresdb.Client, sql string) (uint32, error) { | ||
| resp, err := client.SQLQuery(ctx, ceresdb.SQLQueryRequest{ | ||
| Tables: []string{table}, | ||
| SQL: sql, | ||
| }) | ||
| if err != nil { | ||
| return 0, err | ||
| } | ||
|
|
||
| return resp.AffectedRows, nil | ||
| } | ||
|
|
||
| func writeAndQuery(ctx context.Context, client ceresdb.Client, timestampName string) error { | ||
| ts := currentMS() | ||
| if err := write(ctx, client, ts, false); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := query(ctx, client, ts, timestampName, false); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func writeAndQueryWithNewColumns(ctx context.Context, client ceresdb.Client, timestampName string) error { | ||
| ts := currentMS() | ||
| if err := write(ctx, client, ts, true); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := query(ctx, client, ts, timestampName, true); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func dropTable(ctx context.Context, client ceresdb.Client) error { | ||
| affected, err := ddl(ctx, client, "drop table if exists "+table) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if affected != 0 { | ||
| panic(fmt.Sprintf("drop table expected 0, actual is %d", affected)) | ||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.