Updating v2 package name (#1183)

QuesmaOrg · Jan 14, 2025 · c2bd30a · c2bd30a
1 parent a6df57e
commit c2bd30a
Show file tree

Hide file tree

Showing 83 changed files with 202 additions and 128 deletions.
diff --git a/quesma/backend_connectors/clickhouse_backend_connector.go b/quesma/backend_connectors/clickhouse_backend_connector.go
@@ -8,7 +8,7 @@ import (
 	"database/sql"
 	"github.com/ClickHouse/clickhouse-go/v2"
 
-	quesma_api "quesma_v2/core"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 )
 
 type ClickHouseBackendConnector struct {

diff --git a/quesma/backend_connectors/elasticsearch_backend_connector.go b/quesma/backend_connectors/elasticsearch_backend_connector.go
@@ -10,8 +10,8 @@ import (
 	"fmt"
 	"github.com/QuesmaOrg/quesma/quesma/elasticsearch"
 	"github.com/QuesmaOrg/quesma/quesma/quesma/config"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 	"net/http"
-	quesma_api "quesma_v2/core"
 	"time"
 )
 

diff --git a/quesma/backend_connectors/mysql_backend_connector.go b/quesma/backend_connectors/mysql_backend_connector.go
@@ -6,8 +6,8 @@ package backend_connectors
 import (
 	"context"
 	"database/sql"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 	_ "github.com/go-sql-driver/mysql"
-	quesma_api "quesma_v2/core"
 )
 
 type MySqlRows struct {

diff --git a/quesma/backend_connectors/postgres_backend_connector.go b/quesma/backend_connectors/postgres_backend_connector.go
@@ -5,8 +5,8 @@ package backend_connectors
 
 import (
 	"context"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 	"github.com/jackc/pgx/v4"
-	quesma_api "quesma_v2/core"
 )
 
 type PostgresBackendConnector struct {

diff --git a/quesma/clickhouse/clickhouse.go b/quesma/clickhouse/clickhouse.go
@@ -13,8 +13,8 @@ import (
 	"github.com/QuesmaOrg/quesma/quesma/quesma/recovery"
 	"github.com/QuesmaOrg/quesma/quesma/schema"
 	"github.com/QuesmaOrg/quesma/quesma/util"
-	quesma_api "quesma_v2/core"
-	"quesma_v2/core/diag"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
+	"github.com/QuesmaOrg/quesma/v2/core/diag"
 	"slices"
 	"strings"
 	"sync/atomic"

diff --git a/quesma/clickhouse/connection.go b/quesma/clickhouse/connection.go
@@ -11,8 +11,8 @@ import (
 	"github.com/QuesmaOrg/quesma/quesma/buildinfo"
 	"github.com/QuesmaOrg/quesma/quesma/logger"
 	"github.com/QuesmaOrg/quesma/quesma/quesma/config"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 	"net"
-	quesma_api "quesma_v2/core"
 	"strings"
 	"time"
 )

diff --git a/quesma/clickhouse/quesma_communicator.go b/quesma/clickhouse/quesma_communicator.go
@@ -10,9 +10,9 @@ import (
 	"github.com/QuesmaOrg/quesma/quesma/logger"
 	"github.com/QuesmaOrg/quesma/quesma/model"
 	"github.com/QuesmaOrg/quesma/quesma/quesma/recovery"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
+	"github.com/QuesmaOrg/quesma/v2/core/tracing"
 	"math/rand"
-	quesma_api "quesma_v2/core"
-	tracing "quesma_v2/core/tracing"
 	"strconv"
 	"strings"
 	"sync/atomic"

diff --git a/quesma/clickhouse/table_discovery.go b/quesma/clickhouse/table_discovery.go
@@ -13,8 +13,8 @@ import (
 	"github.com/QuesmaOrg/quesma/quesma/quesma/config"
 	"github.com/QuesmaOrg/quesma/quesma/schema"
 	"github.com/QuesmaOrg/quesma/quesma/util"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 	"github.com/goccy/go-json"
-	quesma_api "quesma_v2/core"
 	"strings"
 	"sync/atomic"
 	"time"

diff --git a/quesma/common_table/const.go b/quesma/common_table/const.go
@@ -5,7 +5,7 @@ package common_table
 import (
 	"context"
 	"github.com/QuesmaOrg/quesma/quesma/logger"
-	quesma_api "quesma_v2/core"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 )
 
 const TableName = "quesma_common_table"

diff --git a/quesma/connectors/connector.go b/quesma/connectors/connector.go
@@ -9,7 +9,7 @@ import (
 	"github.com/QuesmaOrg/quesma/quesma/logger"
 	"github.com/QuesmaOrg/quesma/quesma/quesma/config"
 	"github.com/QuesmaOrg/quesma/quesma/telemetry"
-	quesma_api "quesma_v2/core"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 )
 
 type Connector interface {

diff --git a/quesma/eql/e2e/query_integration_test.go b/quesma/eql/e2e/query_integration_test.go
@@ -7,10 +7,10 @@ package e2e
 import (
 	"bytes"
 	"fmt"
+	"github.com/QuesmaOrg/quesma/quesma/jsonprocessor"
 	"github.com/goccy/go-json"
 	"io"
 	"net/http"
-	"quesma/jsonprocessor"
 	"sort"
 	"strings"
 )

diff --git a/quesma/frontend_connectors/basic_http_frontend_connector.go b/quesma/frontend_connectors/basic_http_frontend_connector.go
@@ -9,10 +9,10 @@ import (
 	"github.com/QuesmaOrg/quesma/quesma/clickhouse"
 	"github.com/QuesmaOrg/quesma/quesma/quesma/config"
 	"github.com/QuesmaOrg/quesma/quesma/schema"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
+	"github.com/QuesmaOrg/quesma/v2/core/diag"
 	"io"
 	"net/http"
-	quesma_api "quesma_v2/core"
-	"quesma_v2/core/diag"
 	"sync"
 )
 

diff --git a/quesma/frontend_connectors/basic_tcp_connection_handler.go b/quesma/frontend_connectors/basic_tcp_connection_handler.go
@@ -5,9 +5,9 @@ package frontend_connectors
 
 import (
 	"fmt"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 	"io"
 	"net"
-	quesma_api "quesma_v2/core"
 )
 
 type BasicTcpConnectionHandler struct {

diff --git a/quesma/frontend_connectors/basic_tcp_connector.go b/quesma/frontend_connectors/basic_tcp_connector.go
@@ -6,8 +6,8 @@ package frontend_connectors
 import (
 	"context"
 	"fmt"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 	"net"
-	quesma_api "quesma_v2/core"
 	"sync/atomic"
 )
 

diff --git a/quesma/frontend_connectors/elastic_http_frontend_connector.go b/quesma/frontend_connectors/elastic_http_frontend_connector.go
@@ -8,8 +8,8 @@ import (
 	"github.com/QuesmaOrg/quesma/quesma/clickhouse"
 	"github.com/QuesmaOrg/quesma/quesma/quesma/config"
 	"github.com/QuesmaOrg/quesma/quesma/schema"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 	"net/http"
-	quesma_api "quesma_v2/core"
 )
 
 type ElasticHttpIngestFrontendConnector struct {

diff --git a/quesma/frontend_connectors/elasticsearch_ingest.go b/quesma/frontend_connectors/elasticsearch_ingest.go
@@ -6,8 +6,8 @@ package frontend_connectors
 import (
 	"context"
 	"github.com/QuesmaOrg/quesma/quesma/processors/es_to_ch_common"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 	"net/http"
-	quesma_api "quesma_v2/core"
 )
 
 type ElasticsearchIngestFrontendConnector struct {

diff --git a/quesma/frontend_connectors/elasticsearch_query.go b/quesma/frontend_connectors/elasticsearch_query.go
@@ -8,8 +8,8 @@ import (
 	"github.com/QuesmaOrg/quesma/quesma/elasticsearch"
 	"github.com/QuesmaOrg/quesma/quesma/processors/es_to_ch_common"
 	"github.com/QuesmaOrg/quesma/quesma/quesma/config"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 	"net/http"
-	quesma_api "quesma_v2/core"
 )
 
 type ElasticsearchQueryFrontendConnector struct {

diff --git a/quesma/frontend_connectors/passthrough_tcp_connection_handler.go b/quesma/frontend_connectors/passthrough_tcp_connection_handler.go
@@ -5,9 +5,9 @@ package frontend_connectors
 
 import (
 	"fmt"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 	"io"
 	"net"
-	quesma_api "quesma_v2/core"
 )
 
 func (p *PassThroughConnectionHandler) copyData(src io.Reader, dest io.Writer) {

diff --git a/quesma/frontend_connectors/router_v2.go b/quesma/frontend_connectors/router_v2.go
@@ -22,12 +22,12 @@ import (
 	"github.com/QuesmaOrg/quesma/quesma/quesma/ui"
 	"github.com/QuesmaOrg/quesma/quesma/schema"
 	"github.com/QuesmaOrg/quesma/quesma/util"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
+	"github.com/QuesmaOrg/quesma/v2/core/diag"
+	"github.com/QuesmaOrg/quesma/v2/core/routes"
+	"github.com/QuesmaOrg/quesma/v2/core/tracing"
 	"io"
 	"net/http"
-	quesma_api "quesma_v2/core"
-	"quesma_v2/core/diag"
-	"quesma_v2/core/routes"
-	"quesma_v2/core/tracing"
 	"strings"
 	"sync/atomic"
 	"time"

diff --git a/quesma/frontend_connectors/tcp_postgres_connection_handler.go b/quesma/frontend_connectors/tcp_postgres_connection_handler.go
@@ -5,9 +5,9 @@ package frontend_connectors
 
 import (
 	"fmt"
+	quesma_api "github.com/QuesmaOrg/quesma/v2/core"
 	"github.com/jackc/pgx/v5/pgproto3"
 	"net"
-	quesma_api "quesma_v2/core"
 )
 
 type TcpPostgresConnectionHandler struct {

diff --git a/quesma/go.mod b/quesma/go.mod
@@ -2,13 +2,14 @@ module github.com/QuesmaOrg/quesma/quesma
 
 go 1.23.2
 
-replace quesma_v2 => ./v2
+replace github.com/QuesmaOrg/quesma/v2 => ./v2
 
 require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.30.0
 	github.com/DATA-DOG/go-sqlmock v1.5.2
 	github.com/DataDog/go-sqllexer v0.0.20
 	github.com/H0llyW00dzZ/cidr v1.2.1
+	github.com/QuesmaOrg/quesma/v2 v2.0.0-00010101000000-000000000000
 	github.com/apparentlymart/go-cidr v1.1.0
 	github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df
 	github.com/coreos/go-semver v0.3.1
@@ -32,25 +33,24 @@ require (
 	github.com/rs/zerolog v1.33.0
 	github.com/shirou/gopsutil/v3 v3.24.5
 	github.com/stretchr/testify v1.10.0
-	github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a
+	github.com/tailscale/hujson v0.0.0-20241010212012-29efb4a0184b
 	github.com/tidwall/sjson v1.2.5
 	github.com/ucarion/urlpath v0.0.0-20200424170820-7ccc79b76bbb
-	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
-	golang.org/x/oauth2 v0.24.0
-	quesma_v2 v0.0.0-00010101000000-000000000000
+	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
+	golang.org/x/oauth2 v0.25.0
 )
 
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.14.3 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgtype v1.14.0 // indirect
+	github.com/jackc/pgtype v1.14.4 // indirect
 	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
@@ -59,35 +59,35 @@ require (
 	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 )
 
 require (
-	github.com/ClickHouse/ch-go v0.61.5 // indirect
+	github.com/ClickHouse/ch-go v0.63.1 // indirect
 	github.com/andybalholm/brotli v1.1.1 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.1
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/go-faster/city v1.0.1 // indirect
 	github.com/go-faster/errors v0.7.1 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/klauspost/compress v1.17.11
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/paulmach/orb v0.11.1 // indirect
-	github.com/pierrec/lz4/v4 v4.1.21 // indirect
+	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
-	github.com/tklauser/go-sysconf v0.3.12 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/tklauser/go-sysconf v0.3.14 // indirect
+	github.com/tklauser/numcpus v0.9.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	go.opentelemetry.io/otel v1.33.0 // indirect
+	go.opentelemetry.io/otel/trace v1.33.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1
 )