Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmd/spark-connect-example-raw-grpc-client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"log"
"time"

proto "github.com/apache/spark-connect-go/internal/generated"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/google/uuid"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
Expand Down
8 changes: 4 additions & 4 deletions cmd/spark-connect-example-spark-session/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"fmt"
"log"

"github.com/apache/spark-connect-go/spark/sql/types"
"github.com/caldempsey/spark-connect-go/spark/sql/types"

"github.com/apache/spark-connect-go/spark/sql/functions"
"github.com/caldempsey/spark-connect-go/spark/sql/functions"

"github.com/apache/spark-connect-go/spark/sql"
"github.com/apache/spark-connect-go/spark/sql/utils"
"github.com/caldempsey/spark-connect-go/spark/sql"
"github.com/caldempsey/spark-connect-go/spark/sql/utils"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

module github.com/apache/spark-connect-go
module github.com/caldempsey/spark-connect-go

go 1.23.2

Expand Down
10 changes: 5 additions & 5 deletions internal/tests/integration/dataframe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ import (
"os"
"testing"

"github.com/apache/spark-connect-go/spark/sql/utils"
"github.com/caldempsey/spark-connect-go/spark/sql/utils"

"github.com/apache/spark-connect-go/spark/sql/types"
"github.com/caldempsey/spark-connect-go/spark/sql/types"

"github.com/apache/spark-connect-go/spark/sql/column"
"github.com/caldempsey/spark-connect-go/spark/sql/column"

"github.com/apache/spark-connect-go/spark/sql/functions"
"github.com/caldempsey/spark-connect-go/spark/sql/functions"

"github.com/apache/spark-connect-go/spark/sql"
"github.com/caldempsey/spark-connect-go/spark/sql"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
6 changes: 3 additions & 3 deletions internal/tests/integration/functions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"context"
"testing"

"github.com/apache/spark-connect-go/spark/sql/types"
"github.com/caldempsey/spark-connect-go/spark/sql/types"

"github.com/apache/spark-connect-go/spark/sql/functions"
"github.com/caldempsey/spark-connect-go/spark/sql/functions"

"github.com/apache/spark-connect-go/spark/sql"
"github.com/caldempsey/spark-connect-go/spark/sql"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/tests/integration/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/apache/arrow-go/v18/arrow/array"
"github.com/apache/arrow-go/v18/arrow/memory"

"github.com/apache/spark-connect-go/spark/sql"
"github.com/caldempsey/spark-connect-go/spark/sql"
)

func connect() (context.Context, sql.SparkSession) {
Expand Down
2 changes: 1 addition & 1 deletion internal/tests/integration/spark_runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"os/exec"
"time"

"github.com/apache/spark-connect-go/spark/sparkerrors"
"github.com/caldempsey/spark-connect-go/spark/sparkerrors"
)

