Skip to content

Commit 16c8e1b

Browse files
zerolbsonyzerolbsony
committed
Resolve the problem that the value of String Data type is transfer to "String", but not "Binary".
1 parent 024548e commit 16c8e1b

3 files changed

Lines changed: 47 additions & 46 deletions

File tree

‎integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBAlterColumnTypeIT.java‎

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.apache.tsfile.read.common.Field;
4242
import org.apache.tsfile.read.common.Path;
4343
import org.apache.tsfile.read.common.RowRecord;
44+
import org.apache.tsfile.utils.Binary;
4445
import org.apache.tsfile.write.TsFileWriter;
4546
import org.apache.tsfile.write.record.Tablet;
4647
import org.apache.tsfile.write.schema.IMeasurementSchema;
@@ -59,6 +60,7 @@
5960

6061
import java.io.File;
6162
import java.io.IOException;
63+
import java.nio.charset.StandardCharsets;
6264
import java.nio.file.Files;
6365
import java.sql.Connection;
6466
import java.sql.Statement;
@@ -128,37 +130,37 @@ public void testWriteAndAlter()
128130
// doWriteAndAlter(TSDataType.INT32, TSDataType.FLOAT, false);
129131
// doWriteAndAlter(TSDataType.INT32, TSDataType.FLOAT, true);
130132

131-
for (TSDataType from : typesToTest) {
132-
for (TSDataType to : typesToTest) {
133-
// TSDataType from = TSDataType.INT32;
134-
// TSDataType to = TSDataType.STRING;
135-
// if (from == TSDataType.DATE && to == TSDataType.DATE) {
136-
// continue;
137-
// }
138-
139-
// TSDataType from = TSDataType.DATE;
140-
// TSDataType to = TSDataType.DATE;
141-
142-
/***@todo tmp test***/
143-
// System.out.printf("testing %s to %s%n", from, to);
144-
// doWriteAndAlter(from, to);
145-
// if (from == TSDataType.DATE && to == TSDataType.DATE) {
146-
// continue;
147-
// }
148-
// if (to.isCompatible(from)) {
149-
// testAlignDeviceSequenceDataQuery(from, to);
150-
// testAlignDeviceUnSequenceDataQuery(from, to);
151-
// }
152-
/***@todo tmp test***/
153-
154-
if (from != to && to.isCompatible(from)) {
155-
System.out.printf("testing %s to %s%n", from, to);
156-
doWriteAndAlter(from, to);
157-
testAlignDeviceSequenceDataQuery(from, to);
158-
testAlignDeviceUnSequenceDataQuery(from, to);
159-
}
160-
}
133+
// for (TSDataType from : typesToTest) {
134+
// for (TSDataType to : typesToTest) {
135+
// TSDataType from = TSDataType.INT32;
136+
// TSDataType to = TSDataType.STRING;
137+
// if (from == TSDataType.DATE && to == TSDataType.DATE) {
138+
// continue;
139+
// }
140+
141+
TSDataType from = TSDataType.DATE;
142+
TSDataType to = TSDataType.STRING;
143+
144+
/***@todo tmp test***/
145+
// System.out.printf("testing %s to %s%n", from, to);
146+
// doWriteAndAlter(from, to);
147+
// if (from == TSDataType.DATE && to == TSDataType.DATE) {
148+
// continue;
149+
// }
150+
// if (to.isCompatible(from)) {
151+
// testAlignDeviceSequenceDataQuery(from, to);
152+
// testAlignDeviceUnSequenceDataQuery(from, to);
153+
// }
154+
/***@todo tmp test***/
155+
156+
if (from != to && to.isCompatible(from)) {
157+
System.out.printf("testing %s to %s%n", from, to);
158+
doWriteAndAlter(from, to);
159+
testAlignDeviceSequenceDataQuery(from, to);
160+
testAlignDeviceUnSequenceDataQuery(from, to);
161161
}
162+
// }
163+
// }
162164
}
163165

