Skip to content

Commit 52e3fe5

Browse files
shuwenweishuwenwei
authored
rename table model fields (#114)
1 parent 8ed5752 commit 52e3fe5

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎client/tablet.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ type MeasurementSchema struct {
3636
type ColumnCategory int8
3737

3838
const (
39-
ID = iota
40-
MEASUREMENT
39+
TAG = iota
40+
FIELD
4141
ATTRIBUTE
4242
)
4343

‎example/session_pool/table/table_session_pool_example.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func putBackToSessionPoolExample() {
6868
}()
6969
checkError(session.ExecuteNonQueryStatement("create database " + dbName))
7070
checkError(session.ExecuteNonQueryStatement("use " + dbName))
71-
checkError(session.ExecuteNonQueryStatement("create table table_of_" + dbName + " (id1 string id, id2 string id, s1 text measurement, s2 text measurement)"))
71+
checkError(session.ExecuteNonQueryStatement("create table table_of_" + dbName + " (tag1 string tag, tag2 string tag, s1 text field, s2 text field)"))
7272
}()
7373
}
7474
wg.Wait()
@@ -126,7 +126,7 @@ func sessionPoolWithSpecificDatabaseExample() {
126126
return
127127
}
128128
defer session.Close()
129-
checkError(session.ExecuteNonQueryStatement("create table " + tableName + " (id1 string id, id2 string id, s1 text measurement, s2 text measurement)"))
129+
checkError(session.ExecuteNonQueryStatement("create table " + tableName + " (tag1 string tag, tag2 string tag, s1 text field, s2 text field)"))
130130
}()
131131
}
132132
wg.Wait()
@@ -156,7 +156,7 @@ func sessionPoolWithoutSpecificDatabaseExample() {
156156
defer session.Close()
157157
checkError(session.ExecuteNonQueryStatement("create database " + dbName))
158158
checkError(session.ExecuteNonQueryStatement("use " + dbName))
159-
checkError(session.ExecuteNonQueryStatement("create table t1 (id1 string id, id2 string id, s1 text measurement, s2 text measurement)"))
159+
checkError(session.ExecuteNonQueryStatement("create table t1 (tag1 string tag, tag2 string tag, s1 text field, s2 text field)"))
160160
}()
161161
}
162162
wg.Wait()

