Merge pull request #100 from pdet/upgrade

Implement new fetchrel definitions and remove R CI

Author: pdet

.github/workflows/r.yml

@@ -416,7 +416,10 @@ shared_ptr<Relation> SubstraitToDuckDB::TransformCrossProductOp(const substrait:
 
 shared_ptr<Relation> SubstraitToDuckDB::TransformFetchOp(const substrait::Rel &sop) {
 	auto &slimit = sop.fetch();
-	return make_shared_ptr<LimitRelation>(TransformOp(slimit.input()), slimit.count(), slimit.offset());
+	idx_t limit, offset;
+	limit = slimit.count() == -1 ? NumericLimits<idx_t>::Maximum() : slimit.count();
+	offset = slimit.offset();
+	return make_shared_ptr<LimitRelation>(TransformOp(slimit.input()), limit, offset);
 }
 
 shared_ptr<Relation> SubstraitToDuckDB::TransformFilterOp(const substrait::Rel &sop) {

src/from_substrait.cpp

@@ -808,34 +808,35 @@ substrait::Rel *DuckDBToSubstrait::TransformTopN(LogicalOperator &dop) {
 }
 
 substrait::Rel *DuckDBToSubstrait::TransformLimit(LogicalOperator &dop) {
-	auto &dlimit = (LogicalLimit &)dop;
-	auto res = new substrait::Rel();
-	auto stopn = res->mutable_fetch();
-	stopn->set_allocated_input(TransformOp(*dop.children[0]));
-
-	idx_t limit_val;
-	idx_t offset_val;
-
+	auto &dlimit = dop.Cast<LogicalLimit>();
+	// figure out limit and offset of this node
+	int32_t limit_val;
+	int32_t offset_val;
 	switch (dlimit.limit_val.Type()) {
 	case LimitNodeType::CONSTANT_VALUE:
-		limit_val = dlimit.limit_val.GetConstantValue();
+		limit_val = static_cast<int32_t>(dlimit.limit_val.GetConstantValue());
 		break;
 	case LimitNodeType::UNSET:
-		limit_val = 2ULL << 62ULL;
+		limit_val = -1;
 		break;
 	default:
 		throw InternalException("Unsupported limit value type");
 	}
 	switch (dlimit.offset_val.Type()) {
 	case LimitNodeType::CONSTANT_VALUE:
-		offset_val = dlimit.offset_val.GetConstantValue();
+		offset_val = static_cast<int32_t>(dlimit.offset_val.GetConstantValue());
 		break;
 	case LimitNodeType::UNSET:
 		offset_val = 0;
 		break;
 	default:
 		throw InternalException("Unsupported offset value type");
 	}
+
+	auto res = new substrait::Rel();
+	auto stopn = res->mutable_fetch();
+	stopn->set_allocated_input(TransformOp(*dop.children[0]));
+
 	stopn->set_offset(offset_val);
 	stopn->set_count(limit_val);
 	return res;
@@ -1190,7 +1191,7 @@ substrait::Rel *DuckDBToSubstrait::TransformDummyScan() {
 
 substrait::Rel *DuckDBToSubstrait::TransformGet(LogicalOperator &dop) {
 	auto get_rel = new substrait::Rel();
-	auto &dget = (LogicalGet &)dop;
+	auto &dget = dop.Cast<LogicalGet>();
 
 	if (!dget.function.get_bind_info) {
 		throw NotImplementedException("This Scanner Type can't be used in substrait because a get bind info "
@@ -1205,8 +1206,8 @@ substrait::Rel *DuckDBToSubstrait::TransformGet(LogicalOperator &dop) {
 		    CreateConjunction(dget.table_filters.filters, [&](std::pair<const idx_t, unique_ptr<TableFilter>> &in) {
 			    auto col_idx = in.first;
 			    auto return_type = dget.returned_types[col_idx];
-			    auto &filter = *in.second;
-			    return TransformFilter(col_idx, return_type, filter, return_type);
+			    auto &inside_filter = *in.second;
+			    return TransformFilter(col_idx, return_type, inside_filter, return_type);
 		    });
 		sget->set_allocated_filter(filter);
 	}

src/to_substrait.cpp

@@ -0,0 +1,21 @@
+# name: test/sql/test_limit.test
+# description: Test limit and offset operations
+# group: [sql]
+
+require substrait
+
+statement ok
+PRAGMA enable_verification
+
+statement ok
+create table t as FROM range(10);
+
+statement ok
+CALL get_substrait('select * from t limit 5');
+
+statement ok
+CALL get_substrait('select * from t offset 1');
+
+statement ok
+CALL get_substrait('select * from t offset 1 limit 5');
+