164166
private void doWriteAndAlter(TSDataType from, TSDataType to)
@@ -260,11 +262,11 @@ private void doWriteAndAlter(TSDataType from, TSDataType to)
260262
assertEquals(genValue(newType, i), rec.getFields().get(1).getDateV());
261263
} else if (newType == TSDataType.STRING || newType == TSDataType.TEXT) {
262264
if (from == TSDataType.DATE) {
263-
assertEquals(genValue(from, i).toString(), rec.getFields().get(1).toString());
264-
//
265-
// getDateStringValue(Integer.parseInt(rec.getFields().get(1).toString())));
265+
assertEquals(
266+
new Binary(genValue(from, i).toString(), StandardCharsets.UTF_8),
267+
rec.getFields().get(1).getBinaryV());
266268
} else {
267-
assertEquals(String.valueOf(genValue(from, i)), rec.getFields().get(1).toString());
269+
assertEquals(newType.castFromSingleValue(from, i), rec.getFields().get(1).getBinaryV());
268270
}
269271
} else {
270272
assertEquals(genValue(newType, i).toString(), rec.getFields().get(1).toString());
@@ -2130,10 +2132,11 @@ private static void standardAccumulatorQueryTest(
21302132
"i is {}, expected value: {}, actual value: {}",
21312133
i,
21322134
TSDataType.getDateStringValue(expectedValue[i]),
2133-
rec.getFields().get(i).toString());
2135+
rec.getFields().get(i).getStringValue());
2136+
// rec.getFields().get(i).getBinaryV().toString());
21342137
assertEquals(
21352138
TSDataType.getDateStringValue(expectedValue[i]),
2136-
rec.getFields().get(i).toString());
2139+
rec.getFields().get(i).getBinaryV().toString());
21372140
} else {
21382141
log.info(
21392142
"i is {}, expected value: {}, actual value: {}",
@@ -2205,9 +2208,11 @@ private static void accumulatorQueryTestForDateType(ITableSession session, TSDat
22052208
"i is {}, expected value: {}, actual value: {}",
22062209
i,
22072210
TSDataType.getDateStringValue(expectedValue[i]),
2208-
rec.getFields().get(i).toString());
2211+
// rec.getFields().get(i).getBinaryV().toString());
2212+
rec.getFields().get(i).getStringValue());
22092213
assertEquals(
2210-
TSDataType.getDateStringValue(expectedValue[i]), rec.getFields().get(i).toString());
2214+
TSDataType.getDateStringValue(expectedValue[i]),
2215+
rec.getFields().get(i).getBinaryV().toString());
22112216
}
22122217
}
22132218
}

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/AlignedTVList.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353

5454
import java.io.DataInputStream;
5555
import java.io.IOException;
56-
import java.nio.charset.StandardCharsets;
5756
import java.util.ArrayList;
5857
import java.util.Arrays;
5958
import java.util.List;
@@ -555,11 +554,9 @@ public Binary getBinaryByValueIndex(int rowIndex, int columnIndex) {
555554
|| dataTypes.get(columnIndex) == TSDataType.STRING) {
556555
return ((Binary[]) columnValues.get(arrayIndex))[elementIndex];
557556
} else {
558-
return new Binary(
559-
(String)
560-
TSDataType.TEXT.castFromSingleValue(
561-
dataTypes.get(columnIndex), getObjectByValueIndex(rowIndex, columnIndex)),
562-
StandardCharsets.UTF_8);
557+
return (Binary)
558+
TSDataType.TEXT.castFromSingleValue(
559+
dataTypes.get(columnIndex), getObjectByValueIndex(rowIndex, columnIndex));
563560
}
564561
}
565562

‎iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/MetadataUtils.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.apache.iotdb.commons.utils;
2121

2222
import org.apache.tsfile.enums.TSDataType;
23-
import org.apache.tsfile.file.metadata.statistics.Statistics;
2423

2524
public class MetadataUtils {
2625

@@ -29,6 +28,6 @@ private MetadataUtils() {
2928
}
3029

3130
public static boolean canAlter(TSDataType from, TSDataType to) {
32-
return Statistics.canMerge(from, to);
31+
return to.isCompatible(from);
3332
}
3433
}

0 commit comments

Comments
 (0)