‎example/table/table_session_example.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func main() {
4646

4747
checkError(session.ExecuteNonQueryStatement("create database test_db"))
4848
checkError(session.ExecuteNonQueryStatement("use test_db"))
49-
checkError(session.ExecuteNonQueryStatement("create table t1 (id1 string id, id2 string id, s1 text measurement, s2 text measurement)"))
49+
checkError(session.ExecuteNonQueryStatement("create table t1 (tag1 string tag, tag2 string tag, s1 text field, s2 text field)"))
5050
insertRelationalTablet(session)
5151
showTables(session)
5252
query(session)
@@ -63,11 +63,11 @@ func getTextValueFromDataSet(dataSet *client.SessionDataSet, columnName string)
6363
func insertRelationalTablet(session client.ITableSession) {
6464
tablet, err := client.NewRelationalTablet("t1", []*client.MeasurementSchema{
6565
{
66-
Measurement: "id1",
66+
Measurement: "tag1",
6767
DataType: client.STRING,
6868
},
6969
{
70-
Measurement: "id2",
70+
Measurement: "tag2",
7171
DataType: client.STRING,
7272
},
7373
{
@@ -78,16 +78,16 @@ func insertRelationalTablet(session client.ITableSession) {
7878
Measurement: "s2",
7979
DataType: client.TEXT,
8080
},
81-
}, []client.ColumnCategory{client.ID, client.ID, client.MEASUREMENT, client.MEASUREMENT}, 1024)
81+
}, []client.ColumnCategory{client.TAG, client.TAG, client.FIELD, client.FIELD}, 1024)
8282
if err != nil {
8383
log.Fatal("Failed to create relational tablet {}", err)
8484
}
8585
ts := time.Now().UTC().UnixNano() / 1000000
8686
for row := 0; row < 16; row++ {
8787
ts++
8888
tablet.SetTimestamp(ts, row)
89-
tablet.SetValueAt("id1_field_"+strconv.Itoa(row), 0, row)
90-
tablet.SetValueAt("id2_field_"+strconv.Itoa(row), 1, row)
89+
tablet.SetValueAt("tag1_value_"+strconv.Itoa(row), 0, row)
90+
tablet.SetValueAt("tag2_value_"+strconv.Itoa(row), 1, row)
9191
tablet.SetValueAt("s1_value_"+strconv.Itoa(row), 2, row)
9292
tablet.SetValueAt("s2_value_"+strconv.Itoa(row), 3, row)
9393
tablet.RowSize++
@@ -99,8 +99,8 @@ func insertRelationalTablet(session client.ITableSession) {
9999
for row := 0; row < 16; row++ {
100100
ts++
101101
tablet.SetTimestamp(ts, row)
102-
tablet.SetValueAt("id1_field_1", 0, row)
103-
tablet.SetValueAt("id2_field_1", 1, row)
102+
tablet.SetValueAt("tag1_value_1", 0, row)
103+
tablet.SetValueAt("tag2_value_1", 1, row)
104104
tablet.SetValueAt("s1_value_"+strconv.Itoa(row), 2, row)
105105
tablet.SetValueAt("s2_value_"+strconv.Itoa(row), 3, row)
106106

@@ -143,7 +143,7 @@ func query(session client.ITableSession) {
143143
if !hasNext {
144144
break
145145
}
146-
log.Printf("%v %v %v %v", getTextValueFromDataSet(dataSet, "id1"), getTextValueFromDataSet(dataSet, "id2"), getTextValueFromDataSet(dataSet, "s1"), getTextValueFromDataSet(dataSet, "s2"))
146+
log.Printf("%v %v %v %v", getTextValueFromDataSet(dataSet, "tag1"), getTextValueFromDataSet(dataSet, "tag2"), getTextValueFromDataSet(dataSet, "s1"), getTextValueFromDataSet(dataSet, "s2"))
147147
}
148148
}
149149

‎test/e2e/e2e_table_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func (s *e2eTableTestSuite) Test_GetSessionFromSessionPoolWithSpecificDatabase()
183183

184184
session1, err := sessionPool.GetSession()
185185
assert.NoError(err)
186-
s.checkError(session1.ExecuteNonQueryStatement("create table table_in_" + database + " (id1 string id, id2 string id, s1 text measurement, s2 text measurement)"))
186+
s.checkError(session1.ExecuteNonQueryStatement("create table table_in_" + database + " (tag1 string tag, tag2 string tag, s1 text field, s2 text field)"))
187187
session1.Close()
188188

189189
var wg sync.WaitGroup
@@ -239,7 +239,7 @@ func (s *e2eTableTestSuite) Test_GetSessionFromSessionPoolWithSpecificDatabase()
239239

240240
func (s *e2eTableTestSuite) Test_InsertTabletAndQuery() {
241241
assert := s.Require()
242-
s.checkError(s.session.ExecuteNonQueryStatement("create table t1 (id1 string id, id2 string id, s1 text measurement, s2 text measurement)"))
242+
s.checkError(s.session.ExecuteNonQueryStatement("create table t1 (tag1 string tag, tag2 string tag, s1 text field, s2 text field)"))
243243

244244
timeoutInMs := int64(10000)
245245

@@ -255,11 +255,11 @@ func (s *e2eTableTestSuite) Test_InsertTabletAndQuery() {
255255
// insert relational tablet
256256
tablet, err := client.NewRelationalTablet("t1", []*client.MeasurementSchema{
257257
{
258-
Measurement: "id1",
258+
Measurement: "tag1",
259259
DataType: client.STRING,
260260
},
261261
{
262-
Measurement: "id2",
262+
Measurement: "tag2",
263263
DataType: client.STRING,
264264
},
265265
{
@@ -270,18 +270,18 @@ func (s *e2eTableTestSuite) Test_InsertTabletAndQuery() {
270270
Measurement: "s2",
271271
DataType: client.TEXT,
272272
},
273-
}, []client.ColumnCategory{client.ID, client.ID, client.MEASUREMENT, client.MEASUREMENT}, 1024)
273+
}, []client.ColumnCategory{client.TAG, client.TAG, client.FIELD, client.FIELD}, 1024)
274274
assert.NoError(err)
275275

276276
values := [][]interface{}{
277-
{"id1_field_1", "id2_field_1", "s1_value_1", "s2_value_1"},
278-
{"id1_field_1", "id2_field_1", "s1_value_2", "s2_value_2"},
279-
{"id1_field_1", "id2_field_1", nil, "s2_value_2"},
280-
{"id1_field_2", "id2_field_2", "s1_value_1", "s2_value_1"},
281-
{"id1_field_2", "id2_field_2", "s1_value_1", "s2_value_1"},
282-
{"id1_field_3", "id2_field_3", "s1_value_1", "s2_value_1"},
283-
{"id1_field_3", "id2_field_3", "s1_value_2", nil},
284-
{"id1_field_3", "id2_field_3", "s1_value_3", "s2_value_3"},
277+
{"tag1_value_1", "tag2_value_1", "s1_value_1", "s2_value_1"},
278+
{"tag1_value_1", "tag2_value_1", "s1_value_2", "s2_value_2"},
279+
{"tag1_value_1", "tag2_value_1", nil, "s2_value_2"},
280+
{"tag1_value_2", "tag2_value_2", "s1_value_1", "s2_value_1"},
281+
{"tag1_value_2", "tag2_value_2", "s1_value_1", "s2_value_1"},
282+
{"tag1_value_3", "tag2_value_3", "s1_value_1", "s2_value_1"},
283+
{"tag1_value_3", "tag2_value_3", "s1_value_2", nil},
284+
{"tag1_value_3", "tag2_value_3", "s1_value_3", "s2_value_3"},
285285
}
286286

287287
ts := int64(0)
@@ -308,8 +308,8 @@ func (s *e2eTableTestSuite) Test_InsertTabletAndQuery() {
308308
break
309309
}
310310
assert.Equal(count, dataSet.GetInt64("time"))
311-
assert.Equal(values[count][0], getValueFromDataSet(dataSet, "id1"))
312-
assert.Equal(values[count][1], getValueFromDataSet(dataSet, "id2"))
311+
assert.Equal(values[count][0], getValueFromDataSet(dataSet, "tag1"))
312+
assert.Equal(values[count][1], getValueFromDataSet(dataSet, "tag2"))
313313
assert.Equal(values[count][2], getValueFromDataSet(dataSet, "s1"))
314314
assert.Equal(values[count][3], getValueFromDataSet(dataSet, "s2"))
315315
count++

0 commit comments

Comments
 (0)