Fixes for R client and rest server

duckdb · Feb 24, 2020 · dbd9ab5 · dbd9ab5
1 parent 2a55c4d
commit dbd9ab5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/tools/rest/server.cpp b/tools/rest/server.cpp
@@ -106,9 +106,18 @@ void serialize_chunk(QueryResult *res, DataChunk *chunk, json &j) {
 		case TypeId::DOUBLE:
 			assign_json_loop<float, double>(v, col_idx, j);
 			break;
-		case TypeId::VARCHAR:
-			assign_json_loop<char *, char *>(v, col_idx, j);
+		case TypeId::VARCHAR: {
+			auto data_ptr = (string_t *)v->GetData();
+			VectorOperations::Exec(*v, [&](index_t i, index_t k) {
+				if (!v->nullmask[i]) {
+					j["data"][col_idx] += data_ptr[i].GetData();
+
+				} else {
+					j["data"][col_idx] += nullptr;
+				}
+			});
 			break;
+		}
 		default:
 			throw std::runtime_error("Unsupported Type");
 		}

diff --git a/tools/rpkg/src/duckdbr.cpp b/tools/rpkg/src/duckdbr.cpp
@@ -85,27 +85,27 @@ static void AppendColumnSegment(SRC *source_data, Vector &result, index_t count)
 }
 
 static void AppendStringSegment(SEXP coldata, Vector &result, index_t row_idx, index_t count) {
-	auto result_data = (const char **)result.GetData();
+	auto result_data = (string_t*) result.GetData();
 	for (index_t i = 0; i < count; i++) {
 		SEXP val = STRING_ELT(coldata, row_idx + i);
 		if (val == NA_STRING) {
 			result.nullmask[i] = true;
 		} else {
-			result_data[i] = CHAR(val);
+			result_data[i] = string_t((char*) CHAR(val));
 		}
 	}
 }
 
 static void AppendFactor(SEXP coldata, Vector &result, index_t row_idx, index_t count) {
 	auto source_data = INTEGER_POINTER(coldata) + row_idx;
-	auto result_data = (const char **)result.GetData();
+	auto result_data = (string_t *)result.GetData();
 	SEXP factor_levels = GET_LEVELS(coldata);
 	for (index_t i = 0; i < count; i++) {
 		int val = source_data[i];
 		if (RIntegerType::IsNull(val)) {
 			result.nullmask[i] = true;
 		} else {
-			result_data[i] = CHAR(STRING_ELT(factor_levels, val - 1));
+			result_data[i] = string_t(CHAR(STRING_ELT(factor_levels, val - 1)));
 		}
 	}
 }
@@ -297,11 +297,11 @@ SEXP duckdb_query_R(SEXP connsexp, SEXP querysexp) {
 					break;
 				case SQLTypeId::VARCHAR: {
 					for (size_t row_idx = 0; row_idx < chunk->data[col_idx].size(); row_idx++) {
-						auto src_ptr = (char **)chunk->data[col_idx].GetData();
+						auto src_ptr = (string_t *)chunk->data[col_idx].GetData();
 						if (chunk->data[col_idx].nullmask[row_idx]) {
 							SET_STRING_ELT(dest, dest_offset + row_idx, NA_STRING);
 						} else {
-							SET_STRING_ELT(dest, dest_offset + row_idx, mkCharCE(src_ptr[row_idx], CE_UTF8));
+							SET_STRING_ELT(dest, dest_offset + row_idx, mkCharCE(src_ptr[row_idx].GetData(), CE_UTF8));
 						}
 					}
 					break;