Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion src/paimon/common/types/data_type_json_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ class TokenParser {
template <typename T>
Result<std::shared_ptr<arrow::DataType>> ParseStringType();
Result<std::shared_ptr<arrow::DataType>> ParseDecimalType();
Result<std::shared_ptr<arrow::DataType>> ParseBinaryType();
Result<std::shared_ptr<arrow::DataType>> ParseDoubleType();
Result<std::shared_ptr<arrow::DataType>> ParseTimestampType();
Result<std::shared_ptr<arrow::DataType>> ParseTimestampLtzType();
Expand Down Expand Up @@ -465,7 +466,8 @@ Result<std::shared_ptr<arrow::DataType>> TokenParser::ParseTypeByKeyword(bool* i
PAIMON_RETURN_NOT_OK(NextToken(TokenType::KEYWORD));
switch (TokenAsKeyword()) {
case Keyword::BYTES:
return arrow::binary();
case Keyword::BINARY:
return ParseBinaryType();
case Keyword::BLOB: {
*is_blob = true;
return arrow::large_binary();
Expand Down Expand Up @@ -538,6 +540,16 @@ Result<std::shared_ptr<arrow::DataType>> TokenParser::ParseDecimalType() {
return arrow::decimal128(precision, scale);
}

Result<std::shared_ptr<arrow::DataType>> TokenParser::ParseBinaryType() {
if (HasNextToken({TokenType::BEGIN_PARAMETER})) {
PAIMON_RETURN_NOT_OK(NextToken(TokenType::BEGIN_PARAMETER));
// length of bytes is ignored.
PAIMON_RETURN_NOT_OK(NextToken(TokenType::LITERAL_INT));
PAIMON_RETURN_NOT_OK(NextToken(TokenType::END_PARAMETER));
}
return arrow::binary();
}

Result<std::shared_ptr<arrow::DataType>> TokenParser::ParseDoubleType() {
if (HasNextToken({Keyword::PRECISION})) {
PAIMON_RETURN_NOT_OK(NextToken(Keyword::PRECISION));
Expand Down
3 changes: 2 additions & 1 deletion src/paimon/fs/local/local_file_system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ Result<LocalFile> LocalFileSystem::ToFile(const std::string& path_string) const
// rewritten to "/tmp"
PAIMON_ASSIGN_OR_RAISE(Path path, PathUtil::ToPath(path_string));
if (!path.scheme.empty() && StringUtils::ToLowerCase(path.scheme) != "file") {
return Status::Invalid(fmt::format("invalid scheme {} for local file system", path.scheme));
return Status::Invalid(
fmt::format("{} invalid scheme {} for local file system", path_string, path.scheme));
}
return LocalFile(path.path);
}
Expand Down
Loading