axiodb 20.3.2 → 20.3.3

package/cli/cmd/transaction.go

@@ -1,191 +0,0 @@
-package cmd
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-
-	"github.com/nexoral/axiodb-cli/internal/config"
-	"github.com/nexoral/axiodb-cli/pkg/commands"
-	"github.com/spf13/cobra"
-)
-
-var transactionCmd = &cobra.Command{
-	Use:   "transaction",
-	Short: "Run ACID transaction operations",
-	Long:  "ACID transactions over TCP (port 27019). Requires TCP server enabled (AXIODB_TCP=true). Use 'transaction run' for file-based batch, or begin/commit/rollback/savepoint for manual control.",
-}
-
-var transactionRunCmd = &cobra.Command{
-	Use:   "run <operations-json-file>",
-	Short: "Run a transaction from a JSON operation list",
-	Long:  "Run a full transaction from a JSON file. Requires TCP (AXIODB_TCP=true) and --db/--collection. Auto-commits on success, auto-rollbacks on failure.",
-	Args:  cobra.ExactArgs(1),
-	RunE: func(cmd *cobra.Command, args []string) error {
-		cfg, err := config.FromFlags(cmd)
-		if err != nil {
-			return err
-		}
-		if cfg.DB == "" || cfg.Collection == "" {
-			return fmt.Errorf("--db and --collection flags are required")
-		}
-		content, err := os.ReadFile(args[0])
-		if err != nil {
-			return fmt.Errorf("read transaction file: %w", err)
-		}
-		var steps []commands.TransactionStep
-		if err := json.Unmarshal(content, &steps); err != nil {
-			return fmt.Errorf("invalid transaction JSON: %w", err)
-		}
-		client, err := cfg.ConnectAndAuth()
-		if err != nil {
-			return err
-		}
-		defer client.Disconnect()
-		response, err := commands.RunTransaction(client, cfg.DB, cfg.Collection, steps)
-		if err != nil {
-			return err
-		}
-		return printOutput(cfg.Output, response)
-	},
-}
-
-var transactionBeginCmd = &cobra.Command{
-	Use:   "begin",
-	Short: "Begin a transaction (returns transactionId)",
-	Long:  "Begin a transaction on --db/--collection. Requires TCP. Returns transactionId for subsequent commit/rollback/savepoint calls.",
-	RunE: func(cmd *cobra.Command, args []string) error {
-		cfg, err := config.FromFlags(cmd)
-		if err != nil {
-			return err
-		}
-		if cfg.DB == "" || cfg.Collection == "" {
-			return fmt.Errorf("--db and --collection flags are required")
-		}
-		client, err := cfg.ConnectAndAuth()
-		if err != nil {
-			return err
-		}
-		defer client.Disconnect()
-		resp, err := commands.BeginTransaction(client, cfg.DB, cfg.Collection)
-		if err != nil {
-			return err
-		}
-		return printOutput(cfg.Output, resp)
-	},
-}
-
-var transactionCommitCmd = &cobra.Command{
-	Use:   "commit <transactionId>",
-	Short: "Commit a transaction",
-	Args:  cobra.ExactArgs(1),
-	RunE: func(cmd *cobra.Command, args []string) error {
-		cfg, err := config.FromFlags(cmd)
-		if err != nil {
-			return err
-		}
-		client, err := cfg.ConnectAndAuth()
-		if err != nil {
-			return err
-		}
-		defer client.Disconnect()
-		resp, err := commands.CommitTransaction(client, args[0])
-		if err != nil {
-			return err
-		}
-		return printOutput(cfg.Output, resp)
-	},
-}
-
-var transactionRollbackCmd = &cobra.Command{
-	Use:   "rollback <transactionId>",
-	Short: "Rollback a transaction",
-	Args:  cobra.ExactArgs(1),
-	RunE: func(cmd *cobra.Command, args []string) error {
-		cfg, err := config.FromFlags(cmd)
-		if err != nil {
-			return err
-		}
-		client, err := cfg.ConnectAndAuth()
-		if err != nil {
-			return err
-		}
-		defer client.Disconnect()
-		resp, err := commands.RollbackTransaction(client, args[0])
-		if err != nil {
-			return err
-		}
-		return printOutput(cfg.Output, resp)
-	},
-}
-
-var transactionSavepointCmd = &cobra.Command{
-	Use:   "savepoint <transactionId> <name>",
-	Short: "Create a savepoint",
-	Args:  cobra.ExactArgs(2),
-	RunE: func(cmd *cobra.Command, args []string) error {
-		cfg, err := config.FromFlags(cmd)
-		if err != nil {
-			return err
-		}
-		client, err := cfg.ConnectAndAuth()
-		if err != nil {
-			return err
-		}
-		defer client.Disconnect()
-		resp, err := commands.Savepoint(client, args[0], args[1])
-		if err != nil {
-			return err
-		}
-		return printOutput(cfg.Output, resp)
-	},
-}
-
-var transactionRollbackToCmd = &cobra.Command{
-	Use:   "rollback-to <transactionId> <name>",
-	Short: "Rollback to a savepoint",
-	Args:  cobra.ExactArgs(2),
-	RunE: func(cmd *cobra.Command, args []string) error {
-		cfg, err := config.FromFlags(cmd)
-		if err != nil {
-			return err
-		}
-		client, err := cfg.ConnectAndAuth()
-		if err != nil {
-			return err
-		}
-		defer client.Disconnect()
-		resp, err := commands.RollbackToSavepoint(client, args[0], args[1])
-		if err != nil {
-			return err
-		}
-		return printOutput(cfg.Output, resp)
-	},
-}
-
-var transactionReleaseCmd = &cobra.Command{
-	Use:   "release <transactionId> <name>",
-	Short: "Release a savepoint",
-	Args:  cobra.ExactArgs(2),
-	RunE: func(cmd *cobra.Command, args []string) error {
-		cfg, err := config.FromFlags(cmd)
-		if err != nil {
-			return err
-		}
-		client, err := cfg.ConnectAndAuth()
-		if err != nil {
-			return err
-		}
-		defer client.Disconnect()
-		resp, err := commands.ReleaseSavepoint(client, args[0], args[1])
-		if err != nil {
-			return err
-		}
-		return printOutput(cfg.Output, resp)
-	},
-}
-
-func init() {
-	transactionCmd.AddCommand(transactionRunCmd, transactionBeginCmd, transactionCommitCmd, transactionRollbackCmd, transactionSavepointCmd, transactionRollbackToCmd, transactionReleaseCmd)
-	rootCmd.AddCommand(transactionCmd)
-}

