- updated pointer handling

Author: adranwit

cmd/command/translate_shape_test.go

@@ -1,7 +1,10 @@
 package command
 
 import (
+	"context"
+	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -28,3 +31,70 @@ func TestRoutePathForShape(t *testing.T) {
 	assert.Equal(t, filepath.ToSlash("platform/campaign"), relDir)
 	assert.Equal(t, "post", stem)
 }
+
+func TestTranslateShape_PreservesPredicateBuilderBlocksInGeneratedSQL(t *testing.T) {
+	ctx := context.Background()
+	projectDir := t.TempDir()
+	repoDir := filepath.Join(projectDir, "repo", "dev")
+	dqlDir := filepath.Join(projectDir, "dql", "opaque")
+	sqlDir := filepath.Join(dqlDir, "sql")
+	require.NoError(t, os.MkdirAll(sqlDir, 0o755))
+	require.NoError(t, os.MkdirAll(repoDir, 0o755))
+
+	sqlSource := `SELECT
+    x0.k_a,
+    x0.k_b,
+    z9.m_q,
+    SUM(x0.v_n) AS agg_alpha,
+    AVG(z9.v_r) AS agg_beta
+FROM
+    data_alpha x0
+LEFT JOIN data_beta z9
+       ON x0.k_b = z9.k_b
+
+${predicate.Builder().CombineOr($predicate.FilterGroup(0, "AND")).Build("WHERE")}
+GROUP BY
+    x0.k_a,
+    x0.k_b,
+    z9.m_q
+ ${predicate.Builder().CombineOr($predicate.FilterGroup(1, "HAVING")).Build("HAVING")}`
+	require.NoError(t, os.WriteFile(filepath.Join(sqlDir, "opaque_source.sql"), []byte(sqlSource), 0o600))
+
+	dqlSource := `/* {"URI":"/opaque/report","Name":"OpaqueReport"} */
+#set($_ = $cube())
+#set($_ = $Cutoff<string>(query/cutoff).Optional().WithPredicate(0, 'greater_or_equal', 'x0', 'k_a'))
+#set($_ = $Threshold<int>(query/threshold).Optional().WithPredicate(1, 'expr', '(SUM(v_n) >= ?)'))
+
+SELECT opaque_root.*,
+       grouping_enabled(opaque_root),
+       allow_nulls(opaque_root),
+       set_limit(opaque_root, 25)
+FROM (${embed:sql/opaque_source.sql}) opaque_root`
+	dqlPath := filepath.Join(dqlDir, "opaque_report.dql")
+	require.NoError(t, os.WriteFile(dqlPath, []byte(dqlSource), 0o600))
+
+	opts := &options.Options{
+		Translate: &options.Translate{
+			Rule: options.Rule{
+				Project: projectDir,
+				Source:  []string{dqlPath},
+				Engine:  options.EngineShape,
+			},
+			Repository: options.Repository{
+				RepositoryURL: repoDir,
+				APIPrefix:     "/v1/api",
+			},
+		},
+	}
+	require.NoError(t, opts.Init(ctx))
+
+	svc := New()
+	require.NoError(t, svc.translateShape(ctx, opts))
+
+	generatedSQLPath := filepath.Join(repoDir, "Datly", "routes", "opaque", "opaque_report", "opaque_report.sql")
+	data, err := os.ReadFile(generatedSQLPath)
+	require.NoError(t, err)
+	generated := string(data)
+	assert.True(t, strings.Contains(generated, `${predicate.Builder().CombineOr($predicate.FilterGroup(0, "AND")).Build("WHERE")}`))
+	assert.True(t, strings.Contains(generated, `${predicate.Builder().CombineOr($predicate.FilterGroup(1, "HAVING")).Build("HAVING")}`))
+}

internal/converter/repeated.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-	"unsafe"
 )
 
 type Repeated []string
@@ -32,23 +31,35 @@ func (r Repeated) AsUInts() ([]uint, error) {
 	if err != nil {
 		return nil, err
 	}
-	return *(*[]uint)(unsafe.Pointer(&v)), nil
+	result := make([]uint, len(v))
+	for i, item := range v {
+		result[i] = uint(item)
+	}
+	return result, nil
 }
 
 func (r Repeated) AsInt64s() ([]int64, error) {
 	v, err := r.AsInts()
 	if err != nil {
 		return nil, err
 	}
-	return *(*[]int64)(unsafe.Pointer(&v)), nil
+	result := make([]int64, len(v))
+	for i, item := range v {
+		result[i] = int64(item)
+	}
+	return result, nil
 }
 
 func (r Repeated) AsUInt64s() ([]uint64, error) {
 	v, err := r.AsInts()
 	if err != nil {
 		return nil, err
 	}
-	return *(*[]uint64)(unsafe.Pointer(&v)), nil
+	result := make([]uint64, len(v))
+	for i, item := range v {
+		result[i] = uint64(item)
+	}
+	return result, nil
 }
 
 func (r Repeated) AsFloats64() ([]float64, error) {

view/collector.go

@@ -1115,8 +1115,8 @@ func (r *Collector) Fetched() {
 }
 
 func (r *Collector) Len() int {
-	if r.DestPtr() != nil {
-		return (*reflect.SliceHeader)(xunsafe.AsPointer(r.DestPtr())).Len
+	if r.DestPtr() != nil && r.slice != nil {
+		return r.slice.Len(xunsafe.AsPointer(r.DestPtr()))
 	}
 	return 0
 }

view/extension/codec/xmlfilter/service.go

@@ -42,7 +42,7 @@ func (t *Service) Transfer(aStruct interface{}) (*xml.FilterHolder, error) {
 			xFilterPtr = *(*unsafe.Pointer)(ownerAddr)
 			fieldType = fieldType.Elem()
 		} else {
-			xFilterPtr = unsafe.Pointer(uintptr(ptr) + field.Offset)
+			xFilterPtr = unsafe.Add(ptr, field.Offset)
 		}
 
 		if fieldType.Kind() != reflect.Struct {