You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2024/07/03 09:53:59 UTC
(spark-connect-go) branch master updated: [SPARK-48777][BUILD][FOLLOW] Set version to `v35` since v1 is not allowed and it follows the Spark release
This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark-connect-go.git
The following commit(s) were added to refs/heads/master by this push:
new 4c315b3 [SPARK-48777][BUILD][FOLLOW] Set version to `v35` since v1 is not allowed and it follows the Spark release
4c315b3 is described below
commit 4c315b39e7967ca40d1398d7b3f8353428e160b2
Author: Martin Grund <ma...@databricks.com>
AuthorDate: Wed Jul 3 18:53:53 2024 +0900
[SPARK-48777][BUILD][FOLLOW] Set version to `v35` since v1 is not allowed 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 <ma...@databricks.com>
Signed-off-by: Hyukjin Kwon <gu...@apache.org>
---
BUILD.bazel | 4 ++--
MODULE.bazel.lock | 2 +-
client/channel/BUILD.bazel | 2 +-
client/channel/channel.go | 2 +-
client/channel/channel_test.go | 4 ++--
client/sparkerrors/BUILD.bazel | 2 +-
client/sql/BUILD.bazel | 2 +-
client/sql/dataframe.go | 4 ++--
client/sql/dataframe_test.go | 2 +-
client/sql/dataframereader.go | 2 +-
client/sql/dataframewriter.go | 4 ++--
client/sql/dataframewriter_test.go | 2 +-
client/sql/executeplanclient.go | 4 ++--
client/sql/mocks_test.go | 2 +-
client/sql/sparksession.go | 6 +++---
client/sql/sparksession_test.go | 4 ++--
cmd/spark-connect-example-raw-grpc-client/BUILD.bazel | 2 +-
cmd/spark-connect-example-raw-grpc-client/main.go | 2 +-
cmd/spark-connect-example-spark-session/main.go | 2 +-
go.mod | 2 +-
20 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/BUILD.bazel b/BUILD.bazel
index da5861e..963f6b0 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -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",
],
@@ -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",
],
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 9276b86..e6ac9d1 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -1578,7 +1578,7 @@
"general": {
"bzlTransitiveDigest": "sH0ZfrlZyTTSTIpGNBfQJlEWK7fgxR4W5O3QYxF2pqQ=",
"recordedFileInputs": {
- "@@//go.mod": "abc5a8099d706c7fbcdeea3162c89e59a155692760627e15fb1b0ad3390ce1b8",
+ "@@//go.mod": "a7d7fa6517fcca894a472a4152e3bc39daf9733f771bf7fc16b01c35e529e642",
"@@rules_go~//go.mod": "de22304b720f7f61350ec1c9739de6c0a1b1103fd22bfeb6e92c6c843ddc6d6e",
"@@gazelle~//go.sum": "7c4460e8ecb5dd8691a51d4fa2e9e4751108b933636497ce46db499fc2e7a88d",
"@@//go.sum": "55323de741b9c6ec4540ada81453c5156c974951335ef4935f6ce3f27e1f0f0c",
diff --git a/client/channel/BUILD.bazel b/client/channel/BUILD.bazel
index f467eb2..7bac507 100644
--- a/client/channel/BUILD.bazel
+++ b/client/channel/BUILD.bazel
@@ -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",
diff --git a/client/channel/channel.go b/client/channel/channel.go
index b5d459d..0a83401 100644
--- a/client/channel/channel.go
+++ b/client/channel/channel.go
@@ -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"
diff --git a/client/channel/channel_test.go b/client/channel/channel_test.go
index 1395d99..04ea31c 100644
--- a/client/channel/channel_test.go
+++ b/client/channel/channel_test.go
@@ -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"
)
diff --git a/client/sparkerrors/BUILD.bazel b/client/sparkerrors/BUILD.bazel
index d12d220..d588343 100644
--- a/client/sparkerrors/BUILD.bazel
+++ b/client/sparkerrors/BUILD.bazel
@@ -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"],
)
diff --git a/client/sql/BUILD.bazel b/client/sql/BUILD.bazel
index 921f528..680b811 100644
--- a/client/sql/BUILD.bazel
+++ b/client/sql/BUILD.bazel
@@ -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",
diff --git a/client/sql/dataframe.go b/client/sql/dataframe.go
index 789550f..f13f85e 100644
--- a/client/sql/dataframe.go
+++ b/client/sql/dataframe.go
@@ -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
diff --git a/client/sql/dataframe_test.go b/client/sql/dataframe_test.go
index d2492d7..8b5dfd3 100644
--- a/client/sql/dataframe_test.go
+++ b/client/sql/dataframe_test.go
@@ -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"
)
diff --git a/client/sql/dataframereader.go b/client/sql/dataframereader.go
index 4edbe04..dcfd37e 100644
--- a/client/sql/dataframereader.go
+++ b/client/sql/dataframereader.go
@@ -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"
diff --git a/client/sql/dataframewriter.go b/client/sql/dataframewriter.go
index 7316f07..8680b31 100644
--- a/client/sql/dataframewriter.go
+++ b/client/sql/dataframewriter.go
@@ -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.
diff --git a/client/sql/dataframewriter_test.go b/client/sql/dataframewriter_test.go
index e5ddc81..f011b1f 100644
--- a/client/sql/dataframewriter_test.go
+++ b/client/sql/dataframewriter_test.go
@@ -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"
)
diff --git a/client/sql/executeplanclient.go b/client/sql/executeplanclient.go
index b56494f..d657ced 100644
--- a/client/sql/executeplanclient.go
+++ b/client/sql/executeplanclient.go
@@ -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 {
diff --git a/client/sql/mocks_test.go b/client/sql/mocks_test.go
index 25da527..c52561d 100644
--- a/client/sql/mocks_test.go
+++ b/client/sql/mocks_test.go
@@ -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"
diff --git a/client/sql/sparksession.go b/client/sql/sparksession.go
index 9949076..e4d6664 100644
--- a/client/sql/sparksession.go
+++ b/client/sql/sparksession.go
@@ -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"
)
diff --git a/client/sql/sparksession_test.go b/client/sql/sparksession_test.go
index 1e26e83..16f65d2 100644
--- a/client/sql/sparksession_test.go
+++ b/client/sql/sparksession_test.go
@@ -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"
)
diff --git a/cmd/spark-connect-example-raw-grpc-client/BUILD.bazel b/cmd/spark-connect-example-raw-grpc-client/BUILD.bazel
index a786831..de365a5 100644
--- a/cmd/spark-connect-example-raw-grpc-client/BUILD.bazel
+++ b/cmd/spark-connect-example-raw-grpc-client/BUILD.bazel
@@ -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",
diff --git a/cmd/spark-connect-example-raw-grpc-client/main.go b/cmd/spark-connect-example-raw-grpc-client/main.go
index 3831dc4..f46a1c7 100644
--- a/cmd/spark-connect-example-raw-grpc-client/main.go
+++ b/cmd/spark-connect-example-raw-grpc-client/main.go
@@ -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"
diff --git a/cmd/spark-connect-example-spark-session/main.go b/cmd/spark-connect-example-spark-session/main.go
index f19a199..885a616 100644
--- a/cmd/spark-connect-example-spark-session/main.go
+++ b/cmd/spark-connect-example-spark-session/main.go
@@ -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 (
diff --git a/go.mod b/go.mod
index 6d12e7a..8f8cd69 100644
--- a/go.mod
+++ b/go.mod
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org