Skip to content

Fix data type conversion for spark iotdb table connector #64

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

Merged
JackieTien97 merged 1 commit into from
Apr 24, 2025
Merged

Fix data type conversion for spark iotdb table connector #64

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
8 changes: 7 additions & 1 deletion .../spark-iotdb-table-common/src/main/scala/org/apache/iotdb/spark/table/db/IoTDBUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,13 @@ object IoTDBUtils {
case BinaryType => TSDataType.BLOB
case DateType => TSDataType.DATE
case TimestampType => TSDataType.STRING
case _ => TSDataType.STRING
case _ => {
var errMsg = s"Unable to convert Spark data type $sparkDataType to IoTDB data type."
if (sparkDataType.simpleString.toLowerCase.contains("decimal")) {
errMsg += s"For float numbers in insert into values sql, you should add the suffix 'f' or 'd' to represent float or double."
}
throw new IllegalArgumentException(errMsg)
}
}
}

Expand Down
11 changes: 8 additions & 3 deletions ...b-table-common/src/main/scala/org/apache/iotdb/spark/table/db/write/IoTDBDataWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import org.apache.spark.SparkException
import org.apache.spark.internal.Logging
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.connector.write.{DataWriter, WriterCommitMessage}
import org.apache.spark.sql.types.StructType
import org.apache.spark.sql.types.{NullType, StructType}
import org.apache.tsfile.enums.TSDataType
import org.apache.tsfile.write.record.Tablet
import org.apache.tsfile.write.record.Tablet.ColumnCategory
Expand Down Expand Up @@ -57,10 +57,15 @@ class IoTDBDataWriter(options: IoTDBOptions, writeSchema: StructType, tableSchem
} else {
tableSchema.fields(i)
}
val columnCategoryStr = tableSchemaMap.getOrElse(fieldInTableSchema.name, tableSchema.fields(i)).metadata.getString(IoTDBUtils.COLUMN_CATEGORY)
val actualColumnSchema = tableSchemaMap.getOrElse(fieldInTableSchema.name, tableSchema.fields(i))
val columnCategoryStr = actualColumnSchema.metadata.getString(IoTDBUtils.COLUMN_CATEGORY)
val columnCategory = IoTDBUtils.getIoTDBColumnCategory(columnCategoryStr)
if (fieldInTableSchema.name != IoTDBUtils.TIME) {
val dataType = writeSchemaField.dataType
val dataType = if (writeSchemaField.dataType == NullType) {
actualColumnSchema.dataType
} else {
writeSchemaField.dataType
}
columnNameList.add(fieldInTableSchema.name)
dataTypeList.add(IoTDBUtils.getIoTDBDataType(dataType))
columnCategoryList.add(columnCategory)
Expand Down