fix more locations

apache · Jan 29, 2025 · 248fb93 · 248fb93
1 parent 265a794
commit 248fb93
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 14 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -223,7 +223,6 @@ CONNECT:
   - changed-files:
     - any-glob-to-any-file: [
      'sql/connect/**/*',
-     'connector/connect/**/*',
      'python/**/connect/**/*'
     ]
 

diff --git a/dev/lint-scala b/dev/lint-scala
@@ -34,14 +34,14 @@ ERRORS=$(./build/mvn \
     -pl sql/api \
     -pl sql/connect/common \
     -pl sql/connect/server \
-    -pl connector/connect/client/jvm \
+    -pl sql/connect/client/jvm \
     2>&1 | grep -e "Unformatted files found" \
 )
 
 if test ! -z "$ERRORS"; then
-  echo -e "The scalafmt check failed on sql/connect or connector/connect at following occurrences:\n\n$ERRORS\n"
+  echo -e "The scalafmt check failed on sql/connect or sql/connect at following occurrences:\n\n$ERRORS\n"
   echo "Before submitting your change, please make sure to format your code using the following command:"
-  echo "./build/mvn scalafmt:format -Dscalafmt.skip=false -Dscalafmt.validateOnly=false -Dscalafmt.changedOnly=false -pl sql/api -pl sql/connect/common -pl sql/connect/server -pl connector/connect/client/jvm"
+  echo "./build/mvn scalafmt:format -Dscalafmt.skip=false -Dscalafmt.validateOnly=false -Dscalafmt.changedOnly=false -pl sql/api -pl sql/connect/common -pl sql/connect/server -pl sql/connect/client/jvm"
   exit 1
 else
   echo -e "Scalafmt checks passed."

diff --git a/dev/protobuf-breaking-changes-check.sh b/dev/protobuf-breaking-changes-check.sh
@@ -35,7 +35,7 @@ fi
 
 pushd sql/connect/common/src/main &&
 echo "Start protobuf breaking changes checking against $BRANCH" &&
-buf breaking --against "https://github.com/apache/spark.git#branch=$BRANCH,subdir=connector/connect/common/src/main" &&
+buf breaking --against "https://github.com/apache/spark.git#branch=$BRANCH,subdir=sql/connect/common/src/main" &&
 echo "Finsh protobuf breaking changes checking: SUCCESS"
 
 if [[ $? -ne -0 ]]; then

diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py
@@ -334,7 +334,6 @@ def __hash__(self):
     dependencies=[hive, avro, protobuf],
     source_file_regexes=[
         "sql/connect",
-        "connector/connect",
     ],
     sbt_test_goals=[
         "connect/test",

diff --git a/docs/_plugins/build_api_docs.rb b/docs/_plugins/build_api_docs.rb
@@ -149,11 +149,11 @@ def build_scala_and_java_docs
   # Copy over the unified ScalaDoc for all projects to api/scala.
   # This directory will be copied over to _site when `jekyll` command is run.
   copy_and_update_scala_docs("../target/scala-2.13/unidoc", "api/scala")
-  # copy_and_update_scala_docs("../connector/connect/client/jvm/target/scala-2.13/unidoc", "api/connect/scala")
+  # copy_and_update_scala_docs("../sql/connect/client/jvm/target/scala-2.13/unidoc", "api/connect/scala")
 
   # Copy over the unified JavaDoc for all projects to api/java.
   copy_and_update_java_docs("../target/javaunidoc", "api/java", "api/scala")
-  # copy_and_update_java_docs("../connector/connect/client/jvm/target/javaunidoc", "api/connect/java", "api/connect/scala")
+  # copy_and_update_java_docs("../sql/connect/client/jvm/target/javaunidoc", "api/connect/java", "api/connect/scala")
 end
 
 def build_python_docs

diff --git a/docs/spark-connect-overview.md b/docs/spark-connect-overview.md
@@ -247,7 +247,7 @@ res0: Long = 10L
 
 By default, the REPL will attempt to connect to a local Spark Server on port 15002.
 The connection, however, may be configured in several ways as described in this configuration
-[reference](https://github.com/apache/spark/blob/master/connector/connect/docs/client-connection-string.md).
+[reference](https://github.com/apache/spark/blob/master/sql/connect/docs/client-connection-string.md).
 
 #### Set SPARK_REMOTE environment variable
 

diff --git a/sql/connect/bin/spark-connect-scala-client b/sql/connect/bin/spark-connect-scala-client
@@ -21,7 +21,7 @@
 #
 # Start a local server:
 # A local spark-connect server with default settings can be started using the following command:
-#  `connector/connect/bin/spark-connect`
+#  `sql/connect/bin/spark-connect`
 # The client should be able to connect to this server directly with the default client settings.
 #
 # Connect to a remote server:

diff --git a/sql/connect/client/jvm/src/test/scala/org/apache/spark/sql/application/ReplE2ESuite.scala b/sql/connect/client/jvm/src/test/scala/org/apache/spark/sql/application/ReplE2ESuite.scala
@@ -173,8 +173,7 @@ class ReplE2ESuite extends ConnectFunSuite with RemoteSparkSession with BeforeAn
     // scalastyle:off classforname line.size.limit
     val sparkHome = IntegrationTestUtils.sparkHome
     val testJar = Paths
-      .get(
-        s"$sparkHome/connector/connect/client/jvm/src/test/resources/TestHelloV2_$scalaVersion.jar")
+      .get(s"$sparkHome/sql/connect/client/jvm/src/test/resources/TestHelloV2_$scalaVersion.jar")
       .toFile
 
     assert(testJar.exists(), "Missing TestHelloV2 jar!")

diff --git a/sql/connect/common/README.md b/sql/connect/common/README.md
@@ -1,5 +1,5 @@
 Spark Common
 ============
 
-See [Spark Connect Client](https://github.com/apache/spark/tree/master/connector/connect) directory
+See [Spark Connect Client](https://github.com/apache/spark/tree/master/sql/connect) directory
 for more information and scripts for development.
diff --git a/sql/connect/server/README.md b/sql/connect/server/README.md
@@ -1,5 +1,5 @@
 Spark Connect Server
 ====================
 
-See [Spark Connect Client](https://github.com/apache/spark/tree/master/connector/connect) directory
+See [Spark Connect Client](https://github.com/apache/spark/tree/master/sql/connect) directory
 for more information and scripts for development.