Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func (btc *BigtableAdapter) convertResultRow(resultRow bigtable.ResultRow, query
// use the result name because that applies the correct alias
key = query.ResultColumnMetadata[i].Name
// use the selected column because that has the CQLType
expectedType = query.SelectClause.Columns[i].ResultType
expectedType = query.SelectClause.Columns[i].GetType()
}

if _, ok := result[key]; ok {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func TestInsertRow(t *testing.T) {
client, err := btc.clients.GetClient(tt.keyspace)
require.NoError(t, err)
table := client.Open(string(tt.table))
row, err := table.ReadRow(t.Context(), string(tt.rowKey))
row, err := table.ReadRow(t.Context(), string(tt.rowKey), bigtable.RowFilter(bigtable.LatestNFilter(1)))
require.NoError(t, err)
require.NotEmpty(t, row)
require.Contains(t, row, "cf1")
Expand Down Expand Up @@ -198,7 +198,7 @@ func TestApplyBulkMutation(t *testing.T) {
require.NoError(t, err)

// Verify mutations
row1, err := tbl.ReadRow(t.Context(), "bulk1")
row1, err := tbl.ReadRow(t.Context(), "bulk1", bigtable.RowFilter(bigtable.LatestNFilter(1)))
assert.NoError(t, err)
assert.NotEmpty(t, row1)
assert.Equal(t, []byte(nil), row1["cf1"][0].Value) // empty row cell
Expand All @@ -208,7 +208,7 @@ func TestApplyBulkMutation(t *testing.T) {
assert.NoError(t, err)
assert.Empty(t, row2)

row3, err := tbl.ReadRow(t.Context(), "bulk3")
row3, err := tbl.ReadRow(t.Context(), "bulk3", bigtable.RowFilter(bigtable.LatestNFilter(1)))
assert.NoError(t, err)
assert.NotEmpty(t, row3)
assert.Equal(t, []byte(nil), row3["cf1"][0].Value) // empty row cell
Expand All @@ -229,7 +229,7 @@ func TestMutateRowDeleteColumnFamily(t *testing.T) {
// Verify both column families are populated
tbl, err := btc.clients.GetTableClient(keyspace, tableName)
require.NoError(t, err)
row, err := tbl.ReadRow(t.Context(), key)
row, err := tbl.ReadRow(t.Context(), key, bigtable.RowFilter(bigtable.LatestNFilter(1)))
require.NoError(t, err)
assert.ElementsMatch(t, maps.Keys(row), []string{"cf1", "tags"})

Expand All @@ -240,7 +240,7 @@ func TestMutateRowDeleteColumnFamily(t *testing.T) {
require.NoError(t, err)

// Verify deletion by reading the row
row, err = tbl.ReadRow(t.Context(), key)
row, err = tbl.ReadRow(t.Context(), key, bigtable.RowFilter(bigtable.LatestNFilter(1)))
require.NoError(t, err)
assert.ElementsMatch(t, maps.Keys(row), []string{"cf1"}, "cf1 should still exist and tags should be deleted")
}
Expand All @@ -265,7 +265,7 @@ func TestMutateRowDeleteQualifiers(t *testing.T) {
// Verify deletion by reading the row
tbl, err := btc.clients.GetTableClient(keyspace, tableName)
require.NoError(t, err)
row, err := tbl.ReadRow(t.Context(), key, bigtable.RowFilter(bigtable.FamilyFilter("cf1")))
row, err := tbl.ReadRow(t.Context(), key, bigtable.RowFilter(bigtable.ChainFilters(bigtable.FamilyFilter("cf1"), bigtable.LatestNFilter(1))))
require.NoError(t, err)
var columns []string
for _, item := range row["cf1"] {
Expand Down Expand Up @@ -297,7 +297,7 @@ func TestMutateRowIfExists(t *testing.T) {
tbl, err := btc.clients.GetTableClient(keyspace, tableName)
require.NoError(t, err)

row, err := tbl.ReadRow(t.Context(), key1, bigtable.RowFilter(bigtable.FamilyFilter("cf1")))
row, err := tbl.ReadRow(t.Context(), key1, bigtable.RowFilter(bigtable.ChainFilters(bigtable.FamilyFilter("cf1"), bigtable.LatestNFilter(1))))
require.NoError(t, err)
assert.Equal(t, []byte(nil), row["cf1"][0].Value) // empty row cell
assert.Equal(t, "v2", string(row["cf1"][1].Value), "value should be updated to v2")
Expand Down Expand Up @@ -327,7 +327,7 @@ func TestMutateRowIfNotExists(t *testing.T) {
// Verify the row is created
tbl, err := btc.clients.GetTableClient(keyspace, tableName)
require.NoError(t, err)
row, err := tbl.ReadRow(t.Context(), key, bigtable.RowFilter(bigtable.FamilyFilter("cf1")))
row, err := tbl.ReadRow(t.Context(), key, bigtable.RowFilter(bigtable.ChainFilters(bigtable.FamilyFilter("cf1"), bigtable.LatestNFilter(1))))
require.NoError(t, err)
assert.Equal(t, []byte(nil), row["cf1"][0].Value) // empty row cell
assert.Equal(t, "v1", string(row["cf1"][1].Value), "row1 should be created with value v1")
Expand All @@ -338,7 +338,7 @@ func TestMutateRowIfNotExists(t *testing.T) {
assert.False(t, wasApplied(res))

// Verify the row is not updated
row, err = tbl.ReadRow(t.Context(), key, bigtable.RowFilter(bigtable.FamilyFilter("cf1")))
row, err = tbl.ReadRow(t.Context(), key, bigtable.RowFilter(bigtable.ChainFilters(bigtable.FamilyFilter("cf1"), bigtable.LatestNFilter(1))))
require.NoError(t, err)
assert.Equal(t, []byte(nil), row["cf1"][0].Value) // empty row cell
assert.Equal(t, "v1", string(row["cf1"][1].Value), "row1 should not be updated")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/datastax/go-cassandra-native-protocol/datatype"
"github.com/datastax/go-cassandra-native-protocol/message"
"github.com/datastax/go-cassandra-native-protocol/primitive"
"github.com/google/uuid"
)

const (
Expand Down Expand Up @@ -117,15 +118,15 @@ func addBindValueIfNeeded(dynamicValue types.DynamicValue, values *types.QueryPa
if dynamicValue == nil {
return nil
}
param, ok := dynamicValue.(*types.ParameterizedValue)
if !ok {
p := dynamicValue.GetParameter()
if p == "" {
return nil
}

var value any
if needsByteConversion {
var err error
value, err = param.GetValue(values)
value, err = dynamicValue.GetValue(values)
if err != nil {
return err
}
Expand All @@ -136,7 +137,7 @@ func addBindValueIfNeeded(dynamicValue types.DynamicValue, values *types.QueryPa
}
} else {
var err error
value, err = param.GetValue(values)
value, err = dynamicValue.GetValue(values)
if err != nil {
return err
}
Expand All @@ -148,7 +149,14 @@ func addBindValueIfNeeded(dynamicValue types.DynamicValue, values *types.QueryPa
value = v[:]
}
}
result[string(param.Parameter)] = value
if u, ok := value.(uuid.UUID); ok {
b, err := u.MarshalBinary()
if err != nil {
return err
}
value = b
}
result[string(p)] = value
return nil
}

Expand Down Expand Up @@ -190,12 +198,12 @@ func addParamIfNeeded(value types.DynamicValue, params *types.QueryParameters, n
return nil
}

param, ok := value.(*types.ParameterizedValue)
if !ok {
p := value.GetParameter()
if p == "" {
return nil
}

md, err := params.GetMetadata(param.Parameter)
md, err := params.GetMetadata(p)
if err != nil {
return err
}
Expand All @@ -204,6 +212,6 @@ func addParamIfNeeded(value types.DynamicValue, params *types.QueryParameters, n
if needsByteConversion {
bigtableType = bigtable.BytesSQLType{}
}
result[string(param.Parameter)] = bigtableType
result[string(p)] = bigtableType
return nil
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package types

type FuncAvg struct {
}

func (f *FuncAvg) GetValidClauses() []QueryClause {
return []QueryClause{QueryClauseSelect}
}

func (f *FuncAvg) GetName() string {
return "avg"
}

func (f *FuncAvg) GetCode() CqlFuncCode {
return FuncCodeAvg
}

func (f *FuncAvg) GetParameterTypes() []CqlFuncParameter {
return []CqlFuncParameter{
*NewCqlFuncParameter(AllNumericTypes, true, false),
}
}

func (f *FuncAvg) Apply(_ []DynamicValue, value *QueryParameterValues) (GoValue, error) {
return nil, nil
}

func (f *FuncAvg) GetReturnType(args []DynamicValue) CqlDataType {
if len(args) != 1 {
return TypeDouble
}
dt := args[0].GetType()
if dt.Code() == INT || dt.Code() == BIGINT {
return TypeFloat
}
Comment on lines +33 to +35

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

According to Cassandra documentation, the avg function on int or bigint columns returns a varint. This implementation returns TypeFloat. While this might be a deliberate simplification, it deviates from the standard Cassandra behavior. Consider returning TypeVarint for better compatibility.

Suggested change
if dt.Code() == INT || dt.Code() == BIGINT {
return TypeFloat
}
if dt.Code() == INT || dt.Code() == BIGINT {
return TypeVarint
}

return dt
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package types

type FuncCount struct {
}

func (f *FuncCount) GetValidClauses() []QueryClause {
return []QueryClause{QueryClauseSelect}
}

func (f *FuncCount) GetName() string {
return "count"
}

func (f *FuncCount) GetCode() CqlFuncCode {
return FuncCodeCount
}

func (f *FuncCount) GetParameterTypes() []CqlFuncParameter {
return []CqlFuncParameter{
*NewCqlFuncParameter(AllScalarTypes, true, true),
}
}

func (f *FuncCount) Apply(_ []DynamicValue, _ *QueryParameterValues) (GoValue, error) {
return nil, nil
}

func (f *FuncCount) GetReturnType(_ []DynamicValue) CqlDataType {
return TypeBigInt
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package types

type FuncMax struct {
}

func (f *FuncMax) GetValidClauses() []QueryClause {
return []QueryClause{QueryClauseSelect}
}

func (f *FuncMax) GetName() string {
return "max"
}

func (f *FuncMax) GetCode() CqlFuncCode {
return FuncCodeMax
}

func (f *FuncMax) GetParameterTypes() []CqlFuncParameter {
return []CqlFuncParameter{
*NewCqlFuncParameter(AllNumericTypes, true, false),
}
}

func (f *FuncMax) Apply(_ []DynamicValue, value *QueryParameterValues) (GoValue, error) {
return nil, nil
}

func (f *FuncMax) GetReturnType(args []DynamicValue) CqlDataType {
if len(args) != 1 {
return TypeDouble
}
return args[0].GetType()
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package types

import (
"github.com/google/uuid"
"time"
)

type FuncMaxTimeuuid struct {
}

func (f *FuncMaxTimeuuid) GetValidClauses() []QueryClause {
return []QueryClause{QueryClauseWhere, QueryClauseValues}
}

func (f *FuncMaxTimeuuid) GetName() string {
return "maxTimeuuid"
}

func (f *FuncMaxTimeuuid) GetCode() CqlFuncCode {
return FuncCodeMaxTimeuuid
}

func (f *FuncMaxTimeuuid) GetParameterTypes() []CqlFuncParameter {
return []CqlFuncParameter{
*NewCqlFuncParameter(
[]CqlDataType{
TypeTimestamp,
},
false,
false),
}
}

func (f *FuncMaxTimeuuid) Apply(args []DynamicValue, values *QueryParameterValues) (GoValue, error) {
u, err := getTimeArg(0, args, values)
if err != nil {
return nil, err
}
return maxUUIDv1ForTime(u)
}

func (f *FuncMaxTimeuuid) GetReturnType(args []DynamicValue) CqlDataType {
return TypeTimeuuid
}

// maxUUIDv1ForTime creates the maximum possible UUIDv1 for a given time.Time.
// This is achieved by setting the timestamp fields based on the input time,
// and setting the Clock Sequence and Node ID fields to their maximum values.
func maxUUIDv1ForTime(t time.Time) (uuid.UUID, error) {
// For maxTimeuuid, Cassandra adds 9999 to the 100-nanosecond intervals timestamp.
// 9999 * 100 nanoseconds.
maxT := t.Add(9999 * 100 * time.Nanosecond)
u := setUuidV1Time(maxT, [16]byte{})

// --- Clock Sequence & Node ID Fields (Maxed Values) ---
// clock_seq_hi_and_variant (byte 8, 8 bits)
// The variant bits must be 10 (0x80 to 0xBF). We set the clock sequence to max.
// 0xBF is 0b10111111 (variant 10 and max 6 bits for the clock sequence high part)
u[8] = 0xBF

// clock_seq_low (byte 9, 8 bits)
u[9] = 0xFF

// Node ID (bytes 10-15, 48 bits) - set to all F's (max)
u[10] = 0xFF
u[11] = 0xFF
u[12] = 0xFF
u[13] = 0xFF
u[14] = 0xFF
u[15] = 0xFF

// Create the UUID from the byte array
return u, nil
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package types

type FuncMin struct {
}

func (f *FuncMin) GetValidClauses() []QueryClause {
return []QueryClause{QueryClauseSelect}
}

func (f *FuncMin) GetName() string {
return "min"
}

func (f *FuncMin) GetCode() CqlFuncCode {
return FuncCodeMin
}

func (f *FuncMin) GetParameterTypes() []CqlFuncParameter {
return []CqlFuncParameter{
*NewCqlFuncParameter(AllNumericTypes, true, false),
}
}

func (f *FuncMin) Apply(_ []DynamicValue, value *QueryParameterValues) (GoValue, error) {
return nil, nil
}

func (f *FuncMin) GetReturnType(args []DynamicValue) CqlDataType {
if len(args) != 1 {
return TypeDouble
}
return args[0].GetType()
}
Loading