Skip to content

Commit dca93d7

Browse files
fixup
1 parent 7c0c12e commit dca93d7

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

docs/building-spark.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ Example:
8383

8484
To enable Hive integration for Spark SQL along with its JDBC server and CLI,
8585
add the `-Phive` and `-Phive-thriftserver` profiles to your existing build options.
86-
By default Spark will build with Hive 2.3.9.
86+
By default Spark will build with Hive 2.3.10.
8787

88-
# With Hive 2.3.9 support
88+
# With Hive 2.3.10 support
8989
./build/mvn -Pyarn -Phive -Phive-thriftserver -DskipTests clean package
9090

9191
## Packaging without Hadoop Dependencies for YARN

docs/sql-data-sources-hive-tables.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ The following options can be used to configure the version of Hive that is used
127127
<thead><tr><th>Property Name</th><th>Default</th><th>Meaning</th><th>Since Version</th></tr></thead>
128128
<tr>
129129
<td><code>spark.sql.hive.metastore.version</code></td>
130-
<td><code>2.3.9</code></td>
130+
<td><code>2.3.10</code></td>
131131
<td>
132132
Version of the Hive metastore. Available
133-
options are <code>0.12.0</code> through <code>2.3.9</code> and <code>3.0.0</code> through <code>3.1.3</code>.
133+
options are <code>0.12.0</code> through <code>2.3.10</code> and <code>3.0.0</code> through <code>3.1.3</code>.
134134
</td>
135135
<td>1.4.0</td>
136136
</tr>
@@ -142,9 +142,9 @@ The following options can be used to configure the version of Hive that is used
142142
property can be one of four options:
143143
<ol>
144144
<li><code>builtin</code></li>
145-
Use Hive 2.3.9, which is bundled with the Spark assembly when <code>-Phive</code> is
145+
Use Hive 2.3.10, which is bundled with the Spark assembly when <code>-Phive</code> is
146146
enabled. When this option is chosen, <code>spark.sql.hive.metastore.version</code> must be
147-
either <code>2.3.9</code> or not defined.
147+
either <code>2.3.10</code> or not defined.
148148
<li><code>maven</code></li>
149149
Use Hive jars of specified version downloaded from Maven repositories. This configuration
150150
is not generally recommended for production deployments.

docs/sql-migration-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,7 @@ Python UDF registration is unchanged.
10091009
Spark SQL is designed to be compatible with the Hive Metastore, SerDes and UDFs.
10101010
Currently, Hive SerDes and UDFs are based on built-in Hive,
10111011
and Spark SQL can be connected to different versions of Hive Metastore
1012-
(from 0.12.0 to 2.3.9 and 3.0.0 to 3.1.3. Also see [Interacting with Different Versions of Hive Metastore](sql-data-sources-hive-tables.html#interacting-with-different-versions-of-hive-metastore)).
1012+
(from 0.12.0 to 10 and 3.0.0 to 3.1.3. Also see [Interacting with Different Versions of Hive Metastore](sql-data-sources-hive-tables.html#interacting-with-different-versions-of-hive-metastore)).
10131013

10141014
#### Deploying in Existing Hive Warehouses
10151015
{:.no_toc}

sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveUtils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private[spark] object HiveUtils extends Logging {
7373

7474
val HIVE_METASTORE_VERSION = buildStaticConf("spark.sql.hive.metastore.version")
7575
.doc("Version of the Hive metastore. Available options are " +
76-
"<code>0.12.0</code> through <code>2.3.9</code> and " +
76+
"<code>0.12.0</code> through <code>2.3.10</code> and " +
7777
"<code>3.0.0</code> through <code>3.1.3</code>.")
7878
.version("1.4.0")
7979
.stringConf

sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClientImpl.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ private[hive] object HiveClientImpl extends Logging {
13621362
val hive = try {
13631363
Hive.getWithoutRegisterFns(hiveConf)
13641364
} catch {
1365-
// SPARK-37069: not all Hive versions have the above method (e.g., Hive 2.3.9 has it but
1365+
// SPARK-37069: not all Hive versions have the above method (e.g., Hive 2.3.10 has it but
13661366
// 2.3.8 don't), therefore here we fallback when encountering the exception.
13671367
case _: NoSuchMethodError =>
13681368
Hive.get(hiveConf)

sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveExternalCatalogVersionsSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class HiveExternalCatalogVersionsSuite extends SparkSubmitTestUtils {
220220
tryDownloadSpark(version, sparkTestingDir.getCanonicalPath)
221221
}
222222

223-
// Extract major.minor for testing Spark 3.1.x and 3.0.x with metastore 2.3.9 and Java 11.
223+
// Extract major.minor for testing Spark 3.1.x and 3.0.x with metastore 2.3.10 and Java 11.
224224
val hiveMetastoreVersion = """^\d+\.\d+""".r.findFirstIn(hiveVersion).get
225225
val args = Seq(
226226
"--name", "prepare testing tables",

0 commit comments

Comments
 (0)