format code

build.sh

@@ -3,3 +3,7 @@ go build
 
 GOOS=linux go install
 
+installpath=`go env GOPATH | awk -F ':' '{print $1}'`/bin
+
+cp cgimport.conf ${installpath}/linux_amd64
+cp cgimport.mql ${installpath}/linux_amd64

cgimport.conf

@@ -38,6 +38,6 @@ mapping.class.EDGE=*EDGE*.csv
 ;指定odbserver路径
 odbpath=127.0.0.1:11001
 ;指定keyspace
-keyspace=matrix
+keyspace=oktest
 # 数据插入请求并发数限制
 concurrent.limit=20

importer/classstruct.go

@@ -78,16 +78,7 @@ func (odbci *ODBCImporter) createclass(classname, mql string) (err error) {
 		return merrs.New("len(cis) != 1")
 	}
 	oci := cis[0]
-	fis := []*schema.FieldInfo{}
-	for _, fi := range oci.Fieldinfos {
-		fis = append(fis, &schema.FieldInfo{
-			Fieldname: fi.Fieldname,
-			Fieldtype: fi.Fieldtype,
-			Keyidx:    fi.Keyidx,
-			Datakey:   fi.NameMapping("dispname"),
-		})
-	}
-	ci := schema.NewClassinfo(oci.Aliasname, oci.Shortname, oci.Basealias, fis, oci.WithOptions...)
+	ci := schema.ClassInfoHelper(oci)
 	// add graph tags
 	_, e = odbci.client.Query(ci.Addtagmql, ci.Classaliasname, ci.Classaliasname, []string{ci.Classaliasname}).Do()
 	if e != nil {
@@ -120,16 +111,7 @@ func (odbci *ODBCImporter) getClassinfos() (err error) {
 		return e
 	}
 	for _, oci := range classinfos {
-		fis := []*schema.FieldInfo{}
-		for _, fi := range oci.Fieldinfos {
-			fis = append(fis, &schema.FieldInfo{
-				Fieldname: fi.Fieldname,
-				Fieldtype: fi.Fieldtype,
-				Keyidx:    fi.Keyidx,
-				Datakey:   fi.NameMapping("dispname"),
-			})
-		}
-		ci := schema.NewClassinfo(oci.Aliasname, oci.Shortname, oci.Basealias, fis, oci.WithOptions...)
+		ci := schema.ClassInfoHelper(oci)
 		cdi := &classdatainfo{ClassInfo: ci}
 		classdatainfos.Set(ci.Classaliasname, cdi)
 		classdatainfos.Set(ci.Classfullname, cdi)

schema/classinfo.go

@@ -3,6 +3,7 @@ package schema
 import (
 	"strings"
 
+	"git.wecise.com/wecise/odb-go/schema"
 	"github.com/scylladb/go-set/strset"
 	"github.com/wecisecode/util/cmap"
 )
@@ -30,6 +31,28 @@ type ClassInfo struct {
 var ClassInfos = cmap.NewSingle[string, *ClassInfo]()
 var ClassAliasNames = []string{}
 
+func ClassInfoHelper(oci *schema.ClassInfo) *ClassInfo {
+	fis := []*FieldInfo{}
+	for _, fi := range oci.Fieldinfos {
+		if fi.Fieldname == "id" {
+			fis = append(fis, &FieldInfo{
+				Fieldname: "id",
+				Fieldtype: "varchar",
+				Keyidx:    0,
+				Datakey:   []string{"id"},
+			})
+		} else {
+			fis = append(fis, &FieldInfo{
+				Fieldname: fi.Fieldname,
+				Fieldtype: fi.Fieldtype,
+				Keyidx:    fi.Keyidx,
+				Datakey:   fi.NameMapping("dispname"),
+			})
+		}
+	}
+	return NewClassinfo(oci.Aliasname, oci.Shortname, oci.Basealias, fis, oci.WithOptions...)
+}
+
 func NewClassinfo(classaliasname, classsimplename, baseclassaliasname string, fieldinfoslist []*FieldInfo, withoptions ...[2]string) (ci *ClassInfo) {
 	fieldinfos := map[string]*FieldInfo{}
 	datakey_fieldinfos := map[string]*FieldInfo{}