package/cli/cmd/version.go

@@ -1,27 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-
-	"github.com/spf13/cobra"
-)
-
-var cliVersion = "20.3.2"
-
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Print the CLI version",
-	Run: func(cmd *cobra.Command, args []string) {
-		short, _ := cmd.Flags().GetBool("short")
-		if short {
-			fmt.Println(cliVersion)
-		} else {
-			fmt.Printf("axiodb-cli version %s\n", cliVersion)
-		}
-	},
-}
-
-func init() {
-	versionCmd.Flags().Bool("short", false, "Print only the version number")
-	rootCmd.AddCommand(versionCmd)
-}

package/cli/go.mod

@@ -1,15 +0,0 @@
-module github.com/nexoral/axiodb-cli
-
-go 1.22
-
-require (
-	github.com/chzyer/readline v1.5.1
-	github.com/google/uuid v1.6.0
-	github.com/spf13/cobra v1.8.1
-)
-
-require (
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
-)

package/cli/go.sum

@@ -1,20 +0,0 @@
-github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM=
-github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
-github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI=
-github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
-github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04=
-github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

package/cli/internal/config/config.go

@@ -1,120 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/nexoral/axiodb-cli/pkg/httpclient"
-	"github.com/nexoral/axiodb-cli/pkg/protocol"
-	"github.com/spf13/cobra"
-)
-
-type Config struct {
-	Host          string
-	Port          int
-	ConnString    string
-	Username      string
-	Password      string
-	TLSEnabled    bool
-	TLSCertPath   string
-	TLSSkipVerify bool
-	Output        string
-	Timeout       int
-	DB            string
-	Collection    string
-	HTTPHost      string
-	HTTPPort      int
-}
-
-func FromFlags(cmd *cobra.Command) (*Config, error) {
-	cfg := &Config{}
-
-	cfg.Host, _ = cmd.Flags().GetString("host")
-	cfg.Port, _ = cmd.Flags().GetInt("port")
-	cfg.ConnString, _ = cmd.Flags().GetString("connection-string")
-	cfg.Username, _ = cmd.Flags().GetString("username")
-	cfg.Password, _ = cmd.Flags().GetString("password")
-	cfg.TLSEnabled, _ = cmd.Flags().GetBool("tls")
-	cfg.TLSCertPath, _ = cmd.Flags().GetString("tls-cert")
-	cfg.TLSSkipVerify, _ = cmd.Flags().GetBool("tls-skip-verify")
-	cfg.Output, _ = cmd.Flags().GetString("output")
-	cfg.Timeout, _ = cmd.Flags().GetInt("timeout")
-	cfg.DB, _ = cmd.Flags().GetString("db")
-	cfg.Collection, _ = cmd.Flags().GetString("collection")
-	cfg.HTTPHost, _ = cmd.Flags().GetString("http-host")
-	cfg.HTTPPort, _ = cmd.Flags().GetInt("http-port")
-
-	if cfg.ConnString != "" {
-		host, port, err := parseConnectionString(cfg.ConnString)
-		if err != nil {
-			return nil, err
-		}
-		cfg.Host = host
-		cfg.Port = port
-	}
-
-	return cfg, nil
-}
-
-func parseConnectionString(connStr string) (string, int, error) {
-	if !strings.HasPrefix(connStr, "axiodb://") {
-		return "", 0, fmt.Errorf("invalid connection string format (expected axiodb://host:port): %s", connStr)
-	}
-
-	hostPort := strings.TrimPrefix(connStr, "axiodb://")
-	parts := strings.SplitN(hostPort, ":", 2)
-	if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
-		return "", 0, fmt.Errorf("invalid connection string format (expected axiodb://host:port): %s", connStr)
-	}
-
-	port, err := strconv.Atoi(parts[1])
-	if err != nil || port <= 0 || port > 65535 {
-		return "", 0, fmt.Errorf("invalid port number in connection string: %s", parts[1])
-	}
-
-	return parts[0], port, nil
-}
-
-func (c *Config) NewClient() *protocol.Client {
-	return protocol.NewClient(protocol.ClientConfig{
-		Host:          c.Host,
-		Port:          c.Port,
-		TLSEnabled:    c.TLSEnabled,
-		TLSCertPath:   c.TLSCertPath,
-		TLSSkipVerify: c.TLSSkipVerify,
-		Timeout:       time.Duration(c.Timeout) * time.Second,
-	})
-}
-
-func (c *Config) ConnectAndAuth() (*protocol.Client, error) {
-	client := c.NewClient()
-
-	if err := client.Connect(); err != nil {
-		return nil, fmt.Errorf("connect: %w", err)
-	}
-
-	if c.Username != "" && c.Password != "" {
-		if _, err := protocol.Authenticate(client, c.Username, c.Password); err != nil {
-			_ = client.Disconnect()
-			return nil, fmt.Errorf("auth: %w", err)
-		}
-	}
-
-	return client, nil
-}
-
-func GetDBContext(cmd *cobra.Command) string {
-	db, _ := cmd.Flags().GetString("db")
-	return db
-}
-
-func GetCollectionContext(cmd *cobra.Command) string {
-	coll, _ := cmd.Flags().GetString("collection")
-	return coll
-}
-
-func (c *Config) NewHTTPClient() *httpclient.HTTPClient {
-	return httpclient.New(c.HTTPHost, c.HTTPPort, time.Duration(c.Timeout)*time.Second)
-}

