use kvql instead of query, and remove go-llama

Author: c4pt0r

.gitmodules

@@ -10,10 +10,3 @@ endif
 
 check:
 	golint -set_exit_status .
-
-prepare-llama-cpp:
-	cd thirdparty/go-llama.cpp; git submodule update --init --recursive
-	cd thirdparty/go-llama.cpp; make libbinding.a
-
-build-with-llama: prepare-llama-cpp
-	LIBRARY_PATH=./thirdparty/go-llama.cpp C_INCLUDE_PATH=./thirdparty/go-llama.cpp $(CGO_FLAGS) go build -tags "llama,$(TAGS)" -o bin/tcli ./cli/*.go

Makefile

@@ -82,25 +82,4 @@ Input: scanp hello
 |-------------|-------|
 2 Records Found
 Success, Elapse: 5 ms
-```
-
-5. Play With LLama
-
-Build tcli with LLama
-
-```
-make build-with-llama
-```
-
-Then you can start `tcli` and then use `ask` command to ask questions to LLama
-
-```
-LLAMA_PATH=/data/models/llama-2-7b.ggmlv3.q4_0.bin bin/tcli
-
->>> ask who are you?
-...
-```
-
-The `LLAMA_PATH` environment variable is tell `tcli` where to load LLama2 model.
-
-And you can also use `embedding` function in `query` command
+```

README.md

@@ -1,14 +1,13 @@
 module github.com/c4pt0r/tcli
 
-go 1.21
+go 1.21.1
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.2.16
 	github.com/abiosoft/ishell v2.0.0+incompatible
 	github.com/beorn7/perks v1.0.1
 	github.com/c4pt0r/log v0.0.0-20211004143616-aa6380016a47
 	github.com/fatih/color v1.12.0
-	github.com/go-skynet/go-llama.cpp v0.0.0-20231009155254-aeba71ee8428
 	github.com/magiconair/properties v1.8.0
 	github.com/manifoldco/promptui v0.8.0
 	github.com/olekukonko/tablewriter v0.0.5
@@ -22,6 +21,7 @@ require (
 
 require (
 	github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db // indirect
+	github.com/c4pt0r/kvql v0.0.0-20240428025121-0619eade54de // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
@@ -67,5 +67,3 @@ require (
 	google.golang.org/grpc v1.27.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 )
-
-replace github.com/go-skynet/go-llama.cpp => ./thirdparty/go-llama.cpp

cli/cmd_llama.go

@@ -54,6 +54,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
+github.com/c4pt0r/kvql v0.0.0-20240428025121-0619eade54de h1:A3Z6rWtCNh81gaMpGb9qzhvFtCOTIdsGV1JK/lANsiw=
+github.com/c4pt0r/kvql v0.0.0-20240428025121-0619eade54de/go.mod h1:ksAcL0FG13v+9UVAznpGjkIh2yB3qUSkgoNR4aPrl9w=
 github.com/c4pt0r/log v0.0.0-20211004143616-aa6380016a47 h1:I7bb8MbleLvoW6scHXngCQaroNa9slYTaYOaQEsv2TQ=
 github.com/c4pt0r/log v0.0.0-20211004143616-aa6380016a47/go.mod h1:N78ACK7UQq5KjTLWQPw2A7UuzX712vN9akunb8ydlck=
 github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5 h1:BjkPE3785EwPhhyuFkbINB+2a1xATwk8SNDWnJiD41g=

go.mod

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/c4pt0r/tcli"
+	"github.com/c4pt0r/kvql"
 	"github.com/c4pt0r/tcli/client"
 	"github.com/c4pt0r/tcli/query"
 	"github.com/c4pt0r/tcli/utils"
@@ -41,7 +42,7 @@ func (c ExplainCmd) Handler() func(ctx context.Context) {
 			}
 			sql := getQueryString(ic)
 			qtxn := query.NewQueryTxn(client.GetTiKVClient())
-			opt := query.NewOptimizer(sql)
+			opt := kvql.NewOptimizer(sql)
 			plan, err := opt.BuildPlan(qtxn)
 			if err != nil {
 				return bindQueryToError(sql, err)

go.sum

@@ -9,6 +9,7 @@ import (
 	"github.com/abiosoft/ishell"
 	"github.com/c4pt0r/tcli"
 	"github.com/c4pt0r/tcli/client"
+	"github.com/c4pt0r/kvql"
 	"github.com/c4pt0r/tcli/query"
 	"github.com/c4pt0r/tcli/utils"
 )
@@ -43,7 +44,7 @@ func getQueryString(ic *ishell.Context) string {
 	return strings.Join(ret, " ")
 }
 
-func convertColumnToString(c query.Column) string {
+func convertColumnToString(c kvql.Column) string {
 	switch v := c.(type) {
 	case int, int8, int16, int32, int64,
 		uint, uint8, uint16, uint32, uint64:
@@ -59,7 +60,7 @@ func convertColumnToString(c query.Column) string {
 			return "true"
 		}
 		return "false"
-	case map[string]any, query.JSON, []any, []string, []int64, []float32, []float64:
+	case map[string]any, kvql.JSON, []any, []string, []int64, []float32, []float64:
 		return fmt.Sprintf("%v", v)
 	default:
 		if v == nil {
@@ -79,7 +80,7 @@ func (c QueryCmd) Handler() func(ctx context.Context) {
 			}
 			sql := getQueryString(ic)
 			qtxn := query.NewQueryTxn(client.GetTiKVClient())
-			opt := query.NewOptimizer(sql)
+			opt := kvql.NewOptimizer(sql)
 			plan, err := opt.BuildPlan(qtxn)
 			if err != nil {
 				return bindQueryToError(sql, err)
@@ -102,19 +103,19 @@ func (c QueryCmd) Handler() func(ctx context.Context) {
 
 func bindQueryToError(sql string, err error) error {
 	switch val := err.(type) {
-	case query.QueryBinder:
+	case kvql.QueryBinder:
 		val.BindQuery(sql)
 		return err
 	default:
 		return err
 	}
 }
 
-func (c QueryCmd) getRows(plan query.FinalPlan) ([][]string, error) {
+func (c QueryCmd) getRows(plan kvql.FinalPlan) ([][]string, error) {
 	ret := [][]string{
 		plan.FieldNameList(),
 	}
-	ectx := query.NewExecuteCtx()
+	ectx := kvql.NewExecuteCtx()
 	for {
 		cols, err := plan.Next(ectx)
 		if err != nil {
@@ -134,11 +135,11 @@ func (c QueryCmd) getRows(plan query.FinalPlan) ([][]string, error) {
 	return ret, nil
 }
 
-func (c QueryCmd) getRowsBatch(plan query.FinalPlan) ([][]string, error) {
+func (c QueryCmd) getRowsBatch(plan kvql.FinalPlan) ([][]string, error) {
 	ret := [][]string{
 		plan.FieldNameList(),
 	}
-	ectx := query.NewExecuteCtx()
+	ectx := kvql.NewExecuteCtx()
 	for {
 		rows, err := plan.Batch(ectx)
 		if err != nil {