Skip to content

Commit

Permalink
[SPARK-48777][BUILD][FOLLOW] Set version to v35 since v1 is not all…
Browse files Browse the repository at this point in the history
…owed and it follows the Spark release

### What changes were proposed in this pull request?
Cleanup from #23 that needs to set the package version to something that is not v1.

### Why are the changes needed?
Go compatibility

### Does this PR introduce _any_ user-facing change?
No

### How was this patch tested?
Existing tests.

Closes #24 from grundprinzip/SPARK-48777-2.

Authored-by: Martin Grund <martin.grund@databricks.com>
Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
  • Loading branch information
grundprinzip authored and HyukjinKwon committed Jul 3, 2024
1 parent 17d03a0 commit 4c315b3
Show file tree
Hide file tree
Showing 20 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ proto_library(
# Create the proto library directly.
go_proto_library(
name = "spark_connect_proto",
importpath = "github.com/apache/spark-connect-go/v1/internal/generated/spark/connect",
importpath = "github.com/apache/spark-connect-go/v35/internal/generated/spark/connect",
protos = [
":spark_connect_protos",
],
Expand All @@ -30,7 +30,7 @@ go_proto_library(
go_grpc_library(
name = "spark_connect_proto_grpc",
compilers = ["@io_bazel_rules_go//proto:go_grpc"],
importpath = "github.com/apache/spark-connect-go/v1/internal/generated/spark/connect",
importpath = "github.com/apache/spark-connect-go/v35/internal/generated/spark/connect",
protos = [
":spark_connect_protos",
],
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/channel/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go_library(
"channel.go",
"compat.go",
],
importpath = "github.com/apache/spark-connect-go/v1/client/channel",
importpath = "github.com/apache/spark-connect-go/v35/client/channel",
visibility = ["//visibility:public"],
deps = [
"//client/sparkerrors",
Expand Down
2 changes: 1 addition & 1 deletion client/channel/channel.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"strconv"
"strings"

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

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

Expand Down
2 changes: 1 addition & 1 deletion client/sparkerrors/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@rules_go//go:def.bzl", "go_library", "go_test")
go_library(
name = "sparkerrors",
srcs = ["errors.go"],
importpath = "github.com/apache/spark-connect-go/v1/client/sparkerrors",
importpath = "github.com/apache/spark-connect-go/v35/client/sparkerrors",
visibility = ["//visibility:public"],
)

Expand Down
2 changes: 1 addition & 1 deletion client/sql/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ go_library(
"sparksession.go",
"structtype.go",
],
importpath = "github.com/apache/spark-connect-go/v1/client/sql",
importpath = "github.com/apache/spark-connect-go/v35/client/sql",
visibility = ["//visibility:public"],
deps = [
"//client/channel",
Expand Down
4 changes: 2 additions & 2 deletions client/sql/dataframe.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/apache/arrow/go/v12/arrow"
"github.com/apache/arrow/go/v12/arrow/array"
"github.com/apache/arrow/go/v12/arrow/ipc"
"github.com/apache/spark-connect-go/v1/client/sparkerrors"
proto "github.com/apache/spark-connect-go/v1/internal/generated/spark/connect"
"github.com/apache/spark-connect-go/v35/client/sparkerrors"
proto "github.com/apache/spark-connect-go/v35/internal/generated/spark/connect"
)

// ResultCollector receives a stream of result rows
Expand Down
2 changes: 1 addition & 1 deletion client/sql/dataframe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/apache/arrow/go/v12/arrow/float16"
"github.com/apache/arrow/go/v12/arrow/ipc"
"github.com/apache/arrow/go/v12/arrow/memory"
proto "github.com/apache/spark-connect-go/v1/internal/generated/spark/connect"
proto "github.com/apache/spark-connect-go/v35/internal/generated/spark/connect"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion client/sql/dataframereader.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package sql

import proto "github.com/apache/spark-connect-go/v1/internal/generated/spark/connect"
import proto "github.com/apache/spark-connect-go/v35/internal/generated/spark/connect"

// DataFrameReader supports reading data from storage and returning a data frame.
// TODO needs to implement other methods like Option(), Schema(), and also "strong typed"
Expand Down
4 changes: 2 additions & 2 deletions client/sql/dataframewriter.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"strings"

"github.com/apache/spark-connect-go/v1/client/sparkerrors"
proto "github.com/apache/spark-connect-go/v1/internal/generated/spark/connect"
"github.com/apache/spark-connect-go/v35/client/sparkerrors"
proto "github.com/apache/spark-connect-go/v35/internal/generated/spark/connect"
)

// DataFrameWriter supports writing data frame to storage.
Expand Down
2 changes: 1 addition & 1 deletion client/sql/dataframewriter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"testing"

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

Expand Down
4 changes: 2 additions & 2 deletions client/sql/executeplanclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"io"

"github.com/apache/spark-connect-go/v1/client/sparkerrors"
proto "github.com/apache/spark-connect-go/v1/internal/generated/spark/connect"
"github.com/apache/spark-connect-go/v35/client/sparkerrors"
proto "github.com/apache/spark-connect-go/v35/internal/generated/spark/connect"
)

type executePlanClient struct {
Expand Down
2 changes: 1 addition & 1 deletion client/sql/mocks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

proto "github.com/apache/spark-connect-go/v1/internal/generated/spark/connect"
proto "github.com/apache/spark-connect-go/v35/internal/generated/spark/connect"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc"
"google.golang.org/grpc/metadata"
Expand Down
6 changes: 3 additions & 3 deletions client/sql/sparksession.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"context"
"fmt"

"github.com/apache/spark-connect-go/v1/client/channel"
"github.com/apache/spark-connect-go/v1/client/sparkerrors"
proto "github.com/apache/spark-connect-go/v1/internal/generated/spark/connect"
"github.com/apache/spark-connect-go/v35/client/channel"
"github.com/apache/spark-connect-go/v35/client/sparkerrors"
proto "github.com/apache/spark-connect-go/v35/internal/generated/spark/connect"
"github.com/google/uuid"
"google.golang.org/grpc/metadata"
)
Expand Down
4 changes: 2 additions & 2 deletions client/sql/sparksession_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"testing"

"github.com/apache/spark-connect-go/v1/client/sparkerrors"
proto "github.com/apache/spark-connect-go/v1/internal/generated/spark/connect"
"github.com/apache/spark-connect-go/v35/client/sparkerrors"
proto "github.com/apache/spark-connect-go/v35/internal/generated/spark/connect"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/spark-connect-example-raw-grpc-client/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
name = "spark-connect-example-raw-grpc-client_lib",
srcs = ["main.go"],
importpath = "github.com/apache/spark-connect-go/v1/cmd/spark-connect-example-raw-grpc-client",
importpath = "github.com/apache/spark-connect-go/v35/cmd/spark-connect-example-raw-grpc-client",
visibility = ["//visibility:private"],
deps = [
"//:spark_connect_proto_grpc",
Expand Down
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/v1/internal/generated/spark/connect"
proto "github.com/apache/spark-connect-go/v35/internal/generated/spark/connect"
"github.com/google/uuid"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
Expand Down
2 changes: 1 addition & 1 deletion cmd/spark-connect-example-spark-session/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"flag"
"log"

"github.com/apache/spark-connect-go/v1/client/sql"
"github.com/apache/spark-connect-go/v35/client/sql"
)

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/v1
module github.com/apache/spark-connect-go/v35

go 1.21

Expand Down

0 comments on commit 4c315b3

Please sign in to comment.