func StartSparkConnect() (int64, error) {
Expand Down
8 changes: 4 additions & 4 deletions internal/tests/integration/sql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import (
"os"
"testing"

"github.com/apache/spark-connect-go/spark/sql/column"
"github.com/caldempsey/spark-connect-go/spark/sql/column"

"github.com/apache/spark-connect-go/spark/sql/functions"
"github.com/caldempsey/spark-connect-go/spark/sql/functions"

"github.com/apache/spark-connect-go/spark/sql/types"
"github.com/caldempsey/spark-connect-go/spark/sql/types"

"github.com/apache/spark-connect-go/spark/sql"
"github.com/caldempsey/spark-connect-go/spark/sql"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions spark/client/base/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ package base
import (
"context"

"github.com/apache/spark-connect-go/spark/sql/utils"
"github.com/caldempsey/spark-connect-go/spark/sql/utils"

"github.com/apache/arrow-go/v18/arrow"
"github.com/apache/spark-connect-go/internal/generated"
"github.com/apache/spark-connect-go/spark/sql/types"
"github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/caldempsey/spark-connect-go/spark/sql/types"
)

type SparkConnectRPCClient generated.SparkConnectServiceClient
Expand Down
4 changes: 2 additions & 2 deletions spark/client/channel/channel.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ import (
"strconv"
"strings"

"github.com/apache/spark-connect-go/spark"
"github.com/caldempsey/spark-connect-go/spark"

"github.com/google/uuid"

"google.golang.org/grpc/credentials/insecure"

"github.com/apache/spark-connect-go/spark/sparkerrors"
"github.com/caldempsey/spark-connect-go/spark/sparkerrors"
"golang.org/x/oauth2"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
Expand Down
4 changes: 2 additions & 2 deletions spark/client/channel/channel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"github.com/google/uuid"

"github.com/apache/spark-connect-go/spark/client/channel"
"github.com/apache/spark-connect-go/spark/sparkerrors"
"github.com/caldempsey/spark-connect-go/spark/client/channel"
"github.com/caldempsey/spark-connect-go/spark/sparkerrors"
"github.com/stretchr/testify/assert"
)

Expand Down
14 changes: 7 additions & 7 deletions spark/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ import (
"fmt"
"io"

"github.com/apache/spark-connect-go/spark/sql/utils"
"github.com/caldempsey/spark-connect-go/spark/sql/utils"

"google.golang.org/grpc"
"google.golang.org/grpc/metadata"

"github.com/apache/spark-connect-go/spark/client/base"
"github.com/apache/spark-connect-go/spark/mocks"
"github.com/caldempsey/spark-connect-go/spark/client/base"
"github.com/caldempsey/spark-connect-go/spark/mocks"

"github.com/apache/spark-connect-go/spark/client/options"
"github.com/caldempsey/spark-connect-go/spark/client/options"

"github.com/google/uuid"

"github.com/apache/arrow-go/v18/arrow"
"github.com/apache/arrow-go/v18/arrow/array"
"github.com/apache/spark-connect-go/spark/sql/types"
"github.com/caldempsey/spark-connect-go/spark/sql/types"

proto "github.com/apache/spark-connect-go/internal/generated"
"github.com/apache/spark-connect-go/spark/sparkerrors"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/caldempsey/spark-connect-go/spark/sparkerrors"
)

type sparkConnectClientImpl struct {
Expand Down
10 changes: 5 additions & 5 deletions spark/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"github.com/apache/arrow-go/v18/arrow/array"
"github.com/apache/arrow-go/v18/arrow/ipc"
"github.com/apache/arrow-go/v18/arrow/memory"
proto "github.com/apache/spark-connect-go/internal/generated"
"github.com/apache/spark-connect-go/spark/client"
"github.com/apache/spark-connect-go/spark/client/testutils"
"github.com/apache/spark-connect-go/spark/mocks"
"github.com/apache/spark-connect-go/spark/sparkerrors"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/caldempsey/spark-connect-go/spark/client"
"github.com/caldempsey/spark-connect-go/spark/client/testutils"
"github.com/caldempsey/spark-connect-go/spark/mocks"
"github.com/caldempsey/spark-connect-go/spark/sparkerrors"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
4 changes: 2 additions & 2 deletions spark/client/conf.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package client
import (
"context"

proto "github.com/apache/spark-connect-go/internal/generated"
"github.com/apache/spark-connect-go/spark/client/base"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/caldempsey/spark-connect-go/spark/client/base"
)

// Public interface RuntimeConfig
Expand Down
8 changes: 4 additions & 4 deletions spark/client/retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import (
"strings"
"time"

"github.com/apache/spark-connect-go/spark/client/base"
"github.com/caldempsey/spark-connect-go/spark/client/base"

"github.com/apache/spark-connect-go/spark/client/options"
"github.com/caldempsey/spark-connect-go/spark/client/options"
"google.golang.org/grpc/metadata"

proto "github.com/apache/spark-connect-go/internal/generated"
"github.com/apache/spark-connect-go/spark/sparkerrors"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/caldempsey/spark-connect-go/spark/sparkerrors"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
)
Expand Down
8 changes: 4 additions & 4 deletions spark/client/retry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"testing"
"time"

"github.com/apache/spark-connect-go/spark/client/options"
"github.com/caldempsey/spark-connect-go/spark/client/options"

"github.com/apache/spark-connect-go/spark/client/testutils"
"github.com/apache/spark-connect-go/spark/mocks"
"github.com/apache/spark-connect-go/spark/sparkerrors"
"github.com/caldempsey/spark-connect-go/spark/client/testutils"
"github.com/caldempsey/spark-connect-go/spark/mocks"
"github.com/caldempsey/spark-connect-go/spark/sparkerrors"

"github.com/stretchr/testify/assert"
"google.golang.org/grpc/codes"
Expand Down
2 changes: 1 addition & 1 deletion spark/client/testutils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"context"
"testing"

proto "github.com/apache/spark-connect-go/internal/generated"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"google.golang.org/grpc"
)

Expand Down
8 changes: 4 additions & 4 deletions spark/mocks/mock_executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import (
"context"
"errors"

"github.com/apache/spark-connect-go/spark/sql/utils"
"github.com/caldempsey/spark-connect-go/spark/sql/utils"

"github.com/apache/spark-connect-go/spark/client/base"
"github.com/caldempsey/spark-connect-go/spark/client/base"

"github.com/apache/arrow-go/v18/arrow"
"github.com/apache/spark-connect-go/internal/generated"
"github.com/apache/spark-connect-go/spark/sql/types"
"github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/caldempsey/spark-connect-go/spark/sql/types"
)

type TestExecutor struct {
Expand Down
2 changes: 1 addition & 1 deletion spark/mocks/mocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/google/uuid"

proto "github.com/apache/spark-connect-go/internal/generated"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"google.golang.org/grpc/metadata"
)

Expand Down
4 changes: 2 additions & 2 deletions spark/sql/column/column.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package column
import (
"context"

"github.com/apache/spark-connect-go/spark/sql/types"
"github.com/caldempsey/spark-connect-go/spark/sql/types"

proto "github.com/apache/spark-connect-go/internal/generated"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
)

// Convertible is the interface for all things that can be converted into a protobuf expression.
Expand Down
2 changes: 1 addition & 1 deletion spark/sql/column/column_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"context"
"testing"

proto "github.com/apache/spark-connect-go/internal/generated"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions spark/sql/column/expressions.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"fmt"
"strings"

"github.com/apache/spark-connect-go/spark/sql/types"
"github.com/caldempsey/spark-connect-go/spark/sql/types"

"github.com/apache/spark-connect-go/spark/sparkerrors"
"github.com/caldempsey/spark-connect-go/spark/sparkerrors"

proto "github.com/apache/spark-connect-go/internal/generated"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
)

func newProtoExpression() *proto.Expression {
Expand Down
2 changes: 1 addition & 1 deletion spark/sql/column/expressions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"reflect"
"testing"

proto "github.com/apache/spark-connect-go/internal/generated"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/stretchr/testify/assert"
)

Expand Down
10 changes: 5 additions & 5 deletions spark/sql/dataframe.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"math/rand/v2"

"github.com/apache/arrow-go/v18/arrow"
"github.com/apache/spark-connect-go/spark/sql/utils"
"github.com/caldempsey/spark-connect-go/spark/sql/utils"

"github.com/apache/spark-connect-go/spark/sql/column"
"github.com/caldempsey/spark-connect-go/spark/sql/column"

"github.com/apache/spark-connect-go/spark/sql/types"
"github.com/caldempsey/spark-connect-go/spark/sql/types"

proto "github.com/apache/spark-connect-go/internal/generated"
"github.com/apache/spark-connect-go/spark/sparkerrors"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/caldempsey/spark-connect-go/spark/sparkerrors"
)