package/cli/main.go

@@ -1,7 +0,0 @@
-package main
-
-import "github.com/nexoral/axiodb-cli/cmd"
-
-func main() {
-	cmd.Execute()
-}

package/cli/pkg/commands/collection.go

@@ -1,68 +0,0 @@
-package commands
-
-import (
-	"fmt"
-
-	"github.com/nexoral/axiodb-cli/pkg/protocol"
-)
-
-func CreateCollection(client *protocol.Client, dbName, collectionName string) (*protocol.Response, error) {
-	resp, err := client.Send("CREATE_COLLECTION", map[string]interface{}{
-		"dbName":         dbName,
-		"collectionName": collectionName,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("create collection: %w", err)
-	}
-	if resp.StatusCode >= 400 {
-		return nil, fmt.Errorf("create collection failed: %s", resp.Error)
-	}
-	return resp, nil
-}
-
-func DeleteCollection(client *protocol.Client, dbName, collectionName string) (*protocol.Response, error) {
-	resp, err := client.Send("DELETE_COLLECTION", map[string]interface{}{
-		"dbName":         dbName,
-		"collectionName": collectionName,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("delete collection: %w", err)
-	}
-	if resp.StatusCode >= 400 {
-		return nil, fmt.Errorf("delete collection failed: %s", resp.Error)
-	}
-	return resp, nil
-}
-
-func CollectionExists(client *protocol.Client, dbName, collectionName string) (bool, error) {
-	resp, err := client.Send("COLLECTION_EXISTS", map[string]interface{}{
-		"dbName":         dbName,
-		"collectionName": collectionName,
-	})
-	if err != nil {
-		return false, fmt.Errorf("check collection exists: %w", err)
-	}
-	if resp.StatusCode >= 400 {
-		return false, fmt.Errorf("check collection exists failed: %s", resp.Error)
-	}
-	data, ok := resp.Data.(map[string]interface{})
-	if !ok {
-		return false, nil
-	}
-	exists, _ := data["exists"].(bool)
-	return exists, nil
-}
-
-func GetCollectionInfo(client *protocol.Client, dbName string) (*protocol.Response, error) {
-	resp, err := client.Send("GET_COLLECTION_INFO", map[string]interface{}{
-		"dbName":         dbName,
-		"collectionName": "_",
-	})
-	if err != nil {
-		return nil, fmt.Errorf("get collection info: %w", err)
-	}
-	if resp.StatusCode >= 400 {
-		return nil, fmt.Errorf("get collection info failed: %s", resp.Error)
-	}
-	return resp, nil
-}

package/cli/pkg/commands/db.go

@@ -1,62 +0,0 @@
-package commands
-
-import (
-	"fmt"
-
-	"github.com/nexoral/axiodb-cli/pkg/protocol"
-)
-
-func CreateDB(client *protocol.Client, dbName string) (*protocol.Response, error) {
-	resp, err := client.Send("CREATE_DB", map[string]interface{}{
-		"dbName": dbName,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("create database: %w", err)
-	}
-	if resp.StatusCode >= 400 {
-		return nil, fmt.Errorf("create database failed: %s", resp.Error)
-	}
-	return resp, nil
-}
-
-func DeleteDB(client *protocol.Client, dbName string) (*protocol.Response, error) {
-	resp, err := client.Send("DELETE_DB", map[string]interface{}{
-		"dbName": dbName,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("delete database: %w", err)
-	}
-	if resp.StatusCode >= 400 {
-		return nil, fmt.Errorf("delete database failed: %s", resp.Error)
-	}
-	return resp, nil
-}
-
-func DBExists(client *protocol.Client, dbName string) (bool, error) {
-	resp, err := client.Send("DB_EXISTS", map[string]interface{}{
-		"dbName": dbName,
-	})
-	if err != nil {
-		return false, fmt.Errorf("check database exists: %w", err)
-	}
-	if resp.StatusCode >= 400 {
-		return false, fmt.Errorf("check database exists failed: %s", resp.Error)
-	}
-	data, ok := resp.Data.(map[string]interface{})
-	if !ok {
-		return false, nil
-	}
-	exists, _ := data["exists"].(bool)
-	return exists, nil
-}
-
-func GetInstanceInfo(client *protocol.Client) (*protocol.Response, error) {
-	resp, err := client.Send("GET_INSTANCE_INFO", nil)
-	if err != nil {
-		return nil, fmt.Errorf("get instance info: %w", err)
-	}
-	if resp.StatusCode >= 400 {
-		return nil, fmt.Errorf("get instance info failed: %s", resp.Error)
-	}
-	return resp, nil
-}