joao-r-reis commented on code in PR #1828:
URL:
https://github.com/apache/cassandra-gocql-driver/pull/1828#discussion_r1822889588
##########
helpers.go:
##########
@@ -162,54 +164,152 @@ func getCassandraBaseType(name string) Type {
}
}
-func getCassandraType(name string, logger StdLogger) TypeInfo {
+// Parse long Java-style type definition to internal data structures.
+func getCassandraLongType(name string, protoVer byte, logger StdLogger)
TypeInfo {
+ if strings.HasPrefix(name, SET_TYPE) {
+ return CollectionType{
+ NativeType: NewNativeType(protoVer, TypeSet),
+ Elem:
getCassandraLongType(strings.TrimPrefix(name[:len(name)-1], SET_TYPE+"("),
protoVer, logger),
+ }
+ } else if strings.HasPrefix(name, LIST_TYPE) {
+ return CollectionType{
+ NativeType: NewNativeType(protoVer, TypeList),
+ Elem:
getCassandraLongType(strings.TrimPrefix(name[:len(name)-1], LIST_TYPE+"("),
protoVer, logger),
+ }
+ } else if strings.HasPrefix(name, MAP_TYPE) {
+ names :=
splitJavaCompositeTypes(strings.TrimPrefix(name[:len(name)-1], MAP_TYPE+"("))
+ if len(names) != 2 {
+ logger.Printf("Error parsing map type, it has %d
subelements, expecting 2\n", len(names))
+ return NewNativeType(protoVer, TypeCustom)
+ }
+ return CollectionType{
+ NativeType: NewNativeType(protoVer, TypeMap),
+ Key: getCassandraLongType(names[0], protoVer,
logger),
+ Elem: getCassandraLongType(names[1], protoVer,
logger),
+ }
+ } else if strings.HasPrefix(name, TUPLE_TYPE) {
+ names :=
splitJavaCompositeTypes(strings.TrimPrefix(name[:len(name)-1], TUPLE_TYPE+"("))
+ types := make([]TypeInfo, len(names))
+
+ for i, name := range names {
+ types[i] = getCassandraLongType(name, protoVer, logger)
+ }
+
+ return TupleTypeInfo{
+ NativeType: NewNativeType(protoVer, TypeTuple),
+ Elems: types,
+ }
+ } else if strings.HasPrefix(name, UDT_TYPE) {
+ names :=
splitJavaCompositeTypes(strings.TrimPrefix(name[:len(name)-1], UDT_TYPE+"("))
+ fields := make([]UDTField, len(names)-2)
+
+ for i := 2; i < len(names); i++ {
+ spec := strings.Split(names[i], ":")
+ fieldName, _ := hex.DecodeString(spec[0])
+ fields[i-2] = UDTField{
+ Name: string(fieldName),
+ Type: getTypeInfo(spec[1], protoVer, logger),
Review Comment:
should this be `getCassandraLongType`?
##########
helpers.go:
##########
@@ -162,54 +164,152 @@ func getCassandraBaseType(name string) Type {
}
}
-func getCassandraType(name string, logger StdLogger) TypeInfo {
+// Parse long Java-style type definition to internal data structures.
+func getCassandraLongType(name string, protoVer byte, logger StdLogger)
TypeInfo {
+ if strings.HasPrefix(name, SET_TYPE) {
+ return CollectionType{
+ NativeType: NewNativeType(protoVer, TypeSet),
+ Elem:
getCassandraLongType(strings.TrimPrefix(name[:len(name)-1], SET_TYPE+"("),
protoVer, logger),
+ }
+ } else if strings.HasPrefix(name, LIST_TYPE) {
+ return CollectionType{
+ NativeType: NewNativeType(protoVer, TypeList),
+ Elem:
getCassandraLongType(strings.TrimPrefix(name[:len(name)-1], LIST_TYPE+"("),
protoVer, logger),
+ }
+ } else if strings.HasPrefix(name, MAP_TYPE) {
+ names :=
splitJavaCompositeTypes(strings.TrimPrefix(name[:len(name)-1], MAP_TYPE+"("))
+ if len(names) != 2 {
+ logger.Printf("Error parsing map type, it has %d
subelements, expecting 2\n", len(names))
+ return NewNativeType(protoVer, TypeCustom)
+ }
+ return CollectionType{
+ NativeType: NewNativeType(protoVer, TypeMap),
+ Key: getCassandraLongType(names[0], protoVer,
logger),
+ Elem: getCassandraLongType(names[1], protoVer,
logger),
+ }
+ } else if strings.HasPrefix(name, TUPLE_TYPE) {
+ names :=
splitJavaCompositeTypes(strings.TrimPrefix(name[:len(name)-1], TUPLE_TYPE+"("))
+ types := make([]TypeInfo, len(names))
+
+ for i, name := range names {
+ types[i] = getCassandraLongType(name, protoVer, logger)
+ }
+
+ return TupleTypeInfo{
+ NativeType: NewNativeType(protoVer, TypeTuple),
+ Elems: types,
+ }
+ } else if strings.HasPrefix(name, UDT_TYPE) {
+ names :=
splitJavaCompositeTypes(strings.TrimPrefix(name[:len(name)-1], UDT_TYPE+"("))
+ fields := make([]UDTField, len(names)-2)
+
+ for i := 2; i < len(names); i++ {
+ spec := strings.Split(names[i], ":")
+ fieldName, _ := hex.DecodeString(spec[0])
+ fields[i-2] = UDTField{
+ Name: string(fieldName),
+ Type: getTypeInfo(spec[1], protoVer, logger),
+ }
+ }
+
+ udtName, _ := hex.DecodeString(names[1])
+ return UDTTypeInfo{
+ NativeType: NewNativeType(protoVer, TypeUDT),
+ KeySpace: names[0],
+ Name: string(udtName),
+ Elements: fields,
+ }
+ } else if strings.HasPrefix(name, VECTOR_TYPE) {
+ names :=
splitJavaCompositeTypes(strings.TrimPrefix(name[:len(name)-1], VECTOR_TYPE+"("))
+ subType := getCassandraLongType(strings.TrimSpace(names[0]),
protoVer, logger)
+ dim, _ := strconv.Atoi(strings.TrimSpace(names[1]))
Review Comment:
Check error like in the `map` case
```
if err != nil {
logger.Printf("gocql: error parsing vector dimensions: %v\n", err)
return NewNativeType(protoVer, TypeCustom)
}
```
##########
metadata.go:
##########
@@ -947,11 +947,11 @@ func getColumnMetadata(session *Session, keyspaceName
string) ([]ColumnMetadata,
return columns, nil
}
-func getTypeInfo(t string, logger StdLogger) TypeInfo {
+func getTypeInfo(t string, protoVer byte, logger StdLogger) TypeInfo {
if strings.HasPrefix(t, apacheCassandraTypePrefix) {
t = apacheToCassandraType(t)
Review Comment:
we can get rid of `apacheToCassandraType` function now right? And just call
`getCassandraLongType`?
##########
helpers.go:
##########
@@ -162,54 +164,152 @@ func getCassandraBaseType(name string) Type {
}
}
-func getCassandraType(name string, logger StdLogger) TypeInfo {
+// Parse long Java-style type definition to internal data structures.
+func getCassandraLongType(name string, protoVer byte, logger StdLogger)
TypeInfo {
+ if strings.HasPrefix(name, SET_TYPE) {
+ return CollectionType{
+ NativeType: NewNativeType(protoVer, TypeSet),
+ Elem:
getCassandraLongType(strings.TrimPrefix(name[:len(name)-1], SET_TYPE+"("),
protoVer, logger),
+ }
+ } else if strings.HasPrefix(name, LIST_TYPE) {
+ return CollectionType{
+ NativeType: NewNativeType(protoVer, TypeList),
+ Elem:
getCassandraLongType(strings.TrimPrefix(name[:len(name)-1], LIST_TYPE+"("),
protoVer, logger),
+ }
+ } else if strings.HasPrefix(name, MAP_TYPE) {
+ names :=
splitJavaCompositeTypes(strings.TrimPrefix(name[:len(name)-1], MAP_TYPE+"("))
+ if len(names) != 2 {
+ logger.Printf("Error parsing map type, it has %d
subelements, expecting 2\n", len(names))
Review Comment:
I think gocql log statements are usually prefixed by `gocql: ` if I'm not
mistaken
--
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]