// ResultCollector receives a stream of result rows
Expand Down
4 changes: 2 additions & 2 deletions spark/sql/dataframe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"context"
"testing"

proto "github.com/apache/spark-connect-go/internal/generated"
"github.com/apache/spark-connect-go/spark/sql/functions"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/caldempsey/spark-connect-go/spark/sql/functions"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion spark/sql/dataframenafunctions.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package sql
import (
"context"

"github.com/apache/spark-connect-go/spark/sql/types"
"github.com/caldempsey/spark-connect-go/spark/sql/types"
)

type DataFrameNaFunctions interface {
Expand Down
4 changes: 2 additions & 2 deletions spark/sql/dataframewriter.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"fmt"
"strings"

proto "github.com/apache/spark-connect-go/internal/generated"
"github.com/apache/spark-connect-go/spark/sparkerrors"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/caldempsey/spark-connect-go/spark/sparkerrors"
)

// DataFrameWriter supports writing data frame to storage.
Expand Down
6 changes: 3 additions & 3 deletions spark/sql/dataframewriter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"context"
"testing"

"github.com/apache/spark-connect-go/spark/client"
"github.com/caldempsey/spark-connect-go/spark/client"

proto "github.com/apache/spark-connect-go/internal/generated"
"github.com/apache/spark-connect-go/spark/mocks"
proto "github.com/caldempsey/spark-connect-go/internal/generated"
"github.com/caldempsey/spark-connect-go/spark/mocks"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions spark/sql/functions/buiitins.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
package functions

import (
"github.com/apache/spark-connect-go/spark/sql/column"
"github.com/apache/spark-connect-go/spark/sql/types"
"github.com/caldempsey/spark-connect-go/spark/sql/column"
"github.com/caldempsey/spark-connect-go/spark/sql/types"
)

func Expr(expr string) column.Column {
Expand Down
Loading
Loading