fix improper use of data vector without indirection

Author: isaacbrodsky

src/h3_hierarchy.cpp

@@ -92,20 +92,18 @@ static void CellToChildrenFunction(DataChunk &args, ExpressionState &state,
 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];
+    string parentStr = args.GetValue(0, i)
+                           .DefaultCastAs(LogicalType::VARCHAR)
+                           .GetValue<string>();
     int32_t res = args.GetValue(1, i)
                       .DefaultCastAs(LogicalType::INTEGER)
                       .GetValue<int32_t>();
     H3Index parent;
-    H3Error err0 = stringToH3(parentStr.GetString().c_str(), &parent);
+    H3Error err0 = stringToH3(parentStr.c_str(), &parent);
     if (err0) {
       result.SetValue(i, Value(LogicalType::SQLNULL));
     } else {

src/h3_indexing.cpp

@@ -156,19 +156,16 @@ static void CellToLatLngFunction(DataChunk &args, ExpressionState &state,
 
 static void CellToLatLngVarcharFunction(DataChunk &args, ExpressionState &state,
                                         Vector &result) {
-  UnifiedVectorFormat vdata;
-  args.data[0].ToUnifiedFormat(args.size(), vdata);
-
-  auto ldata = UnifiedVectorFormat::GetData<string_t>(vdata);
-
   result.SetVectorType(VectorType::FLAT_VECTOR);
   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 cellAddress = ldata[i];
+    string cellAddress = args.GetValue(0, i)
+                             .DefaultCastAs(LogicalType::VARCHAR)
+                             .GetValue<string>();
     H3Index cell;
-    H3Error err0 = stringToH3(cellAddress.GetString().c_str(), &cell);
+    H3Error err0 = stringToH3(cellAddress.c_str(), &cell);
     if (err0) {
       result.SetValue(i, Value(LogicalType::SQLNULL));
     } else {

src/h3_inspection.cpp

@@ -272,21 +272,18 @@ static void GetIcosahedronFacesFunction(DataChunk &args, ExpressionState &state,
 static void GetIcosahedronFacesVarcharFunction(DataChunk &args,
                                                ExpressionState &state,
                                                Vector &result) {
-  UnifiedVectorFormat vdata;
-  args.data[0].ToUnifiedFormat(args.size(), vdata);
-
-  auto ldata = UnifiedVectorFormat::GetData<string_t>(vdata);
-
   result.SetVectorType(VectorType::FLAT_VECTOR);
   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);
 
     int faceCount;
     int64_t actual = 0;
-    string_t cellAddress = ldata[i];
+    string cellAddress = args.GetValue(0, i)
+                             .DefaultCastAs(LogicalType::VARCHAR)
+                             .GetValue<string>();
     H3Index cell;
-    H3Error err0 = stringToH3(cellAddress.GetString().c_str(), &cell);
+    H3Error err0 = stringToH3(cellAddress.c_str(), &cell);
     if (err0) {
       result.SetValue(i, Value(LogicalType::SQLNULL));
     } else {

test/sql/h3/h3_json.test

@@ -0,0 +1,46 @@
+# name: test/sql/h3/h3_json.test
+# group: [h3]
+
+statement ok
+install json
+
+statement ok
+load json
+
+require h3
+
+statement ok
+create table cells as (
+    select unnest(cells) as cell
+    from 'test/data/cell_order.json'
+);
+
+query I
+select h3_cell_to_children(cell, 6) from cells where cell = '85283083fffffff';
+----
+[862830807ffffff, 86283080fffffff, 862830817ffffff, 86283081fffffff, 862830827ffffff, 86283082fffffff, 862830837ffffff]
+
+query I
+select h3_cell_to_children(cell, 6) from cells where cell = '85283097fffffff';
+----
+[862830947ffffff, 86283094fffffff, 862830957ffffff, 86283095fffffff, 862830967ffffff, 86283096fffffff, 862830977ffffff]
+
+query I
+SELECT list_transform(h3_cell_to_latlng(cell), x-> round(x, 12)) from cells where cell = '85283083fffffff';
+----
+[37.790261155804, -122.345478597884]
+
+query I
+SELECT list_transform(h3_cell_to_latlng(cell), x-> round(x, 12)) from cells where cell = '85283097fffffff';
+----
+[37.699065685397, -122.51211811448]
+
+query I
+select h3_get_icosahedron_faces(cell) from cells where cell = '85283083fffffff';
+----
+[7]
+
+query I
+select h3_get_icosahedron_faces(cell) from cells where cell = '85d02903fffffff';
+----
+[13]