Skip to content
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

Jump to bottom

Varchar input/output for hierarchy except for compact #112

Merged
merged 6 commits into from
Jun 26, 2024
Merged

Varchar input/output for hierarchy except for compact #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
03a2977
rename to h3
isaacbrodsky Jun 25, 2024
f7ed5c2
cell_to_parent
isaacbrodsky Jun 26, 2024
bac6652
cell_to_children
isaacbrodsky Jun 26, 2024
ca853bb
child pos, center child
isaacbrodsky Jun 26, 2024
dd2af85
README
isaacbrodsky Jun 26, 2024
2e77ab3
Merge branch 'main' into varchar-hierarchy
isaacbrodsky Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ one to use. The unsigned and signed APIs are identical. Many functions also supp
| `h3_is_res_class_iii` | [v](#fv) | True if the cell's resolution is class III
| `h3_is_pentagon` | [v](#fv) | True if the cell is a pentagon
| `h3_get_icosahedron_faces` | [v](#fv) | List of icosahedron face IDs the cell is on
| `h3_cell_to_parent` | [i](#fi) | Get coarser cell for a cell
| `h3_cell_to_children` | [i](#fi) | Get finer cells for a cell
| `h3_cell_to_center_child` | [i](#fi) | Get the center finer cell for a cell
| `h3_cell_to_child_pos` | [i](#fi) | Get a sub-indexing number for a cell inside a parent
| `h3_child_pos_to_cell` | [i](#fi) | Convert parent and sub-indexing number to a cell ID
| `h3_cell_to_parent` | [v](#fv) | Get coarser cell for a cell
| `h3_cell_to_children` | [v](#fv) | Get finer cells for a cell
| `h3_cell_to_center_child` | [v](#fv) | Get the center finer cell for a cell
| `h3_cell_to_child_pos` | [v](#fv) | Get a sub-indexing number for a cell inside a parent
| `h3_child_pos_to_cell` | [v](#fv) | Convert parent and sub-indexing number to a cell ID
| `h3_compact_cells` | [i](#fi) | Convert a set of single-resolution cells to the minimal mixed-resolution set
| `h3_uncompact_cells` | [i](#fi) | Convert a mixed-resolution set to a single-resolution set of cells
| `h3_grid_disk` | [i](#fi) | Find cells within a grid distance
Expand Down
187 changes: 180 additions & 7 deletions src/h3_hierarchy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,33 @@ static void CellToParentFunction(DataChunk &args, ExpressionState &state,
});
}

static void CellToParentVarcharFunction(DataChunk &args, ExpressionState &state,
Vector &result) {
auto &inputs = args.data[0];
auto &inputs2 = args.data[1];
BinaryExecutor::ExecuteWithNulls<string_t, int, string_t>(
inputs, inputs2, result, args.size(),
[&](string_t input, int res, ValidityMask &mask, idx_t idx) {
H3Index h;
H3Error err0 = stringToH3(input.GetString().c_str(), &h);
if (err0) {
mask.SetInvalid(idx);
return StringVector::EmptyString(result, 0);
} else {
H3Index parent;
H3Error err1 = cellToParent(h, res, &parent);
if (err1) {
mask.SetInvalid(idx);
return StringVector::EmptyString(result, 0);
} else {
auto str = StringUtil::Format("%llx", parent);
string_t strAsStr = string_t(strdup(str.c_str()), str.size());
return StringVector::AddString(result, strAsStr);
}
}
});
}

static void CellToChildrenFunction(DataChunk &args, ExpressionState &state,
Vector &result) {
auto result_data = FlatVector::GetData<list_entry_t>(result);
Expand Down Expand Up @@ -59,6 +86,82 @@ static void CellToChildrenFunction(DataChunk &args, ExpressionState &state,
result.Verify(args.size());
}

static void CellToChildrenVarcharFunction(DataChunk &args,
ExpressionState &state,
Vector &result) {
UnifiedVectorFormat vdata;
args.data[0].ToUnifiedFormat(args.size(), vdata);
auto ldata = UnifiedVectorFormat::GetData<string_t>(vdata);

auto result_data = FlatVector::GetData<list_entry_t>(result);
for (idx_t i = 0; i < args.size(); i++) {
result_data[i].offset = ListVector::GetListSize(result);

string_t parentStr = ldata[i];
int32_t res = args.GetValue(1, i)
.DefaultCastAs(LogicalType::INTEGER)
.GetValue<int32_t>();
H3Index parent;
H3Error err0 = stringToH3(parentStr.GetString().c_str(), &parent);
if (err0) {
result.SetValue(i, Value(LogicalType::SQLNULL));
} else {
int64_t sz;
H3Error err1 = cellToChildrenSize(parent, res, &sz);
if (err1) {
result.SetValue(i, Value(LogicalType::SQLNULL));
} else {
std::vector<H3Index> out(sz);
H3Error err2 = cellToChildren(parent, res, out.data());
if (err2) {
result.SetValue(i, Value(LogicalType::SQLNULL));
} else {
int64_t actual = 0;
for (auto val : out) {
if (val != H3_NULL) {
auto str = StringUtil::Format("%llx", val);
string_t strAsStr = string_t(strdup(str.c_str()), str.size());
ListVector::PushBack(result, strAsStr);
actual++;
}
}

result_data[i].length = actual;
}
}
}
}
result.Verify(args.size());
}

static void CellToCenterChildVarcharFunction(DataChunk &args,
ExpressionState &state,
Vector &result) {
auto &inputs = args.data[0];
auto &inputs2 = args.data[1];
BinaryExecutor::ExecuteWithNulls<string_t, int, string_t>(
inputs, inputs2, result, args.size(),
[&](string_t input, int res, ValidityMask &mask, idx_t idx) {
H3Index h;
H3Error err0 = stringToH3(input.GetString().c_str(), &h);
if (err0) {
mask.SetInvalid(idx);
return StringVector::EmptyString(result, 0);
} else {
H3Index parent;
H3Error err1 = cellToCenterChild(h, res, &parent);
if (err1) {
mask.SetInvalid(idx);
return StringVector::EmptyString(result, 0);
} else {
auto str = StringUtil::Format("%llx", parent);
string_t strAsStr = string_t(strdup(str.c_str()), str.size());
return StringVector::AddString(result, strAsStr);
}
}
});
}

static void CellToCenterChildFunction(DataChunk &args, ExpressionState &state,
Vector &result) {
auto &inputs = args.data[0];
Expand All @@ -77,6 +180,32 @@ static void CellToCenterChildFunction(DataChunk &args, ExpressionState &state,
});
}

static void CellToChildPosVarcharFunction(DataChunk &args,
ExpressionState &state,
Vector &result) {
auto &inputs = args.data[0];
auto &inputs2 = args.data[1];
BinaryExecutor::ExecuteWithNulls<string_t, int, int64_t>(
inputs, inputs2, result, args.size(),
[&](string_t input, int res, ValidityMask &mask, idx_t idx) {
H3Index h;
H3Error err0 = stringToH3(input.GetString().c_str(), &h);
if (err0) {
mask.SetInvalid(idx);
return int64_t(0);
} else {
int64_t child;
H3Error err1 = cellToChildPos(h, res, &child);
if (err1) {
mask.SetInvalid(idx);
return int64_t(0);
} else {
return child;
}
}
});
}

static void CellToChildPosFunction(DataChunk &args, ExpressionState &state,
Vector &result) {
auto &inputs = args.data[0];
Expand All @@ -95,6 +224,35 @@ static void CellToChildPosFunction(DataChunk &args, ExpressionState &state,
});
}

static void ChildPosToCellVarcharFunction(DataChunk &args,
ExpressionState &state,
Vector &result) {
auto &inputs = args.data[0];
auto &inputs2 = args.data[1];
auto &inputs3 = args.data[2];
TernaryExecutor::ExecuteWithNulls<int64_t, string_t, int, string_t>(
inputs, inputs2, inputs3, result, args.size(),
[&](int64_t pos, string_t input, int res, ValidityMask &mask, idx_t idx) {
H3Index h;
H3Error err0 = stringToH3(input.GetString().c_str(), &h);
if (err0) {
mask.SetInvalid(idx);
return StringVector::EmptyString(result, 0);
} else {
H3Index child;
H3Error err = childPosToCell(pos, h, res, &child);
if (err) {
mask.SetInvalid(idx);
return StringVector::EmptyString(result, 0);
} else {
auto str = StringUtil::Format("%llx", child);
string_t strAsStr = string_t(strdup(str.c_str()), str.size());
return StringVector::AddString(result, strAsStr);
}
}
});
}

static void ChildPosToCellFunction(DataChunk &args, ExpressionState &state,
Vector &result) {
auto &inputs = args.data[0];
Expand Down Expand Up @@ -275,7 +433,9 @@ static void UncompactCellsFunction(DataChunk &args, ExpressionState &state,

CreateScalarFunctionInfo H3Functions::GetCellToParentFunction() {
ScalarFunctionSet funcs("h3_cell_to_parent");
// TODO: VARCHAR variant of this function
funcs.AddFunction(ScalarFunction({LogicalType::VARCHAR, LogicalType::INTEGER},
LogicalType::VARCHAR,
CellToParentVarcharFunction));
funcs.AddFunction(ScalarFunction({LogicalType::UBIGINT, LogicalType::INTEGER},
LogicalType::UBIGINT, CellToParentFunction));
funcs.AddFunction(ScalarFunction({LogicalType::BIGINT, LogicalType::INTEGER},
Expand All @@ -285,7 +445,9 @@ CreateScalarFunctionInfo H3Functions::GetCellToParentFunction() {

CreateScalarFunctionInfo H3Functions::GetCellToChildrenFunction() {
ScalarFunctionSet funcs("h3_cell_to_children");
// TODO: VARCHAR variant of this function
funcs.AddFunction(ScalarFunction({LogicalType::VARCHAR, LogicalType::INTEGER},
LogicalType::LIST(LogicalType::VARCHAR),
CellToChildrenVarcharFunction));
funcs.AddFunction(ScalarFunction({LogicalType::UBIGINT, LogicalType::INTEGER},
LogicalType::LIST(LogicalType::UBIGINT),
CellToChildrenFunction));
Expand All @@ -297,7 +459,9 @@ CreateScalarFunctionInfo H3Functions::GetCellToChildrenFunction() {

CreateScalarFunctionInfo H3Functions::GetCellToCenterChildFunction() {
ScalarFunctionSet funcs("h3_cell_to_center_child");
// TODO: VARCHAR variant of this function
funcs.AddFunction(ScalarFunction({LogicalType::VARCHAR, LogicalType::INTEGER},
LogicalType::VARCHAR,
CellToCenterChildVarcharFunction));
funcs.AddFunction(ScalarFunction({LogicalType::UBIGINT, LogicalType::INTEGER},
LogicalType::UBIGINT,
CellToCenterChildFunction));
Expand All @@ -309,8 +473,10 @@ CreateScalarFunctionInfo H3Functions::GetCellToCenterChildFunction() {

CreateScalarFunctionInfo H3Functions::GetCellToChildPosFunction() {
ScalarFunctionSet funcs("h3_cell_to_child_pos");
// TODO: VARCHAR variant of this function
// Note this does not return an index, rather it returns a position ID
funcs.AddFunction(ScalarFunction({LogicalType::VARCHAR, LogicalType::INTEGER},
LogicalType::BIGINT,
CellToChildPosVarcharFunction));
funcs.AddFunction(ScalarFunction({LogicalType::UBIGINT, LogicalType::INTEGER},
LogicalType::BIGINT,
CellToChildPosFunction));
Expand All @@ -322,7 +488,9 @@ CreateScalarFunctionInfo H3Functions::GetCellToChildPosFunction() {

CreateScalarFunctionInfo H3Functions::GetChildPosToCellFunction() {
ScalarFunctionSet funcs("h3_child_pos_to_cell");
// TODO: VARCHAR variant of this function
funcs.AddFunction(ScalarFunction(
{LogicalType::BIGINT, LogicalType::VARCHAR, LogicalType::INTEGER},
LogicalType::VARCHAR, ChildPosToCellVarcharFunction));
funcs.AddFunction(ScalarFunction(
{LogicalType::BIGINT, LogicalType::UBIGINT, LogicalType::INTEGER},
LogicalType::UBIGINT, ChildPosToCellFunction));
Expand All @@ -334,7 +502,9 @@ CreateScalarFunctionInfo H3Functions::GetChildPosToCellFunction() {

CreateScalarFunctionInfo H3Functions::GetCompactCellsFunction() {
ScalarFunctionSet funcs("h3_compact_cells");
// TODO: VARCHAR variant of this function
// funcs.AddFunction(ScalarFunction({LogicalType::LIST(LogicalType::VARCHAR)},
// LogicalType::LIST(LogicalType::VARCHAR),
// CompactCellsVarcharFunction));
funcs.AddFunction(ScalarFunction({LogicalType::LIST(LogicalType::UBIGINT)},
LogicalType::LIST(LogicalType::UBIGINT),
CompactCellsFunction));
Expand All @@ -346,7 +516,10 @@ CreateScalarFunctionInfo H3Functions::GetCompactCellsFunction() {

CreateScalarFunctionInfo H3Functions::GetUncompactCellsFunction() {
ScalarFunctionSet funcs("h3_uncompact_cells");
// TODO: VARCHAR variant of this function
// funcs.AddFunction(ScalarFunction(
// {LogicalType::LIST(LogicalType::VARCHAR), LogicalType::INTEGER},
// LogicalType::LIST(LogicalType::VARCHAR),
// UncompactCellsVarcharFunction));
funcs.AddFunction(ScalarFunction(
{LogicalType::LIST(LogicalType::UBIGINT), LogicalType::INTEGER},
LogicalType::LIST(LogicalType::UBIGINT), UncompactCellsFunction));
Expand Down