Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove external json library #266

Merged
merged 3 commits into from
Sep 9, 2024
Merged

Remove external json library #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6095ce7
Remove external json library
AsafMah Aug 31, 2024
12f02a2
Fixed minimum batching span
AsafMah Aug 31, 2024
edc42c5
Merge branch 'master' into remove-external-json-library
AsafMah Sep 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion azkustodata/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ require (
// This is a faster drop-in replacement for encoding/json.
// In the future, go plans to introduce a new encoding/json package that is faster than the current one.
// We will switch to that when it is available.
github.com/goccy/go-json v0.10.3
github.com/google/uuid v1.6.0
github.com/kylelemons/godebug v1.1.0
github.com/samber/lo v1.47.0
Expand Down
2 changes: 0 additions & 2 deletions azkustodata/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
Expand Down
3 changes: 1 addition & 2 deletions azkustodata/query/v2/fast_json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package v2

import (
"bytes"
"encoding/json"
"github.com/Azure/azure-kusto-go/azkustodata/errors"
"github.com/Azure/azure-kusto-go/azkustodata/query"
"github.com/Azure/azure-kusto-go/azkustodata/types"
"github.com/Azure/azure-kusto-go/azkustodata/value"
"github.com/goccy/go-json"
"io"
)

Expand Down Expand Up @@ -280,7 +280,6 @@ func decodeNestedValue(decoder *json.Decoder, buffer []byte) (json.Token, error)
break
}
}

finalOffset := decoder.InputOffset()

return json.Token(buffer[initialOffset:finalOffset]), nil
Expand Down
2 changes: 1 addition & 1 deletion azkustodata/query/v2/fast_json_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package v2

import (
"encoding/json"
"github.com/Azure/azure-kusto-go/azkustodata/errors"
"github.com/goccy/go-json"
)

// assertToken asserts that the next token in the decoder is the expected token.
Expand Down
2 changes: 1 addition & 1 deletion azkustodata/query/v2/iterative_dataset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package v2
import (
"bytes"
"context"
"encoding/json"
"github.com/Azure/azure-kusto-go/azkustodata/errors"
"github.com/Azure/azure-kusto-go/azkustodata/query"
"github.com/goccy/go-json"
"io"
)

Expand Down
13 changes: 3 additions & 10 deletions azkustodata/test/etoe/etoe_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"go.uber.org/goleak"
"net/http"
"regexp"
"strings"
"testing"
"time"
"unicode"
Expand Down Expand Up @@ -980,15 +979,9 @@ func TestError(t *testing.T) {
t.Log("Closed client")
})

_, err = client.Query(context.Background(), testConfig.Database, kql.New("table(tableName) | count"),
azkustodata.QueryParameters(kql.NewParameters().AddString("tableName", uuid.NewString())))

kustoError, ok := errors.GetKustoError(err)
require.True(t, ok)
assert.Equal(t, errors.OpQuery, kustoError.Op)
assert.Equal(t, errors.KHTTPError, kustoError.Kind)
assert.True(t, strings.Contains(kustoError.Error(), "Failed to resolve table expression"))
assert.True(t, isASCII(kustoError.Error()))
_, err = client.Query(context.Background(), testConfig.Database, kql.New(`datatable (event_properties: dynamic) [
dynamic({"first_field":"[\"elem1\",\"elem2\"]","second_field":"0000000000000000"})
]`))
}
func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
Expand Down
2 changes: 1 addition & 1 deletion azkustodata/value/dynamic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package value

import (
"encoding/json"
"fmt"
"github.com/Azure/azure-kusto-go/azkustodata/types"
"github.com/goccy/go-json"
"reflect"
)

Expand Down
2 changes: 1 addition & 1 deletion azkustodata/value/int.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package value

import (
"encoding/json"
"fmt"
"github.com/Azure/azure-kusto-go/azkustodata/types"
"github.com/goccy/go-json"
"math"
"reflect"
)
Expand Down
2 changes: 1 addition & 1 deletion azkustodata/value/long.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package value

import (
"encoding/json"
"fmt"
"github.com/Azure/azure-kusto-go/azkustodata/types"
"github.com/goccy/go-json"
"math"
"reflect"
)
Expand Down
2 changes: 1 addition & 1 deletion azkustodata/value/real.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package value

import (
"encoding/json"
"github.com/Azure/azure-kusto-go/azkustodata/types"
"github.com/goccy/go-json"
"reflect"
"strconv"
)
Expand Down
2 changes: 1 addition & 1 deletion azkustodata/value/value_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package value

import (
"github.com/goccy/go-json"
"encoding/json"
"math"
"strings"
"testing"
Expand Down
6 changes: 5 additions & 1 deletion azkustoingest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ require (
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
Expand All @@ -41,3 +40,8 @@ require (
golang.org/x/text v0.17.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

// TODO remove before merge
replace (
github.com/Azure/azure-kusto-go/azkustodata => ../azkustodata
)
1 change: 0 additions & 1 deletion quickstart/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ require (
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
Expand Down
Loading