joao-r-reis commented on code in PR #1828:
URL:
https://github.com/apache/cassandra-gocql-driver/pull/1828#discussion_r1820639670
##########
helpers.go:
##########
@@ -162,47 +164,83 @@ func getCassandraBaseType(name string) Type {
}
}
-func getCassandraType(name string, logger StdLogger) TypeInfo {
+func getCassandraType(name string, protoVer byte, logger StdLogger) TypeInfo {
if strings.HasPrefix(name, "frozen<") {
- return getCassandraType(strings.TrimPrefix(name[:len(name)-1],
"frozen<"), logger)
+ return getCassandraType(strings.TrimPrefix(name[:len(name)-1],
"frozen<"), protoVer, logger)
} else if strings.HasPrefix(name, "set<") {
return CollectionType{
- NativeType: NativeType{typ: TypeSet},
- Elem:
getCassandraType(strings.TrimPrefix(name[:len(name)-1], "set<"), logger),
+ NativeType: NativeType{typ: TypeSet, proto: protoVer},
+ Elem:
getCassandraType(strings.TrimPrefix(name[:len(name)-1], "set<"), protoVer,
logger),
}
} else if strings.HasPrefix(name, "list<") {
return CollectionType{
- NativeType: NativeType{typ: TypeList},
- Elem:
getCassandraType(strings.TrimPrefix(name[:len(name)-1], "list<"), logger),
+ NativeType: NativeType{typ: TypeList, proto: protoVer},
+ Elem:
getCassandraType(strings.TrimPrefix(name[:len(name)-1], "list<"), protoVer,
logger),
}
} else if strings.HasPrefix(name, "map<") {
names :=
splitCompositeTypes(strings.TrimPrefix(name[:len(name)-1], "map<"))
if len(names) != 2 {
logger.Printf("Error parsing map type, it has %d
subelements, expecting 2\n", len(names))
return NativeType{
- typ: TypeCustom,
+ proto: protoVer,
+ typ: TypeCustom,
}
}
return CollectionType{
- NativeType: NativeType{typ: TypeMap},
- Key: getCassandraType(names[0], logger),
- Elem: getCassandraType(names[1], logger),
+ NativeType: NativeType{typ: TypeMap, proto: protoVer},
+ Key: getCassandraType(names[0], protoVer,
logger),
+ Elem: getCassandraType(names[1], protoVer,
logger),
}
} else if strings.HasPrefix(name, "tuple<") {
names :=
splitCompositeTypes(strings.TrimPrefix(name[:len(name)-1], "tuple<"))
types := make([]TypeInfo, len(names))
for i, name := range names {
- types[i] = getCassandraType(name, logger)
+ types[i] = getCassandraType(name, protoVer, logger)
}
return TupleTypeInfo{
- NativeType: NativeType{typ: TypeTuple},
+ NativeType: NativeType{typ: TypeTuple, proto: protoVer},
Elems: types,
}
+ } else if strings.HasPrefix(name, "udt<") {
Review Comment:
Check my other comment that expands on this but my point is that you're
creating a short type that does not exist in CQL and then adding handling logic
for that "artificial" type on the short type handling function. Doesn't make a
lot of sense.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
