Add plan hash from contination to EXPLAIN result

Author: hazefully

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/QueryPlan.java

@@ -310,7 +310,8 @@ private RelationalResultSet executeExplain(@Nonnull ContinuationImpl parsedConti
                             DataType.StructType.Field.from("EXECUTION_STATE", DataType.Primitives.BYTES.type(), 0),
                             DataType.StructType.Field.from("VERSION", DataType.Primitives.INTEGER.type(), 1),
                             DataType.StructType.Field.from("PLAN_HASH_MODE", DataType.Primitives.STRING.type(), 2),
-                            DataType.StructType.Field.from("SERIALIZED_PLAN_COMPLEXITY", DataType.Primitives.INTEGER.type(), 3)),
+                            DataType.StructType.Field.from("PLAN_HASH", DataType.Primitives.INTEGER.type(), 3),
+                            DataType.StructType.Field.from("SERIALIZED_PLAN_COMPLEXITY", DataType.Primitives.INTEGER.type(), 4)),
                     true);
             final var plannerMetricsStructType = DataType.StructType.from(
                     "PLANNER_METRICS", List.of(
@@ -338,6 +339,7 @@ private RelationalResultSet executeExplain(@Nonnull ContinuationImpl parsedConti
                             parsedContinuation.getExecutionState(),
                             parsedContinuation.getVersion(),
                             parsedContinuation.getCompiledStatement() == null ? null : parsedContinuation.getCompiledStatement().getPlanSerializationMode(),
+                            parsedContinuation.getPlanHash(),
                             getPlanFromContinuation(parsedContinuation, executionContext).map(RecordQueryPlan::getComplexity).orElse(null)
                     ), RelationalStructMetaData.of(continuationStructType));
 
@@ -432,7 +434,7 @@ private Continuation enrichContinuation(@Nonnull final Continuation continuation
                 // 3. query constraints
                 //
 
-                final var serializationContext = new PlanSerializationContext(new DefaultPlanSerializationRegistry(), currentPlanHashMode);
+                final var serializationContext = new PlanSerializationContext(DefaultPlanSerializationRegistry.INSTANCE, currentPlanHashMode);
 
                 final var literals = queryExecutionContext.getLiterals();
                 final var compiledStatementBuilder = CompiledStatement.newBuilder()

fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/query/ExplainTests.java

@@ -73,9 +73,10 @@ void explainResultSetMetadataTest() throws Exception {
                 "EXECUTION_STATE",
                 "VERSION",
                 "PLAN_HASH_MODE",
+                "PLAN_HASH",
                 "SERIALIZED_PLAN_COMPLEXITY"
         );
-        final var expectedContTypes = List.of(Types.BINARY, Types.INTEGER, Types.VARCHAR, Types.INTEGER);
+        final var expectedContTypes = List.of(Types.BINARY, Types.INTEGER, Types.VARCHAR, Types.INTEGER, Types.INTEGER);
         try (var ddl = Ddl.builder().database(URI.create("/TEST/QT")).relationalExtension(relationalExtension).schemaTemplate(schemaTemplate).build()) {
             executeInsert(ddl);
             try (RelationalPreparedStatement ps = ddl.setSchemaAndGetConnection().prepareStatement("EXPLAIN SELECT * FROM RestaurantComplexRecord")) {
@@ -108,7 +109,7 @@ void explainWithNoContinuationTest() throws Exception {
                     final var assertResult = ResultSetAssert.assertThat(resultSet);
                     assertResult.hasNextRow()
                             .hasColumn("PLAN", "ISCAN(RECORD_NAME_IDX <,>)")
-                            .hasColumn("PLAN_HASH", -1635569052L)
+                            .hasColumn("PLAN_HASH", -1635569052)
                             .hasColumn("PLAN_CONTINUATION", null);
                     assertResult.hasNoNextRow();
                 }
@@ -132,15 +133,17 @@ void explainWithContinuationNoSerializedPlanTest() throws Exception {
                     ps.setObject("cont", continuation.serialize());
                     try (final RelationalResultSet resultSet = ps.executeQuery()) {
                         final var assertResult = ResultSetAssert.assertThat(resultSet);
+
                         assertResult.hasNextRow()
                                 .hasColumn("PLAN", "ISCAN(RECORD_NAME_IDX <,>)")
-                                .hasColumn("PLAN_HASH", -1635569052L);
+                                .hasColumn("PLAN_HASH", -1635569052);
                         final var continuationInfo = resultSet.getStruct(5);
                         org.junit.jupiter.api.Assertions.assertNotNull(continuationInfo);
                         final var assertStruct = RelationalStructAssert.assertThat(continuationInfo);
                         assertStruct.hasValue("EXECUTION_STATE", new byte[]{0, 21, 1, 21, 11});
                         assertStruct.hasValue("VERSION", 1);
                         assertStruct.hasValue("PLAN_HASH_MODE", null);
+                        assertStruct.hasValue("PLAN_HASH", -1635569052);
                         assertStruct.hasValue("SERIALIZED_PLAN_COMPLEXITY", null);
                     }
                 }
@@ -166,13 +169,14 @@ void explainWithContinuationSerializedPlanTest() throws Exception {
                         final var assertResult = ResultSetAssert.assertThat(resultSet);
                         assertResult.hasNextRow()
                                 .hasColumn("PLAN", "ISCAN(RECORD_NAME_IDX <,>)")
-                                .hasColumn("PLAN_HASH", -1635569052L);
+                                .hasColumn("PLAN_HASH", -1635569052);
                         final var continuationInfo = resultSet.getStruct(5);
                         org.junit.jupiter.api.Assertions.assertNotNull(continuationInfo);
                         final var assertStruct = RelationalStructAssert.assertThat(continuationInfo);
                         assertStruct.hasValue("EXECUTION_STATE", new byte[]{0, 21, 1, 21, 11});
                         assertStruct.hasValue("VERSION", 1);
                         assertStruct.hasValue("PLAN_HASH_MODE", "VC0");
+                        assertStruct.hasValue("PLAN_HASH", -1635569052);
                         assertStruct.hasValue("SERIALIZED_PLAN_COMPLEXITY", 1);
                     }
                 }
@@ -198,13 +202,14 @@ void explainExecuteStatementTest() throws Exception {
                         final var assertResult = ResultSetAssert.assertThat(resultSet);
                         assertResult.hasNextRow()
                                 .hasColumn("PLAN", "ISCAN(RECORD_NAME_IDX <,>)")
-                                .hasColumn("PLAN_HASH", -1635569052L);
+                                .hasColumn("PLAN_HASH", -1635569052);
                         final var continuationInfo = resultSet.getStruct(5);
                         org.junit.jupiter.api.Assertions.assertNotNull(continuationInfo);
                         final var assertStruct = RelationalStructAssert.assertThat(continuationInfo);
                         assertStruct.hasValue("EXECUTION_STATE", new byte[]{0, 21, 1, 21, 11});
                         assertStruct.hasValue("VERSION", 1);
                         assertStruct.hasValue("PLAN_HASH_MODE", "VC0");
+                        assertStruct.hasValue("PLAN_HASH", -1635569052);
                         assertStruct.hasValue("SERIALIZED_PLAN_COMPLEXITY", 1);
                     }
                 }