From 2f68a3dca441325768fdaba5be6c30964e3e3339 Mon Sep 17 00:00:00 2001 From: Richard Antal Date: Mon, 24 Aug 2020 15:47:20 +0200 Subject: [PATCH] PHOENIX-6091 Calling MetaDataProtocol.getVersion() on a 4.16 timestamp gives version as 4.15.x --- .../org/apache/phoenix/coprocessor/MetaDataProtocol.java | 1 + .../java/org/apache/phoenix/schema/MetaDataClientTest.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java index a3485f0db2f..5d0fc85c9f8 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java @@ -142,6 +142,7 @@ public abstract class MetaDataProtocol extends MetaDataService { TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_13_0, "4.13.x"); TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_14_0, "4.14.x"); TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_15_0, "4.15.x"); + TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_16_0, "4.16.x"); } public static final String CURRENT_CLIENT_VERSION = PHOENIX_MAJOR_VERSION + "." + PHOENIX_MINOR_VERSION + "." + PHOENIX_PATCH_NUMBER; diff --git a/phoenix-core/src/test/java/org/apache/phoenix/schema/MetaDataClientTest.java b/phoenix-core/src/test/java/org/apache/phoenix/schema/MetaDataClientTest.java index 1f408b21668..21c751461e9 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/schema/MetaDataClientTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/schema/MetaDataClientTest.java @@ -32,6 +32,8 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; +import static org.apache.phoenix.coprocessor.MetaDataProtocol.PHOENIX_MAJOR_VERSION; +import static org.apache.phoenix.coprocessor.MetaDataProtocol.PHOENIX_MINOR_VERSION; public class MetaDataClientTest extends BaseConnectionlessQueryTest { @@ -83,4 +85,9 @@ public void testHandleCreateTableMutationCodeWithNewCode() throws SQLException { } } + @Test + public void testMetaDataProtocolVersion() { + assertEquals(String.format("%d.%d.%s", PHOENIX_MAJOR_VERSION, PHOENIX_MINOR_VERSION, "x"), + MetaDataProtocol.getVersion(System.currentTimeMillis())); + } }