This is an automated email from the ASF dual-hosted git repository.
pvary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 2524c21 HIVE-26002: Preparing for 4.0.0-alpha-1 development (Peter
Vary reviewed by Stamatis Zampetakis) (#3081)
2524c21 is described below
commit 2524c2137bc2e70bd32e43a49a15fbfc0fa93159
Author: pvary <pv...@cloudera.com>
AuthorDate: Thu Mar 17 17:25:12 2022 +0100
HIVE-26002: Preparing for 4.0.0-alpha-1 development (Peter Vary reviewed by
Stamatis Zampetakis) (#3081)
---
accumulo-handler/pom.xml | 2 +-
beeline/pom.xml | 2 +-
classification/pom.xml | 2 +-
cli/pom.xml | 2 +-
common/pom.xml | 2 +-
contrib/pom.xml | 2 +-
druid-handler/pom.xml | 2 +-
hbase-handler/pom.xml | 2 +-
hcatalog/core/pom.xml | 2 +-
hcatalog/hcatalog-pig-adapter/pom.xml | 4 ++--
hcatalog/pom.xml | 4 ++--
hcatalog/server-extensions/pom.xml | 2 +-
hcatalog/webhcat/java-client/pom.xml | 2 +-
hcatalog/webhcat/svr/pom.xml | 2 +-
hplsql/pom.xml | 2 +-
iceberg/iceberg-catalog/pom.xml | 2 +-
iceberg/iceberg-handler/pom.xml | 2 +-
iceberg/iceberg-shading/pom.xml | 2 +-
iceberg/patched-iceberg-api/pom.xml | 2 +-
iceberg/patched-iceberg-core/pom.xml | 2 +-
iceberg/pom.xml | 4 ++--
itests/custom-serde/pom.xml | 2 +-
itests/custom-udfs/pom.xml | 2 +-
itests/custom-udfs/udf-classloader-udf1/pom.xml | 2 +-
itests/custom-udfs/udf-classloader-udf2/pom.xml | 2 +-
itests/custom-udfs/udf-classloader-util/pom.xml | 2 +-
.../custom-udfs/udf-vectorized-badexample/pom.xml | 2 +-
itests/hcatalog-unit/pom.xml | 2 +-
itests/hive-blobstore/pom.xml | 2 +-
itests/hive-jmh/pom.xml | 2 +-
itests/hive-minikdc/pom.xml | 2 +-
itests/hive-unit-hadoop2/pom.xml | 2 +-
itests/hive-unit/pom.xml | 2 +-
.../InformationSchemaWithPrivilegeTestBase.java | 2 +-
itests/pom.xml | 2 +-
itests/qtest-accumulo/pom.xml | 2 +-
itests/qtest-druid/pom.xml | 2 +-
itests/qtest-iceberg/pom.xml | 2 +-
itests/qtest-kudu/pom.xml | 2 +-
itests/qtest-spark/pom.xml | 2 +-
itests/qtest/pom.xml | 2 +-
itests/test-serde/pom.xml | 2 +-
itests/util/pom.xml | 2 +-
.../hadoop/hive/ql/qoption/QTestSysDbHandler.java | 2 +-
jdbc-handler/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
kafka-handler/pom.xml | 2 +-
kryo-registrator/pom.xml | 2 +-
kudu-handler/pom.xml | 2 +-
llap-client/pom.xml | 2 +-
llap-common/pom.xml | 2 +-
llap-ext-client/pom.xml | 2 +-
llap-server/pom.xml | 2 +-
llap-tez/pom.xml | 2 +-
metastore/pom.xml | 2 +-
...hive.sql => hive-schema-4.0.0-alpha-1.hive.sql} | 4 ++--
...sql => upgrade-3.1.0-to-4.0.0-alpha-1.hive.sql} | 8 +++----
metastore/scripts/upgrade/hive/upgrade.order.hive | 1 +
packaging/pom.xml | 2 +-
parser/pom.xml | 2 +-
pom.xml | 8 +++----
ql/pom.xml | 2 +-
.../metastore/txn/TestCompactionTxnHandler.java | 2 +-
.../hive/ql/txn/compactor/CompactorTest.java | 2 +-
.../hadoop/hive/ql/txn/compactor/TestCleaner.java | 2 +-
.../ql/txn/compactor/TestCompactionMetrics.java | 26 +++++++++++-----------
.../hive/ql/txn/compactor/TestInitiator.java | 8 +++----
.../hadoop/hive/ql/txn/compactor/TestWorker.java | 4 ++--
.../clientpositive/materialized_view_parquet.q | 2 ++
ql/src/test/queries/clientpositive/parquet_stats.q | 2 ++
.../llap/materialized_view_parquet.q.out | 2 +-
.../clientpositive/llap/parquet_stats.q.out | 2 +-
.../test/results/clientpositive/llap/sysdb.q.out | 10 ++++-----
serde/pom.xml | 2 +-
service-rpc/pom.xml | 2 +-
service/pom.xml | 2 +-
shims/0.23/pom.xml | 2 +-
shims/aggregator/pom.xml | 2 +-
shims/common/pom.xml | 2 +-
shims/pom.xml | 2 +-
shims/scheduler/pom.xml | 2 +-
spark-client/pom.xml | 2 +-
standalone-metastore/metastore-common/pom.xml | 2 +-
standalone-metastore/metastore-server/pom.xml | 4 ++--
.../hadoop/hive/metastore/MetaStoreSchemaInfo.java | 2 +-
...rby.sql => hive-schema-4.0.0-alpha-1.derby.sql} | 2 +-
...ql => upgrade-3.2.0-to-4.0.0-alpha-1.derby.sql} | 4 ++--
.../src/main/sql/derby/upgrade.order.derby | 2 +-
...sql.sql => hive-schema-4.0.0-alpha-1.mssql.sql} | 2 +-
...ql => upgrade-3.2.0-to-4.0.0-alpha-1.mssql.sql} | 6 ++---
.../src/main/sql/mssql/upgrade.order.mssql | 2 +-
...sql.sql => hive-schema-4.0.0-alpha-1.mysql.sql} | 2 +-
...ql => upgrade-3.2.0-to-4.0.0-alpha-1.mysql.sql} | 6 ++---
.../src/main/sql/mysql/upgrade.order.mysql | 2 +-
...le.sql => hive-schema-4.0.0-alpha-1.oracle.sql} | 2 +-
...l => upgrade-3.2.0-to-4.0.0-alpha-1.oracle.sql} | 6 ++---
.../src/main/sql/oracle/upgrade.order.oracle | 2 +-
....sql => hive-schema-4.0.0-alpha-1.postgres.sql} | 2 +-
...=> upgrade-3.2.0-to-4.0.0-alpha-1.postgres.sql} | 6 ++---
.../src/main/sql/postgres/upgrade.order.postgres | 2 +-
.../metastore/dbinstall/rules/PostgresTPCDS.java | 2 +-
...upgrade-3.1.3000-to-4.0.0-alpha-1.postgres.sql} | 8 +++----
.../metastore-tools/metastore-benchmarks/pom.xml | 2 +-
standalone-metastore/metastore-tools/pom.xml | 2 +-
.../metastore-tools/tools-common/pom.xml | 2 +-
standalone-metastore/pom.xml | 8 +++----
storage-api/pom.xml | 2 +-
streaming/pom.xml | 4 ++--
testutils/pom.xml | 2 +-
udf/pom.xml | 2 +-
upgrade-acid/pom.xml | 2 +-
upgrade-acid/pre-upgrade/pom.xml | 2 +-
vector-code-gen/pom.xml | 2 +-
113 files changed, 162 insertions(+), 157 deletions(-)
diff --git a/accumulo-handler/pom.xml b/accumulo-handler/pom.xml
index 9c5ae33..5da051f 100644
--- a/accumulo-handler/pom.xml
+++ b/accumulo-handler/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-accumulo-handler</artifactId>
diff --git a/beeline/pom.xml b/beeline/pom.xml
index 5fd2e7d..1c289bc 100644
--- a/beeline/pom.xml
+++ b/beeline/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-beeline</artifactId>
diff --git a/classification/pom.xml b/classification/pom.xml
index e098c5d..02488e2 100644
--- a/classification/pom.xml
+++ b/classification/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-classification</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 3e67cf5..554fdf6 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-cli</artifactId>
diff --git a/common/pom.xml b/common/pom.xml
index f89f273..f589526 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-common</artifactId>
diff --git a/contrib/pom.xml b/contrib/pom.xml
index a66093b..1b5b39d 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-contrib</artifactId>
diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml
index 395bb99..5f9262c 100644
--- a/druid-handler/pom.xml
+++ b/druid-handler/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-druid-handler</artifactId>
diff --git a/hbase-handler/pom.xml b/hbase-handler/pom.xml
index bd14c62..d060671 100644
--- a/hbase-handler/pom.xml
+++ b/hbase-handler/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-hbase-handler</artifactId>
diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml
index caef669..d9d0cd1 100644
--- a/hcatalog/core/pom.xml
+++ b/hcatalog/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-hcatalog-core</artifactId>
diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml
b/hcatalog/hcatalog-pig-adapter/pom.xml
index 43ba669..c19d109 100644
--- a/hcatalog/hcatalog-pig-adapter/pom.xml
+++ b/hcatalog/hcatalog-pig-adapter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-hcatalog-pig-adapter</artifactId>
@@ -136,7 +136,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-server</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/hcatalog/pom.xml b/hcatalog/pom.xml
index c97a8e1..b6e8641 100644
--- a/hcatalog/pom.xml
+++ b/hcatalog/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.hcatalog</groupId>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-server</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/hcatalog/server-extensions/pom.xml
b/hcatalog/server-extensions/pom.xml
index 6fa375e..a9a44ee 100644
--- a/hcatalog/server-extensions/pom.xml
+++ b/hcatalog/server-extensions/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-hcatalog-server-extensions</artifactId>
diff --git a/hcatalog/webhcat/java-client/pom.xml
b/hcatalog/webhcat/java-client/pom.xml
index 45e0f90..d426d3e 100644
--- a/hcatalog/webhcat/java-client/pom.xml
+++ b/hcatalog/webhcat/java-client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>hive-webhcat-java-client</artifactId>
diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml
index bbc4634..1432c22 100644
--- a/hcatalog/webhcat/svr/pom.xml
+++ b/hcatalog/webhcat/svr/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>hive-webhcat</artifactId>
diff --git a/hplsql/pom.xml b/hplsql/pom.xml
index d2adb3a..d761496 100644
--- a/hplsql/pom.xml
+++ b/hplsql/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-hplsql</artifactId>
diff --git a/iceberg/iceberg-catalog/pom.xml b/iceberg/iceberg-catalog/pom.xml
index 4d8ac40..cb8490e 100644
--- a/iceberg/iceberg-catalog/pom.xml
+++ b/iceberg/iceberg-catalog/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-iceberg</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/iceberg/iceberg-handler/pom.xml b/iceberg/iceberg-handler/pom.xml
index bd5b86f..82ae4c7 100644
--- a/iceberg/iceberg-handler/pom.xml
+++ b/iceberg/iceberg-handler/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-iceberg</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/iceberg/iceberg-shading/pom.xml b/iceberg/iceberg-shading/pom.xml
index 848524d..fc2eb3b 100644
--- a/iceberg/iceberg-shading/pom.xml
+++ b/iceberg/iceberg-shading/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-iceberg</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/iceberg/patched-iceberg-api/pom.xml
b/iceberg/patched-iceberg-api/pom.xml
index 0ae231e..2170f7c 100644
--- a/iceberg/patched-iceberg-api/pom.xml
+++ b/iceberg/patched-iceberg-api/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-iceberg</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/iceberg/patched-iceberg-core/pom.xml
b/iceberg/patched-iceberg-core/pom.xml
index bf49c73..73842ba 100644
--- a/iceberg/patched-iceberg-core/pom.xml
+++ b/iceberg/patched-iceberg-core/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-iceberg</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/iceberg/pom.xml b/iceberg/pom.xml
index b3d72fb..7c84a50 100644
--- a/iceberg/pom.xml
+++ b/iceberg/pom.xml
@@ -14,12 +14,12 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hive-iceberg</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Hive Iceberg Modules</name>
<properties>
diff --git a/itests/custom-serde/pom.xml b/itests/custom-serde/pom.xml
index 102fd31..1340be1 100644
--- a/itests/custom-serde/pom.xml
+++ b/itests/custom-serde/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-custom-serde</artifactId>
diff --git a/itests/custom-udfs/pom.xml b/itests/custom-udfs/pom.xml
index 6f3814c..2f21bf7 100644
--- a/itests/custom-udfs/pom.xml
+++ b/itests/custom-udfs/pom.xml
@@ -17,7 +17,7 @@ limitations under the License.
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-custom-udfs</artifactId>
diff --git a/itests/custom-udfs/udf-classloader-udf1/pom.xml
b/itests/custom-udfs/udf-classloader-udf1/pom.xml
index feec515..048f4b3 100644
--- a/itests/custom-udfs/udf-classloader-udf1/pom.xml
+++ b/itests/custom-udfs/udf-classloader-udf1/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it-custom-udfs</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.hive-it-custom-udfs</groupId>
diff --git a/itests/custom-udfs/udf-classloader-udf2/pom.xml
b/itests/custom-udfs/udf-classloader-udf2/pom.xml
index 768c488..51b96ca 100644
--- a/itests/custom-udfs/udf-classloader-udf2/pom.xml
+++ b/itests/custom-udfs/udf-classloader-udf2/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it-custom-udfs</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.hive-it-custom-udfs</groupId>
diff --git a/itests/custom-udfs/udf-classloader-util/pom.xml
b/itests/custom-udfs/udf-classloader-util/pom.xml
index f1a9738..7db6e8b 100644
--- a/itests/custom-udfs/udf-classloader-util/pom.xml
+++ b/itests/custom-udfs/udf-classloader-util/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it-custom-udfs</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.hive-it-custom-udfs</groupId>
diff --git a/itests/custom-udfs/udf-vectorized-badexample/pom.xml
b/itests/custom-udfs/udf-vectorized-badexample/pom.xml
index 6be3032..5131321 100644
--- a/itests/custom-udfs/udf-vectorized-badexample/pom.xml
+++ b/itests/custom-udfs/udf-vectorized-badexample/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it-custom-udfs</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.hive-it-custom-udfs</groupId>
diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml
index cec9b09..0533c7d 100644
--- a/itests/hcatalog-unit/pom.xml
+++ b/itests/hcatalog-unit/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-hcatalog-it-unit</artifactId>
diff --git a/itests/hive-blobstore/pom.xml b/itests/hive-blobstore/pom.xml
index 69afb2f..4afb553 100644
--- a/itests/hive-blobstore/pom.xml
+++ b/itests/hive-blobstore/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-blobstore</artifactId>
diff --git a/itests/hive-jmh/pom.xml b/itests/hive-jmh/pom.xml
index 6a2121b..2296f38 100644
--- a/itests/hive-jmh/pom.xml
+++ b/itests/hive-jmh/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-jmh</artifactId>
diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml
index df415b6..f825ed6 100644
--- a/itests/hive-minikdc/pom.xml
+++ b/itests/hive-minikdc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-minikdc</artifactId>
diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml
index eebaf62..6496029 100644
--- a/itests/hive-unit-hadoop2/pom.xml
+++ b/itests/hive-unit-hadoop2/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-unit-hadoop2</artifactId>
diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml
index b16ceff..92d4b4f 100644
--- a/itests/hive-unit/pom.xml
+++ b/itests/hive-unit/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-unit</artifactId>
diff --git
a/itests/hive-unit/src/test/java/org/apache/hive/service/server/InformationSchemaWithPrivilegeTestBase.java
b/itests/hive-unit/src/test/java/org/apache/hive/service/server/InformationSchemaWithPrivilegeTestBase.java
index 87527e9..e0f8947 100644
---
a/itests/hive-unit/src/test/java/org/apache/hive/service/server/InformationSchemaWithPrivilegeTestBase.java
+++
b/itests/hive-unit/src/test/java/org/apache/hive/service/server/InformationSchemaWithPrivilegeTestBase.java
@@ -287,7 +287,7 @@ public abstract class
InformationSchemaWithPrivilegeTestBase {
List<String> args = new ArrayList<String>(baseArgs);
args.add("-f");
-
args.add("../../metastore/scripts/upgrade/hive/hive-schema-4.0.0.hive.sql");
+
args.add("../../metastore/scripts/upgrade/hive/hive-schema-4.0.0-alpha-1.hive.sql");
BeeLine beeLine = new BeeLine();
int result = beeLine.begin(args.toArray(new String[] {}), null);
beeLine.close();
diff --git a/itests/pom.xml b/itests/pom.xml
index caa0c94..e1740cc 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it</artifactId>
diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml
index 3aec361..112dd41 100644
--- a/itests/qtest-accumulo/pom.xml
+++ b/itests/qtest-accumulo/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-qfile-accumulo</artifactId>
diff --git a/itests/qtest-druid/pom.xml b/itests/qtest-druid/pom.xml
index cee23a2..473e341 100644
--- a/itests/qtest-druid/pom.xml
+++ b/itests/qtest-druid/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>hive-it</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-druid</artifactId>
diff --git a/itests/qtest-iceberg/pom.xml b/itests/qtest-iceberg/pom.xml
index e521f00..cd42604 100644
--- a/itests/qtest-iceberg/pom.xml
+++ b/itests/qtest-iceberg/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>hive-it</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/itests/qtest-kudu/pom.xml b/itests/qtest-kudu/pom.xml
index be78023..a31eb42 100644
--- a/itests/qtest-kudu/pom.xml
+++ b/itests/qtest-kudu/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-qfile-kudu</artifactId>
diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml
index 32adf8e..c072fab 100644
--- a/itests/qtest-spark/pom.xml
+++ b/itests/qtest-spark/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-qfile-spark</artifactId>
diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml
index 0e1f69f..2684256 100644
--- a/itests/qtest/pom.xml
+++ b/itests/qtest/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-qfile</artifactId>
diff --git a/itests/test-serde/pom.xml b/itests/test-serde/pom.xml
index 173a090..e3b58b9 100644
--- a/itests/test-serde/pom.xml
+++ b/itests/test-serde/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-test-serde</artifactId>
diff --git a/itests/util/pom.xml b/itests/util/pom.xml
index b8b491b..a75ed54 100644
--- a/itests/util/pom.xml
+++ b/itests/util/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-util</artifactId>
diff --git
a/itests/util/src/main/java/org/apache/hadoop/hive/ql/qoption/QTestSysDbHandler.java
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/qoption/QTestSysDbHandler.java
index be84423..4834ad2 100644
---
a/itests/util/src/main/java/org/apache/hadoop/hive/ql/qoption/QTestSysDbHandler.java
+++
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/qoption/QTestSysDbHandler.java
@@ -44,7 +44,7 @@ public class QTestSysDbHandler implements QTestOptionHandler {
@Override
public void beforeTest(QTestUtil qt) throws Exception {
if (enabled) {
- String stsdbPath = HiveTestEnvSetup.HIVE_ROOT +
"/metastore/scripts/upgrade/hive/hive-schema-4.0.0.hive.sql";
+ String stsdbPath = HiveTestEnvSetup.HIVE_ROOT +
"/metastore/scripts/upgrade/hive/hive-schema-4.0.0-alpha-1.hive.sql";
qt.getCliDriver().processLine("source " + stsdbPath);
qt.getCliDriver().processLine("use default");
}
diff --git a/jdbc-handler/pom.xml b/jdbc-handler/pom.xml
index 15a9af1..f946963 100644
--- a/jdbc-handler/pom.xml
+++ b/jdbc-handler/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-jdbc-handler</artifactId>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index be44dcd..35a8eb6 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-jdbc</artifactId>
diff --git a/kafka-handler/pom.xml b/kafka-handler/pom.xml
index 0c313d9..834e895 100644
--- a/kafka-handler/pom.xml
+++ b/kafka-handler/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/kryo-registrator/pom.xml b/kryo-registrator/pom.xml
index 0d30f66..82073cc 100644
--- a/kryo-registrator/pom.xml
+++ b/kryo-registrator/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>hive</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
</parent>
<artifactId>hive-kryo-registrator</artifactId>
<packaging>jar</packaging>
diff --git a/kudu-handler/pom.xml b/kudu-handler/pom.xml
index d330143..c3dddc2 100644
--- a/kudu-handler/pom.xml
+++ b/kudu-handler/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-kudu-handler</artifactId>
diff --git a/llap-client/pom.xml b/llap-client/pom.xml
index 01dc268..64fe68e 100644
--- a/llap-client/pom.xml
+++ b/llap-client/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-llap-client</artifactId>
diff --git a/llap-common/pom.xml b/llap-common/pom.xml
index 93fec85..caae4f0 100644
--- a/llap-common/pom.xml
+++ b/llap-common/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-llap-common</artifactId>
diff --git a/llap-ext-client/pom.xml b/llap-ext-client/pom.xml
index ef33ac9..87b13d4 100644
--- a/llap-ext-client/pom.xml
+++ b/llap-ext-client/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-llap-ext-client</artifactId>
diff --git a/llap-server/pom.xml b/llap-server/pom.xml
index db0c2c3..c96f3cb 100644
--- a/llap-server/pom.xml
+++ b/llap-server/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-llap-server</artifactId>
diff --git a/llap-tez/pom.xml b/llap-tez/pom.xml
index c2728af..070a060 100644
--- a/llap-tez/pom.xml
+++ b/llap-tez/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-llap-tez</artifactId>
diff --git a/metastore/pom.xml b/metastore/pom.xml
index 3c34821..ecfe84f 100644
--- a/metastore/pom.xml
+++ b/metastore/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-metastore</artifactId>
diff --git a/metastore/scripts/upgrade/hive/hive-schema-4.0.0.hive.sql
b/metastore/scripts/upgrade/hive/hive-schema-4.0.0-alpha-1.hive.sql
similarity index 99%
rename from metastore/scripts/upgrade/hive/hive-schema-4.0.0.hive.sql
rename to metastore/scripts/upgrade/hive/hive-schema-4.0.0-alpha-1.hive.sql
index 522229c..8528ae8 100644
--- a/metastore/scripts/upgrade/hive/hive-schema-4.0.0.hive.sql
+++ b/metastore/scripts/upgrade/hive/hive-schema-4.0.0-alpha-1.hive.sql
@@ -823,8 +823,8 @@ FROM
\"PART_COL_STATS\""
);
-CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '4.0.0' AS
`SCHEMA_VERSION`,
- 'Hive release version 4.0.0' AS `VERSION_COMMENT`;
+CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '4.0.0-alpha-1' AS
`SCHEMA_VERSION`,
+ 'Hive release version 4.0.0-alpha-1' AS `VERSION_COMMENT`;
CREATE EXTERNAL TABLE IF NOT EXISTS `DB_VERSION` (
`VER_ID` BIGINT,
diff --git a/metastore/scripts/upgrade/hive/upgrade-3.1.0-to-4.0.0.hive.sql
b/metastore/scripts/upgrade/hive/upgrade-3.1.0-to-4.0.0-alpha-1.hive.sql
similarity index 99%
rename from metastore/scripts/upgrade/hive/upgrade-3.1.0-to-4.0.0.hive.sql
rename to metastore/scripts/upgrade/hive/upgrade-3.1.0-to-4.0.0-alpha-1.hive.sql
index eb3a997..d707a22 100644
--- a/metastore/scripts/upgrade/hive/upgrade-3.1.0-to-4.0.0.hive.sql
+++ b/metastore/scripts/upgrade/hive/upgrade-3.1.0-to-4.0.0-alpha-1.hive.sql
@@ -1,4 +1,4 @@
-SELECT 'Upgrading MetaStore schema from 3.1.0 to 4.0.0';
+SELECT 'Upgrading MetaStore schema from 3.1.0 to 4.0.0-alpha-1';
USE SYS;
@@ -597,8 +597,8 @@ FROM \"NOTIFICATION_LOG\""
DROP TABLE IF EXISTS `VERSION`;
-CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '4.0.0' AS
`SCHEMA_VERSION`,
- 'Hive release version 4.0.0' AS `VERSION_COMMENT`;
+CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '4.0.0-alpha-1' AS
`SCHEMA_VERSION`,
+ 'Hive release version 4.0.0-alpha-1' AS `VERSION_COMMENT`;
USE INFORMATION_SCHEMA;
@@ -884,4 +884,4 @@ WHERE
AND P.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer());
-SELECT 'Finished upgrading MetaStore schema from 3.1.0 to 4.0.0';
+SELECT 'Finished upgrading MetaStore schema from 3.1.0 to 4.0.0-alpha-1';
diff --git a/metastore/scripts/upgrade/hive/upgrade.order.hive
b/metastore/scripts/upgrade/hive/upgrade.order.hive
index dd040af..16feb4e 100644
--- a/metastore/scripts/upgrade/hive/upgrade.order.hive
+++ b/metastore/scripts/upgrade/hive/upgrade.order.hive
@@ -1 +1,2 @@
3.0.0-to-3.1.0
+3.1.0-to-4.0.0-alpha-1.hive
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 0f4a3d7..c4ffa36 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-packaging</artifactId>
diff --git a/parser/pom.xml b/parser/pom.xml
index b1049ba..810266f 100644
--- a/parser/pom.xml
+++ b/parser/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-parser</artifactId>
diff --git a/pom.xml b/pom.xml
index 804aadd..83c0757 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
</parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Hive</name>
<url>https://hive.apache.org</url>
@@ -64,8 +64,8 @@
<module>kafka-handler</module>
</modules>
<properties>
- <standalone-metastore.version>4.0.0-SNAPSHOT</standalone-metastore.version>
- <hive.version.shortname>4.0.0</hive.version.shortname>
+
<standalone-metastore.version>4.0.0-alpha-1-SNAPSHOT</standalone-metastore.version>
+ <hive.version.shortname>4.0.0-alpha-1</hive.version.shortname>
<!-- Build Properties -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
@@ -196,7 +196,7 @@
<stax.version>1.0.1</stax.version>
<slf4j.version>1.7.30</slf4j.version>
<ST4.version>4.0.4</ST4.version>
- <storage-api.version>2.7.3-SNAPSHOT</storage-api.version>
+ <storage-api.version>4.0.0-alpha-1-SNAPSHOT</storage-api.version>
<tez.version>0.10.1</tez.version>
<super-csv.version>2.2.0</super-csv.version>
<spark.version>2.4.5</spark.version>
diff --git a/ql/pom.xml b/ql/pom.xml
index 8ecc7dc..dd838f4 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-exec</artifactId>
diff --git
a/ql/src/test/org/apache/hadoop/hive/metastore/txn/TestCompactionTxnHandler.java
b/ql/src/test/org/apache/hadoop/hive/metastore/txn/TestCompactionTxnHandler.java
index a3b814e..b9d34d5 100644
---
a/ql/src/test/org/apache/hadoop/hive/metastore/txn/TestCompactionTxnHandler.java
+++
b/ql/src/test/org/apache/hadoop/hive/metastore/txn/TestCompactionTxnHandler.java
@@ -73,7 +73,7 @@ import static
org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars.COMPA
*/
public class TestCompactionTxnHandler {
- public static final String WORKER_VERSION = "4.0.0";
+ public static final String WORKER_VERSION = "4.0.0-alpha-1";
private HiveConf conf = new HiveConf();
private TxnStore txnHandler;
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/CompactorTest.java
b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/CompactorTest.java
index e486497..a67795a 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/CompactorTest.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/CompactorTest.java
@@ -112,7 +112,7 @@ import javax.management.ObjectName;
public abstract class CompactorTest {
static final private String CLASS_NAME = CompactorTest.class.getName();
static final private Logger LOG = LoggerFactory.getLogger(CLASS_NAME);
- public static final String WORKER_VERSION = "4.0.0";
+ public static final String WORKER_VERSION = "4.0.0-alpha-1";
protected TxnStore txnHandler;
protected IMetaStoreClient ms;
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCleaner.java
b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCleaner.java
index ec5ca39..757b01a 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCleaner.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCleaner.java
@@ -280,7 +280,7 @@ public class TestCleaner extends CompactorTest {
FindNextCompactRequest findNextCompactRequest = new
FindNextCompactRequest();
findNextCompactRequest.setWorkerId("fred");
- findNextCompactRequest.setWorkerVersion("4.0.0");
+ findNextCompactRequest.setWorkerVersion("4.0.0-alpha-1");
CompactionInfo ci = txnHandler.findNextToCompact(findNextCompactRequest);
ci.runAs = System.getProperty("user.name");
long compactTxn = openTxn(TxnType.COMPACTION);
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCompactionMetrics.java
b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCompactionMetrics.java
index bde83a5..a431955 100644
---
a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCompactionMetrics.java
+++
b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCompactionMetrics.java
@@ -430,7 +430,7 @@ public class TestCompactionMetrics extends CompactorTest {
elements.add(generateElement(4,"db", "tb3", "p1", CompactionType.MINOR,
TxnStore.FAILED_RESPONSE));
elements.add(generateElement(6,"db1", "tb", null, CompactionType.MINOR,
TxnStore.FAILED_RESPONSE,
- System.currentTimeMillis(), true, "4.0.0", "4.0.0", 10));
+ System.currentTimeMillis(), true, "4.0.0-alpha-1",
"4.0.0-alpha-1", 10));
elements.add(generateElement(7,"db1", "tb2", null, CompactionType.MINOR,
TxnStore.FAILED_RESPONSE));
elements.add(generateElement(8,"db1", "tb3", null, CompactionType.MINOR,
TxnStore.FAILED_RESPONSE));
@@ -444,10 +444,10 @@ public class TestCompactionMetrics extends CompactorTest
{
elements.add(generateElement(14,"db3", "tb4", null, CompactionType.MINOR,
TxnStore.WORKING_RESPONSE,
System.currentTimeMillis(), false, null, null,20));
elements.add(generateElement(15,"db3", "tb5", null, CompactionType.MINOR,
TxnStore.WORKING_RESPONSE,
- System.currentTimeMillis(),true, "4.0.0", "4.0.0", 30));
+ System.currentTimeMillis(),true, "4.0.0-alpha-1", "4.0.0-alpha-1",
30));
elements.add(generateElement(16,"db3", "tb6", null, CompactionType.MINOR,
TxnStore.WORKING_RESPONSE));
elements.add(generateElement(17,"db3", "tb7", null, CompactionType.MINOR,
TxnStore.WORKING_RESPONSE,
- System.currentTimeMillis(),true, "4.0.0", "4.0.0",40));
+ System.currentTimeMillis(),true, "4.0.0-alpha-1",
"4.0.0-alpha-1",40));
scr.setCompacts(elements);
AcidMetricService.updateMetricsFromShowCompact(scr);
@@ -520,7 +520,7 @@ public class TestCompactionMetrics extends CompactorTest {
long start = System.currentTimeMillis() - 1000L;
List<ShowCompactResponseElement> elements = ImmutableList.of(
generateElement(17, "db3", "tb7", null, CompactionType.MINOR,
TxnStore.WORKING_RESPONSE,
- System.currentTimeMillis(), true, "4.0.0", "4.0.0", start)
+ System.currentTimeMillis(), true, "4.0.0-alpha-1",
"4.0.0-alpha-1", start)
);
scr.setCompacts(elements);
@@ -540,7 +540,7 @@ public class TestCompactionMetrics extends CompactorTest {
long start = System.currentTimeMillis() - 1000L;
List<ShowCompactResponseElement> elements = ImmutableList.of(
generateElement(19, "db3", "tb7", null, CompactionType.MINOR,
TxnStore.CLEANING_RESPONSE,
- System.currentTimeMillis(), true, "4.0.0", "4.0.0", -1L, start)
+ System.currentTimeMillis(), true, "4.0.0-alpha-1",
"4.0.0-alpha-1", -1L, start)
);
scr.setCompacts(elements);
@@ -591,9 +591,9 @@ public class TestCompactionMetrics extends CompactorTest {
List<ShowCompactResponseElement> elements = ImmutableList.of(
generateElement(15, "db3", "tb5", null, CompactionType.MINOR,
TxnStore.WORKING_RESPONSE,
- start, false, "4.0.0", "4.0.0", start - 1_000L),
+ start, false, "4.0.0-alpha-1", "4.0.0-alpha-1", start - 1_000L),
generateElement(16, "db3", "tb6", null, CompactionType.MINOR,
TxnStore.WORKING_RESPONSE,
- start, false, "4.0.0", "4.0.0", start - 15_000L)
+ start, false, "4.0.0-alpha-1", "4.0.0-alpha-1", start - 15_000L)
);
scr.setCompacts(elements);
@@ -604,9 +604,9 @@ public class TestCompactionMetrics extends CompactorTest {
// Check the reverse order
elements = ImmutableList.of(
generateElement(16, "db3", "tb6", null, CompactionType.MINOR,
TxnStore.WORKING_RESPONSE,
- start, false, "4.0.0", "4.0.0", start - 25_000L),
+ start, false, "4.0.0-alpha-1", "4.0.0-alpha-1", start - 25_000L),
generateElement(15, "db3", "tb5", null, CompactionType.MINOR,
TxnStore.WORKING_RESPONSE,
- start, false, "4.0.0", "4.0.0", start - 1_000L)
+ start, false, "4.0.0-alpha-1", "4.0.0-alpha-1", start - 1_000L)
);
scr.setCompacts(elements);
AcidMetricService.updateMetricsFromShowCompact(scr);
@@ -622,9 +622,9 @@ public class TestCompactionMetrics extends CompactorTest {
List<ShowCompactResponseElement> elements = ImmutableList.of(
generateElement(15, "db3", "tb5", null, CompactionType.MINOR,
TxnStore.CLEANING_RESPONSE,
- start, false, "4.0.0", "4.0.0", -1L, start - 1_000L),
+ start, false, "4.0.0-alpha-1", "4.0.0-alpha-1", -1L, start -
1_000L),
generateElement(16, "db3", "tb6", null, CompactionType.MINOR,
TxnStore.CLEANING_RESPONSE,
- start, false, "4.0.0", "4.0.0", -1L, start - 15_000L)
+ start, false, "4.0.0-alpha-1", "4.0.0-alpha-1", -1L, start -
15_000L)
);
scr.setCompacts(elements);
@@ -635,9 +635,9 @@ public class TestCompactionMetrics extends CompactorTest {
// Check the reverse order
elements = ImmutableList.of(
generateElement(16, "db3", "tb6", null, CompactionType.MINOR,
TxnStore.CLEANING_RESPONSE,
- start, false, "4.0.0", "4.0.0", -1L, start - 25_000L),
+ start, false, "4.0.0-alpha-1", "4.0.0-alpha-1", -1L, start -
25_000L),
generateElement(15, "db3", "tb5", null, CompactionType.MINOR,
TxnStore.CLEANING_RESPONSE,
- start, false, "4.0.0", "4.0.0", -1L, start - 1_000L)
+ start, false, "4.0.0-alpha-1", "4.0.0-alpha-1", -1L, start -
1_000L)
);
scr.setCompacts(elements);
AcidMetricService.updateMetricsFromShowCompact(scr);
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestInitiator.java
b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestInitiator.java
index dd508a2..084fb26 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestInitiator.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestInitiator.java
@@ -82,8 +82,8 @@ public class TestInitiator extends CompactorTest {
rqst = new CompactionRequest("default", "rflw2", CompactionType.MINOR);
txnHandler.compact(rqst);
-
txnHandler.findNextToCompact(aFindNextCompactRequest(ServerUtils.hostname() +
"-193892", "4.0.0"));
- txnHandler.findNextToCompact(aFindNextCompactRequest("nosuchhost-193892",
"4.0.0"));
+
txnHandler.findNextToCompact(aFindNextCompactRequest(ServerUtils.hostname() +
"-193892", "4.0.0-alpha-1"));
+ txnHandler.findNextToCompact(aFindNextCompactRequest("nosuchhost-193892",
"4.0.0-alpha-1"));
startInitiator();
@@ -109,7 +109,7 @@ public class TestInitiator extends CompactorTest {
CompactionRequest rqst = new CompactionRequest("default", "rfrw1",
CompactionType.MINOR);
txnHandler.compact(rqst);
- txnHandler.findNextToCompact(aFindNextCompactRequest("nosuchhost-193892",
"4.0.0"));
+ txnHandler.findNextToCompact(aFindNextCompactRequest("nosuchhost-193892",
"4.0.0-alpha-1"));
conf.setTimeVar(HiveConf.ConfVars.HIVE_COMPACTOR_WORKER_TIMEOUT, 1L,
TimeUnit.MILLISECONDS);
@@ -1051,7 +1051,7 @@ public class TestInitiator extends CompactorTest {
// need to mock the runtime version, because the manifest file won't be
there in the mvn test setup
Initiator initiator = Mockito.spy(new Initiator());
initiator.setConf(conf);
- String runtimeVersion = "4.0.0-SNAPSHOT";
+ String runtimeVersion = "4.0.0-alpha-1-SNAPSHOT";
doReturn(runtimeVersion).when(initiator).getRuntimeVersion();
initiator.init(new AtomicBoolean(true));
initiator.run();
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java
b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java
index b902c14..996d956 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java
@@ -988,13 +988,13 @@ public class TestWorker extends CompactorTest {
burnThroughTransactions("default", "mtwb", 25);
CompactionRequest rqst = new CompactionRequest("default", "mtwb",
CompactionType.MINOR);
- String initiatorVersion = "4.0.0";
+ String initiatorVersion = "4.0.0-alpha-1";
rqst.setInitiatorVersion(initiatorVersion);
txnHandler.compact(rqst);
Worker worker = Mockito.spy(new Worker());
worker.setConf(conf);
- String workerVersion = "4.0.0-SNAPSHOT";
+ String workerVersion = "4.0.0-alpha-1-SNAPSHOT";
doReturn(workerVersion).when(worker).getRuntimeVersion();
worker.init(new AtomicBoolean(true));
worker.run();
diff --git a/ql/src/test/queries/clientpositive/materialized_view_parquet.q
b/ql/src/test/queries/clientpositive/materialized_view_parquet.q
index fd24a07..c29f99c 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_parquet.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_parquet.q
@@ -1,3 +1,5 @@
+-- Mask the totalSize value as it can have slight variability, causing test
flakiness
+--! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
-- SORT_QUERY_RESULTS
set hive.support.concurrency=true;
diff --git a/ql/src/test/queries/clientpositive/parquet_stats.q
b/ql/src/test/queries/clientpositive/parquet_stats.q
index 92eaadb..96d5aa8 100644
--- a/ql/src/test/queries/clientpositive/parquet_stats.q
+++ b/ql/src/test/queries/clientpositive/parquet_stats.q
@@ -1,3 +1,5 @@
+-- Mask the totalSize value as it can have slight variability, causing test
flakiness
+--! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
DROP TABLE if exists parquet_stats;
diff --git
a/ql/src/test/results/clientpositive/llap/materialized_view_parquet.q.out
b/ql/src/test/results/clientpositive/llap/materialized_view_parquet.q.out
index 649e0f8..026030a 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_parquet.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_parquet.q.out
@@ -200,7 +200,7 @@ Table Parameters:
numFiles 1
numRows 3
rawDataSize 279
- totalSize 1220
+ totalSize #Masked#
transactional true
transactional_properties insert_only
#### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/parquet_stats.q.out
b/ql/src/test/results/clientpositive/llap/parquet_stats.q.out
index e9119b8..bdcf878 100644
--- a/ql/src/test/results/clientpositive/llap/parquet_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/parquet_stats.q.out
@@ -48,7 +48,7 @@ Table Parameters:
numFiles 1
numRows 2
rawDataSize 98
- totalSize 626
+ totalSize #Masked#
#### A masked pattern was here ####
# Storage Information
diff --git a/ql/src/test/results/clientpositive/llap/sysdb.q.out
b/ql/src/test/results/clientpositive/llap/sysdb.q.out
index 9013de1..5debf9b 100644
--- a/ql/src/test/results/clientpositive/llap/sysdb.q.out
+++ b/ql/src/test/results/clientpositive/llap/sysdb.q.out
@@ -1397,7 +1397,7 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: _dummy_database@_dummy_table
POSTHOOK: Input: sys@version
#### A masked pattern was here ####
-4.0.0
+4.0.0-alpha-1
PREHOOK: query: select func_name, func_type from funcs order by func_name,
func_type limit 5
PREHOOK: type: QUERY
PREHOOK: Input: sys@funcs
@@ -1555,8 +1555,8 @@ POSTHOOK: Input: sys@compaction_queue
POSTHOOK: Input: sys@compactions
POSTHOOK: Input: sys@completed_compactions
#### A masked pattern was here ####
-1 default default scr_txn NULL major initiated NULL NULL
NULL #Masked# NULL NULL NULL NULL NULL #Masked#
manual 4.0.0-SNAPSHOT NULL
-2 default default scr_txn_2 NULL minor initiated NULL
NULL NULL #Masked# NULL NULL NULL NULL NULL
#Masked# manual 4.0.0-SNAPSHOT NULL
+1 default default scr_txn NULL major initiated NULL NULL
NULL #Masked# NULL NULL NULL NULL NULL #Masked#
manual 4.0.0-alpha-1-SNAPSHOT NULL
+2 default default scr_txn_2 NULL minor initiated NULL
NULL NULL #Masked# NULL NULL NULL NULL NULL
#Masked# manual 4.0.0-alpha-1-SNAPSHOT NULL
PREHOOK: query: use INFORMATION_SCHEMA
PREHOOK: type: SWITCHDATABASE
PREHOOK: Input: database:information_schema
@@ -1784,5 +1784,5 @@ POSTHOOK: Input: sys@dbs
POSTHOOK: Input: sys@tbl_privs
POSTHOOK: Input: sys@tbls
#### A masked pattern was here ####
-1 default default scr_txn NULL major initiated NULL NULL
NULL #Masked# NULL NULL NULL NULL NULL #Masked#
manual 4.0.0-SNAPSHOT NULL
-2 default default scr_txn_2 NULL minor initiated NULL
NULL NULL #Masked# NULL NULL NULL NULL NULL
#Masked# manual 4.0.0-SNAPSHOT NULL
+1 default default scr_txn NULL major initiated NULL NULL
NULL #Masked# NULL NULL NULL NULL NULL #Masked#
manual 4.0.0-alpha-1-SNAPSHOT NULL
+2 default default scr_txn_2 NULL minor initiated NULL
NULL NULL #Masked# NULL NULL NULL NULL NULL
#Masked# manual 4.0.0-alpha-1-SNAPSHOT NULL
diff --git a/serde/pom.xml b/serde/pom.xml
index 479c76c..3c43d40 100644
--- a/serde/pom.xml
+++ b/serde/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-serde</artifactId>
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index 133f357..de73c92 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-service-rpc</artifactId>
diff --git a/service/pom.xml b/service/pom.xml
index fa56bdb..6aca7e2 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-service</artifactId>
diff --git a/shims/0.23/pom.xml b/shims/0.23/pom.xml
index 51ec8f3..4a7f586 100644
--- a/shims/0.23/pom.xml
+++ b/shims/0.23/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.shims</groupId>
diff --git a/shims/aggregator/pom.xml b/shims/aggregator/pom.xml
index b68f629..f218c5b 100644
--- a/shims/aggregator/pom.xml
+++ b/shims/aggregator/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>hive-shims</artifactId>
diff --git a/shims/common/pom.xml b/shims/common/pom.xml
index 386e6da..38edd5d 100644
--- a/shims/common/pom.xml
+++ b/shims/common/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.shims</groupId>
diff --git a/shims/pom.xml b/shims/pom.xml
index 44a1c1f..a1a1680 100644
--- a/shims/pom.xml
+++ b/shims/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-shims-aggregator</artifactId>
diff --git a/shims/scheduler/pom.xml b/shims/scheduler/pom.xml
index 36bcc92..ac02c50 100644
--- a/shims/scheduler/pom.xml
+++ b/shims/scheduler/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.shims</groupId>
diff --git a/spark-client/pom.xml b/spark-client/pom.xml
index 411dda9..d141d00 100644
--- a/spark-client/pom.xml
+++ b/spark-client/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
</parent>
<artifactId>hive-spark-client</artifactId>
<packaging>jar</packaging>
diff --git a/standalone-metastore/metastore-common/pom.xml
b/standalone-metastore/metastore-common/pom.xml
index 1c5c579..057e653 100644
--- a/standalone-metastore/metastore-common/pom.xml
+++ b/standalone-metastore/metastore-common/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>hive-standalone-metastore</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hive-standalone-metastore-common</artifactId>
diff --git a/standalone-metastore/metastore-server/pom.xml
b/standalone-metastore/metastore-server/pom.xml
index 55a9601..367bb79 100644
--- a/standalone-metastore/metastore-server/pom.xml
+++ b/standalone-metastore/metastore-server/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>hive-standalone-metastore</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hive-standalone-metastore-server</artifactId>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-common</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.orc</groupId>
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
index ec1f169..0466a7f 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
@@ -103,7 +103,7 @@ public class MetaStoreSchemaInfo implements
IMetaStoreSchemaInfo {
// Find the list of scripts to execute for this upgrade
int firstScript = hiveSchemaVersions.length;
for (int i=0; i < hiveSchemaVersions.length; i++) {
- if (hiveSchemaVersions[i].startsWith(fromVersion)) {
+ if (hiveSchemaVersions[i].startsWith(fromVersion + "-to-")) {
firstScript = i;
}
}
diff --git
a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql
b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-alpha-1.derby.sql
similarity index 99%
rename from
standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql
rename to
standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-alpha-1.derby.sql
index 8c80524..a92ccf7 100644
---
a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-alpha-1.derby.sql
@@ -868,4 +868,4 @@ ALTER TABLE "PACKAGES" ADD CONSTRAINT "PACKAGES_FK1"
FOREIGN KEY ("DB_ID") REFER
-- -----------------------------------------------------------------
-- Record schema version. Should be the last step in the init script
-- -----------------------------------------------------------------
-INSERT INTO "APP"."VERSION" (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES
(1, '4.0.0', 'Hive release version 4.0.0');
+INSERT INTO "APP"."VERSION" (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES
(1, '4.0.0-alpha-1', 'Hive release version 4.0.0-alpha-1');
diff --git
a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0.derby.sql
b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0-alpha-1.derby.sql
similarity index 98%
rename from
standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0.derby.sql
rename to
standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0-alpha-1.derby.sql
index 4891c6e..d38e20e 100644
---
a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0.derby.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0-alpha-1.derby.sql
@@ -1,4 +1,4 @@
--- Upgrade MetaStore schema from 3.2.0 to 4.0.0
+-- Upgrade MetaStore schema from 3.2.0 to 4.0.0-alpha-1
-- HIVE-19416
ALTER TABLE "APP"."TBLS" ADD WRITE_ID bigint DEFAULT 0;
ALTER TABLE "APP"."PARTITIONS" ADD WRITE_ID bigint DEFAULT 0;
@@ -199,4 +199,4 @@ CREATE TABLE COMPACTION_METRICS_CACHE (
ALTER TABLE "APP"."COMPACTION_QUEUE" ADD COLUMN "CQ_RETRY_RETENTION" bigint
NOT NULL DEFAULT 0;
-- This needs to be the last thing done. Insert any changes above this line.
-UPDATE "APP".VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release
version 4.0.0' where VER_ID=1;
+UPDATE "APP".VERSION SET SCHEMA_VERSION='4.0.0-alpha-1', VERSION_COMMENT='Hive
release version 4.0.0-alpha-1' where VER_ID=1;
diff --git
a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade.order.derby
b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade.order.derby
index 3d05dda..8301fae 100644
---
a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade.order.derby
+++
b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade.order.derby
@@ -16,4 +16,4 @@
2.3.0-to-3.0.0
3.0.0-to-3.1.0
3.1.0-to-3.2.0
-3.2.0-to-4.0.0
+3.2.0-to-4.0.0-alpha-1
diff --git
a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql
b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-alpha-1.mssql.sql
similarity index 99%
rename from
standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql
rename to
standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-alpha-1.mssql.sql
index 074c5bb..57b0fd5 100644
---
a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-alpha-1.mssql.sql
@@ -1452,4 +1452,4 @@ CREATE INDEX DC_PRIVS_N49 ON DC_PRIVS (NAME);
-- -----------------------------------------------------------------
-- Record schema version. Should be the last step in the init script
-- -----------------------------------------------------------------
-INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1,
'4.0.0', 'Hive release version 4.0.0');
+INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1,
'4.0.0-alpha-1', 'Hive release version 4.0.0-alpha-1');
diff --git
a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql
b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0-alpha-1.mssql.sql
similarity index 97%
rename from
standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql
rename to
standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0-alpha-1.mssql.sql
index a3547d2..25c1807 100644
---
a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0-alpha-1.mssql.sql
@@ -1,4 +1,4 @@
-SELECT 'Upgrading MetaStore schema from 3.2.0 to 4.0.0' AS MESSAGE;
+SELECT 'Upgrading MetaStore schema from 3.2.0 to 4.0.0-alpha-1' AS MESSAGE;
-- HIVE-19416
ALTER TABLE TBLS ADD WRITE_ID bigint NOT NULL CONSTRAINT DEF_TBLS_WRITE_ID
DEFAULT(0);
@@ -250,5 +250,5 @@ CREATE TABLE COMPACTION_METRICS_CACHE (
ALTER TABLE "COMPACTION_QUEUE" ADD "CQ_RETRY_RETENTION" bigint NOT NULL
DEFAULT 0;
-- These lines need to be last. Insert any changes above.
-UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release
version 4.0.0' where VER_ID=1;
-SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0' AS MESSAGE;
+UPDATE VERSION SET SCHEMA_VERSION='4.0.0-alpha-1', VERSION_COMMENT='Hive
release version 4.0.0-alpha-1' where VER_ID=1;
+SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0-alpha-1' AS
MESSAGE;
diff --git
a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade.order.mssql
b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade.order.mssql
index 735f6c8..4aa1165 100644
---
a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade.order.mssql
+++
b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade.order.mssql
@@ -10,4 +10,4 @@
2.3.0-to-3.0.0
3.0.0-to-3.1.0
3.1.0-to-3.2.0
-3.2.0-to-4.0.0
+3.2.0-to-4.0.0-alpha-1
diff --git
a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql
b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-alpha-1.mysql.sql
similarity index 99%
rename from
standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql
rename to
standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-alpha-1.mysql.sql
index 0c9dbce..805c552 100644
---
a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-alpha-1.mysql.sql
@@ -1365,7 +1365,7 @@ CREATE TABLE IF NOT EXISTS `DC_PRIVS` (
-- -----------------------------------------------------------------
-- Record schema version. Should be the last step in the init script
-- -----------------------------------------------------------------
-INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1,
'4.0.0', 'Hive release version 4.0.0');
+INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1,
'4.0.0-alpha-1', 'Hive release version 4.0.0-alpha-1');
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git
a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql
b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0-alpha-1.mysql.sql
similarity index 97%
rename from
standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql
rename to
standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0-alpha-1.mysql.sql
index 6233b79..9ea178a 100644
---
a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0-alpha-1.mysql.sql
@@ -1,4 +1,4 @@
-SELECT 'Upgrading MetaStore schema from 3.2.0 to 4.0.0' AS MESSAGE;
+SELECT 'Upgrading MetaStore schema from 3.2.0 to 4.0.0-alpha-1' AS MESSAGE;
-- HIVE-19416
ALTER TABLE TBLS ADD WRITE_ID bigint DEFAULT 0;
@@ -227,5 +227,5 @@ CREATE TABLE COMPACTION_METRICS_CACHE (
ALTER TABLE `COMPACTION_QUEUE` ADD COLUMN `CQ_RETRY_RETENTION` bigint NOT NULL
DEFAULT 0;
-- These lines need to be last. Insert any changes above.
-UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release
version 4.0.0' where VER_ID=1;
-SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0' AS MESSAGE;
+UPDATE VERSION SET SCHEMA_VERSION='4.0.0-alpha-1', VERSION_COMMENT='Hive
release version 4.0.0-alpha-1' where VER_ID=1;
+SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0-alpha-1' AS
MESSAGE;
diff --git
a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade.order.mysql
b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade.order.mysql
index 3d05dda..8301fae 100644
---
a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade.order.mysql
+++
b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade.order.mysql
@@ -16,4 +16,4 @@
2.3.0-to-3.0.0
3.0.0-to-3.1.0
3.1.0-to-3.2.0
-3.2.0-to-4.0.0
+3.2.0-to-4.0.0-alpha-1
diff --git
a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql
b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-alpha-1.oracle.sql
similarity index 99%
rename from
standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql
rename to
standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-alpha-1.oracle.sql
index e9078ac..1ba6ab3 100644
---
a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-alpha-1.oracle.sql
@@ -1350,4 +1350,4 @@ CREATE INDEX DC_PRIVS_N49 ON DC_PRIVS (NAME);
-- -----------------------------------------------------------------
-- Record schema version. Should be the last step in the init script
-- -----------------------------------------------------------------
-INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1,
'4.0.0', 'Hive release version 4.0.0');
+INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1,
'4.0.0-alpha-1', 'Hive release version 4.0.0-alpha-1');
diff --git
a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql
b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0-alpha-1.oracle.sql
similarity index 96%
rename from
standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql
rename to
standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0-alpha-1.oracle.sql
index 91cee24..9ec8258 100644
---
a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0-alpha-1.oracle.sql
@@ -1,4 +1,4 @@
-SELECT 'Upgrading MetaStore schema from 3.2.0 to 4.0.0' AS Status from dual;
+SELECT 'Upgrading MetaStore schema from 3.2.0 to 4.0.0-alpha-1' AS Status from
dual;
-- HIVE-21336 safeguards from changes user may have made after 3.x schema was
installed.
ALTER SESSION SET NLS_LENGTH_SEMANTICS=BYTE;
@@ -224,5 +224,5 @@ CREATE TABLE COMPACTION_METRICS_CACHE (
ALTER TABLE COMPACTION_QUEUE ADD "CQ_RETRY_RETENTION" NUMBER(19) DEFAULT 0 NOT
NULL;
-- These lines need to be last. Insert any changes above.
-UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release
version 4.0.0' where VER_ID=1;
-SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0' AS Status
from dual;
+UPDATE VERSION SET SCHEMA_VERSION='4.0.0-alpha-1', VERSION_COMMENT='Hive
release version 4.0.0-alpha-1' where VER_ID=1;
+SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0-alpha-1' AS
Status from dual;
diff --git
a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade.order.oracle
b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade.order.oracle
index 6b50ee9..f43b92e 100644
---
a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade.order.oracle
+++
b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade.order.oracle
@@ -12,4 +12,4 @@
2.3.0-to-3.0.0
3.0.0-to-3.1.0
3.1.0-to-3.2.0
-3.2.0-to-4.0.0
+3.2.0-to-4.0.0-alpha-1
diff --git
a/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql
b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-alpha-1.postgres.sql
similarity index 99%
rename from
standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql
rename to
standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-alpha-1.postgres.sql
index c86747f..ed1a807 100644
---
a/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-alpha-1.postgres.sql
@@ -2058,4 +2058,4 @@ ALTER TABLE ONLY "DC_PRIVS"
-- -----------------------------------------------------------------
-- Record schema version. Should be the last step in the init script
-- -----------------------------------------------------------------
-INSERT INTO "VERSION" ("VER_ID", "SCHEMA_VERSION", "VERSION_COMMENT") VALUES
(1, '4.0.0', 'Hive release version 4.0.0');
+INSERT INTO "VERSION" ("VER_ID", "SCHEMA_VERSION", "VERSION_COMMENT") VALUES
(1, '4.0.0-alpha-1', 'Hive release version 4.0.0-alpha-1');
diff --git
a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0.postgres.sql
b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0-alpha-1.postgres.sql
similarity index 98%
rename from
standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0.postgres.sql
rename to
standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0-alpha-1.postgres.sql
index 3213a39..a165d98 100644
---
a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0.postgres.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0-alpha-1.postgres.sql
@@ -1,4 +1,4 @@
-SELECT 'Upgrading MetaStore schema from 3.2.0 to 4.0.0';
+SELECT 'Upgrading MetaStore schema from 3.2.0 to 4.0.0-alpha-1';
-- HIVE-19416
ALTER TABLE "TBLS" ADD "WRITE_ID" bigint DEFAULT 0;
@@ -361,5 +361,5 @@ CREATE TABLE "COMPACTION_METRICS_CACHE" (
ALTER TABLE "COMPACTION_QUEUE" ADD "CQ_RETRY_RETENTION" bigint NOT NULL
DEFAULT 0;
-- These lines need to be last. Insert any changes above.
-UPDATE "VERSION" SET "SCHEMA_VERSION"='4.0.0', "VERSION_COMMENT"='Hive release
version 4.0.0' where "VER_ID"=1;
-SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0';
+UPDATE "VERSION" SET "SCHEMA_VERSION"='4.0.0-alpha-1', "VERSION_COMMENT"='Hive
release version 4.0.0-alpha-1' where "VER_ID"=1;
+SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0-alpha-1';
diff --git
a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade.order.postgres
b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade.order.postgres
index 3d05dda..8301fae 100644
---
a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade.order.postgres
+++
b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade.order.postgres
@@ -16,4 +16,4 @@
2.3.0-to-3.0.0
3.0.0-to-3.1.0
3.1.0-to-3.2.0
-3.2.0-to-4.0.0
+3.2.0-to-4.0.0-alpha-1
diff --git
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/PostgresTPCDS.java
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/PostgresTPCDS.java
index 8c0056e..738e007 100644
---
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/PostgresTPCDS.java
+++
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/PostgresTPCDS.java
@@ -51,7 +51,7 @@ public class PostgresTPCDS extends Postgres {
public void install() {
// Upgrade the metastore to latest by running explicitly a script.
try (InputStream script = PostgresTPCDS.class.getClassLoader()
-
.getResourceAsStream("sql/postgres/upgrade-3.1.3000-to-4.0.0.postgres.sql")) {
+
.getResourceAsStream("sql/postgres/upgrade-3.1.3000-to-4.0.0-alpha-1.postgres.sql"))
{
new MetastoreSchemaTool().runScript(
buildArray(
"-upgradeSchema",
diff --git
a/standalone-metastore/metastore-server/src/test/resources/sql/postgres/upgrade-3.1.3000-to-4.0.0.postgres.sql
b/standalone-metastore/metastore-server/src/test/resources/sql/postgres/upgrade-3.1.3000-to-4.0.0-alpha-1.postgres.sql
similarity index 94%
rename from
standalone-metastore/metastore-server/src/test/resources/sql/postgres/upgrade-3.1.3000-to-4.0.0.postgres.sql
rename to
standalone-metastore/metastore-server/src/test/resources/sql/postgres/upgrade-3.1.3000-to-4.0.0-alpha-1.postgres.sql
index af68ca9..2d9fa69 100644
---
a/standalone-metastore/metastore-server/src/test/resources/sql/postgres/upgrade-3.1.3000-to-4.0.0.postgres.sql
+++
b/standalone-metastore/metastore-server/src/test/resources/sql/postgres/upgrade-3.1.3000-to-4.0.0-alpha-1.postgres.sql
@@ -1,5 +1,5 @@
--- The file has some overlapping with upgrade-3.2.0-to-4.0.0.postgres.sql
-SELECT 'Upgrading MetaStore schema from 3.1.3000 to 4.0.0';
+-- The file has some overlapping with
upgrade-3.2.0-to-4.0.0-alpha-1.postgres.sql
+SELECT 'Upgrading MetaStore schema from 3.1.3000 to 4.0.0-alpha-1';
-- HIVE-20793
ALTER TABLE "WM_RESOURCEPLAN" ADD "NS" character varying(128);
@@ -132,5 +132,5 @@ CREATE TABLE "COMPACTION_METRICS_CACHE" (
ALTER TABLE "COMPACTION_QUEUE" ADD "CQ_RETRY_RETENTION" integer NOT NULL
DEFAULT 0;
-- These lines need to be last. Insert any changes above.
-UPDATE "VERSION" SET "SCHEMA_VERSION"='4.0.0', "VERSION_COMMENT"='Hive release
version 4.0.0' where "VER_ID"=1;
-SELECT 'Finished upgrading MetaStore schema from 3.1.3000 to 4.0.0';
+UPDATE "VERSION" SET "SCHEMA_VERSION"='4.0.0-alpha-1', "VERSION_COMMENT"='Hive
release version 4.0.0-alpha-1' where "VER_ID"=1;
+SELECT 'Finished upgrading MetaStore schema from 3.1.3000 to 4.0.0-alpha-1';
diff --git a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
index 56e1d86e..88a0658 100644
--- a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
+++ b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>hive-metastore-tools</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/standalone-metastore/metastore-tools/pom.xml
b/standalone-metastore/metastore-tools/pom.xml
index 18fdfcc..1093e77 100644
--- a/standalone-metastore/metastore-tools/pom.xml
+++ b/standalone-metastore/metastore-tools/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>hive-standalone-metastore</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<groupId>org.apache.hive</groupId>
</parent>
<artifactId>hive-metastore-tools</artifactId>
diff --git a/standalone-metastore/metastore-tools/tools-common/pom.xml
b/standalone-metastore/metastore-tools/tools-common/pom.xml
index fda8ef9..17cc0bb 100644
--- a/standalone-metastore/metastore-tools/tools-common/pom.xml
+++ b/standalone-metastore/metastore-tools/tools-common/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>hive-metastore-tools</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index 554a09d..b84a65b 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -21,7 +21,7 @@
</parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Hive Standalone Metastore</name>
<modules>
@@ -30,8 +30,8 @@
<module>metastore-tools</module>
</modules>
<properties>
- <hive.version>4.0.0-SNAPSHOT</hive.version>
- <hive.version.shortname>4.0.0</hive.version.shortname>
+ <hive.version>4.0.0-alpha-1-SNAPSHOT</hive.version>
+ <hive.version.shortname>4.0.0-alpha-1</hive.version.shortname>
<standalone.metastore.path.to.root>.</standalone.metastore.path.to.root>
<!-- Build properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -94,7 +94,7 @@
<sqlline.version>1.9.0</sqlline.version>
<jline.version>2.14.6</jline.version>
<ST4.version>4.0.4</ST4.version>
- <storage-api.version>2.7.3-SNAPSHOT</storage-api.version>
+ <storage-api.version>4.0.0-alpha-1-SNAPSHOT</storage-api.version>
<beanutils.version>1.9.4</beanutils.version>
<hamcrest.version>1.3</hamcrest.version>
<curator.version>4.2.0</curator.version>
diff --git a/storage-api/pom.xml b/storage-api/pom.xml
index af899f0..c866a98 100644
--- a/storage-api/pom.xml
+++ b/storage-api/pom.xml
@@ -21,7 +21,7 @@
</parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-storage-api</artifactId>
- <version>2.7.3-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hive Storage API</name>
<properties>
diff --git a/streaming/pom.xml b/streaming/pom.xml
index d666eb4..3606c2d 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-streaming</artifactId>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-server</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/testutils/pom.xml b/testutils/pom.xml
index b8bb7fd..9e91b41 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-testutils</artifactId>
diff --git a/udf/pom.xml b/udf/pom.xml
index bff1d7c..84cef73 100644
--- a/udf/pom.xml
+++ b/udf/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-udf</artifactId>
diff --git a/upgrade-acid/pom.xml b/upgrade-acid/pom.xml
index 6c62a83..8fd07a1 100644
--- a/upgrade-acid/pom.xml
+++ b/upgrade-acid/pom.xml
@@ -23,7 +23,7 @@
<!--this module is added to parent pom so that it builds and releases with
the reset of Hive-->
<groupId>org.apache.hive</groupId>
<artifactId>hive-upgrade-acid</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<name>Hive Upgrade Acid</name>
<packaging>pom</packaging>
<properties>
diff --git a/upgrade-acid/pre-upgrade/pom.xml b/upgrade-acid/pre-upgrade/pom.xml
index 655db4d..aaff313 100644
--- a/upgrade-acid/pre-upgrade/pom.xml
+++ b/upgrade-acid/pre-upgrade/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-upgrade-acid</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/vector-code-gen/pom.xml b/vector-code-gen/pom.xml
index b26aa23..d706962 100644
--- a/vector-code-gen/pom.xml
+++ b/vector-code-gen/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-vector-code-gen</artifactId>
