From d3cd92a0e2a7a54505e2e7b44f7a4ea1b6947683 Mon Sep 17 00:00:00 2001
From: Jim Hughes <jhughes@confluent.io>
Date: Thu, 10 Mar 2022 20:40:05 -0500
Subject: [PATCH 1/5] feat: Generalize the UDAFs earliest_by_offset and
 latest_by_offset

Addresses: https://github.com/confluentinc/ksql/issues/5437 and https://github.com/confluentinc/ksql/issues/8368
---
 .../ksql/function/UdafFactoryInvoker.java     |  22 +-
 .../udaf/offset/EarliestByOffset.java         | 322 ++++--------------
 .../udaf/offset/KudafByOffsetUtils.java       |   9 +
 .../udaf/offset/EarliestByOffsetTest.java     | 119 +++++--
 .../7.2.0_1644852483241/plan.json             | 229 +++++++++++++
 .../7.2.0_1644852483241/spec.json             | 241 +++++++++++++
 .../7.2.0_1644852483241/topology              |  25 ++
 .../7.2.0_1644852482932/plan.json             | 229 +++++++++++++
 .../7.2.0_1644852482932/spec.json             | 224 ++++++++++++
 .../7.2.0_1644852482932/topology              |  25 ++
 .../7.2.0_1646962668589/plan.json             | 234 +++++++++++++
 .../7.2.0_1646962668589/spec.json             | 145 ++++++++
 .../7.2.0_1646962668589/topology              |  25 ++
 .../7.2.0_1644852483075/plan.json             | 229 +++++++++++++
 .../7.2.0_1644852483075/spec.json             | 185 ++++++++++
 .../7.2.0_1644852483075/topology              |  25 ++
 .../7.2.0_1644852483152/plan.json             | 229 +++++++++++++
 .../7.2.0_1644852483152/spec.json             | 193 +++++++++++
 .../7.2.0_1644852483152/topology              |  25 ++
 .../earliest-offset-udaf.json                 |  91 +++++
 .../query-validation-tests/udaf.json          |  11 -
 21 files changed, 2529 insertions(+), 308 deletions(-)
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_an_array_added/7.2.0_1644852483241/plan.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_an_array_added/7.2.0_1644852483241/spec.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_an_array_added/7.2.0_1644852483241/topology
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1644852482932/plan.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1644852482932/spec.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1644852482932/topology
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_decimals/7.2.0_1646962668589/plan.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_decimals/7.2.0_1646962668589/spec.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_decimals/7.2.0_1646962668589/topology
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_maps/7.2.0_1644852483075/plan.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_maps/7.2.0_1644852483075/spec.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_maps/7.2.0_1644852483075/topology
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_structs/7.2.0_1644852483152/plan.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_structs/7.2.0_1644852483152/spec.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_structs/7.2.0_1644852483152/topology

diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/UdafFactoryInvoker.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/UdafFactoryInvoker.java
index 741a27d71947..86753dfab243 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/UdafFactoryInvoker.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/UdafFactoryInvoker.java
@@ -41,13 +41,15 @@ class UdafFactoryInvoker implements FunctionSignature {
   private static final Logger LOG = LoggerFactory.getLogger(UdafFactoryInvoker.class);
 
   private final FunctionName functionName;
-  private final ParamType aggregateArgType;
-  private final ParamType aggregateReturnType;
   private final Optional<Metrics> metrics;
   private final List<ParamType> paramTypes;
   private final List<ParameterInfo> params;
   private final Method method;
   private final String description;
+  private final UdafTypes types;
+  private final String aggregateSchema;
+  private final String outputSchema;
+  private ParamType aggregateReturnType;
 
   UdafFactoryInvoker(
       final Method method,
@@ -70,10 +72,12 @@ class UdafFactoryInvoker implements FunctionSignature {
     if (!Modifier.isStatic(method.getModifiers())) {
       throw new KsqlException("UDAF factory methods must be static " + method);
     }
-    final UdafTypes types = new UdafTypes(method, functionName, typeParser);
+    this.types = new UdafTypes(method, functionName, typeParser);
     this.functionName = Objects.requireNonNull(functionName);
-    this.aggregateArgType = Objects.requireNonNull(types.getAggregateSchema(aggregateSchema));
-    this.aggregateReturnType = Objects.requireNonNull(types.getOutputSchema(outputSchema));
+    this.aggregateSchema = aggregateSchema;
+    this.outputSchema = outputSchema;
+    //this.aggregateArgType = Objects.requireNonNull(types.getAggregateSchema(aggregateSchema));
+    //this.aggregateReturnType = Objects.requireNonNull(types.getOutputSchema(outputSchema));
     this.metrics = Objects.requireNonNull(metrics);
     this.params = types.getInputSchema(Objects.requireNonNull(inputSchema));
     this.paramTypes = params.stream().map(ParameterInfo::type).collect(Collectors.toList());
@@ -95,10 +99,14 @@ KsqlAggregateFunction createFunction(final AggregateFunctionInitArguments initAr
       }
 
       final SqlType aggregateSqlType = (SqlType) udaf.getAggregateSqlType()
-          .orElseGet(() -> SchemaConverters.functionToSqlConverter().toSqlType(aggregateArgType));
+          .orElseGet(() -> SchemaConverters.functionToSqlConverter()
+              .toSqlType(types.getAggregateSchema(aggregateSchema)));
       final SqlType returnSqlType = (SqlType) udaf.getReturnSqlType()
           .orElseGet(() ->
-              SchemaConverters.functionToSqlConverter().toSqlType(aggregateReturnType));
+              SchemaConverters.functionToSqlConverter()
+                  .toSqlType(types.getOutputSchema(outputSchema)));
+      this.aggregateReturnType =
+          SchemaConverters.sqlToFunctionConverter().toFunctionType(returnSqlType);
 
       final KsqlAggregateFunction function;
       if (TableUdaf.class.isAssignableFrom(method.getReturnType())) {
diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/EarliestByOffset.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/EarliestByOffset.java
index a8bbe4588b0d..b44a76361259 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/EarliestByOffset.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/EarliestByOffset.java
@@ -16,15 +16,6 @@
 package io.confluent.ksql.function.udaf.offset;
 
 import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.INTERMEDIATE_STRUCT_COMPARATOR;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_BOOLEAN;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_BYTES;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_DATE;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_DOUBLE;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_INTEGER;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_LONG;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_STRING;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_TIME;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_TIMESTAMP;
 import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.VAL_FIELD;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -32,18 +23,20 @@
 import io.confluent.ksql.function.udaf.Udaf;
 import io.confluent.ksql.function.udaf.UdafDescription;
 import io.confluent.ksql.function.udaf.UdafFactory;
+import io.confluent.ksql.schema.ksql.SchemaConverters;
+import io.confluent.ksql.schema.ksql.SqlArgument;
+import io.confluent.ksql.schema.ksql.types.SqlArray;
+import io.confluent.ksql.schema.ksql.types.SqlType;
 import io.confluent.ksql.util.KsqlConstants;
-import java.nio.ByteBuffer;
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.Struct;
 
+//    name = "EARLIEST_BY_OFFSET_OLD",
 @UdafDescription(
     name = "EARLIEST_BY_OFFSET",
     description = EarliestByOffset.DESCRIPTION,
@@ -59,249 +52,25 @@ private EarliestByOffset() {
 
   static final AtomicLong sequence = new AtomicLong();
 
-  @UdafFactory(description = "return the earliest value of an integer column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL INT>")
-  public static Udaf<Integer, Struct, Integer> earliestInteger() {
-    return earliestInteger(true);
+  @UdafFactory(description = "return the earliest value of a column")
+  public static <T> Udaf<T, Struct, T> earliest() {
+    return earliest(true);
   }
 
-  @UdafFactory(description = "return the earliest value of an integer column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL INT>")
-  public static Udaf<Integer, Struct, Integer> earliestInteger(final boolean ignoreNulls) {
-    return earliest(STRUCT_INTEGER, ignoreNulls);
+  @UdafFactory(description = "return the earliest value of a column")
+  public static <T> Udaf<T, Struct, T> earliest(final boolean ignoreNulls) {
+    return earliestT(ignoreNulls);
   }
 
-  @UdafFactory(description = "return the earliest N values of an integer column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL INT>>")
-  public static Udaf<Integer, List<Struct>, List<Integer>> earliestIntegers(final int earliestN) {
-    return earliestIntegers(earliestN, true);
+  @UdafFactory(description = "return the earliest N values of a column")
+  public static <T> Udaf<T, List<Struct>, List<T>> earliest(final int earliestN) {
+    return earliest(earliestN, true);
   }
 
-  @UdafFactory(description = "return the earliest N values of an integer column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL INT>>")
-  public static Udaf<Integer, List<Struct>, List<Integer>> earliestIntegers(
-      final int earliestN,
-      final boolean ignoreNulls
-  ) {
-    return earliestN(STRUCT_INTEGER, earliestN, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest value of an big integer column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL BIGINT>")
-  public static Udaf<Long, Struct, Long> earliestLong() {
-    return earliestLong(true);
-  }
-
-  @UdafFactory(description = "return the earliest value of an big integer column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL BIGINT>")
-  public static Udaf<Long, Struct, Long> earliestLong(final boolean ignoreNulls) {
-    return earliest(STRUCT_LONG, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest N values of an long column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL BIGINT>>")
-  public static Udaf<Long, List<Struct>, List<Long>> earliestLongs(final int earliestN) {
-    return earliestLongs(earliestN, true);
-  }
-
-  @UdafFactory(description = "return the earliest N values of an long column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL BIGINT>>")
-  public static Udaf<Long, List<Struct>, List<Long>> earliestLongs(
-      final int earliestN,
-      final boolean ignoreNulls
-  ) {
-    return earliestN(STRUCT_LONG, earliestN, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest value of a double column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL DOUBLE>")
-  public static Udaf<Double, Struct, Double> earliestDouble() {
-    return earliestDouble(true);
-  }
-
-  @UdafFactory(description = "return the earliest value of a double column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL DOUBLE>")
-  public static Udaf<Double, Struct, Double> earliestDouble(final boolean ignoreNulls) {
-    return earliest(STRUCT_DOUBLE, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a double column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL DOUBLE>>")
-  public static Udaf<Double, List<Struct>, List<Double>> earliestDoubles(final int earliestN) {
-    return earliestDoubles(earliestN, true);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a double column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL DOUBLE>>")
-  public static Udaf<Double, List<Struct>, List<Double>> earliestDoubles(
-      final int earliestN,
-      final boolean ignoreNulls
-  ) {
-    return earliestN(STRUCT_DOUBLE, earliestN, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest value of a boolean column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL BOOLEAN>")
-  public static Udaf<Boolean, Struct, Boolean> earliestBoolean() {
-    return earliestBoolean(true);
-  }
-
-  @UdafFactory(description = "return the earliest value of a boolean column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL BOOLEAN>")
-  public static Udaf<Boolean, Struct, Boolean> earliestBoolean(final boolean ignoreNulls) {
-    return earliest(STRUCT_BOOLEAN, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a boolean column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL BOOLEAN>>")
-  public static Udaf<Boolean, List<Struct>, List<Boolean>> earliestBooleans(final int earliestN) {
-    return earliestBooleans(earliestN, true);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a boolean column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL BOOLEAN>>")
-  public static Udaf<Boolean, List<Struct>, List<Boolean>> earliestBooleans(
-      final int earliestN,
-      final boolean ignoreNulls
-  ) {
-    return earliestN(STRUCT_BOOLEAN, earliestN, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest value of a string column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL STRING>")
-  public static Udaf<String, Struct, String> earliestString() {
-    return earliestString(true);
-  }
-
-  @UdafFactory(description = "return the earliest value of a string column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL STRING>")
-  public static Udaf<String, Struct, String> earliestString(final boolean ignoreNulls) {
-    return earliest(STRUCT_STRING, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a string column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL STRING>>")
-  public static Udaf<String, List<Struct>, List<String>> earliestStrings(final int earliestN) {
-    return earliestStrings(earliestN, true);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a string column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL STRING>>")
-  public static Udaf<String, List<Struct>, List<String>> earliestStrings(
-      final int earliestN,
-      final boolean ignoreNulls
-  ) {
-    return earliestN(STRUCT_STRING, earliestN, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest value of a timestamp column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL TIMESTAMP>")
-  public static Udaf<Timestamp, Struct, Timestamp> earliestTimestamp() {
-    return earliestTimestamp(true);
-  }
-
-  @UdafFactory(description = "return the earliest value of a timestamp column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL TIMESTAMP>")
-  public static Udaf<Timestamp, Struct, Timestamp> earliestTimestamp(final boolean ignoreNulls) {
-    return earliest(STRUCT_TIMESTAMP, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a timestamp column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL TIMESTAMP>>")
-  public static Udaf<Timestamp, List<Struct>, List<Timestamp>> earliestTimestamps(
-      final int earliestN) {
-    return earliestTimestamps(earliestN, true);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a timestamp column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL TIMESTAMP>>")
-  public static Udaf<Timestamp, List<Struct>, List<Timestamp>> earliestTimestamps(
-      final int earliestN,
-      final boolean ignoreNulls
-  ) {
-    return earliestN(STRUCT_TIMESTAMP, earliestN, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest value of a time column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL TIME>")
-  public static Udaf<Time, Struct, Time> earliestTime() {
-    return earliestTime(true);
-  }
-
-  @UdafFactory(description = "return the earliest value of a time column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL TIME>")
-  public static Udaf<Time, Struct, Time> earliestTime(final boolean ignoreNulls) {
-    return earliest(STRUCT_TIME, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a time column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL TIME>>")
-  public static Udaf<Time, List<Struct>, List<Time>> earliestTimes(final int earliestN) {
-    return earliestTimes(earliestN, true);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a time column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL TIME>>")
-  public static Udaf<Time, List<Struct>, List<Time>> earliestTimes(
-      final int earliestN,
-      final boolean ignoreNulls
-  ) {
-    return earliestN(STRUCT_TIME, earliestN, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest value of a date column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL DATE>")
-  public static Udaf<Date, Struct, Date> earliestDate() {
-    return earliestDate(true);
-  }
-
-  @UdafFactory(description = "return the earliest value of a date column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL DATE>")
-  public static Udaf<Date, Struct, Date> earliestDate(final boolean ignoreNulls) {
-    return earliest(STRUCT_DATE, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a date column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL DATE>>")
-  public static Udaf<Date, List<Struct>, List<Date>> earliestDates(final int earliestN) {
-    return earliestDates(earliestN, true);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a date column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL DATE>>")
-  public static Udaf<Date, List<Struct>, List<Date>> earliestDates(
-      final int earliestN,
-      final boolean ignoreNulls
-  ) {
-    return earliestN(STRUCT_DATE, earliestN, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest value of a bytes column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL BYTES>")
-  public static Udaf<ByteBuffer, Struct, ByteBuffer> earliestBytes() {
-    return earliestBytes(true);
-  }
-
-  @UdafFactory(description = "return the earliest value of a bytes column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL BYTES>")
-  public static Udaf<ByteBuffer, Struct, ByteBuffer> earliestBytes(final boolean ignoreNulls) {
-    return earliest(STRUCT_BYTES, ignoreNulls);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a bytes column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL BYTES>>")
-  public static Udaf<ByteBuffer, List<Struct>, List<ByteBuffer>> earliestBytes(
-      final int earliestN) {
-    return earliestBytes(earliestN, true);
-  }
-
-  @UdafFactory(description = "return the earliest N values of a bytes column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL BYTES>>")
-  public static Udaf<ByteBuffer, List<Struct>, List<ByteBuffer>> earliestBytes(
-      final int earliestN,
-      final boolean ignoreNulls
-  ) {
-    return earliestN(STRUCT_BYTES, earliestN, ignoreNulls);
+  @UdafFactory(description = "return the earliest N values of a column")
+  public static <T> Udaf<T, List<Struct>, List<T>> earliest(final int earliestN,
+      final boolean ignoreNulls) {
+    return earliestTN(earliestN, ignoreNulls);
   }
 
   @VisibleForTesting
@@ -314,11 +83,32 @@ private static long generateSequence() {
   }
 
   @VisibleForTesting
-  static <T> Udaf<T, Struct, T> earliest(
-      final Schema structSchema,
+  static <T> Udaf<T, Struct, T> earliestT(
       final boolean ignoreNulls
   ) {
     return new Udaf<T, Struct, T>() {
+      Schema structSchema;
+      SqlType aggregateType;
+      SqlType returnType;
+
+      @Override
+      public void initializeTypeArguments(final List<SqlArgument> argTypeList) {
+        returnType = argTypeList.get(0).getSqlTypeOrThrow();
+        final Schema connectType =
+            SchemaConverters.sqlToConnectConverter().toConnectSchema(returnType);
+        structSchema = KudafByOffsetUtils.buildSchema(connectType);
+        aggregateType = SchemaConverters.connectToSqlConverter().toSqlType(structSchema);
+      }
+
+      @Override
+      public Optional<SqlType> getAggregateSqlType() {
+        return Optional.of(aggregateType);
+      }
+
+      @Override
+      public Optional<SqlType> getReturnSqlType() {
+        return Optional.of(returnType);
+      }
 
       @Override
       public Struct initialize() {
@@ -370,8 +160,7 @@ public T map(final Struct agg) {
   }
 
   @VisibleForTesting
-  static <T> Udaf<T, List<Struct>, List<T>> earliestN(
-      final Schema structSchema,
+  static <T> Udaf<T, List<Struct>, List<T>> earliestTN(
       final int earliestN,
       final boolean ignoreNulls
   ) {
@@ -380,6 +169,31 @@ static <T> Udaf<T, List<Struct>, List<T>> earliestN(
     }
 
     return new Udaf<T, List<Struct>, List<T>>() {
+      Schema structSchema;
+      SqlType aggregateType;
+      SqlType returnType;
+
+      @Override
+      public void initializeTypeArguments(final List<SqlArgument> argTypeList) {
+        final SqlType inputType = argTypeList.get(0).getSqlTypeOrThrow();
+        final Schema connectType =
+            SchemaConverters.sqlToConnectConverter().toConnectSchema(inputType);
+        structSchema = KudafByOffsetUtils.buildSchema(connectType);
+        aggregateType =
+            SqlArray.of(SchemaConverters.connectToSqlConverter().toSqlType(structSchema));
+        returnType = SqlArray.of(inputType);
+      }
+
+      @Override
+      public Optional<SqlType> getAggregateSqlType() {
+        return Optional.of(aggregateType);
+      }
+
+      @Override
+      public Optional<SqlType> getReturnSqlType() {
+        return Optional.of(returnType);
+      }
+
       @Override
       public List<Struct> initialize() {
         return new ArrayList<>(earliestN);
diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/KudafByOffsetUtils.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/KudafByOffsetUtils.java
index 6b843effd7ac..700fdf96254e 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/KudafByOffsetUtils.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/KudafByOffsetUtils.java
@@ -20,12 +20,14 @@
 import static io.confluent.ksql.serde.connect.ConnectKsqlSchemaTranslator.OPTIONAL_TIME_SCHEMA;
 
 import java.util.Comparator;
+import java.util.concurrent.atomic.AtomicLong;
 import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.SchemaBuilder;
 import org.apache.kafka.connect.data.Struct;
 
 final class KudafByOffsetUtils {
 
+  static final AtomicLong sequence = new AtomicLong();
   static final String SEQ_FIELD = "SEQ";
   public static final String VAL_FIELD = "VAL";
 
@@ -103,6 +105,13 @@ final class KudafByOffsetUtils {
         return INTERMEDIATE_STRUCT_COMPARATOR.compare(struct1, struct2);
       };
 
+  static Schema buildSchema(final Schema schema) {
+    return SchemaBuilder.struct().optional()
+        .field(SEQ_FIELD, Schema.OPTIONAL_INT64_SCHEMA)
+        .field(VAL_FIELD, schema)
+        .build();
+  }
+
   static <T> Struct createStruct(final Schema schema, final long sequence, final T val) {
     final Struct struct = new Struct(schema);
     struct.put(SEQ_FIELD, sequence);
diff --git a/ksqldb-engine/src/test/java/io/confluent/ksql/function/udaf/offset/EarliestByOffsetTest.java b/ksqldb-engine/src/test/java/io/confluent/ksql/function/udaf/offset/EarliestByOffsetTest.java
index 665202a21875..a24e284bae58 100644
--- a/ksqldb-engine/src/test/java/io/confluent/ksql/function/udaf/offset/EarliestByOffsetTest.java
+++ b/ksqldb-engine/src/test/java/io/confluent/ksql/function/udaf/offset/EarliestByOffsetTest.java
@@ -35,12 +35,15 @@
 
 import com.google.common.collect.Lists;
 import io.confluent.ksql.function.udaf.Udaf;
+import io.confluent.ksql.schema.ksql.SqlArgument;
+import io.confluent.ksql.schema.ksql.types.SqlTypes;
 import io.confluent.ksql.util.KsqlException;
 import java.nio.ByteBuffer;
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.apache.kafka.connect.data.Struct;
 import org.junit.Test;
@@ -52,7 +55,7 @@ public class EarliestByOffsetTest {
   public void shouldInitialize() {
     // Given:
     final Udaf<Integer, Struct, Integer> udaf = EarliestByOffset
-        .earliest(STRUCT_LONG, true);
+        .earliestT(true);
 
     // When:
     final Struct init = udaf.initialize();
@@ -65,7 +68,7 @@ public void shouldInitialize() {
   public void shouldInitializeN() {
     // Given:
     final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset
-        .earliestN(STRUCT_LONG, 2, false);
+        .earliestTN( 2, false);
 
     // When:
     final List<Struct> init = udaf.initialize();
@@ -77,7 +80,7 @@ public void shouldInitializeN() {
   @Test
   public void shouldThrowExceptionForInvalidN() {
     try {
-      EarliestByOffset.earliestN(STRUCT_LONG, -1, true);
+      EarliestByOffset.earliestTN( -1, true);
     } catch (KsqlException e) {
       assertThat(e.getMessage(), is("earliestN must be 1 or greater"));
     }
@@ -86,7 +89,8 @@ public void shouldThrowExceptionForInvalidN() {
   @Test
   public void shouldComputeEarliestInteger() {
     // Given:
-    final Udaf<Integer, Struct, Integer> udaf = EarliestByOffset.earliestInteger();
+    final Udaf<Integer, Struct, Integer> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.INTEGER)));
 
     // When:
     final Struct res = udaf.aggregate(123, EarliestByOffset.createStruct(STRUCT_INTEGER, 321));
@@ -98,7 +102,8 @@ public void shouldComputeEarliestInteger() {
   @Test
   public void shouldComputeEarliestNIntegers() {
     // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset.earliestIntegers(2);
+    final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset.earliest(2);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.INTEGER)));
 
     // When:
     final List<Struct> res = udaf
@@ -112,7 +117,8 @@ public void shouldComputeEarliestNIntegers() {
   @Test
   public void shouldCaptureValuesUpToN() {
     // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset.earliestIntegers(2);
+    final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset.earliest(2);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.INTEGER)));
 
     // When:
     final List<Struct> res0 = udaf.aggregate(321, new ArrayList<>());
@@ -127,7 +133,9 @@ public void shouldCaptureValuesUpToN() {
   @Test
   public void shouldCaptureValuesPastN() {
     // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset.earliestIntegers(2);
+    final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset.earliest(2);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.INTEGER)));
+
     final List<Struct> aggregate = Lists.newArrayList(
         EarliestByOffset.createStruct(STRUCT_INTEGER, 10),
         EarliestByOffset.createStruct(STRUCT_INTEGER, 3)
@@ -145,7 +153,8 @@ public void shouldCaptureValuesPastN() {
   @Test
   public void shouldMerge() {
     // Given:
-    final Udaf<Integer, Struct, Integer> udaf = EarliestByOffset.earliestInteger();
+    final Udaf<Integer, Struct, Integer> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.INTEGER)));
 
     final Struct agg1 = EarliestByOffset.createStruct(STRUCT_INTEGER, 123);
     final Struct agg2 = EarliestByOffset.createStruct(STRUCT_INTEGER, 321);
@@ -162,7 +171,8 @@ public void shouldMerge() {
   @Test
   public void shouldMergeNIntegers() {
     // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset.earliestIntegers(2);
+    final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset.earliest(2);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.INTEGER)));
     final Struct struct1 = EarliestByOffset.createStruct(STRUCT_INTEGER, 123);
     final Struct struct2 = EarliestByOffset.createStruct(STRUCT_INTEGER, 321);
     final Struct struct3 = EarliestByOffset.createStruct(STRUCT_INTEGER, 543);
@@ -182,7 +192,8 @@ public void shouldMergeNIntegers() {
   @Test
   public void shouldMergeNIntegersSmallerThanN() {
     // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset.earliestIntegers(5);
+    final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset.earliest(5);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.INTEGER)));
     final Struct struct1 = EarliestByOffset.createStruct(STRUCT_INTEGER, 123);
     final Struct struct2 = EarliestByOffset.createStruct(STRUCT_INTEGER, 321);
     final Struct struct3 = EarliestByOffset.createStruct(STRUCT_INTEGER, 543);
@@ -204,7 +215,8 @@ public void shouldMergeNIntegersSmallerThanN() {
   @Test
   public void shouldMergeWithOverflow() {
     // Given:
-    final Udaf<Integer, Struct, Integer> udaf = EarliestByOffset.earliestInteger();
+    final Udaf<Integer, Struct, Integer> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.INTEGER)));
 
     EarliestByOffset.sequence.set(Long.MAX_VALUE);
 
@@ -225,7 +237,8 @@ public void shouldMergeWithOverflow() {
   @Test
   public void shouldMergeWithOverflowNIntegers() {
     // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset.earliestIntegers(2);
+    final Udaf<Integer, List<Struct>, List<Integer>> udaf = EarliestByOffset.earliest(2);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.INTEGER)));
 
     EarliestByOffset.sequence.set(Long.MAX_VALUE - 1);
 
@@ -251,7 +264,8 @@ public void shouldMergeWithOverflowNIntegers() {
   @Test
   public void shouldComputeEarliestLong() {
     // Given:
-    final Udaf<Long, Struct, Long> udaf = EarliestByOffset.earliestLong();
+    final Udaf<Long, Struct, Long> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BIGINT)));
 
     // When:
     final Struct res = udaf.aggregate(123L, EarliestByOffset.createStruct(STRUCT_LONG, 321L));
@@ -263,7 +277,9 @@ public void shouldComputeEarliestLong() {
   @Test
   public void shouldComputeEarliestNLongs() {
     // Given:
-    final Udaf<Long, List<Struct>, List<Long>> udaf = EarliestByOffset.earliestLongs(3);
+    final Udaf<Long, List<Struct>, List<Long>> udaf = EarliestByOffset.earliest(3);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BIGINT)));
+
 
     // When:
     final List<Struct> res = udaf
@@ -282,7 +298,9 @@ public void shouldComputeEarliestNLongs() {
   @Test
   public void shouldComputeEarliestDouble() {
     // Given:
-    final Udaf<Double, Struct, Double> udaf = EarliestByOffset.earliestDouble();
+    final Udaf<Double, Struct, Double> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BIGINT)));
+
 
     // When:
     final Struct res = udaf
@@ -295,7 +313,9 @@ public void shouldComputeEarliestDouble() {
   @Test
   public void shouldComputeEarliestNDoubles() {
     // Given:
-    final Udaf<Double, List<Struct>, List<Double>> udaf = EarliestByOffset.earliestDoubles(1);
+    final Udaf<Double, List<Struct>, List<Double>> udaf = EarliestByOffset.earliest(1);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BIGINT)));
+
 
     // When:
     final List<Struct> res = udaf
@@ -309,7 +329,9 @@ public void shouldComputeEarliestNDoubles() {
   @Test
   public void shouldComputeEarliestBoolean() {
     // Given:
-    final Udaf<Boolean, Struct, Boolean> udaf = EarliestByOffset.earliestBoolean();
+    final Udaf<Boolean, Struct, Boolean> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BOOLEAN)));
+
 
     // When:
     final Struct res = udaf
@@ -322,7 +344,8 @@ public void shouldComputeEarliestBoolean() {
   @Test
   public void shouldComputeEarliestNBooleans() {
     // Given:
-    final Udaf<Boolean, List<Struct>, List<Boolean>> udaf = EarliestByOffset.earliestBooleans(2);
+    final Udaf<Boolean, List<Struct>, List<Boolean>> udaf = EarliestByOffset.earliest(2);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BOOLEAN)));
 
     // When:
     final List<Struct> res = udaf
@@ -337,7 +360,8 @@ public void shouldComputeEarliestNBooleans() {
   @Test
   public void shouldComputeEarliestTimestamp() {
     // Given:
-    final Udaf<Timestamp, Struct, Timestamp> udaf = EarliestByOffset.earliestTimestamp();
+    final Udaf<Timestamp, Struct, Timestamp> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BOOLEAN)));
 
     // When:
     final Struct res = udaf.aggregate(new Timestamp(123), EarliestByOffset.createStruct(STRUCT_TIMESTAMP, new Timestamp(321)));
@@ -349,7 +373,8 @@ public void shouldComputeEarliestTimestamp() {
   @Test
   public void shouldComputeEarliestNTimestamps() {
     // Given:
-    final Udaf<Timestamp, List<Struct>, List<Timestamp>> udaf = EarliestByOffset.earliestTimestamps(3);
+    final Udaf<Timestamp, List<Struct>, List<Timestamp>> udaf = EarliestByOffset.earliest(3);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.TIMESTAMP)));
 
     // When:
     final List<Struct> res = udaf.aggregate(new Timestamp(123),
@@ -367,7 +392,8 @@ public void shouldComputeEarliestNTimestamps() {
   @Test
   public void shouldComputeEarliestDate() {
     // Given:
-    final Udaf<Date, Struct, Date> udaf = EarliestByOffset.earliestDate();
+    final Udaf<Date, Struct, Date> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.DATE)));
 
     // When:
     final Struct res = udaf.aggregate(new Date(123), EarliestByOffset.createStruct(STRUCT_DATE, new Date(321)));
@@ -379,7 +405,8 @@ public void shouldComputeEarliestDate() {
   @Test
   public void shouldComputeEarliestNDates() {
     // Given:
-    final Udaf<Date, List<Struct>, List<Date>> udaf = EarliestByOffset.earliestDates(3);
+    final Udaf<Date, List<Struct>, List<Date>> udaf = EarliestByOffset.earliest(3);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.DATE)));
 
     // When:
     final List<Struct> res = udaf.aggregate(new Date(123),
@@ -397,7 +424,8 @@ public void shouldComputeEarliestNDates() {
   @Test
   public void shouldComputeEarliestTime() {
     // Given:
-    final Udaf<Time, Struct, Time> udaf = EarliestByOffset.earliestTime();
+    final Udaf<Time, Struct, Time> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.TIME)));
 
     // When:
     final Struct res = udaf.aggregate(new Time(123), EarliestByOffset.createStruct(STRUCT_TIME, new Time(321)));
@@ -409,7 +437,8 @@ public void shouldComputeEarliestTime() {
   @Test
   public void shouldComputeEarliestNTimes() {
     // Given:
-    final Udaf<Time, List<Struct>, List<Time>> udaf = EarliestByOffset.earliestTimes(3);
+    final Udaf<Time, List<Struct>, List<Time>> udaf = EarliestByOffset.earliest(3);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.TIME)));
 
     // When:
     final List<Struct> res = udaf.aggregate(new Time(123),
@@ -427,7 +456,8 @@ public void shouldComputeEarliestNTimes() {
   @Test
   public void shouldComputeEarliestBytes() {
     // Given:
-    final Udaf<Timestamp, Struct, Timestamp> udaf = EarliestByOffset.earliestTimestamp();
+    final Udaf<Timestamp, Struct, Timestamp> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.TIMESTAMP)));
 
     // When:
     final Struct res = udaf.aggregate(new Timestamp(123), EarliestByOffset.createStruct(STRUCT_TIMESTAMP, new Timestamp(321)));
@@ -439,7 +469,8 @@ public void shouldComputeEarliestBytes() {
   @Test
   public void shouldComputeEarliestNBytes() {
     // Given:
-    final Udaf<ByteBuffer, List<Struct>, List<ByteBuffer>> udaf = EarliestByOffset.earliestBytes(3);
+    final Udaf<ByteBuffer, List<Struct>, List<ByteBuffer>> udaf = EarliestByOffset.earliest(3);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BYTES)));
 
     // When:
     final List<Struct> res = udaf.aggregate(ByteBuffer.wrap(new byte[] { 123 }),
@@ -457,7 +488,8 @@ public void shouldComputeEarliestNBytes() {
   @Test
   public void shouldComputeEarliestString() {
     // Given:
-    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliestString();
+    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
 
     // When:
     final Struct res = udaf.aggregate("foo", EarliestByOffset.createStruct(STRUCT_STRING, "bar"));
@@ -469,7 +501,8 @@ public void shouldComputeEarliestString() {
   @Test
   public void shouldComputeEarliestNStrings() {
     // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset.earliestStrings(3);
+    final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset.earliest(3);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
 
     // When:
     final List<Struct> res = udaf.aggregate("boo",
@@ -487,7 +520,8 @@ public void shouldComputeEarliestNStrings() {
   @Test
   public void shouldNotAcceptNullAsEarliest() {
     // Given:
-    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliestString();
+    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
 
     // When:
     final Struct res = udaf
@@ -507,7 +541,9 @@ public void shouldNotAcceptNullAsEarliest() {
   @Test
   public void shouldAcceptNullAsEarliest() {
     // Given:
-    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliestString(false);
+    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliest(false);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
+
 
     // When:
     final Struct res = udaf
@@ -528,7 +564,8 @@ public void shouldAcceptNullAsEarliest() {
   public void shouldNotAcceptNullAsEarliestN() {
     // Given:
     final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset
-        .earliestStrings(1);
+        .earliest(1);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
 
     // When:
     final List<Struct> res = udaf
@@ -542,7 +579,9 @@ public void shouldNotAcceptNullAsEarliestN() {
   public void shouldAcceptNullAsEarliestN() {
     // Given:
     final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset
-        .earliestStrings(1, false);
+        .earliest(1, false);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
+
 
     // When:
     final List<Struct> res = udaf
@@ -556,7 +595,9 @@ public void shouldAcceptNullAsEarliestN() {
   @Test
   public void shouldMapInitialized() {
     // Given:
-    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliestString();
+    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
+
 
     final Struct init = udaf.initialize();
 
@@ -570,7 +611,9 @@ public void shouldMapInitialized() {
   @Test
   public void shouldMergeAndMapInitialized() {
     // Given:
-    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliestString();
+    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliest();
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
+
 
     final Struct init1 = udaf.initialize();
     final Struct init2 = udaf.initialize();
@@ -586,7 +629,9 @@ public void shouldMergeAndMapInitialized() {
   @Test
   public void shouldMapInitializedN() {
     // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset.earliestStrings(2);
+    final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset.earliest(2);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
+
 
     final List<Struct> init = udaf.initialize();
 
@@ -600,7 +645,9 @@ public void shouldMapInitializedN() {
   @Test
   public void shouldMergeAndMapInitializedN() {
     // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset.earliestStrings(2);
+    final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset.earliest(2);
+    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
+
 
     final List<Struct> init1 = udaf.initialize();
     final List<Struct> init2 = udaf.initialize();
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_an_array_added/7.2.0_1644852483241/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_an_array_added/7.2.0_1644852483241/plan.json
new file mode 100644
index 000000000000..c4015ddd5155
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_an_array_added/7.2.0_1644852483241/plan.json
@@ -0,0 +1,229 @@
+{
+  "plan" : [ {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE STREAM INPUT (ID BIGINT KEY, F0 INTEGER, F1 BIGINT, F2 DOUBLE, F3 BOOLEAN, F4 STRING, F5 TIMESTAMP, F6 TIME, F7 DATE, F8 BYTES, F9 ARRAY<INTEGER>) WITH (KAFKA_TOPIC='test_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');",
+    "ddlCommand" : {
+      "@type" : "createStreamV1",
+      "sourceName" : "INPUT",
+      "schema" : "`ID` BIGINT KEY, `F0` INTEGER, `F1` BIGINT, `F2` DOUBLE, `F3` BOOLEAN, `F4` STRING, `F5` TIMESTAMP, `F6` TIME, `F7` DATE, `F8` BYTES, `F9` ARRAY<INTEGER>",
+      "topicName" : "test_topic",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    }
+  }, {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE TABLE OUTPUT AS SELECT\n  INPUT.ID ID,\n  EARLIEST_BY_OFFSET(INPUT.F0) L0,\n  EARLIEST_BY_OFFSET(INPUT.F1) L1,\n  EARLIEST_BY_OFFSET(INPUT.F2) L2,\n  EARLIEST_BY_OFFSET(INPUT.F3) L3,\n  EARLIEST_BY_OFFSET(INPUT.F4) L4,\n  EARLIEST_BY_OFFSET(INPUT.F5) L5,\n  EARLIEST_BY_OFFSET(INPUT.F6) L6,\n  EARLIEST_BY_OFFSET(INPUT.F7) L7,\n  EARLIEST_BY_OFFSET(INPUT.F8) L8,\n  EARLIEST_BY_OFFSET(INPUT.F9) L9\nFROM INPUT INPUT\nGROUP BY INPUT.ID\nEMIT CHANGES",
+    "ddlCommand" : {
+      "@type" : "createTableV1",
+      "sourceName" : "OUTPUT",
+      "schema" : "`ID` BIGINT KEY, `L0` INTEGER, `L1` BIGINT, `L2` DOUBLE, `L3` BOOLEAN, `L4` STRING, `L5` TIMESTAMP, `L6` TIME, `L7` DATE, `L8` BYTES, `L9` ARRAY<INTEGER>",
+      "topicName" : "OUTPUT",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    },
+    "queryPlan" : {
+      "sources" : [ "INPUT" ],
+      "sink" : "OUTPUT",
+      "physicalPlan" : {
+        "@type" : "tableSinkV1",
+        "properties" : {
+          "queryContext" : "OUTPUT"
+        },
+        "source" : {
+          "@type" : "tableSelectV1",
+          "properties" : {
+            "queryContext" : "Aggregate/Project"
+          },
+          "source" : {
+            "@type" : "streamAggregateV1",
+            "properties" : {
+              "queryContext" : "Aggregate/Aggregate"
+            },
+            "source" : {
+              "@type" : "streamGroupByKeyV1",
+              "properties" : {
+                "queryContext" : "Aggregate/GroupBy"
+              },
+              "source" : {
+                "@type" : "streamSelectV1",
+                "properties" : {
+                  "queryContext" : "Aggregate/Prepare"
+                },
+                "source" : {
+                  "@type" : "streamSourceV1",
+                  "properties" : {
+                    "queryContext" : "KsqlTopic/Source"
+                  },
+                  "topicName" : "test_topic",
+                  "formats" : {
+                    "keyFormat" : {
+                      "format" : "KAFKA"
+                    },
+                    "valueFormat" : {
+                      "format" : "JSON"
+                    }
+                  },
+                  "sourceSchema" : "`ID` BIGINT KEY, `F0` INTEGER, `F1` BIGINT, `F2` DOUBLE, `F3` BOOLEAN, `F4` STRING, `F5` TIMESTAMP, `F6` TIME, `F7` DATE, `F8` BYTES, `F9` ARRAY<INTEGER>",
+                  "pseudoColumnVersion" : 1
+                },
+                "keyColumnNames" : [ "ID" ],
+                "selectExpressions" : [ "ID AS ID", "F0 AS F0", "F1 AS F1", "F2 AS F2", "F3 AS F3", "F4 AS F4", "F5 AS F5", "F6 AS F6", "F7 AS F7", "F8 AS F8", "F9 AS F9" ]
+              },
+              "internalFormats" : {
+                "keyFormat" : {
+                  "format" : "KAFKA"
+                },
+                "valueFormat" : {
+                  "format" : "JSON"
+                }
+              }
+            },
+            "internalFormats" : {
+              "keyFormat" : {
+                "format" : "KAFKA"
+              },
+              "valueFormat" : {
+                "format" : "JSON"
+              }
+            },
+            "nonAggregateColumns" : [ "ID", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9" ],
+            "aggregationFunctions" : [ "EARLIEST_BY_OFFSET(F0)", "EARLIEST_BY_OFFSET(F1)", "EARLIEST_BY_OFFSET(F2)", "EARLIEST_BY_OFFSET(F3)", "EARLIEST_BY_OFFSET(F4)", "EARLIEST_BY_OFFSET(F5)", "EARLIEST_BY_OFFSET(F6)", "EARLIEST_BY_OFFSET(F7)", "EARLIEST_BY_OFFSET(F8)", "EARLIEST_BY_OFFSET(F9)" ]
+          },
+          "keyColumnNames" : [ "ID" ],
+          "selectExpressions" : [ "KSQL_AGG_VARIABLE_0 AS L0", "KSQL_AGG_VARIABLE_1 AS L1", "KSQL_AGG_VARIABLE_2 AS L2", "KSQL_AGG_VARIABLE_3 AS L3", "KSQL_AGG_VARIABLE_4 AS L4", "KSQL_AGG_VARIABLE_5 AS L5", "KSQL_AGG_VARIABLE_6 AS L6", "KSQL_AGG_VARIABLE_7 AS L7", "KSQL_AGG_VARIABLE_8 AS L8", "KSQL_AGG_VARIABLE_9 AS L9" ],
+          "internalFormats" : {
+            "keyFormat" : {
+              "format" : "KAFKA"
+            },
+            "valueFormat" : {
+              "format" : "JSON"
+            }
+          }
+        },
+        "formats" : {
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        },
+        "topicName" : "OUTPUT"
+      },
+      "queryId" : "CTAS_OUTPUT_0"
+    }
+  } ],
+  "configs" : {
+    "ksql.extension.dir" : "ext",
+    "ksql.streams.cache.max.bytes.buffering" : "0",
+    "metric.reporters" : "",
+    "ksql.query.status.running.threshold.seconds" : "300",
+    "ksql.connect.basic.auth.credentials.reload" : "false",
+    "ksql.output.topic.name.prefix" : "",
+    "ksql.query.pull.stream.enabled" : "true",
+    "ksql.query.push.v2.interpreter.enabled" : "true",
+    "ksql.queryanonymizer.logs_enabled" : "true",
+    "ksql.variable.substitution.enable" : "true",
+    "ksql.streams.shutdown.timeout.ms" : "300000",
+    "ksql.query.pull.max.allowed.offset.lag" : "9223372036854775807",
+    "ksql.query.pull.max.qps" : "2147483647",
+    "ksql.access.validator.enable" : "auto",
+    "ksql.streams.bootstrap.servers" : "localhost:0",
+    "ksql.query.pull.metrics.enabled" : "true",
+    "ksql.metrics.extension" : null,
+    "ksql.query.push.v2.alos.enabled" : "true",
+    "ksql.query.push.v2.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.query.pull.range.scan.enabled" : "true",
+    "ksql.hidden.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.lambdas.enabled" : "true",
+    "ksql.source.table.materialization.enabled" : "true",
+    "ksql.query.pull.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.sink.window.change.log.additional.retention" : "1000000",
+    "ksql.query.persistent.active.limit" : "2147483647",
+    "ksql.persistence.wrap.single.values" : null,
+    "ksql.query.transient.max.bytes.buffering.total" : "-1",
+    "ksql.connect.basic.auth.credentials.source" : "NONE",
+    "ksql.schema.registry.url" : "schema_registry.url:0",
+    "ksql.properties.overrides.denylist" : "",
+    "ksql.service.id" : "some.ksql.service.id",
+    "ksql.query.push.v2.max.catchup.consumers" : "5",
+    "ksql.query.push.v2.enabled" : "false",
+    "ksql.rowpartition.rowoffset.enabled" : "true",
+    "ksql.streams.commit.interval.ms" : "2000",
+    "ksql.query.pull.table.scan.enabled" : "true",
+    "ksql.streams.auto.commit.interval.ms" : "0",
+    "ksql.streams.topology.optimization" : "all",
+    "ksql.endpoint.migrate.query" : "true",
+    "ksql.query.push.v2.registry.installed" : "false",
+    "ksql.streams.num.stream.threads" : "4",
+    "ksql.metrics.tags.custom" : "",
+    "ksql.query.push.v2.catchup.consumer.msg.window" : "50",
+    "ksql.runtime.feature.shared.enabled" : "false",
+    "ksql.udf.collect.metrics" : "false",
+    "ksql.connect.request.headers.plugin" : null,
+    "ksql.security.extension.class" : null,
+    "ksql.transient.prefix" : "transient_",
+    "ksql.headers.columns.enabled" : "true",
+    "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler",
+    "ksql.connect.request.timeout.ms" : "5000",
+    "ksql.query.pull.enable.standby.reads" : "false",
+    "ksql.persistence.default.format.key" : "KAFKA",
+    "ksql.query.persistent.max.bytes.buffering.total" : "-1",
+    "ksql.query.error.max.queue.size" : "10",
+    "ksql.query.cleanup.shutdown.timeout.ms" : "30000",
+    "ksql.internal.topic.min.insync.replicas" : "1",
+    "ksql.internal.topic.replicas" : "1",
+    "ksql.insert.into.values.enabled" : "true",
+    "ksql.queryanonymizer.cluster_namespace" : null,
+    "ksql.create.or.replace.enabled" : "true",
+    "ksql.shared.runtimes.count" : "8",
+    "ksql.cast.strings.preserve.nulls" : "true",
+    "ksql.authorization.cache.max.entries" : "10000",
+    "ksql.pull.queries.enable" : "true",
+    "ksql.query.pull.consistency.token.enabled" : "false",
+    "ksql.suppress.enabled" : "false",
+    "ksql.readonly.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.connect.basic.auth.credentials.file" : "",
+    "ksql.authorization.cache.expiry.time.secs" : "30",
+    "ksql.query.retry.backoff.initial.ms" : "15000",
+    "ksql.query.pull.max.concurrent.requests" : "2147483647",
+    "ksql.streams.auto.offset.reset" : "earliest",
+    "ksql.connect.url" : "http://localhost:8083",
+    "ksql.query.push.v2.new.latest.delay.ms" : "5000",
+    "ksql.query.push.v2.latest.reset.age.ms" : "30000",
+    "ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
+    "ksql.query.pull.interpreter.enabled" : "true",
+    "ksql.query.pull.limit.clause.enabled" : "true",
+    "ksql.connect.error.handler" : null,
+    "ksql.query.pull.router.thread.pool.size" : "50",
+    "ksql.query.push.v2.continuation.tokens.enabled" : "false",
+    "ksql.query.retry.backoff.max.ms" : "900000",
+    "ksql.timestamp.throw.on.invalid" : "false",
+    "ksql.persistence.default.format.value" : null,
+    "ksql.udfs.enabled" : "true",
+    "ksql.udf.enable.security.manager" : "true",
+    "ksql.connect.worker.config" : "",
+    "ksql.nested.error.set.null" : "true",
+    "ksql.query.pull.thread.pool.size" : "50",
+    "ksql.persistent.prefix" : "query_",
+    "ksql.metastore.backup.location" : "",
+    "ksql.error.classifier.regex" : "",
+    "ksql.suppress.buffer.size.bytes" : "-1"
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_an_array_added/7.2.0_1644852483241/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_an_array_added/7.2.0_1644852483241/spec.json
new file mode 100644
index 000000000000..a4408fb29d44
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_an_array_added/7.2.0_1644852483241/spec.json
@@ -0,0 +1,241 @@
+{
+  "version" : "7.2.0",
+  "timestamp" : 1644852483241,
+  "path" : "query-validation-tests/earliest-offset-udaf.json",
+  "schemas" : {
+    "CTAS_OUTPUT_0.Aggregate.Project" : {
+      "schema" : "`ID` BIGINT KEY, `L0` INTEGER, `L1` BIGINT, `L2` DOUBLE, `L3` BOOLEAN, `L4` STRING, `L5` TIMESTAMP, `L6` TIME, `L7` DATE, `L8` BYTES, `L9` ARRAY<INTEGER>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.GroupBy" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` INTEGER, `F1` BIGINT, `F2` DOUBLE, `F3` BOOLEAN, `F4` STRING, `F5` TIMESTAMP, `F6` TIME, `F7` DATE, `F8` BYTES, `F9` ARRAY<INTEGER>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.KsqlTopic.Source" : {
+      "schema" : "`ID` BIGINT KEY, `F0` INTEGER, `F1` BIGINT, `F2` DOUBLE, `F3` BOOLEAN, `F4` STRING, `F5` TIMESTAMP, `F6` TIME, `F7` DATE, `F8` BYTES, `F9` ARRAY<INTEGER>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` INTEGER, `F1` BIGINT, `F2` DOUBLE, `F3` BOOLEAN, `F4` STRING, `F5` TIMESTAMP, `F6` TIME, `F7` DATE, `F8` BYTES, `F9` ARRAY<INTEGER>, `KSQL_AGG_VARIABLE_0` STRUCT<`SEQ` BIGINT, `VAL` INTEGER>, `KSQL_AGG_VARIABLE_1` STRUCT<`SEQ` BIGINT, `VAL` BIGINT>, `KSQL_AGG_VARIABLE_2` STRUCT<`SEQ` BIGINT, `VAL` DOUBLE>, `KSQL_AGG_VARIABLE_3` STRUCT<`SEQ` BIGINT, `VAL` BOOLEAN>, `KSQL_AGG_VARIABLE_4` STRUCT<`SEQ` BIGINT, `VAL` STRING>, `KSQL_AGG_VARIABLE_5` STRUCT<`SEQ` BIGINT, `VAL` TIMESTAMP>, `KSQL_AGG_VARIABLE_6` STRUCT<`SEQ` BIGINT, `VAL` TIME>, `KSQL_AGG_VARIABLE_7` STRUCT<`SEQ` BIGINT, `VAL` DATE>, `KSQL_AGG_VARIABLE_8` STRUCT<`SEQ` BIGINT, `VAL` BYTES>, `KSQL_AGG_VARIABLE_9` STRUCT<`SEQ` BIGINT, `VAL` ARRAY<INTEGER>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.OUTPUT" : {
+      "schema" : "`ID` BIGINT KEY, `L0` INTEGER, `L1` BIGINT, `L2` DOUBLE, `L3` BOOLEAN, `L4` STRING, `L5` TIMESTAMP, `L6` TIME, `L7` DATE, `L8` BYTES, `L9` ARRAY<INTEGER>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    }
+  },
+  "testCase" : {
+    "name" : "earliest by offset with an array added",
+    "inputs" : [ {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : 12,
+        "F1" : 1000,
+        "F2" : 1.23,
+        "F3" : true,
+        "F4" : "foo",
+        "F5" : 12,
+        "F6" : 123,
+        "F7" : 1234,
+        "F8" : "YQ==",
+        "F9" : [ 0, 0, 1, 0, -1 ]
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : 12,
+        "F1" : 1000,
+        "F2" : 1.23,
+        "F3" : true,
+        "F4" : "foo",
+        "F5" : 12,
+        "F6" : 123,
+        "F7" : 1234,
+        "F8" : "YQ==",
+        "F9" : [ 0, 0, 1, 0, -1 ]
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : 21,
+        "F1" : 2000,
+        "F2" : 2.23,
+        "F3" : false,
+        "F4" : "foo",
+        "F5" : 34,
+        "F6" : 234,
+        "F7" : 2345,
+        "F8" : "Yg==",
+        "F9" : [ 1, 2, 3, 4, -1 ]
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : 21,
+        "F1" : 2000,
+        "F2" : 2.23,
+        "F3" : false,
+        "F4" : "foo",
+        "F5" : 34,
+        "F6" : 234,
+        "F7" : 2345,
+        "F8" : "Yg==",
+        "F9" : [ 1, 2, 3, 4, -1 ]
+      }
+    } ],
+    "outputs" : [ {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : 12,
+        "L1" : 1000,
+        "L2" : 1.23,
+        "L3" : true,
+        "L4" : "foo",
+        "L5" : 12,
+        "L6" : 123,
+        "L7" : 1234,
+        "L8" : "YQ==",
+        "L9" : [ 0, 0, 1, 0, -1 ]
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : 12,
+        "L1" : 1000,
+        "L2" : 1.23,
+        "L3" : true,
+        "L4" : "foo",
+        "L5" : 12,
+        "L6" : 123,
+        "L7" : 1234,
+        "L8" : "YQ==",
+        "L9" : [ 0, 0, 1, 0, -1 ]
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : 12,
+        "L1" : 1000,
+        "L2" : 1.23,
+        "L3" : true,
+        "L4" : "foo",
+        "L5" : 12,
+        "L6" : 123,
+        "L7" : 1234,
+        "L8" : "YQ==",
+        "L9" : [ 0, 0, 1, 0, -1 ]
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : 12,
+        "L1" : 1000,
+        "L2" : 1.23,
+        "L3" : true,
+        "L4" : "foo",
+        "L5" : 12,
+        "L6" : 123,
+        "L7" : 1234,
+        "L8" : "YQ==",
+        "L9" : [ 0, 0, 1, 0, -1 ]
+      }
+    } ],
+    "topics" : [ {
+      "name" : "OUTPUT",
+      "replicas" : 1,
+      "numPartitions" : 4
+    }, {
+      "name" : "test_topic",
+      "replicas" : 1,
+      "numPartitions" : 4
+    } ],
+    "statements" : [ "CREATE STREAM INPUT (ID BIGINT KEY, F0 INT, F1 BIGINT, F2 DOUBLE, F3 BOOLEAN, F4 STRING, F5 TIMESTAMP, F6 TIME, F7 DATE, F8 BYTES, F9 ARRAY<INT>) WITH (kafka_topic='test_topic', value_format='JSON');", "CREATE TABLE OUTPUT AS SELECT ID, EARLIEST_BY_OFFSET(F0) AS L0, EARLIEST_BY_OFFSET(F1) AS L1, EARLIEST_BY_OFFSET(F2) AS L2, EARLIEST_BY_OFFSET(F3) AS L3, EARLIEST_BY_OFFSET(F4) AS L4, EARLIEST_BY_OFFSET(F5) AS L5, EARLIEST_BY_OFFSET(F6) AS L6, EARLIEST_BY_OFFSET(F7) AS L7, EARLIEST_BY_OFFSET(F8) AS L8, EARLIEST_BY_OFFSET(F9) AS L9 FROM INPUT GROUP BY ID;" ],
+    "post" : {
+      "sources" : [ {
+        "name" : "INPUT",
+        "type" : "STREAM",
+        "schema" : "`ID` BIGINT KEY, `F0` INTEGER, `F1` BIGINT, `F2` DOUBLE, `F3` BOOLEAN, `F4` STRING, `F5` TIMESTAMP, `F6` TIME, `F7` DATE, `F8` BYTES, `F9` ARRAY<INTEGER>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      }, {
+        "name" : "OUTPUT",
+        "type" : "TABLE",
+        "schema" : "`ID` BIGINT KEY, `L0` INTEGER, `L1` BIGINT, `L2` DOUBLE, `L3` BOOLEAN, `L4` STRING, `L5` TIMESTAMP, `L6` TIME, `L7` DATE, `L8` BYTES, `L9` ARRAY<INTEGER>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      } ],
+      "topics" : {
+        "topics" : [ {
+          "name" : "test_topic",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        }, {
+          "name" : "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        }, {
+          "name" : "OUTPUT",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        } ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_an_array_added/7.2.0_1644852483241/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_an_array_added/7.2.0_1644852483241/topology
new file mode 100644
index 000000000000..e000b160c4db
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_an_array_added/7.2.0_1644852483241/topology
@@ -0,0 +1,25 @@
+Topologies:
+   Sub-topology: 0
+    Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic])
+      --> KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: [])
+      --> Aggregate-Prepare
+      <-- KSTREAM-SOURCE-0000000000
+    Processor: Aggregate-Prepare (stores: [])
+      --> KSTREAM-AGGREGATE-0000000003
+      <-- KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize])
+      --> Aggregate-Aggregate-ToOutputSchema
+      <-- Aggregate-Prepare
+    Processor: Aggregate-Aggregate-ToOutputSchema (stores: [])
+      --> Aggregate-Project
+      <-- KSTREAM-AGGREGATE-0000000003
+    Processor: Aggregate-Project (stores: [])
+      --> KTABLE-TOSTREAM-0000000006
+      <-- Aggregate-Aggregate-ToOutputSchema
+    Processor: KTABLE-TOSTREAM-0000000006 (stores: [])
+      --> KSTREAM-SINK-0000000007
+      <-- Aggregate-Project
+    Sink: KSTREAM-SINK-0000000007 (topic: OUTPUT)
+      <-- KTABLE-TOSTREAM-0000000006
+
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1644852482932/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1644852482932/plan.json
new file mode 100644
index 000000000000..f6017459bfd3
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1644852482932/plan.json
@@ -0,0 +1,229 @@
+{
+  "plan" : [ {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE STREAM INPUT (ID BIGINT KEY, F0 ARRAY<STRUCT<A STRING, M MAP<STRING, DOUBLE>>>) WITH (KAFKA_TOPIC='test_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');",
+    "ddlCommand" : {
+      "@type" : "createStreamV1",
+      "sourceName" : "INPUT",
+      "schema" : "`ID` BIGINT KEY, `F0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+      "topicName" : "test_topic",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    }
+  }, {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE TABLE OUTPUT AS SELECT\n  INPUT.ID ID,\n  EARLIEST_BY_OFFSET(INPUT.F0) L0\nFROM INPUT INPUT\nGROUP BY INPUT.ID\nEMIT CHANGES",
+    "ddlCommand" : {
+      "@type" : "createTableV1",
+      "sourceName" : "OUTPUT",
+      "schema" : "`ID` BIGINT KEY, `L0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+      "topicName" : "OUTPUT",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    },
+    "queryPlan" : {
+      "sources" : [ "INPUT" ],
+      "sink" : "OUTPUT",
+      "physicalPlan" : {
+        "@type" : "tableSinkV1",
+        "properties" : {
+          "queryContext" : "OUTPUT"
+        },
+        "source" : {
+          "@type" : "tableSelectV1",
+          "properties" : {
+            "queryContext" : "Aggregate/Project"
+          },
+          "source" : {
+            "@type" : "streamAggregateV1",
+            "properties" : {
+              "queryContext" : "Aggregate/Aggregate"
+            },
+            "source" : {
+              "@type" : "streamGroupByKeyV1",
+              "properties" : {
+                "queryContext" : "Aggregate/GroupBy"
+              },
+              "source" : {
+                "@type" : "streamSelectV1",
+                "properties" : {
+                  "queryContext" : "Aggregate/Prepare"
+                },
+                "source" : {
+                  "@type" : "streamSourceV1",
+                  "properties" : {
+                    "queryContext" : "KsqlTopic/Source"
+                  },
+                  "topicName" : "test_topic",
+                  "formats" : {
+                    "keyFormat" : {
+                      "format" : "KAFKA"
+                    },
+                    "valueFormat" : {
+                      "format" : "JSON"
+                    }
+                  },
+                  "sourceSchema" : "`ID` BIGINT KEY, `F0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+                  "pseudoColumnVersion" : 1
+                },
+                "keyColumnNames" : [ "ID" ],
+                "selectExpressions" : [ "ID AS ID", "F0 AS F0" ]
+              },
+              "internalFormats" : {
+                "keyFormat" : {
+                  "format" : "KAFKA"
+                },
+                "valueFormat" : {
+                  "format" : "JSON"
+                }
+              }
+            },
+            "internalFormats" : {
+              "keyFormat" : {
+                "format" : "KAFKA"
+              },
+              "valueFormat" : {
+                "format" : "JSON"
+              }
+            },
+            "nonAggregateColumns" : [ "ID", "F0" ],
+            "aggregationFunctions" : [ "EARLIEST_BY_OFFSET(F0)" ]
+          },
+          "keyColumnNames" : [ "ID" ],
+          "selectExpressions" : [ "KSQL_AGG_VARIABLE_0 AS L0" ],
+          "internalFormats" : {
+            "keyFormat" : {
+              "format" : "KAFKA"
+            },
+            "valueFormat" : {
+              "format" : "JSON"
+            }
+          }
+        },
+        "formats" : {
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        },
+        "topicName" : "OUTPUT"
+      },
+      "queryId" : "CTAS_OUTPUT_0"
+    }
+  } ],
+  "configs" : {
+    "ksql.extension.dir" : "ext",
+    "ksql.streams.cache.max.bytes.buffering" : "0",
+    "metric.reporters" : "",
+    "ksql.query.status.running.threshold.seconds" : "300",
+    "ksql.connect.basic.auth.credentials.reload" : "false",
+    "ksql.output.topic.name.prefix" : "",
+    "ksql.query.pull.stream.enabled" : "true",
+    "ksql.query.push.v2.interpreter.enabled" : "true",
+    "ksql.queryanonymizer.logs_enabled" : "true",
+    "ksql.variable.substitution.enable" : "true",
+    "ksql.streams.shutdown.timeout.ms" : "300000",
+    "ksql.query.pull.max.allowed.offset.lag" : "9223372036854775807",
+    "ksql.query.pull.max.qps" : "2147483647",
+    "ksql.access.validator.enable" : "auto",
+    "ksql.streams.bootstrap.servers" : "localhost:0",
+    "ksql.query.pull.metrics.enabled" : "true",
+    "ksql.metrics.extension" : null,
+    "ksql.query.push.v2.alos.enabled" : "true",
+    "ksql.query.push.v2.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.query.pull.range.scan.enabled" : "true",
+    "ksql.hidden.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.lambdas.enabled" : "true",
+    "ksql.source.table.materialization.enabled" : "true",
+    "ksql.query.pull.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.sink.window.change.log.additional.retention" : "1000000",
+    "ksql.query.persistent.active.limit" : "2147483647",
+    "ksql.persistence.wrap.single.values" : null,
+    "ksql.query.transient.max.bytes.buffering.total" : "-1",
+    "ksql.connect.basic.auth.credentials.source" : "NONE",
+    "ksql.schema.registry.url" : "schema_registry.url:0",
+    "ksql.properties.overrides.denylist" : "",
+    "ksql.service.id" : "some.ksql.service.id",
+    "ksql.query.push.v2.max.catchup.consumers" : "5",
+    "ksql.query.push.v2.enabled" : "false",
+    "ksql.rowpartition.rowoffset.enabled" : "true",
+    "ksql.streams.commit.interval.ms" : "2000",
+    "ksql.query.pull.table.scan.enabled" : "true",
+    "ksql.streams.auto.commit.interval.ms" : "0",
+    "ksql.streams.topology.optimization" : "all",
+    "ksql.endpoint.migrate.query" : "true",
+    "ksql.query.push.v2.registry.installed" : "false",
+    "ksql.streams.num.stream.threads" : "4",
+    "ksql.metrics.tags.custom" : "",
+    "ksql.query.push.v2.catchup.consumer.msg.window" : "50",
+    "ksql.runtime.feature.shared.enabled" : "false",
+    "ksql.udf.collect.metrics" : "false",
+    "ksql.connect.request.headers.plugin" : null,
+    "ksql.security.extension.class" : null,
+    "ksql.transient.prefix" : "transient_",
+    "ksql.headers.columns.enabled" : "true",
+    "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler",
+    "ksql.connect.request.timeout.ms" : "5000",
+    "ksql.query.pull.enable.standby.reads" : "false",
+    "ksql.persistence.default.format.key" : "KAFKA",
+    "ksql.query.persistent.max.bytes.buffering.total" : "-1",
+    "ksql.query.error.max.queue.size" : "10",
+    "ksql.query.cleanup.shutdown.timeout.ms" : "30000",
+    "ksql.internal.topic.min.insync.replicas" : "1",
+    "ksql.internal.topic.replicas" : "1",
+    "ksql.insert.into.values.enabled" : "true",
+    "ksql.queryanonymizer.cluster_namespace" : null,
+    "ksql.create.or.replace.enabled" : "true",
+    "ksql.shared.runtimes.count" : "8",
+    "ksql.cast.strings.preserve.nulls" : "true",
+    "ksql.authorization.cache.max.entries" : "10000",
+    "ksql.pull.queries.enable" : "true",
+    "ksql.query.pull.consistency.token.enabled" : "false",
+    "ksql.suppress.enabled" : "false",
+    "ksql.readonly.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.connect.basic.auth.credentials.file" : "",
+    "ksql.authorization.cache.expiry.time.secs" : "30",
+    "ksql.query.retry.backoff.initial.ms" : "15000",
+    "ksql.query.pull.max.concurrent.requests" : "2147483647",
+    "ksql.streams.auto.offset.reset" : "earliest",
+    "ksql.connect.url" : "http://localhost:8083",
+    "ksql.query.push.v2.new.latest.delay.ms" : "5000",
+    "ksql.query.push.v2.latest.reset.age.ms" : "30000",
+    "ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
+    "ksql.query.pull.interpreter.enabled" : "true",
+    "ksql.query.pull.limit.clause.enabled" : "true",
+    "ksql.connect.error.handler" : null,
+    "ksql.query.pull.router.thread.pool.size" : "50",
+    "ksql.query.push.v2.continuation.tokens.enabled" : "false",
+    "ksql.query.retry.backoff.max.ms" : "900000",
+    "ksql.timestamp.throw.on.invalid" : "false",
+    "ksql.persistence.default.format.value" : null,
+    "ksql.udfs.enabled" : "true",
+    "ksql.udf.enable.security.manager" : "true",
+    "ksql.connect.worker.config" : "",
+    "ksql.nested.error.set.null" : "true",
+    "ksql.query.pull.thread.pool.size" : "50",
+    "ksql.persistent.prefix" : "query_",
+    "ksql.metastore.backup.location" : "",
+    "ksql.error.classifier.regex" : "",
+    "ksql.suppress.buffer.size.bytes" : "-1"
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1644852482932/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1644852482932/spec.json
new file mode 100644
index 000000000000..ded344747a03
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1644852482932/spec.json
@@ -0,0 +1,224 @@
+{
+  "version" : "7.2.0",
+  "timestamp" : 1644852482932,
+  "path" : "query-validation-tests/earliest-offset-udaf.json",
+  "schemas" : {
+    "CTAS_OUTPUT_0.Aggregate.Project" : {
+      "schema" : "`ID` BIGINT KEY, `L0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.GroupBy" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.KsqlTopic.Source" : {
+      "schema" : "`ID` BIGINT KEY, `F0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>, `KSQL_AGG_VARIABLE_0` STRUCT<`SEQ` BIGINT, `VAL` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.OUTPUT" : {
+      "schema" : "`ID` BIGINT KEY, `L0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    }
+  },
+  "testCase" : {
+    "name" : "earliest by offset with arrays, structs, and maps",
+    "inputs" : [ {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : [ {
+          "A" : "Early0",
+          "M" : {
+            "Early0" : 1.234
+          }
+        }, {
+          "A" : "Early2",
+          "M" : {
+            "Early2" : 1.23456
+          }
+        } ]
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : [ {
+          "A" : "Early1",
+          "M" : {
+            "Early0" : 2.345
+          }
+        } ]
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : [ {
+          "A" : "Later0",
+          "M" : {
+            "Early0" : 3.45
+          }
+        } ]
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : [ {
+          "A" : "Later1",
+          "M" : {
+            "Early0" : 4.56
+          }
+        } ]
+      }
+    } ],
+    "outputs" : [ {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : [ {
+          "A" : "Early0",
+          "M" : {
+            "Early0" : 1.234
+          }
+        }, {
+          "A" : "Early2",
+          "M" : {
+            "Early2" : 1.23456
+          }
+        } ]
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : [ {
+          "A" : "Early1",
+          "M" : {
+            "Early0" : 2.345
+          }
+        } ]
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : [ {
+          "A" : "Early0",
+          "M" : {
+            "Early0" : 1.234
+          }
+        }, {
+          "A" : "Early2",
+          "M" : {
+            "Early2" : 1.23456
+          }
+        } ]
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : [ {
+          "A" : "Early1",
+          "M" : {
+            "Early0" : 2.345
+          }
+        } ]
+      }
+    } ],
+    "topics" : [ {
+      "name" : "OUTPUT",
+      "replicas" : 1,
+      "numPartitions" : 4
+    }, {
+      "name" : "test_topic",
+      "replicas" : 1,
+      "numPartitions" : 4
+    } ],
+    "statements" : [ "CREATE STREAM INPUT (ID BIGINT KEY, F0 ARRAY<STRUCT<A VARCHAR, M MAP<STRING, DOUBLE>>>) WITH (kafka_topic='test_topic', value_format='JSON');", "CREATE TABLE OUTPUT AS SELECT ID, EARLIEST_BY_OFFSET(F0) AS L0 FROM INPUT GROUP BY ID;" ],
+    "post" : {
+      "sources" : [ {
+        "name" : "INPUT",
+        "type" : "STREAM",
+        "schema" : "`ID` BIGINT KEY, `F0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      }, {
+        "name" : "OUTPUT",
+        "type" : "TABLE",
+        "schema" : "`ID` BIGINT KEY, `L0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      } ],
+      "topics" : {
+        "topics" : [ {
+          "name" : "test_topic",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        }, {
+          "name" : "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        }, {
+          "name" : "OUTPUT",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        } ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1644852482932/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1644852482932/topology
new file mode 100644
index 000000000000..e000b160c4db
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1644852482932/topology
@@ -0,0 +1,25 @@
+Topologies:
+   Sub-topology: 0
+    Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic])
+      --> KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: [])
+      --> Aggregate-Prepare
+      <-- KSTREAM-SOURCE-0000000000
+    Processor: Aggregate-Prepare (stores: [])
+      --> KSTREAM-AGGREGATE-0000000003
+      <-- KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize])
+      --> Aggregate-Aggregate-ToOutputSchema
+      <-- Aggregate-Prepare
+    Processor: Aggregate-Aggregate-ToOutputSchema (stores: [])
+      --> Aggregate-Project
+      <-- KSTREAM-AGGREGATE-0000000003
+    Processor: Aggregate-Project (stores: [])
+      --> KTABLE-TOSTREAM-0000000006
+      <-- Aggregate-Aggregate-ToOutputSchema
+    Processor: KTABLE-TOSTREAM-0000000006 (stores: [])
+      --> KSTREAM-SINK-0000000007
+      <-- Aggregate-Project
+    Sink: KSTREAM-SINK-0000000007 (topic: OUTPUT)
+      <-- KTABLE-TOSTREAM-0000000006
+
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_decimals/7.2.0_1646962668589/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_decimals/7.2.0_1646962668589/plan.json
new file mode 100644
index 000000000000..63f704975e48
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_decimals/7.2.0_1646962668589/plan.json
@@ -0,0 +1,234 @@
+{
+  "plan" : [ {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE STREAM INPUT (ID BIGINT KEY, F0 DECIMAL(3, 2)) WITH (KAFKA_TOPIC='test_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');",
+    "ddlCommand" : {
+      "@type" : "createStreamV1",
+      "sourceName" : "INPUT",
+      "schema" : "`ID` BIGINT KEY, `F0` DECIMAL(3, 2)",
+      "topicName" : "test_topic",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    }
+  }, {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE TABLE OUTPUT AS SELECT\n  INPUT.ID ID,\n  EARLIEST_BY_OFFSET(INPUT.F0, true) L0\nFROM INPUT INPUT\nGROUP BY INPUT.ID\nEMIT CHANGES",
+    "ddlCommand" : {
+      "@type" : "createTableV1",
+      "sourceName" : "OUTPUT",
+      "schema" : "`ID` BIGINT KEY, `L0` DECIMAL(3, 2)",
+      "topicName" : "OUTPUT",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    },
+    "queryPlan" : {
+      "sources" : [ "INPUT" ],
+      "sink" : "OUTPUT",
+      "physicalPlan" : {
+        "@type" : "tableSinkV1",
+        "properties" : {
+          "queryContext" : "OUTPUT"
+        },
+        "source" : {
+          "@type" : "tableSelectV1",
+          "properties" : {
+            "queryContext" : "Aggregate/Project"
+          },
+          "source" : {
+            "@type" : "streamAggregateV1",
+            "properties" : {
+              "queryContext" : "Aggregate/Aggregate"
+            },
+            "source" : {
+              "@type" : "streamGroupByKeyV1",
+              "properties" : {
+                "queryContext" : "Aggregate/GroupBy"
+              },
+              "source" : {
+                "@type" : "streamSelectV1",
+                "properties" : {
+                  "queryContext" : "Aggregate/Prepare"
+                },
+                "source" : {
+                  "@type" : "streamSourceV1",
+                  "properties" : {
+                    "queryContext" : "KsqlTopic/Source"
+                  },
+                  "topicName" : "test_topic",
+                  "formats" : {
+                    "keyFormat" : {
+                      "format" : "KAFKA"
+                    },
+                    "valueFormat" : {
+                      "format" : "JSON"
+                    }
+                  },
+                  "sourceSchema" : "`ID` BIGINT KEY, `F0` DECIMAL(3, 2)",
+                  "pseudoColumnVersion" : 1
+                },
+                "keyColumnNames" : [ "ID" ],
+                "selectExpressions" : [ "ID AS ID", "F0 AS F0", "true AS KSQL_INTERNAL_COL_2" ]
+              },
+              "internalFormats" : {
+                "keyFormat" : {
+                  "format" : "KAFKA"
+                },
+                "valueFormat" : {
+                  "format" : "JSON"
+                }
+              }
+            },
+            "internalFormats" : {
+              "keyFormat" : {
+                "format" : "KAFKA"
+              },
+              "valueFormat" : {
+                "format" : "JSON"
+              }
+            },
+            "nonAggregateColumns" : [ "ID", "F0" ],
+            "aggregationFunctions" : [ "EARLIEST_BY_OFFSET(F0, true)" ]
+          },
+          "keyColumnNames" : [ "ID" ],
+          "selectExpressions" : [ "KSQL_AGG_VARIABLE_0 AS L0" ],
+          "internalFormats" : {
+            "keyFormat" : {
+              "format" : "KAFKA"
+            },
+            "valueFormat" : {
+              "format" : "JSON"
+            }
+          }
+        },
+        "formats" : {
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        },
+        "topicName" : "OUTPUT"
+      },
+      "queryId" : "CTAS_OUTPUT_0"
+    }
+  } ],
+  "configs" : {
+    "ksql.extension.dir" : "ext",
+    "ksql.streams.cache.max.bytes.buffering" : "0",
+    "metric.reporters" : "",
+    "ksql.query.status.running.threshold.seconds" : "300",
+    "ksql.connect.basic.auth.credentials.reload" : "false",
+    "ksql.output.topic.name.prefix" : "",
+    "ksql.query.pull.stream.enabled" : "true",
+    "ksql.query.push.v2.interpreter.enabled" : "true",
+    "ksql.queryanonymizer.logs_enabled" : "true",
+    "ksql.variable.substitution.enable" : "true",
+    "ksql.streams.shutdown.timeout.ms" : "300000",
+    "ksql.query.pull.max.allowed.offset.lag" : "9223372036854775807",
+    "ksql.query.pull.max.qps" : "2147483647",
+    "ksql.access.validator.enable" : "auto",
+    "ksql.streams.bootstrap.servers" : "localhost:0",
+    "ksql.query.pull.metrics.enabled" : "true",
+    "ksql.metrics.extension" : null,
+    "ksql.query.push.v2.alos.enabled" : "true",
+    "ksql.query.push.v2.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.query.pull.range.scan.enabled" : "true",
+    "ksql.transient.query.cleanup.service.initial.delay.seconds" : "600",
+    "ksql.hidden.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.lambdas.enabled" : "true",
+    "ksql.source.table.materialization.enabled" : "true",
+    "ksql.query.pull.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.sink.window.change.log.additional.retention" : "1000000",
+    "ksql.query.persistent.active.limit" : "2147483647",
+    "ksql.persistence.wrap.single.values" : null,
+    "ksql.query.transient.max.bytes.buffering.total" : "-1",
+    "ksql.connect.basic.auth.credentials.source" : "NONE",
+    "ksql.schema.registry.url" : "schema_registry.url:0",
+    "ksql.properties.overrides.denylist" : "",
+    "ksql.service.id" : "some.ksql.service.id",
+    "ksql.query.push.v2.max.catchup.consumers" : "5",
+    "ksql.query.push.v2.enabled" : "false",
+    "ksql.transient.query.cleanup.service.enable" : "true",
+    "ksql.query.push.v2.metrics.enabled" : "true",
+    "ksql.rowpartition.rowoffset.enabled" : "true",
+    "ksql.streams.commit.interval.ms" : "2000",
+    "ksql.query.pull.table.scan.enabled" : "true",
+    "ksql.streams.auto.commit.interval.ms" : "0",
+    "ksql.streams.topology.optimization" : "all",
+    "ksql.endpoint.migrate.query" : "true",
+    "ksql.query.push.v2.registry.installed" : "false",
+    "ksql.streams.num.stream.threads" : "4",
+    "ksql.metrics.tags.custom" : "",
+    "ksql.query.push.v2.catchup.consumer.msg.window" : "50",
+    "ksql.runtime.feature.shared.enabled" : "false",
+    "ksql.udf.collect.metrics" : "false",
+    "ksql.new.query.planner.enabled" : "false",
+    "ksql.connect.request.headers.plugin" : null,
+    "ksql.security.extension.class" : null,
+    "ksql.transient.prefix" : "transient_",
+    "ksql.headers.columns.enabled" : "true",
+    "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler",
+    "ksql.connect.request.timeout.ms" : "5000",
+    "ksql.query.pull.enable.standby.reads" : "false",
+    "ksql.persistence.default.format.key" : "KAFKA",
+    "ksql.query.persistent.max.bytes.buffering.total" : "-1",
+    "ksql.query.error.max.queue.size" : "10",
+    "ksql.query.cleanup.shutdown.timeout.ms" : "30000",
+    "ksql.internal.topic.min.insync.replicas" : "1",
+    "ksql.internal.topic.replicas" : "1",
+    "ksql.insert.into.values.enabled" : "true",
+    "ksql.queryanonymizer.cluster_namespace" : null,
+    "ksql.create.or.replace.enabled" : "true",
+    "ksql.shared.runtimes.count" : "8",
+    "ksql.cast.strings.preserve.nulls" : "true",
+    "ksql.authorization.cache.max.entries" : "10000",
+    "ksql.pull.queries.enable" : "true",
+    "ksql.query.pull.consistency.token.enabled" : "true",
+    "ksql.transient.query.cleanup.service.period.seconds" : "600",
+    "ksql.suppress.enabled" : "false",
+    "ksql.readonly.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.connect.basic.auth.credentials.file" : "",
+    "ksql.authorization.cache.expiry.time.secs" : "30",
+    "ksql.query.retry.backoff.initial.ms" : "15000",
+    "ksql.query.pull.max.concurrent.requests" : "2147483647",
+    "ksql.streams.auto.offset.reset" : "earliest",
+    "ksql.connect.url" : "http://localhost:8083",
+    "ksql.query.push.v2.new.latest.delay.ms" : "5000",
+    "ksql.query.push.v2.latest.reset.age.ms" : "30000",
+    "ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
+    "ksql.query.pull.interpreter.enabled" : "true",
+    "ksql.query.pull.limit.clause.enabled" : "true",
+    "ksql.connect.error.handler" : null,
+    "ksql.query.pull.router.thread.pool.size" : "50",
+    "ksql.query.push.v2.continuation.tokens.enabled" : "false",
+    "ksql.query.retry.backoff.max.ms" : "900000",
+    "ksql.timestamp.throw.on.invalid" : "false",
+    "ksql.persistence.default.format.value" : null,
+    "ksql.udfs.enabled" : "true",
+    "ksql.udf.enable.security.manager" : "true",
+    "ksql.connect.worker.config" : "",
+    "ksql.nested.error.set.null" : "true",
+    "ksql.query.pull.thread.pool.size" : "50",
+    "ksql.persistent.prefix" : "query_",
+    "ksql.metastore.backup.location" : "",
+    "ksql.error.classifier.regex" : "",
+    "ksql.suppress.buffer.size.bytes" : "-1"
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_decimals/7.2.0_1646962668589/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_decimals/7.2.0_1646962668589/spec.json
new file mode 100644
index 000000000000..7d9c719ed8ef
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_decimals/7.2.0_1646962668589/spec.json
@@ -0,0 +1,145 @@
+{
+  "version" : "7.2.0",
+  "timestamp" : 1646962668589,
+  "path" : "query-validation-tests/earliest-offset-udaf.json",
+  "schemas" : {
+    "CTAS_OUTPUT_0.Aggregate.Project" : {
+      "schema" : "`ID` BIGINT KEY, `L0` DECIMAL(3, 2)",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.GroupBy" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` DECIMAL(3, 2), `KSQL_INTERNAL_COL_2` BOOLEAN",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.KsqlTopic.Source" : {
+      "schema" : "`ID` BIGINT KEY, `F0` DECIMAL(3, 2)",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` DECIMAL(3, 2), `KSQL_AGG_VARIABLE_0` STRUCT<`SEQ` BIGINT, `VAL` DECIMAL(3, 2)>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.OUTPUT" : {
+      "schema" : "`ID` BIGINT KEY, `L0` DECIMAL(3, 2)",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    }
+  },
+  "testCase" : {
+    "name" : "earliest by offset with decimals",
+    "inputs" : [ {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : "3.4"
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : "8.9"
+      }
+    } ],
+    "outputs" : [ {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : "3.40"
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : "3.40"
+      }
+    } ],
+    "topics" : [ {
+      "name" : "OUTPUT",
+      "replicas" : 1,
+      "numPartitions" : 4
+    }, {
+      "name" : "test_topic",
+      "replicas" : 1,
+      "numPartitions" : 4
+    } ],
+    "statements" : [ "CREATE STREAM INPUT (ID BIGINT KEY, F0 DECIMAL(3,2)) WITH (kafka_topic='test_topic', value_format='JSON');", "CREATE TABLE OUTPUT AS SELECT ID, EARLIEST_BY_OFFSET(F0, true) AS L0 FROM INPUT GROUP BY ID;" ],
+    "post" : {
+      "sources" : [ {
+        "name" : "INPUT",
+        "type" : "STREAM",
+        "schema" : "`ID` BIGINT KEY, `F0` DECIMAL(3, 2)",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      }, {
+        "name" : "OUTPUT",
+        "type" : "TABLE",
+        "schema" : "`ID` BIGINT KEY, `L0` DECIMAL(3, 2)",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      } ],
+      "topics" : {
+        "topics" : [ {
+          "name" : "test_topic",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        }, {
+          "name" : "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        }, {
+          "name" : "OUTPUT",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        } ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_decimals/7.2.0_1646962668589/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_decimals/7.2.0_1646962668589/topology
new file mode 100644
index 000000000000..e000b160c4db
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_decimals/7.2.0_1646962668589/topology
@@ -0,0 +1,25 @@
+Topologies:
+   Sub-topology: 0
+    Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic])
+      --> KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: [])
+      --> Aggregate-Prepare
+      <-- KSTREAM-SOURCE-0000000000
+    Processor: Aggregate-Prepare (stores: [])
+      --> KSTREAM-AGGREGATE-0000000003
+      <-- KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize])
+      --> Aggregate-Aggregate-ToOutputSchema
+      <-- Aggregate-Prepare
+    Processor: Aggregate-Aggregate-ToOutputSchema (stores: [])
+      --> Aggregate-Project
+      <-- KSTREAM-AGGREGATE-0000000003
+    Processor: Aggregate-Project (stores: [])
+      --> KTABLE-TOSTREAM-0000000006
+      <-- Aggregate-Aggregate-ToOutputSchema
+    Processor: KTABLE-TOSTREAM-0000000006 (stores: [])
+      --> KSTREAM-SINK-0000000007
+      <-- Aggregate-Project
+    Sink: KSTREAM-SINK-0000000007 (topic: OUTPUT)
+      <-- KTABLE-TOSTREAM-0000000006
+
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_maps/7.2.0_1644852483075/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_maps/7.2.0_1644852483075/plan.json
new file mode 100644
index 000000000000..d7411a690ce7
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_maps/7.2.0_1644852483075/plan.json
@@ -0,0 +1,229 @@
+{
+  "plan" : [ {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE STREAM INPUT (ID BIGINT KEY, F0 MAP<STRING, DOUBLE>) WITH (KAFKA_TOPIC='test_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');",
+    "ddlCommand" : {
+      "@type" : "createStreamV1",
+      "sourceName" : "INPUT",
+      "schema" : "`ID` BIGINT KEY, `F0` MAP<STRING, DOUBLE>",
+      "topicName" : "test_topic",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    }
+  }, {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE TABLE OUTPUT AS SELECT\n  INPUT.ID ID,\n  EARLIEST_BY_OFFSET(INPUT.F0) L0\nFROM INPUT INPUT\nGROUP BY INPUT.ID\nEMIT CHANGES",
+    "ddlCommand" : {
+      "@type" : "createTableV1",
+      "sourceName" : "OUTPUT",
+      "schema" : "`ID` BIGINT KEY, `L0` MAP<STRING, DOUBLE>",
+      "topicName" : "OUTPUT",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    },
+    "queryPlan" : {
+      "sources" : [ "INPUT" ],
+      "sink" : "OUTPUT",
+      "physicalPlan" : {
+        "@type" : "tableSinkV1",
+        "properties" : {
+          "queryContext" : "OUTPUT"
+        },
+        "source" : {
+          "@type" : "tableSelectV1",
+          "properties" : {
+            "queryContext" : "Aggregate/Project"
+          },
+          "source" : {
+            "@type" : "streamAggregateV1",
+            "properties" : {
+              "queryContext" : "Aggregate/Aggregate"
+            },
+            "source" : {
+              "@type" : "streamGroupByKeyV1",
+              "properties" : {
+                "queryContext" : "Aggregate/GroupBy"
+              },
+              "source" : {
+                "@type" : "streamSelectV1",
+                "properties" : {
+                  "queryContext" : "Aggregate/Prepare"
+                },
+                "source" : {
+                  "@type" : "streamSourceV1",
+                  "properties" : {
+                    "queryContext" : "KsqlTopic/Source"
+                  },
+                  "topicName" : "test_topic",
+                  "formats" : {
+                    "keyFormat" : {
+                      "format" : "KAFKA"
+                    },
+                    "valueFormat" : {
+                      "format" : "JSON"
+                    }
+                  },
+                  "sourceSchema" : "`ID` BIGINT KEY, `F0` MAP<STRING, DOUBLE>",
+                  "pseudoColumnVersion" : 1
+                },
+                "keyColumnNames" : [ "ID" ],
+                "selectExpressions" : [ "ID AS ID", "F0 AS F0" ]
+              },
+              "internalFormats" : {
+                "keyFormat" : {
+                  "format" : "KAFKA"
+                },
+                "valueFormat" : {
+                  "format" : "JSON"
+                }
+              }
+            },
+            "internalFormats" : {
+              "keyFormat" : {
+                "format" : "KAFKA"
+              },
+              "valueFormat" : {
+                "format" : "JSON"
+              }
+            },
+            "nonAggregateColumns" : [ "ID", "F0" ],
+            "aggregationFunctions" : [ "EARLIEST_BY_OFFSET(F0)" ]
+          },
+          "keyColumnNames" : [ "ID" ],
+          "selectExpressions" : [ "KSQL_AGG_VARIABLE_0 AS L0" ],
+          "internalFormats" : {
+            "keyFormat" : {
+              "format" : "KAFKA"
+            },
+            "valueFormat" : {
+              "format" : "JSON"
+            }
+          }
+        },
+        "formats" : {
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        },
+        "topicName" : "OUTPUT"
+      },
+      "queryId" : "CTAS_OUTPUT_0"
+    }
+  } ],
+  "configs" : {
+    "ksql.extension.dir" : "ext",
+    "ksql.streams.cache.max.bytes.buffering" : "0",
+    "metric.reporters" : "",
+    "ksql.query.status.running.threshold.seconds" : "300",
+    "ksql.connect.basic.auth.credentials.reload" : "false",
+    "ksql.output.topic.name.prefix" : "",
+    "ksql.query.pull.stream.enabled" : "true",
+    "ksql.query.push.v2.interpreter.enabled" : "true",
+    "ksql.queryanonymizer.logs_enabled" : "true",
+    "ksql.variable.substitution.enable" : "true",
+    "ksql.streams.shutdown.timeout.ms" : "300000",
+    "ksql.query.pull.max.allowed.offset.lag" : "9223372036854775807",
+    "ksql.query.pull.max.qps" : "2147483647",
+    "ksql.access.validator.enable" : "auto",
+    "ksql.streams.bootstrap.servers" : "localhost:0",
+    "ksql.query.pull.metrics.enabled" : "true",
+    "ksql.metrics.extension" : null,
+    "ksql.query.push.v2.alos.enabled" : "true",
+    "ksql.query.push.v2.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.query.pull.range.scan.enabled" : "true",
+    "ksql.hidden.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.lambdas.enabled" : "true",
+    "ksql.source.table.materialization.enabled" : "true",
+    "ksql.query.pull.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.sink.window.change.log.additional.retention" : "1000000",
+    "ksql.query.persistent.active.limit" : "2147483647",
+    "ksql.persistence.wrap.single.values" : null,
+    "ksql.query.transient.max.bytes.buffering.total" : "-1",
+    "ksql.connect.basic.auth.credentials.source" : "NONE",
+    "ksql.schema.registry.url" : "schema_registry.url:0",
+    "ksql.properties.overrides.denylist" : "",
+    "ksql.service.id" : "some.ksql.service.id",
+    "ksql.query.push.v2.max.catchup.consumers" : "5",
+    "ksql.query.push.v2.enabled" : "false",
+    "ksql.rowpartition.rowoffset.enabled" : "true",
+    "ksql.streams.commit.interval.ms" : "2000",
+    "ksql.query.pull.table.scan.enabled" : "true",
+    "ksql.streams.auto.commit.interval.ms" : "0",
+    "ksql.streams.topology.optimization" : "all",
+    "ksql.endpoint.migrate.query" : "true",
+    "ksql.query.push.v2.registry.installed" : "false",
+    "ksql.streams.num.stream.threads" : "4",
+    "ksql.metrics.tags.custom" : "",
+    "ksql.query.push.v2.catchup.consumer.msg.window" : "50",
+    "ksql.runtime.feature.shared.enabled" : "false",
+    "ksql.udf.collect.metrics" : "false",
+    "ksql.connect.request.headers.plugin" : null,
+    "ksql.security.extension.class" : null,
+    "ksql.transient.prefix" : "transient_",
+    "ksql.headers.columns.enabled" : "true",
+    "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler",
+    "ksql.connect.request.timeout.ms" : "5000",
+    "ksql.query.pull.enable.standby.reads" : "false",
+    "ksql.persistence.default.format.key" : "KAFKA",
+    "ksql.query.persistent.max.bytes.buffering.total" : "-1",
+    "ksql.query.error.max.queue.size" : "10",
+    "ksql.query.cleanup.shutdown.timeout.ms" : "30000",
+    "ksql.internal.topic.min.insync.replicas" : "1",
+    "ksql.internal.topic.replicas" : "1",
+    "ksql.insert.into.values.enabled" : "true",
+    "ksql.queryanonymizer.cluster_namespace" : null,
+    "ksql.create.or.replace.enabled" : "true",
+    "ksql.shared.runtimes.count" : "8",
+    "ksql.cast.strings.preserve.nulls" : "true",
+    "ksql.authorization.cache.max.entries" : "10000",
+    "ksql.pull.queries.enable" : "true",
+    "ksql.query.pull.consistency.token.enabled" : "false",
+    "ksql.suppress.enabled" : "false",
+    "ksql.readonly.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.connect.basic.auth.credentials.file" : "",
+    "ksql.authorization.cache.expiry.time.secs" : "30",
+    "ksql.query.retry.backoff.initial.ms" : "15000",
+    "ksql.query.pull.max.concurrent.requests" : "2147483647",
+    "ksql.streams.auto.offset.reset" : "earliest",
+    "ksql.connect.url" : "http://localhost:8083",
+    "ksql.query.push.v2.new.latest.delay.ms" : "5000",
+    "ksql.query.push.v2.latest.reset.age.ms" : "30000",
+    "ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
+    "ksql.query.pull.interpreter.enabled" : "true",
+    "ksql.query.pull.limit.clause.enabled" : "true",
+    "ksql.connect.error.handler" : null,
+    "ksql.query.pull.router.thread.pool.size" : "50",
+    "ksql.query.push.v2.continuation.tokens.enabled" : "false",
+    "ksql.query.retry.backoff.max.ms" : "900000",
+    "ksql.timestamp.throw.on.invalid" : "false",
+    "ksql.persistence.default.format.value" : null,
+    "ksql.udfs.enabled" : "true",
+    "ksql.udf.enable.security.manager" : "true",
+    "ksql.connect.worker.config" : "",
+    "ksql.nested.error.set.null" : "true",
+    "ksql.query.pull.thread.pool.size" : "50",
+    "ksql.persistent.prefix" : "query_",
+    "ksql.metastore.backup.location" : "",
+    "ksql.error.classifier.regex" : "",
+    "ksql.suppress.buffer.size.bytes" : "-1"
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_maps/7.2.0_1644852483075/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_maps/7.2.0_1644852483075/spec.json
new file mode 100644
index 000000000000..7ff11513428f
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_maps/7.2.0_1644852483075/spec.json
@@ -0,0 +1,185 @@
+{
+  "version" : "7.2.0",
+  "timestamp" : 1644852483075,
+  "path" : "query-validation-tests/earliest-offset-udaf.json",
+  "schemas" : {
+    "CTAS_OUTPUT_0.Aggregate.Project" : {
+      "schema" : "`ID` BIGINT KEY, `L0` MAP<STRING, DOUBLE>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.GroupBy" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` MAP<STRING, DOUBLE>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.KsqlTopic.Source" : {
+      "schema" : "`ID` BIGINT KEY, `F0` MAP<STRING, DOUBLE>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` MAP<STRING, DOUBLE>, `KSQL_AGG_VARIABLE_0` STRUCT<`SEQ` BIGINT, `VAL` MAP<STRING, DOUBLE>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.OUTPUT" : {
+      "schema" : "`ID` BIGINT KEY, `L0` MAP<STRING, DOUBLE>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    }
+  },
+  "testCase" : {
+    "name" : "earliest by offset with maps",
+    "inputs" : [ {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : {
+          "Early0" : 1.234
+        }
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : {
+          "Early1" : 2.3456789
+        }
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : {
+          "Later0" : 3.6789
+        }
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : {
+          "Later1" : 4
+        }
+      }
+    } ],
+    "outputs" : [ {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : {
+          "Early0" : 1.234
+        }
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : {
+          "Early1" : 2.3456789
+        }
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : {
+          "Early0" : 1.234
+        }
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : {
+          "Early1" : 2.3456789
+        }
+      }
+    } ],
+    "topics" : [ {
+      "name" : "OUTPUT",
+      "replicas" : 1,
+      "numPartitions" : 4
+    }, {
+      "name" : "test_topic",
+      "replicas" : 1,
+      "numPartitions" : 4
+    } ],
+    "statements" : [ "CREATE STREAM INPUT (ID BIGINT KEY, F0 MAP<STRING, DOUBLE>) WITH (kafka_topic='test_topic', value_format='JSON');", "CREATE TABLE OUTPUT AS SELECT ID, EARLIEST_BY_OFFSET(F0) AS L0 FROM INPUT GROUP BY ID;" ],
+    "post" : {
+      "sources" : [ {
+        "name" : "INPUT",
+        "type" : "STREAM",
+        "schema" : "`ID` BIGINT KEY, `F0` MAP<STRING, DOUBLE>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      }, {
+        "name" : "OUTPUT",
+        "type" : "TABLE",
+        "schema" : "`ID` BIGINT KEY, `L0` MAP<STRING, DOUBLE>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      } ],
+      "topics" : {
+        "topics" : [ {
+          "name" : "test_topic",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        }, {
+          "name" : "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        }, {
+          "name" : "OUTPUT",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        } ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_maps/7.2.0_1644852483075/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_maps/7.2.0_1644852483075/topology
new file mode 100644
index 000000000000..e000b160c4db
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_maps/7.2.0_1644852483075/topology
@@ -0,0 +1,25 @@
+Topologies:
+   Sub-topology: 0
+    Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic])
+      --> KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: [])
+      --> Aggregate-Prepare
+      <-- KSTREAM-SOURCE-0000000000
+    Processor: Aggregate-Prepare (stores: [])
+      --> KSTREAM-AGGREGATE-0000000003
+      <-- KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize])
+      --> Aggregate-Aggregate-ToOutputSchema
+      <-- Aggregate-Prepare
+    Processor: Aggregate-Aggregate-ToOutputSchema (stores: [])
+      --> Aggregate-Project
+      <-- KSTREAM-AGGREGATE-0000000003
+    Processor: Aggregate-Project (stores: [])
+      --> KTABLE-TOSTREAM-0000000006
+      <-- Aggregate-Aggregate-ToOutputSchema
+    Processor: KTABLE-TOSTREAM-0000000006 (stores: [])
+      --> KSTREAM-SINK-0000000007
+      <-- Aggregate-Project
+    Sink: KSTREAM-SINK-0000000007 (topic: OUTPUT)
+      <-- KTABLE-TOSTREAM-0000000006
+
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_structs/7.2.0_1644852483152/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_structs/7.2.0_1644852483152/plan.json
new file mode 100644
index 000000000000..36b759d47476
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_structs/7.2.0_1644852483152/plan.json
@@ -0,0 +1,229 @@
+{
+  "plan" : [ {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE STREAM INPUT (ID BIGINT KEY, F0 STRUCT<A STRING, B BIGINT>) WITH (KAFKA_TOPIC='test_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');",
+    "ddlCommand" : {
+      "@type" : "createStreamV1",
+      "sourceName" : "INPUT",
+      "schema" : "`ID` BIGINT KEY, `F0` STRUCT<`A` STRING, `B` BIGINT>",
+      "topicName" : "test_topic",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    }
+  }, {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE TABLE OUTPUT AS SELECT\n  INPUT.ID ID,\n  EARLIEST_BY_OFFSET(INPUT.F0) L0\nFROM INPUT INPUT\nGROUP BY INPUT.ID\nEMIT CHANGES",
+    "ddlCommand" : {
+      "@type" : "createTableV1",
+      "sourceName" : "OUTPUT",
+      "schema" : "`ID` BIGINT KEY, `L0` STRUCT<`A` STRING, `B` BIGINT>",
+      "topicName" : "OUTPUT",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    },
+    "queryPlan" : {
+      "sources" : [ "INPUT" ],
+      "sink" : "OUTPUT",
+      "physicalPlan" : {
+        "@type" : "tableSinkV1",
+        "properties" : {
+          "queryContext" : "OUTPUT"
+        },
+        "source" : {
+          "@type" : "tableSelectV1",
+          "properties" : {
+            "queryContext" : "Aggregate/Project"
+          },
+          "source" : {
+            "@type" : "streamAggregateV1",
+            "properties" : {
+              "queryContext" : "Aggregate/Aggregate"
+            },
+            "source" : {
+              "@type" : "streamGroupByKeyV1",
+              "properties" : {
+                "queryContext" : "Aggregate/GroupBy"
+              },
+              "source" : {
+                "@type" : "streamSelectV1",
+                "properties" : {
+                  "queryContext" : "Aggregate/Prepare"
+                },
+                "source" : {
+                  "@type" : "streamSourceV1",
+                  "properties" : {
+                    "queryContext" : "KsqlTopic/Source"
+                  },
+                  "topicName" : "test_topic",
+                  "formats" : {
+                    "keyFormat" : {
+                      "format" : "KAFKA"
+                    },
+                    "valueFormat" : {
+                      "format" : "JSON"
+                    }
+                  },
+                  "sourceSchema" : "`ID` BIGINT KEY, `F0` STRUCT<`A` STRING, `B` BIGINT>",
+                  "pseudoColumnVersion" : 1
+                },
+                "keyColumnNames" : [ "ID" ],
+                "selectExpressions" : [ "ID AS ID", "F0 AS F0" ]
+              },
+              "internalFormats" : {
+                "keyFormat" : {
+                  "format" : "KAFKA"
+                },
+                "valueFormat" : {
+                  "format" : "JSON"
+                }
+              }
+            },
+            "internalFormats" : {
+              "keyFormat" : {
+                "format" : "KAFKA"
+              },
+              "valueFormat" : {
+                "format" : "JSON"
+              }
+            },
+            "nonAggregateColumns" : [ "ID", "F0" ],
+            "aggregationFunctions" : [ "EARLIEST_BY_OFFSET(F0)" ]
+          },
+          "keyColumnNames" : [ "ID" ],
+          "selectExpressions" : [ "KSQL_AGG_VARIABLE_0 AS L0" ],
+          "internalFormats" : {
+            "keyFormat" : {
+              "format" : "KAFKA"
+            },
+            "valueFormat" : {
+              "format" : "JSON"
+            }
+          }
+        },
+        "formats" : {
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        },
+        "topicName" : "OUTPUT"
+      },
+      "queryId" : "CTAS_OUTPUT_0"
+    }
+  } ],
+  "configs" : {
+    "ksql.extension.dir" : "ext",
+    "ksql.streams.cache.max.bytes.buffering" : "0",
+    "metric.reporters" : "",
+    "ksql.query.status.running.threshold.seconds" : "300",
+    "ksql.connect.basic.auth.credentials.reload" : "false",
+    "ksql.output.topic.name.prefix" : "",
+    "ksql.query.pull.stream.enabled" : "true",
+    "ksql.query.push.v2.interpreter.enabled" : "true",
+    "ksql.queryanonymizer.logs_enabled" : "true",
+    "ksql.variable.substitution.enable" : "true",
+    "ksql.streams.shutdown.timeout.ms" : "300000",
+    "ksql.query.pull.max.allowed.offset.lag" : "9223372036854775807",
+    "ksql.query.pull.max.qps" : "2147483647",
+    "ksql.access.validator.enable" : "auto",
+    "ksql.streams.bootstrap.servers" : "localhost:0",
+    "ksql.query.pull.metrics.enabled" : "true",
+    "ksql.metrics.extension" : null,
+    "ksql.query.push.v2.alos.enabled" : "true",
+    "ksql.query.push.v2.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.query.pull.range.scan.enabled" : "true",
+    "ksql.hidden.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.lambdas.enabled" : "true",
+    "ksql.source.table.materialization.enabled" : "true",
+    "ksql.query.pull.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.sink.window.change.log.additional.retention" : "1000000",
+    "ksql.query.persistent.active.limit" : "2147483647",
+    "ksql.persistence.wrap.single.values" : null,
+    "ksql.query.transient.max.bytes.buffering.total" : "-1",
+    "ksql.connect.basic.auth.credentials.source" : "NONE",
+    "ksql.schema.registry.url" : "schema_registry.url:0",
+    "ksql.properties.overrides.denylist" : "",
+    "ksql.service.id" : "some.ksql.service.id",
+    "ksql.query.push.v2.max.catchup.consumers" : "5",
+    "ksql.query.push.v2.enabled" : "false",
+    "ksql.rowpartition.rowoffset.enabled" : "true",
+    "ksql.streams.commit.interval.ms" : "2000",
+    "ksql.query.pull.table.scan.enabled" : "true",
+    "ksql.streams.auto.commit.interval.ms" : "0",
+    "ksql.streams.topology.optimization" : "all",
+    "ksql.endpoint.migrate.query" : "true",
+    "ksql.query.push.v2.registry.installed" : "false",
+    "ksql.streams.num.stream.threads" : "4",
+    "ksql.metrics.tags.custom" : "",
+    "ksql.query.push.v2.catchup.consumer.msg.window" : "50",
+    "ksql.runtime.feature.shared.enabled" : "false",
+    "ksql.udf.collect.metrics" : "false",
+    "ksql.connect.request.headers.plugin" : null,
+    "ksql.security.extension.class" : null,
+    "ksql.transient.prefix" : "transient_",
+    "ksql.headers.columns.enabled" : "true",
+    "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler",
+    "ksql.connect.request.timeout.ms" : "5000",
+    "ksql.query.pull.enable.standby.reads" : "false",
+    "ksql.persistence.default.format.key" : "KAFKA",
+    "ksql.query.persistent.max.bytes.buffering.total" : "-1",
+    "ksql.query.error.max.queue.size" : "10",
+    "ksql.query.cleanup.shutdown.timeout.ms" : "30000",
+    "ksql.internal.topic.min.insync.replicas" : "1",
+    "ksql.internal.topic.replicas" : "1",
+    "ksql.insert.into.values.enabled" : "true",
+    "ksql.queryanonymizer.cluster_namespace" : null,
+    "ksql.create.or.replace.enabled" : "true",
+    "ksql.shared.runtimes.count" : "8",
+    "ksql.cast.strings.preserve.nulls" : "true",
+    "ksql.authorization.cache.max.entries" : "10000",
+    "ksql.pull.queries.enable" : "true",
+    "ksql.query.pull.consistency.token.enabled" : "false",
+    "ksql.suppress.enabled" : "false",
+    "ksql.readonly.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.connect.basic.auth.credentials.file" : "",
+    "ksql.authorization.cache.expiry.time.secs" : "30",
+    "ksql.query.retry.backoff.initial.ms" : "15000",
+    "ksql.query.pull.max.concurrent.requests" : "2147483647",
+    "ksql.streams.auto.offset.reset" : "earliest",
+    "ksql.connect.url" : "http://localhost:8083",
+    "ksql.query.push.v2.new.latest.delay.ms" : "5000",
+    "ksql.query.push.v2.latest.reset.age.ms" : "30000",
+    "ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
+    "ksql.query.pull.interpreter.enabled" : "true",
+    "ksql.query.pull.limit.clause.enabled" : "true",
+    "ksql.connect.error.handler" : null,
+    "ksql.query.pull.router.thread.pool.size" : "50",
+    "ksql.query.push.v2.continuation.tokens.enabled" : "false",
+    "ksql.query.retry.backoff.max.ms" : "900000",
+    "ksql.timestamp.throw.on.invalid" : "false",
+    "ksql.persistence.default.format.value" : null,
+    "ksql.udfs.enabled" : "true",
+    "ksql.udf.enable.security.manager" : "true",
+    "ksql.connect.worker.config" : "",
+    "ksql.nested.error.set.null" : "true",
+    "ksql.query.pull.thread.pool.size" : "50",
+    "ksql.persistent.prefix" : "query_",
+    "ksql.metastore.backup.location" : "",
+    "ksql.error.classifier.regex" : "",
+    "ksql.suppress.buffer.size.bytes" : "-1"
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_structs/7.2.0_1644852483152/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_structs/7.2.0_1644852483152/spec.json
new file mode 100644
index 000000000000..9e34d95d9f02
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_structs/7.2.0_1644852483152/spec.json
@@ -0,0 +1,193 @@
+{
+  "version" : "7.2.0",
+  "timestamp" : 1644852483152,
+  "path" : "query-validation-tests/earliest-offset-udaf.json",
+  "schemas" : {
+    "CTAS_OUTPUT_0.Aggregate.Project" : {
+      "schema" : "`ID` BIGINT KEY, `L0` STRUCT<`A` STRING, `B` BIGINT>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.GroupBy" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` STRUCT<`A` STRING, `B` BIGINT>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.KsqlTopic.Source" : {
+      "schema" : "`ID` BIGINT KEY, `F0` STRUCT<`A` STRING, `B` BIGINT>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` STRUCT<`A` STRING, `B` BIGINT>, `KSQL_AGG_VARIABLE_0` STRUCT<`SEQ` BIGINT, `VAL` STRUCT<`A` STRING, `B` BIGINT>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.OUTPUT" : {
+      "schema" : "`ID` BIGINT KEY, `L0` STRUCT<`A` STRING, `B` BIGINT>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    }
+  },
+  "testCase" : {
+    "name" : "earliest by offset with structs",
+    "inputs" : [ {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : {
+          "A" : "Early0",
+          "B" : 1
+        }
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : {
+          "A" : "Early1",
+          "B" : 2
+        }
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : {
+          "A" : "Later0",
+          "B" : 3
+        }
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : {
+          "A" : "Later1",
+          "B" : 4
+        }
+      }
+    } ],
+    "outputs" : [ {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : {
+          "A" : "Early0",
+          "B" : 1
+        }
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : {
+          "A" : "Early1",
+          "B" : 2
+        }
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : {
+          "A" : "Early0",
+          "B" : 1
+        }
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : {
+          "A" : "Early1",
+          "B" : 2
+        }
+      }
+    } ],
+    "topics" : [ {
+      "name" : "OUTPUT",
+      "replicas" : 1,
+      "numPartitions" : 4
+    }, {
+      "name" : "test_topic",
+      "replicas" : 1,
+      "numPartitions" : 4
+    } ],
+    "statements" : [ "CREATE STREAM INPUT (ID BIGINT KEY, F0 STRUCT<A VARCHAR, B BIGINT>) WITH (kafka_topic='test_topic', value_format='JSON');", "CREATE TABLE OUTPUT AS SELECT ID, EARLIEST_BY_OFFSET(F0) AS L0 FROM INPUT GROUP BY ID;" ],
+    "post" : {
+      "sources" : [ {
+        "name" : "INPUT",
+        "type" : "STREAM",
+        "schema" : "`ID` BIGINT KEY, `F0` STRUCT<`A` STRING, `B` BIGINT>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      }, {
+        "name" : "OUTPUT",
+        "type" : "TABLE",
+        "schema" : "`ID` BIGINT KEY, `L0` STRUCT<`A` STRING, `B` BIGINT>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      } ],
+      "topics" : {
+        "topics" : [ {
+          "name" : "test_topic",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        }, {
+          "name" : "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        }, {
+          "name" : "OUTPUT",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        } ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_structs/7.2.0_1644852483152/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_structs/7.2.0_1644852483152/topology
new file mode 100644
index 000000000000..e000b160c4db
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/earliest-offset-udaf_-_earliest_by_offset_with_structs/7.2.0_1644852483152/topology
@@ -0,0 +1,25 @@
+Topologies:
+   Sub-topology: 0
+    Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic])
+      --> KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: [])
+      --> Aggregate-Prepare
+      <-- KSTREAM-SOURCE-0000000000
+    Processor: Aggregate-Prepare (stores: [])
+      --> KSTREAM-AGGREGATE-0000000003
+      <-- KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize])
+      --> Aggregate-Aggregate-ToOutputSchema
+      <-- Aggregate-Prepare
+    Processor: Aggregate-Aggregate-ToOutputSchema (stores: [])
+      --> Aggregate-Project
+      <-- KSTREAM-AGGREGATE-0000000003
+    Processor: Aggregate-Project (stores: [])
+      --> KTABLE-TOSTREAM-0000000006
+      <-- Aggregate-Aggregate-ToOutputSchema
+    Processor: KTABLE-TOSTREAM-0000000006 (stores: [])
+      --> KSTREAM-SINK-0000000007
+      <-- Aggregate-Project
+    Sink: KSTREAM-SINK-0000000007 (topic: OUTPUT)
+      <-- KTABLE-TOSTREAM-0000000006
+
diff --git a/ksqldb-functional-tests/src/test/resources/query-validation-tests/earliest-offset-udaf.json b/ksqldb-functional-tests/src/test/resources/query-validation-tests/earliest-offset-udaf.json
index 5b53085c5a51..eb5d3231b343 100644
--- a/ksqldb-functional-tests/src/test/resources/query-validation-tests/earliest-offset-udaf.json
+++ b/ksqldb-functional-tests/src/test/resources/query-validation-tests/earliest-offset-udaf.json
@@ -4,6 +4,82 @@
     "Tests covering the use of the EARLIEST_BY_OFFSET aggregate function"
   ],
   "tests": [
+    {
+      "name": "earliest by offset with arrays, structs, and maps",
+      "statements": [
+        "CREATE STREAM INPUT (ID BIGINT KEY, F0 ARRAY<STRUCT<A VARCHAR, M MAP<STRING, DOUBLE>>>) WITH (kafka_topic='test_topic', value_format='JSON');",
+        "CREATE TABLE OUTPUT AS SELECT ID, EARLIEST_BY_OFFSET(F0) AS L0 FROM INPUT GROUP BY ID;"
+      ],
+      "inputs": [
+        {"topic": "test_topic", "key": 0, "value": {"F0": [{"A": "Early0", "M": {"Early0": 1.234}}, {"A": "Early2", "M": {"Early2": 1.23456}}]}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": [{"A": "Early1", "M": {"Early0": 2.345}}]}},
+        {"topic": "test_topic", "key": 0, "value": {"F0": [{"A": "Later0", "M": {"Early0": 3.45}}]}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": [{"A": "Later1", "M": {"Early0": 4.56}}]}}
+      ],
+      "outputs": [
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": [{"A": "Early0", "M": {"Early0": 1.234}}, {"A": "Early2", "M": {"Early2": 1.23456}}]}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": [{"A": "Early1", "M": {"Early0": 2.345}}]}},
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": [{"A": "Early0", "M": {"Early0": 1.234}}, {"A": "Early2", "M": {"Early2": 1.23456}}]}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": [{"A": "Early1", "M": {"Early0": 2.345}}]}}
+      ]
+    },
+    {
+      "name": "earliest by offset with maps",
+      "statements": [
+        "CREATE STREAM INPUT (ID BIGINT KEY, F0 MAP<STRING, DOUBLE>) WITH (kafka_topic='test_topic', value_format='JSON');",
+        "CREATE TABLE OUTPUT AS SELECT ID, EARLIEST_BY_OFFSET(F0) AS L0 FROM INPUT GROUP BY ID;"
+      ],
+      "inputs": [
+        {"topic": "test_topic", "key": 0, "value": {"F0": {"Early0": 1.234}}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": {"Early1": 2.3456789}}},
+        {"topic": "test_topic", "key": 0, "value": {"F0": {"Later0": 3.6789}}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": {"Later1": 4}}}
+      ],
+      "outputs": [
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": {"Early0": 1.234}}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": {"Early1": 2.3456789}}},
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": {"Early0": 1.234}}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": {"Early1": 2.3456789}}}
+      ]
+    },
+    {
+      "name": "earliest by offset with structs",
+      "statements": [
+        "CREATE STREAM INPUT (ID BIGINT KEY, F0 STRUCT<A VARCHAR, B BIGINT>) WITH (kafka_topic='test_topic', value_format='JSON');",
+        "CREATE TABLE OUTPUT AS SELECT ID, EARLIEST_BY_OFFSET(F0) AS L0 FROM INPUT GROUP BY ID;"
+      ],
+      "inputs": [
+        {"topic": "test_topic", "key": 0, "value": {"F0": {"A": "Early0", "B": 1}}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": {"A": "Early1", "B": 2}}},
+        {"topic": "test_topic", "key": 0, "value": {"F0": {"A": "Later0", "B": 3}}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": {"A": "Later1", "B": 4}}}
+      ],
+      "outputs": [
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": {"A": "Early0", "B": 1}}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": {"A": "Early1", "B": 2}}},
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": {"A": "Early0", "B": 1}}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": {"A": "Early1", "B": 2}}}
+      ]
+    },
+    {
+      "name": "earliest by offset with an array added",
+      "statements": [
+        "CREATE STREAM INPUT (ID BIGINT KEY, F0 INT, F1 BIGINT, F2 DOUBLE, F3 BOOLEAN, F4 STRING, F5 TIMESTAMP, F6 TIME, F7 DATE, F8 BYTES, F9 ARRAY<INT>) WITH (kafka_topic='test_topic', value_format='JSON');",
+        "CREATE TABLE OUTPUT AS SELECT ID, EARLIEST_BY_OFFSET(F0) AS L0, EARLIEST_BY_OFFSET(F1) AS L1, EARLIEST_BY_OFFSET(F2) AS L2, EARLIEST_BY_OFFSET(F3) AS L3, EARLIEST_BY_OFFSET(F4) AS L4, EARLIEST_BY_OFFSET(F5) AS L5, EARLIEST_BY_OFFSET(F6) AS L6, EARLIEST_BY_OFFSET(F7) AS L7, EARLIEST_BY_OFFSET(F8) AS L8, EARLIEST_BY_OFFSET(F9) AS L9 FROM INPUT GROUP BY ID;"
+      ],
+      "inputs": [
+        {"topic": "test_topic", "key": 0, "value": {"F0": 12, "F1": 1000, "F2": 1.23, "F3": true, "F4": "foo", "F5": 12, "F6": 123, "F7": 1234, "F8": "YQ==", "F9": [0,0,1,0,-1]}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": 12, "F1": 1000, "F2": 1.23, "F3": true, "F4": "foo", "F5": 12, "F6": 123, "F7": 1234, "F8": "YQ==", "F9": [0,0,1,0,-1]}},
+        {"topic": "test_topic", "key": 0, "value": {"F0": 21, "F1": 2000, "F2": 2.23, "F3": false, "F4": "foo", "F5": 34, "F6": 234, "F7": 2345, "F8": "Yg==", "F9": [1,2,3,4,-1]}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": 21, "F1": 2000, "F2": 2.23, "F3": false, "F4": "foo", "F5": 34, "F6": 234, "F7": 2345, "F8": "Yg==", "F9": [1,2,3,4,-1]}}
+      ],
+      "outputs": [
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": 12, "L1": 1000, "L2": 1.23, "L3": true, "L4": "foo", "L5": 12, "L6": 123, "L7": 1234, "L8": "YQ==", "L9": [0,0,1,0,-1]}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": 12, "L1": 1000, "L2": 1.23, "L3": true, "L4": "foo", "L5": 12, "L6": 123, "L7": 1234, "L8": "YQ==", "L9": [0,0,1,0,-1]}},
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": 12, "L1": 1000, "L2": 1.23, "L3": true, "L4": "foo", "L5": 12, "L6": 123, "L7": 1234, "L8": "YQ==", "L9": [0,0,1,0,-1]}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": 12, "L1": 1000, "L2": 1.23, "L3": true, "L4": "foo", "L5": 12, "L6": 123, "L7": 1234, "L8": "YQ==", "L9": [0,0,1,0,-1]}}
+      ]
+    },
     {
       "name": "earliest by offset",
       "statements": [
@@ -23,6 +99,21 @@
         {"topic": "OUTPUT", "key": 1, "value": {"L0": 12, "L1": 1000, "L2": 1.23, "L3": true, "L4": "foo", "L5": 12, "L6": 123, "L7": 1234, "L8": "YQ=="}}
       ]
     },
+    {
+      "name": "earliest by offset with decimals",
+      "statements": [
+        "CREATE STREAM INPUT (ID BIGINT KEY, F0 DECIMAL(3,2)) WITH (kafka_topic='test_topic', value_format='JSON');",
+        "CREATE TABLE OUTPUT AS SELECT ID, EARLIEST_BY_OFFSET(F0, true) AS L0 FROM INPUT GROUP BY ID;"
+      ],
+      "inputs": [
+        {"topic": "test_topic", "key": 0, "value": {"F0": "3.4"}},
+        {"topic": "test_topic", "key": 0, "value": {"F0": "8.9"}}
+      ],
+      "outputs": [
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": "3.40"}},
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": "3.40"}}
+      ]
+    },
     {
       "name": "null first - single - ignoring nulls",
       "statements": [
diff --git a/ksqldb-functional-tests/src/test/resources/query-validation-tests/udaf.json b/ksqldb-functional-tests/src/test/resources/query-validation-tests/udaf.json
index be3b6965ed9b..06ca604319fd 100644
--- a/ksqldb-functional-tests/src/test/resources/query-validation-tests/udaf.json
+++ b/ksqldb-functional-tests/src/test/resources/query-validation-tests/udaf.json
@@ -4,17 +4,6 @@
     "Tests covering generic UDAFs"
   ],
   "tests": [
-    {
-      "name": "throw on signature mismatch",
-      "statements": [
-        "CREATE STREAM INPUT (ID BIGINT KEY, F0 INT) WITH (kafka_topic='test_topic', value_format='JSON');",
-        "CREATE TABLE OUTPUT AS SELECT ID, EARLIEST_BY_OFFSET(F0, false, 2) FROM INPUT GROUP BY ID;"
-      ],
-      "expectedException": {
-        "type": "io.confluent.ksql.util.KsqlStatementException",
-        "message": "Function 'EARLIEST_BY_OFFSET' does not accept parameters (INTEGER, BOOLEAN, INTEGER).\nValid alternatives are:"
-      }
-    },
     {
       "name": "throw on no literal expressions pass for literal params",
       "statements": [

From f02ffe7c62346fb660088fbb0d2f19ee8ea1d6ea Mon Sep 17 00:00:00 2001
From: Jim Hughes <jhughes@confluent.io>
Date: Thu, 10 Mar 2022 23:05:01 -0500
Subject: [PATCH 2/5] chore: Fix a test.

---
 .../test/java/io/confluent/ksql/function/UdfLoaderTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ksqldb-engine/src/test/java/io/confluent/ksql/function/UdfLoaderTest.java b/ksqldb-engine/src/test/java/io/confluent/ksql/function/UdfLoaderTest.java
index f491ff495069..c4160ef43f1d 100644
--- a/ksqldb-engine/src/test/java/io/confluent/ksql/function/UdfLoaderTest.java
+++ b/ksqldb-engine/src/test/java/io/confluent/ksql/function/UdfLoaderTest.java
@@ -982,7 +982,7 @@ public void shouldThrowIfMissingInputTypeSchema() throws Exception {
     assertThat(e.getMessage(), containsString("Must specify 'paramSchema' for STRUCT parameter in @UdafFactory."));
   }
 
-  @Test
+  //@Test
   public void shouldThrowIfMissingAggregateTypeSchema() throws Exception {
     // When:
     final Exception e = assertThrows(
@@ -1000,7 +1000,7 @@ public void shouldThrowIfMissingAggregateTypeSchema() throws Exception {
     assertThat(e.getMessage(), containsString("Must specify 'aggregateSchema' for STRUCT parameter in @UdafFactory."));
   }
 
-  @Test
+  //@Test
   public void shouldThrowIfMissingOutputTypeSchema() throws Exception {
     // When:
     final Exception e = assertThrows(

From e08e2c0c114ed53cf506a798a4be9a290bedc7bb Mon Sep 17 00:00:00 2001
From: Jim Hughes <jhughes@confluent.io>
Date: Mon, 14 Mar 2022 15:47:16 -0400
Subject: [PATCH 3/5] chore: Fixing up some unit tests and responding to
 comments.

---
 .../ksql/function/UdafFactoryInvoker.java     |   6 +-
 .../io/confluent/ksql/function/UdafTypes.java |   3 +-
 .../udaf/offset/EarliestByOffset.java         |   1 -
 .../udaf/offset/KudafByOffsetUtils.java       |   2 -
 .../ksql/function/UdfLoaderTest.java          |  89 +++-
 .../udaf/offset/EarliestByOffsetTest.java     | 411 ------------------
 6 files changed, 72 insertions(+), 440 deletions(-)

diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/UdafFactoryInvoker.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/UdafFactoryInvoker.java
index 86753dfab243..8eaf7bc290c0 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/UdafFactoryInvoker.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/UdafFactoryInvoker.java
@@ -74,10 +74,8 @@ class UdafFactoryInvoker implements FunctionSignature {
     }
     this.types = new UdafTypes(method, functionName, typeParser);
     this.functionName = Objects.requireNonNull(functionName);
-    this.aggregateSchema = aggregateSchema;
-    this.outputSchema = outputSchema;
-    //this.aggregateArgType = Objects.requireNonNull(types.getAggregateSchema(aggregateSchema));
-    //this.aggregateReturnType = Objects.requireNonNull(types.getOutputSchema(outputSchema));
+    this.aggregateSchema = aggregateSchema; // This can be null if the annotation is not used.
+    this.outputSchema = outputSchema;       // This can be null if the annotation is not used.
     this.metrics = Objects.requireNonNull(metrics);
     this.params = types.getInputSchema(Objects.requireNonNull(inputSchema));
     this.paramTypes = params.stream().map(ParameterInfo::type).collect(Collectors.toList());
diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/UdafTypes.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/UdafTypes.java
index ff2f267ab377..c50f9e83b48e 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/UdafTypes.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/UdafTypes.java
@@ -133,7 +133,8 @@ private static void validateStructAnnotation(
       final String msg
   ) {
     if (type.equals(Struct.class) && schema.isEmpty()) {
-      throw new KsqlException("Must specify '" + msg + "' for STRUCT parameter in @UdafFactory.");
+      throw new KsqlException("Must specify '" + msg + "' for STRUCT parameter in @UdafFactory or"
+          + " implement getAggregateSqlType()/getReturnSqlType().");
     }
   }
 
diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/EarliestByOffset.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/EarliestByOffset.java
index b44a76361259..7f6cc9dcc24b 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/EarliestByOffset.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/EarliestByOffset.java
@@ -36,7 +36,6 @@
 import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.Struct;
 
-//    name = "EARLIEST_BY_OFFSET_OLD",
 @UdafDescription(
     name = "EARLIEST_BY_OFFSET",
     description = EarliestByOffset.DESCRIPTION,
diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/KudafByOffsetUtils.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/KudafByOffsetUtils.java
index 700fdf96254e..b34c4333dbb3 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/KudafByOffsetUtils.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/KudafByOffsetUtils.java
@@ -20,14 +20,12 @@
 import static io.confluent.ksql.serde.connect.ConnectKsqlSchemaTranslator.OPTIONAL_TIME_SCHEMA;
 
 import java.util.Comparator;
-import java.util.concurrent.atomic.AtomicLong;
 import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.SchemaBuilder;
 import org.apache.kafka.connect.data.Struct;
 
 final class KudafByOffsetUtils {
 
-  static final AtomicLong sequence = new AtomicLong();
   static final String SEQ_FIELD = "SEQ";
   public static final String VAL_FIELD = "VAL";
 
diff --git a/ksqldb-engine/src/test/java/io/confluent/ksql/function/UdfLoaderTest.java b/ksqldb-engine/src/test/java/io/confluent/ksql/function/UdfLoaderTest.java
index c4160ef43f1d..dfa3910b673c 100644
--- a/ksqldb-engine/src/test/java/io/confluent/ksql/function/UdfLoaderTest.java
+++ b/ksqldb-engine/src/test/java/io/confluent/ksql/function/UdfLoaderTest.java
@@ -982,41 +982,48 @@ public void shouldThrowIfMissingInputTypeSchema() throws Exception {
     assertThat(e.getMessage(), containsString("Must specify 'paramSchema' for STRUCT parameter in @UdafFactory."));
   }
 
-  //@Test
+  @Test
   public void shouldThrowIfMissingAggregateTypeSchema() throws Exception {
     // When:
+    UdafFactoryInvoker invoker = createUdafLoader().createUdafFactoryInvoker(
+        UdfLoaderTest.class.getMethod("missingAggregateSchemaAnnotationUdaf"),
+        of("test"),
+        "desc",
+        "",
+        "",
+        ""
+    );
     final Exception e = assertThrows(
         KsqlException.class,
-        () -> createUdafLoader().createUdafFactoryInvoker(
-            UdfLoaderTest.class.getMethod("missingAggregateSchemaAnnotationUdaf"),
-            of("test"),
-            "desc",
-            "",
-            "",
-            "")
+        () -> invoker.createFunction(AggregateFunctionInitArguments.EMPTY_ARGS,
+            Collections.emptyList())
     );
 
     // Then:
-    assertThat(e.getMessage(), containsString("Must specify 'aggregateSchema' for STRUCT parameter in @UdafFactory."));
+    assertThat(e.getCause().getMessage(), containsString("Must specify 'aggregateSchema' for STRUCT"
+        + " parameter in @UdafFactory or implement getAggregateSqlType()/getReturnSqlType()."));
   }
 
-  //@Test
+  @Test
   public void shouldThrowIfMissingOutputTypeSchema() throws Exception {
     // When:
+    UdafFactoryInvoker invoker = createUdafLoader().createUdafFactoryInvoker(
+        UdfLoaderTest.class.getMethod("missingOutputSchemaAnnotationUdaf"),
+        of("test"),
+        "desc",
+        "",
+        "",
+        ""
+    );
     final Exception e = assertThrows(
         KsqlException.class,
-        () -> createUdafLoader().createUdafFactoryInvoker(
-            UdfLoaderTest.class.getMethod("missingOutputSchemaAnnotationUdaf"),
-            of("test"),
-            "desc",
-            "",
-            "",
-            ""
-        )
+        () -> invoker.createFunction(AggregateFunctionInitArguments.EMPTY_ARGS,
+            Collections.emptyList())
     );
 
     // Then:
-    assertThat(e.getMessage(), containsString("Must specify 'returnSchema' for STRUCT parameter in @UdafFactory."));
+    assertThat(e.getCause().getMessage(), containsString("Must specify 'returnSchema' for STRUCT"
+        + " parameter in @UdafFactory or implement getAggregateSqlType()/getReturnSqlType()."));
   }
 
   @Test
@@ -1370,11 +1377,51 @@ public static Udaf<Struct, String, String> missingInputSchemaAnnotationUdaf() {
   }
 
   public static Udaf<String, Struct, String> missingAggregateSchemaAnnotationUdaf() {
-    return null;
+    return new Udaf<String, Struct, String>() {
+      @Override
+      public Struct initialize() {
+        return null;
+      }
+
+      @Override
+      public Struct aggregate(String current, Struct aggregate) {
+        return null;
+      }
+
+      @Override
+      public Struct merge(Struct aggOne, Struct aggTwo) {
+        return null;
+      }
+
+      @Override
+      public String map(Struct agg) {
+        return null;
+      }
+    };
   }
 
   public static Udaf<String, String, Struct> missingOutputSchemaAnnotationUdaf() {
-    return null;
+    return  new Udaf<String, String, Struct>() {
+      @Override
+      public String initialize() {
+        return null;
+      }
+
+      @Override
+      public String aggregate(String current, String aggregate) {
+        return null;
+      }
+
+      @Override
+      public String merge(String aggOne, String aggTwo) {
+        return null;
+      }
+
+      @Override
+      public Struct map(String agg) {
+        return null;
+      }
+    };
   }
 
   private static UdafLoader createUdafLoader() {
diff --git a/ksqldb-engine/src/test/java/io/confluent/ksql/function/udaf/offset/EarliestByOffsetTest.java b/ksqldb-engine/src/test/java/io/confluent/ksql/function/udaf/offset/EarliestByOffsetTest.java
index a24e284bae58..ccadcab19435 100644
--- a/ksqldb-engine/src/test/java/io/confluent/ksql/function/udaf/offset/EarliestByOffsetTest.java
+++ b/ksqldb-engine/src/test/java/io/confluent/ksql/function/udaf/offset/EarliestByOffsetTest.java
@@ -16,15 +16,7 @@
 package io.confluent.ksql.function.udaf.offset;
 
 import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.SEQ_FIELD;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_BOOLEAN;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_BYTES;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_DATE;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_DOUBLE;
 import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_INTEGER;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_LONG;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_STRING;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_TIME;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_TIMESTAMP;
 import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.VAL_FIELD;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
@@ -38,10 +30,6 @@
 import io.confluent.ksql.schema.ksql.SqlArgument;
 import io.confluent.ksql.schema.ksql.types.SqlTypes;
 import io.confluent.ksql.util.KsqlException;
-import java.nio.ByteBuffer;
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -260,403 +248,4 @@ public void shouldMergeWithOverflowNIntegers() {
     assertThat(merged1, contains(struct1, struct2));
     assertThat(merged2, contains(struct1, struct2));
   }
-
-  @Test
-  public void shouldComputeEarliestLong() {
-    // Given:
-    final Udaf<Long, Struct, Long> udaf = EarliestByOffset.earliest();
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BIGINT)));
-
-    // When:
-    final Struct res = udaf.aggregate(123L, EarliestByOffset.createStruct(STRUCT_LONG, 321L));
-
-    // Then:
-    assertThat(res.getInt64(VAL_FIELD), is(321L));
-  }
-
-  @Test
-  public void shouldComputeEarliestNLongs() {
-    // Given:
-    final Udaf<Long, List<Struct>, List<Long>> udaf = EarliestByOffset.earliest(3);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BIGINT)));
-
-
-    // When:
-    final List<Struct> res = udaf
-        .aggregate(123L, Lists.newArrayList(EarliestByOffset.createStruct(STRUCT_LONG, 321L)));
-
-    List<Struct> res2 = udaf
-        .aggregate(543L, res);
-
-    // Then:
-    assertThat(res2.size(), is(3));
-    assertThat(res2.get(0).get(VAL_FIELD), is(321L));
-    assertThat(res2.get(1).get(VAL_FIELD), is(123L));
-    assertThat(res2.get(2).get(VAL_FIELD), is(543L));
-  }
-
-  @Test
-  public void shouldComputeEarliestDouble() {
-    // Given:
-    final Udaf<Double, Struct, Double> udaf = EarliestByOffset.earliest();
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BIGINT)));
-
-
-    // When:
-    final Struct res = udaf
-        .aggregate(1.1d, EarliestByOffset.createStruct(STRUCT_DOUBLE, 2.2d));
-
-    // Then:
-    assertThat(res.getFloat64(VAL_FIELD), is(2.2d));
-  }
-
-  @Test
-  public void shouldComputeEarliestNDoubles() {
-    // Given:
-    final Udaf<Double, List<Struct>, List<Double>> udaf = EarliestByOffset.earliest(1);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BIGINT)));
-
-
-    // When:
-    final List<Struct> res = udaf
-        .aggregate(1.1d, Lists.newArrayList(EarliestByOffset.createStruct(STRUCT_DOUBLE, 2.2d)));
-
-    // Then:
-    assertThat(res.size(), is(1));
-    assertThat(res.get(0).get(VAL_FIELD), is(2.2d));
-  }
-
-  @Test
-  public void shouldComputeEarliestBoolean() {
-    // Given:
-    final Udaf<Boolean, Struct, Boolean> udaf = EarliestByOffset.earliest();
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BOOLEAN)));
-
-
-    // When:
-    final Struct res = udaf
-        .aggregate(true, EarliestByOffset.createStruct(STRUCT_BOOLEAN, false));
-
-    // Then:
-    assertThat(res.getBoolean(VAL_FIELD), is(false));
-  }
-
-  @Test
-  public void shouldComputeEarliestNBooleans() {
-    // Given:
-    final Udaf<Boolean, List<Struct>, List<Boolean>> udaf = EarliestByOffset.earliest(2);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BOOLEAN)));
-
-    // When:
-    final List<Struct> res = udaf
-        .aggregate(true, Lists.newArrayList(EarliestByOffset.createStruct(STRUCT_BOOLEAN, false)));
-
-    // Then:
-    assertThat(res.size(), is(2));
-    assertThat(res.get(0).get(VAL_FIELD), is(false));
-    assertThat(res.get(1).get(VAL_FIELD), is(true));
-  }
-
-  @Test
-  public void shouldComputeEarliestTimestamp() {
-    // Given:
-    final Udaf<Timestamp, Struct, Timestamp> udaf = EarliestByOffset.earliest();
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BOOLEAN)));
-
-    // When:
-    final Struct res = udaf.aggregate(new Timestamp(123), EarliestByOffset.createStruct(STRUCT_TIMESTAMP, new Timestamp(321)));
-
-    // Then:
-    assertThat(res.get(VAL_FIELD), is(new Timestamp(321)));
-  }
-
-  @Test
-  public void shouldComputeEarliestNTimestamps() {
-    // Given:
-    final Udaf<Timestamp, List<Struct>, List<Timestamp>> udaf = EarliestByOffset.earliest(3);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.TIMESTAMP)));
-
-    // When:
-    final List<Struct> res = udaf.aggregate(new Timestamp(123),
-        Lists.newArrayList(EarliestByOffset.createStruct(STRUCT_TIMESTAMP, new Timestamp(321)),
-            EarliestByOffset.createStruct(STRUCT_TIMESTAMP, new Timestamp(456)),
-            EarliestByOffset.createStruct(STRUCT_TIMESTAMP, new Timestamp(654))));
-
-    // Then:
-    assertThat(res.size(), is(3));
-    assertThat(res.get(0).get(VAL_FIELD), is(new Timestamp(321)));
-    assertThat(res.get(1).get(VAL_FIELD), is(new Timestamp(456)));
-    assertThat(res.get(2).get(VAL_FIELD), is(new Timestamp(654)));
-  }
-
-  @Test
-  public void shouldComputeEarliestDate() {
-    // Given:
-    final Udaf<Date, Struct, Date> udaf = EarliestByOffset.earliest();
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.DATE)));
-
-    // When:
-    final Struct res = udaf.aggregate(new Date(123), EarliestByOffset.createStruct(STRUCT_DATE, new Date(321)));
-
-    // Then:
-    assertThat(res.get(VAL_FIELD), is(new Date(321)));
-  }
-
-  @Test
-  public void shouldComputeEarliestNDates() {
-    // Given:
-    final Udaf<Date, List<Struct>, List<Date>> udaf = EarliestByOffset.earliest(3);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.DATE)));
-
-    // When:
-    final List<Struct> res = udaf.aggregate(new Date(123),
-        Lists.newArrayList(EarliestByOffset.createStruct(STRUCT_DATE, new Date(321)),
-            EarliestByOffset.createStruct(STRUCT_DATE, new Date(456)),
-            EarliestByOffset.createStruct(STRUCT_DATE, new Date(654))));
-
-    // Then:
-    assertThat(res.size(), is(3));
-    assertThat(res.get(0).get(VAL_FIELD), is(new Date(321)));
-    assertThat(res.get(1).get(VAL_FIELD), is(new Date(456)));
-    assertThat(res.get(2).get(VAL_FIELD), is(new Date(654)));
-  }
-
-  @Test
-  public void shouldComputeEarliestTime() {
-    // Given:
-    final Udaf<Time, Struct, Time> udaf = EarliestByOffset.earliest();
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.TIME)));
-
-    // When:
-    final Struct res = udaf.aggregate(new Time(123), EarliestByOffset.createStruct(STRUCT_TIME, new Time(321)));
-
-    // Then:
-    assertThat(res.get(VAL_FIELD), is(new Time(321)));
-  }
-
-  @Test
-  public void shouldComputeEarliestNTimes() {
-    // Given:
-    final Udaf<Time, List<Struct>, List<Time>> udaf = EarliestByOffset.earliest(3);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.TIME)));
-
-    // When:
-    final List<Struct> res = udaf.aggregate(new Time(123),
-        Lists.newArrayList(EarliestByOffset.createStruct(STRUCT_TIME, new Time(321)),
-            EarliestByOffset.createStruct(STRUCT_TIME, new Time(456)),
-            EarliestByOffset.createStruct(STRUCT_TIME, new Time(654))));
-
-    // Then:
-    assertThat(res.size(), is(3));
-    assertThat(res.get(0).get(VAL_FIELD), is(new Time(321)));
-    assertThat(res.get(1).get(VAL_FIELD), is(new Time(456)));
-    assertThat(res.get(2).get(VAL_FIELD), is(new Time(654)));
-  }
-
-  @Test
-  public void shouldComputeEarliestBytes() {
-    // Given:
-    final Udaf<Timestamp, Struct, Timestamp> udaf = EarliestByOffset.earliest();
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.TIMESTAMP)));
-
-    // When:
-    final Struct res = udaf.aggregate(new Timestamp(123), EarliestByOffset.createStruct(STRUCT_TIMESTAMP, new Timestamp(321)));
-
-    // Then:
-    assertThat(res.get(VAL_FIELD), is(new Timestamp(321)));
-  }
-
-  @Test
-  public void shouldComputeEarliestNBytes() {
-    // Given:
-    final Udaf<ByteBuffer, List<Struct>, List<ByteBuffer>> udaf = EarliestByOffset.earliest(3);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.BYTES)));
-
-    // When:
-    final List<Struct> res = udaf.aggregate(ByteBuffer.wrap(new byte[] { 123 }),
-        Lists.newArrayList(EarliestByOffset.createStruct(STRUCT_BYTES, ByteBuffer.wrap(new byte[] { 1 })),
-            EarliestByOffset.createStruct(STRUCT_BYTES, ByteBuffer.wrap(new byte[] { 2 })),
-            EarliestByOffset.createStruct(STRUCT_BYTES, ByteBuffer.wrap(new byte[] { 3 }))));
-
-    // Then:
-    assertThat(res.size(), is(3));
-    assertThat(res.get(0).get(VAL_FIELD), is(ByteBuffer.wrap(new byte[] { 1 })));
-    assertThat(res.get(1).get(VAL_FIELD), is(ByteBuffer.wrap(new byte[] { 2 })));
-    assertThat(res.get(2).get(VAL_FIELD), is(ByteBuffer.wrap(new byte[] { 3 })));
-  }
-
-  @Test
-  public void shouldComputeEarliestString() {
-    // Given:
-    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliest();
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
-
-    // When:
-    final Struct res = udaf.aggregate("foo", EarliestByOffset.createStruct(STRUCT_STRING, "bar"));
-
-    // Then:
-    assertThat(res.getString(VAL_FIELD), is("bar"));
-  }
-
-  @Test
-  public void shouldComputeEarliestNStrings() {
-    // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset.earliest(3);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
-
-    // When:
-    final List<Struct> res = udaf.aggregate("boo",
-        Lists.newArrayList(EarliestByOffset.createStruct(STRUCT_STRING, "foo"),
-            EarliestByOffset.createStruct(STRUCT_STRING, "bar"),
-            EarliestByOffset.createStruct(STRUCT_STRING, "baz")));
-
-    // Then:
-    assertThat(res.size(), is(3));
-    assertThat(res.get(0).get(VAL_FIELD), is("foo"));
-    assertThat(res.get(1).get(VAL_FIELD), is("bar"));
-    assertThat(res.get(2).get(VAL_FIELD), is("baz"));
-  }
-
-  @Test
-  public void shouldNotAcceptNullAsEarliest() {
-    // Given:
-    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliest();
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
-
-    // When:
-    final Struct res = udaf
-        .aggregate(null, udaf.initialize());
-
-    // Then:
-    assertThat(res, is(nullValue()));
-
-    // When:
-    final Struct res2 = udaf
-        .aggregate("value", res);
-
-    // Then:
-    assertThat(res2.getString(VAL_FIELD), is("value"));
-  }
-
-  @Test
-  public void shouldAcceptNullAsEarliest() {
-    // Given:
-    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliest(false);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
-
-
-    // When:
-    final Struct res = udaf
-        .aggregate(null, udaf.initialize());
-
-    // Then:
-    assertThat(res.getString(VAL_FIELD), is(nullValue()));
-
-    // When:
-    final Struct res2 = udaf
-        .aggregate("value", res);
-
-    // Then:
-    assertThat(res2.getString(VAL_FIELD), is(nullValue()));
-  }
-
-  @Test
-  public void shouldNotAcceptNullAsEarliestN() {
-    // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset
-        .earliest(1);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
-
-    // When:
-    final List<Struct> res = udaf
-        .aggregate(null, udaf.initialize());
-
-    // Then:
-    assertThat(res, is(empty()));
-  }
-
-  @Test
-  public void shouldAcceptNullAsEarliestN() {
-    // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset
-        .earliest(1, false);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
-
-
-    // When:
-    final List<Struct> res = udaf
-        .aggregate(null, udaf.initialize());
-
-    // Then:
-    assertThat(res, hasSize(1));
-    assertThat(res.get(0).getString(VAL_FIELD), is(nullValue()));
-  }
-
-  @Test
-  public void shouldMapInitialized() {
-    // Given:
-    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliest();
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
-
-
-    final Struct init = udaf.initialize();
-
-    // When:
-    final String result = udaf.map(init);
-
-    // Then:
-    assertThat(result, is(nullValue()));
-  }
-
-  @Test
-  public void shouldMergeAndMapInitialized() {
-    // Given:
-    final Udaf<String, Struct, String> udaf = EarliestByOffset.earliest();
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
-
-
-    final Struct init1 = udaf.initialize();
-    final Struct init2 = udaf.initialize();
-
-    // When:
-    final Struct merged = udaf.merge(init1, init2);
-    final String result = udaf.map(merged);
-
-    // Then:
-    assertThat(result, is(nullValue()));
-  }
-
-  @Test
-  public void shouldMapInitializedN() {
-    // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset.earliest(2);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
-
-
-    final List<Struct> init = udaf.initialize();
-
-    // When:
-    final List<String> result = udaf.map(init);
-
-    // Then:
-    assertThat(result, is(empty()));
-  }
-
-  @Test
-  public void shouldMergeAndMapInitializedN() {
-    // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = EarliestByOffset.earliest(2);
-    udaf.initializeTypeArguments(Collections.singletonList(SqlArgument.of(SqlTypes.STRING)));
-
-
-    final List<Struct> init1 = udaf.initialize();
-    final List<Struct> init2 = udaf.initialize();
-
-    // When:
-    final List<Struct> merged = udaf.merge(init1, init2);
-    final List<String> result = udaf.map(merged);
-
-    // Then:
-    assertThat(result, is(empty()));
-  }
 }

From 51926d5f3f6a8c5264c3acd906212ed885592596 Mon Sep 17 00:00:00 2001
From: Jim Hughes <jhughes@confluent.io>
Date: Mon, 14 Mar 2022 20:35:15 -0400
Subject: [PATCH 4/5] feat: Sort out latest_by_offset.

---
 .../function/udaf/offset/LatestByOffset.java  | 334 ++-------
 .../udaf/offset/LatestByOffsetTest.java       | 694 ------------------
 .../7.2.0_1647304272090/plan.json             | 234 ++++++
 .../7.2.0_1647304272090/spec.json             | 241 ++++++
 .../7.2.0_1647304272090/topology              |  25 +
 .../7.2.0_1647304271909/plan.json             | 234 ++++++
 .../7.2.0_1647304271909/spec.json             | 219 ++++++
 .../7.2.0_1647304271909/topology              |  25 +
 .../7.2.0_1647304272361/plan.json             | 234 ++++++
 .../7.2.0_1647304272361/spec.json             | 145 ++++
 .../7.2.0_1647304272361/topology              |  25 +
 .../7.2.0_1647304271978/plan.json             | 234 ++++++
 .../7.2.0_1647304271978/spec.json             | 185 +++++
 .../7.2.0_1647304271978/topology              |  25 +
 .../7.2.0_1647304272034/plan.json             | 234 ++++++
 .../7.2.0_1647304272034/spec.json             | 193 +++++
 .../7.2.0_1647304272034/topology              |  25 +
 .../latest-offset-udaf.json                   |  94 +++
 18 files changed, 2445 insertions(+), 955 deletions(-)
 delete mode 100644 ksqldb-engine/src/test/java/io/confluent/ksql/function/udaf/offset/LatestByOffsetTest.java
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_an_array_added/7.2.0_1647304272090/plan.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_an_array_added/7.2.0_1647304272090/spec.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_an_array_added/7.2.0_1647304272090/topology
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1647304271909/plan.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1647304271909/spec.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1647304271909/topology
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_decimals/7.2.0_1647304272361/plan.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_decimals/7.2.0_1647304272361/spec.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_decimals/7.2.0_1647304272361/topology
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_maps/7.2.0_1647304271978/plan.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_maps/7.2.0_1647304271978/spec.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_maps/7.2.0_1647304271978/topology
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_structs/7.2.0_1647304272034/plan.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_structs/7.2.0_1647304272034/spec.json
 create mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_structs/7.2.0_1647304272034/topology

diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/LatestByOffset.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/LatestByOffset.java
index 6f0997ab0ca0..ba9588aa4ea4 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/LatestByOffset.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/offset/LatestByOffset.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Confluent Inc.
+ * Copyright 2020 Confluent Inc.
  *
  * Licensed under the Confluent Community License (the "License"; you may not use
  * this file except in compliance with the License. You may obtain a copy of the
@@ -17,15 +17,6 @@
 
 import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.INTERMEDIATE_STRUCT_COMPARATOR;
 import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.INTERMEDIATE_STRUCT_COMPARATOR_IGNORE_NULLS;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_BOOLEAN;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_BYTES;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_DATE;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_DOUBLE;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_INTEGER;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_LONG;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_STRING;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_TIME;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_TIMESTAMP;
 import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.VAL_FIELD;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -33,14 +24,15 @@
 import io.confluent.ksql.function.udaf.Udaf;
 import io.confluent.ksql.function.udaf.UdafDescription;
 import io.confluent.ksql.function.udaf.UdafFactory;
+import io.confluent.ksql.schema.ksql.SchemaConverters;
+import io.confluent.ksql.schema.ksql.SqlArgument;
+import io.confluent.ksql.schema.ksql.types.SqlArray;
+import io.confluent.ksql.schema.ksql.types.SqlType;
 import io.confluent.ksql.util.KsqlConstants;
-import java.nio.ByteBuffer;
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 import org.apache.kafka.connect.data.Schema;
@@ -54,254 +46,32 @@
 public final class LatestByOffset {
 
   static final String DESCRIPTION =
-      "This function returns the most recent N values for the column, computed by offset.";
+      "This function returns the oldest N values for the column, computed by offset.";
 
   private LatestByOffset() {
   }
 
   static final AtomicLong sequence = new AtomicLong();
 
-  @UdafFactory(description = "return the latest value of an integer column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL INT>")
-  public static Udaf<Integer, Struct, Integer> latestInteger() {
-    return latestInteger(true);
+  @UdafFactory(description = "return the latest value of a column")
+  public static <T> Udaf<T, Struct, T> latest() {
+    return latest(true);
   }
 
-  @UdafFactory(description = "return the latest value of an integer column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL INT>")
-  public static Udaf<Integer, Struct, Integer> latestInteger(final boolean ignoreNulls) {
-    return latest(STRUCT_INTEGER, ignoreNulls, getComparator(ignoreNulls));
+  @UdafFactory(description = "return the latest value of a column")
+  public static <T> Udaf<T, Struct, T> latest(final boolean ignoreNulls) {
+    return latestT(ignoreNulls, getComparator(ignoreNulls));
   }
 
-  @UdafFactory(description = "return the latest N values of an integer column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL INT>>")
-  public static Udaf<Integer, List<Struct>, List<Integer>> latestIntegers(final int latestN) {
-    return latestIntegers(latestN, true);
+  @UdafFactory(description = "return the latest N values of a column")
+  public static <T> Udaf<T, List<Struct>, List<T>> latest(final int latestN) {
+    return latest(latestN, true);
   }
 
-  @UdafFactory(description = "return the latest N values of an integer column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL INT>>")
-  public static Udaf<Integer, List<Struct>, List<Integer>> latestIntegers(
-      final int latestN,
-      final boolean ignoreNulls
-  ) {
-    return latestN(STRUCT_INTEGER, latestN, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest value of an big integer column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL BIGINT>")
-  public static Udaf<Long, Struct, Long> latestLong() {
-    return latestLong(true);
-  }
-
-  @UdafFactory(description = "return the latest value of an big integer column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL BIGINT>")
-  public static Udaf<Long, Struct, Long> latestLong(final boolean ignoreNulls) {
-    return latest(STRUCT_LONG, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest N values of an big integer column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL BIGINT>>")
-  public static Udaf<Long, List<Struct>, List<Long>> latestLongs(final int latestN) {
-    return latestLongs(latestN, true);
-  }
-
-  @UdafFactory(description = "return the latest N values of an big integer column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL BIGINT>>")
-  public static Udaf<Long, List<Struct>, List<Long>> latestLongs(
-      final int latestN,
-      final boolean ignoreNulls
-  ) {
-    return latestN(STRUCT_LONG, latestN, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest value of a double column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL DOUBLE>")
-  public static Udaf<Double, Struct, Double> latestDouble() {
-    return latestDouble(true);
-  }
-
-  @UdafFactory(description = "return the latest value of a double column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL DOUBLE>")
-  public static Udaf<Double, Struct, Double> latestDouble(final boolean ignoreNulls) {
-    return latest(STRUCT_DOUBLE, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest N values of a double column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL DOUBLE>>")
-  public static Udaf<Double, List<Struct>, List<Double>> latestDoubles(final int latestN) {
-    return latestDoubles(latestN, true);
-  }
-
-  @UdafFactory(description = "return the latest N values of a double column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL DOUBLE>>")
-  public static Udaf<Double, List<Struct>, List<Double>> latestDoubles(
-      final int latestN,
-      final boolean ignoreNulls
-  ) {
-    return latestN(STRUCT_DOUBLE, latestN, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest value of a boolean column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL BOOLEAN>")
-  public static Udaf<Boolean, Struct, Boolean> latestBoolean() {
-    return latestBoolean(true);
-  }
-
-  @UdafFactory(description = "return the latest value of a boolean column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL BOOLEAN>")
-  public static Udaf<Boolean, Struct, Boolean> latestBoolean(final boolean ignoreNulls) {
-    return latest(STRUCT_BOOLEAN, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest N values of a boolean column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL BOOLEAN>>")
-  public static Udaf<Boolean, List<Struct>, List<Boolean>> latestBooleans(final int latestN) {
-    return latestBooleans(latestN, true);
-  }
-
-  @UdafFactory(description = "return the latest N values of a boolean column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL BOOLEAN>>")
-  public static Udaf<Boolean, List<Struct>, List<Boolean>> latestBooleans(
-      final int latestN,
-      final boolean ignoreNulls
-  ) {
-    return latestN(STRUCT_BOOLEAN, latestN, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest value of a string column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL STRING>")
-  public static Udaf<String, Struct, String> latestString() {
-    return latestString(true);
-  }
-
-  @UdafFactory(description = "return the latest value of a string column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL STRING>")
-  public static Udaf<String, Struct, String> latestString(final boolean ignoreNulls) {
-    return latest(STRUCT_STRING, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest N values of a string column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL STRING>>")
-  public static Udaf<String, List<Struct>, List<String>> latestStrings(final int latestN) {
-    return latestStrings(latestN, true);
-  }
-
-  @UdafFactory(description = "return the latest N values of a string column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL STRING>>")
-  public static Udaf<String, List<Struct>, List<String>> latestStrings(
-      final int latestN,
-      final boolean ignoreNulls
-  ) {
-    return latestN(STRUCT_STRING, latestN, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest value of a timestamp column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL TIMESTAMP>")
-  public static Udaf<Timestamp, Struct, Timestamp> latestTimestamp() {
-    return latestTimestamp(true);
-  }
-
-  @UdafFactory(description = "return the latest value of a timestamp column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL TIMESTAMP>")
-  public static Udaf<Timestamp, Struct, Timestamp> latestTimestamp(final boolean ignoreNulls) {
-    return latest(STRUCT_TIMESTAMP, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest N values of a timestamp column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL TIMESTAMP>>")
-  public static Udaf<Timestamp, List<Struct>, List<Timestamp>> latestTimestamps(final int latestN) {
-    return latestTimestamps(latestN, true);
-  }
-
-  @UdafFactory(description = "return the latest N values of a timestamp column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL TIMESTAMP>>")
-  public static Udaf<Timestamp, List<Struct>, List<Timestamp>> latestTimestamps(
-      final int latestN,
-      final boolean ignoreNulls
-  ) {
-    return latestN(STRUCT_TIMESTAMP, latestN, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest value of a date column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL DATE>")
-  public static Udaf<Date, Struct, Date> latestDate() {
-    return latestDate(true);
-  }
-
-  @UdafFactory(description = "return the latest value of a date column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL DATE>")
-  public static Udaf<Date, Struct, Date> latestDate(final boolean ignoreNulls) {
-    return latest(STRUCT_DATE, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest N values of a date column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL DATE>>")
-  public static Udaf<Date, List<Struct>, List<Date>> latestDates(final int latestN) {
-    return latestDates(latestN, true);
-  }
-
-  @UdafFactory(description = "return the latest N values of a date column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL DATE>>")
-  public static Udaf<Date, List<Struct>, List<Date>> latestDates(
-      final int latestN,
-      final boolean ignoreNulls
-  ) {
-    return latestN(STRUCT_DATE, latestN, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest value of a time column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL TIME>")
-  public static Udaf<Time, Struct, Time> latestTime() {
-    return latestTime(true);
-  }
-
-  @UdafFactory(description = "return the latest value of a time column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL TIME>")
-  public static Udaf<Time, Struct, Time> latestTime(final boolean ignoreNulls) {
-    return latest(STRUCT_TIME, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest N values of a time column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL TIME>>")
-  public static Udaf<Time, List<Struct>, List<Time>> latestTimes(final int latestN) {
-    return latestTimes(latestN, true);
-  }
-
-  @UdafFactory(description = "return the latest N values of a time column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL TIME>>")
-  public static Udaf<Time, List<Struct>, List<Time>> latestTimes(
-      final int latestN,
-      final boolean ignoreNulls
-  ) {
-    return latestN(STRUCT_TIME, latestN, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest value of a bytes column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL BYTES>")
-  public static Udaf<ByteBuffer, Struct, ByteBuffer> latestBytes() {
-    return latestBytes(true);
-  }
-
-  @UdafFactory(description = "return the latest value of a bytes column",
-      aggregateSchema = "STRUCT<SEQ BIGINT, VAL BYTES>")
-  public static Udaf<ByteBuffer, Struct, ByteBuffer> latestBytes(final boolean ignoreNulls) {
-    return latest(STRUCT_BYTES, ignoreNulls, getComparator(ignoreNulls));
-  }
-
-  @UdafFactory(description = "return the latest N values of a bytes column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL BYTES>>")
-  public static Udaf<ByteBuffer, List<Struct>, List<ByteBuffer>> latestBytes(final int latestN) {
-    return latestBytes(latestN, true);
-  }
-
-  @UdafFactory(description = "return the latest N values of a bytes column",
-      aggregateSchema = "ARRAY<STRUCT<SEQ BIGINT, VAL BYTES>>")
-  public static Udaf<ByteBuffer, List<Struct>, List<ByteBuffer>> latestBytes(
-      final int latestN,
-      final boolean ignoreNulls
-  ) {
-    return latestN(STRUCT_BYTES, latestN, ignoreNulls, getComparator(ignoreNulls));
+  @UdafFactory(description = "return the latest N values of a column")
+  public static <T> Udaf<T, List<Struct>, List<T>> latest(final int latestN,
+      final boolean ignoreNulls) {
+    return latestTN(latestN, ignoreNulls, getComparator(ignoreNulls));
   }
 
   @VisibleForTesting
@@ -314,12 +84,33 @@ private static long generateSequence() {
   }
 
   @VisibleForTesting
-  static <T> Udaf<T, Struct, T> latest(
-      final Schema structSchema,
+  static <T> Udaf<T, Struct, T> latestT(
       final boolean ignoreNulls,
-      final Comparator<Struct> comparator
+      final Comparator comparator
   ) {
     return new Udaf<T, Struct, T>() {
+      Schema structSchema;
+      SqlType aggregateType;
+      SqlType returnType;
+
+      @Override
+      public void initializeTypeArguments(final List<SqlArgument> argTypeList) {
+        returnType = argTypeList.get(0).getSqlTypeOrThrow();
+        final Schema connectType =
+            SchemaConverters.sqlToConnectConverter().toConnectSchema(returnType);
+        structSchema = KudafByOffsetUtils.buildSchema(connectType);
+        aggregateType = SchemaConverters.connectToSqlConverter().toSqlType(structSchema);
+      }
+
+      @Override
+      public Optional<SqlType> getAggregateSqlType() {
+        return Optional.of(aggregateType);
+      }
+
+      @Override
+      public Optional<SqlType> getReturnSqlType() {
+        return Optional.of(returnType);
+      }
 
       @Override
       public Struct initialize() {
@@ -355,18 +146,40 @@ public T map(final Struct agg) {
   }
 
   @VisibleForTesting
-  static <T> Udaf<T, List<Struct>, List<T>> latestN(
-      final Schema structSchema,
+  static <T> Udaf<T, List<Struct>, List<T>> latestTN(
       final int latestN,
       final boolean ignoreNulls,
-      final Comparator<Struct> comparator
+      final Comparator comparator
   ) {
-
     if (latestN <= 0) {
-      throw new KsqlFunctionException("earliestN must be 1 or greater");
+      throw new KsqlFunctionException("latestN must be 1 or greater");
     }
 
     return new Udaf<T, List<Struct>, List<T>>() {
+      Schema structSchema;
+      SqlType aggregateType;
+      SqlType returnType;
+
+      @Override
+      public void initializeTypeArguments(final List<SqlArgument> argTypeList) {
+        final SqlType inputType = argTypeList.get(0).getSqlTypeOrThrow();
+        final Schema connectType =
+            SchemaConverters.sqlToConnectConverter().toConnectSchema(inputType);
+        structSchema = KudafByOffsetUtils.buildSchema(connectType);
+        aggregateType =
+            SqlArray.of(SchemaConverters.connectToSqlConverter().toSqlType(structSchema));
+        returnType = SqlArray.of(inputType);
+      }
+
+      @Override
+      public Optional<SqlType> getAggregateSqlType() {
+        return Optional.of(aggregateType);
+      }
+
+      @Override
+      public Optional<SqlType> getReturnSqlType() {
+        return Optional.of(returnType);
+      }
 
       @Override
       public List<Struct> initialize() {
@@ -392,9 +205,8 @@ public List<Struct> merge(final List<Struct> aggOne, final List<Struct> aggTwo)
         final List<Struct> merged = new ArrayList<>(aggOne.size() + aggTwo.size());
         merged.addAll(aggOne);
         merged.addAll(aggTwo);
-        merged.sort(comparator);
-        final int start = merged.size() > latestN ? (merged.size() - latestN) : 0;
-        return merged.subList(start, merged.size());
+        merged.sort(INTERMEDIATE_STRUCT_COMPARATOR);
+        return merged.subList(0, Math.min(latestN, merged.size()));
       }
 
       @Override
diff --git a/ksqldb-engine/src/test/java/io/confluent/ksql/function/udaf/offset/LatestByOffsetTest.java b/ksqldb-engine/src/test/java/io/confluent/ksql/function/udaf/offset/LatestByOffsetTest.java
deleted file mode 100644
index 8d4558451571..000000000000
--- a/ksqldb-engine/src/test/java/io/confluent/ksql/function/udaf/offset/LatestByOffsetTest.java
+++ /dev/null
@@ -1,694 +0,0 @@
-/*
- * Copyright 2020 Confluent Inc.
- *
- * Licensed under the Confluent Community License (the "License"; you may not use
- * this file except in compliance with the License. You may obtain a copy of the
- * License at
- *
- * http://www.confluent.io/confluent-community-license
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package io.confluent.ksql.function.udaf.offset;
-
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.INTERMEDIATE_STRUCT_COMPARATOR_IGNORE_NULLS;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.SEQ_FIELD;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_BOOLEAN;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_BYTES;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_DATE;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_DOUBLE;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_INTEGER;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_LONG;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_STRING;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_TIME;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.STRUCT_TIMESTAMP;
-import static io.confluent.ksql.function.udaf.offset.KudafByOffsetUtils.VAL_FIELD;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-
-import com.google.common.collect.Lists;
-import io.confluent.ksql.function.udaf.Udaf;
-import io.confluent.ksql.util.KsqlException;
-import java.nio.ByteBuffer;
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.kafka.connect.data.Struct;
-import org.junit.Test;
-
-
-public class LatestByOffsetTest {
-
-  @Test
-  public void shouldInitialize() {
-    // Given:
-    final Udaf<Integer, Struct, Integer> udaf = LatestByOffset.latest(
-        STRUCT_LONG, true, INTERMEDIATE_STRUCT_COMPARATOR_IGNORE_NULLS);
-
-    // When:
-    final Struct init = udaf.initialize();
-
-    // Then:
-    assertThat(init, is(notNullValue()));
-  }
-
-  @Test
-  public void shouldInitializeLatestN() {
-    // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = LatestByOffset
-        .latestN(STRUCT_LONG, 2, true, INTERMEDIATE_STRUCT_COMPARATOR_IGNORE_NULLS);
-
-    // When:
-    final List<Struct> init = udaf.initialize();
-
-    // Then:
-    assertThat(init, is(empty()));
-  }
-
-  @Test
-  public void shouldThrowExceptionForInvalidN() {
-    try {
-      LatestByOffset.latestN(STRUCT_LONG, -1, true, INTERMEDIATE_STRUCT_COMPARATOR_IGNORE_NULLS);
-    } catch (KsqlException e) {
-      assertThat(e.getMessage(), is("earliestN must be 1 or greater"));
-    }
-  }
-
-  @Test
-  public void shouldComputeLatestInteger() {
-    // Given:
-    final Udaf<Integer, Struct, Integer> udaf = LatestByOffset.latestInteger();
-
-    // When:
-    Struct res = udaf.aggregate(123, LatestByOffset.createStruct(STRUCT_INTEGER, 321));
-
-    // Then:
-    assertThat(res.get(VAL_FIELD), is(123));
-  }
-
-  @Test
-  public void shouldComputeLatestNIntegers() {
-    // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = LatestByOffset.latestIntegers(2);
-
-    // When:
-    List<Struct> res = udaf
-        .aggregate(123, Lists.newArrayList(LatestByOffset.createStruct(STRUCT_INTEGER, 321)));
-
-    // Then:
-    assertThat(res.get(0).get(VAL_FIELD), is(321));
-    assertThat(res.get(1).get(VAL_FIELD), is(123));
-  }
-
-  @Test
-  public void shouldCaptureValuesUpToN() {
-    // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = LatestByOffset.latestIntegers(2);
-
-    // When:
-    final List<Struct> res0 = udaf.aggregate(321, new ArrayList<>());
-    final List<Struct> res1 = udaf.aggregate(123, res0);
-
-    // Then:
-    assertThat(res1, hasSize(2));
-    assertThat(res1.get(0).get(VAL_FIELD), is(321));
-    assertThat(res1.get(1).get(VAL_FIELD), is(123));
-  }
-
-  @Test
-  public void shouldCaptureValuesPastN() {
-    // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = LatestByOffset.latestIntegers(2);
-    final List<Struct> aggregate = Lists.newArrayList(
-        LatestByOffset.createStruct(STRUCT_INTEGER, 10),
-        LatestByOffset.createStruct(STRUCT_INTEGER, 3)
-    );
-
-    // When:
-    final List<Struct> result = udaf.aggregate(2, aggregate);
-
-    // Then:
-    assertThat(result, hasSize(2));
-    assertThat(result.get(0).get(VAL_FIELD), is(3));
-    assertThat(result.get(1).get(VAL_FIELD), is(2));
-  }
-
-  @Test
-  public void shouldMerge() {
-    // Given:
-    final Udaf<Integer, Struct, Integer> udaf = LatestByOffset.latestInteger();
-
-    final Struct agg1 = LatestByOffset.createStruct(STRUCT_INTEGER, 123);
-    final Struct agg2 = LatestByOffset.createStruct(STRUCT_INTEGER, 321);
-
-    // When:
-    final Struct merged1 = udaf.merge(agg1, agg2);
-    final Struct merged2 = udaf.merge(agg2, agg1);
-
-    // Then:
-    assertThat(merged1, is(agg2));
-    assertThat(merged2, is(agg2));
-  }
-
-  @Test
-  public void shouldMergeNIntegers() {
-    // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = LatestByOffset.latestIntegers(2);
-    final Struct struct1 = LatestByOffset.createStruct(STRUCT_INTEGER, 123);
-    final Struct struct2 = LatestByOffset.createStruct(STRUCT_INTEGER, 321);
-    final Struct struct3 = LatestByOffset.createStruct(STRUCT_INTEGER, 543);
-    final Struct struct4 = LatestByOffset.createStruct(STRUCT_INTEGER, 654);
-    final List<Struct> agg1 = new ArrayList<>(Lists.newArrayList(struct1, struct4));
-    final List<Struct> agg2 = new ArrayList<>(Lists.newArrayList(struct2, struct3));
-
-    // When:
-    final List<Struct> merged1 = udaf.merge(agg1, agg2);
-    final List<Struct> merged2 = udaf.merge(agg2, agg1);
-
-    // Then:
-    assertThat(merged1, contains(struct3, struct4));
-    assertThat(merged2, contains(struct3, struct4));
-  }
-
-  @Test
-  public void shouldMergeNIntegersSmallerThanN() {
-    // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = LatestByOffset.latestIntegers(5);
-    final Struct struct1 = LatestByOffset.createStruct(STRUCT_INTEGER, 123);
-    final Struct struct2 = LatestByOffset.createStruct(STRUCT_INTEGER, 321);
-    final Struct struct3 = LatestByOffset.createStruct(STRUCT_INTEGER, 543);
-    final Struct struct4 = LatestByOffset.createStruct(STRUCT_INTEGER, 654);
-    final List<Struct> agg1 = new ArrayList<>(Lists.newArrayList(struct1, struct4));
-    final List<Struct> agg2 = new ArrayList<>(Lists.newArrayList(struct2, struct3));
-
-    // When:
-    final List<Struct> merged1 = udaf.merge(agg1, agg2);
-    final List<Struct> merged2 = udaf.merge(agg2, agg1);
-
-    // Then:
-    assertThat(merged1, contains(struct1, struct2, struct3, struct4));
-    assertThat(merged1.size(), is(4));
-    assertThat(merged2, contains(struct1, struct2, struct3, struct4));
-    assertThat(merged2.size(), is(4));
-
-  }
-
-  @Test
-  public void shouldMergeWithOverflow() {
-    // Given:
-    final Udaf<Integer, Struct, Integer> udaf = LatestByOffset.latestInteger();
-
-    LatestByOffset.sequence.set(Long.MAX_VALUE);
-
-    final Struct agg1 = LatestByOffset.createStruct(STRUCT_INTEGER, 123);
-    final Struct agg2 = LatestByOffset.createStruct(STRUCT_INTEGER, 321);
-
-    // When:
-    final Struct merged1 = udaf.merge(agg1, agg2);
-    final Struct merged2 = udaf.merge(agg2, agg1);
-
-    // Then:
-    assertThat(agg1.getInt64(SEQ_FIELD), is(Long.MAX_VALUE));
-    assertThat(agg2.getInt64(SEQ_FIELD), is(Long.MIN_VALUE));
-    assertThat(merged1, is(agg2));
-    assertThat(merged2, is(agg2));
-  }
-
-  @Test
-  public void shouldMergeWithOverflowNIntegers() {
-    // Given:
-    final Udaf<Integer, List<Struct>, List<Integer>> udaf = LatestByOffset.latestIntegers(2);
-
-    LatestByOffset.sequence.set(Long.MAX_VALUE - 1);
-
-    final Struct struct1 = LatestByOffset.createStruct(STRUCT_INTEGER, 123);
-    final Struct struct2 = LatestByOffset.createStruct(STRUCT_INTEGER, 321);
-    final Struct struct3 = LatestByOffset.createStruct(STRUCT_INTEGER, 543);
-    final Struct struct4 = LatestByOffset.createStruct(STRUCT_INTEGER, 654);
-
-    final List<Struct> agg1 = Lists.newArrayList(struct1, struct2);
-    final List<Struct> agg2 = Lists.newArrayList(struct3, struct4);
-
-    // When:
-    final List<Struct> merged1 = udaf.merge(agg1, agg2);
-    final List<Struct> merged2 = udaf.merge(agg2, agg1);
-
-    // Then:
-    assertThat(agg1.get(0).getInt64(SEQ_FIELD), is(Long.MAX_VALUE - 1));
-    assertThat(agg2.get(0).getInt64(SEQ_FIELD), is(Long.MIN_VALUE));
-    assertThat(merged1, contains(struct3, struct4));
-    assertThat(merged2, contains(struct3, struct4));
-  }
-
-  @Test
-  public void shouldMergeIgnoringNulls() {
-    // Given:
-    final Udaf<Integer, Struct, Integer> udaf = LatestByOffset.latestInteger();
-
-    final Struct agg1 = LatestByOffset.createStruct(STRUCT_INTEGER, 123);
-    final Struct agg2 = LatestByOffset.createStruct(STRUCT_INTEGER, null);
-
-    // When:
-    final Struct merged1 = udaf.merge(agg1, agg2);
-    final Struct merged2 = udaf.merge(agg2, agg1);
-
-    // Then:
-    assertThat(merged1, is(agg1));
-    assertThat(merged2, is(agg1));
-  }
-
-  @Test
-  public void shouldComputeLatestLong() {
-    // Given:
-    final Udaf<Long, Struct, Long> udaf = LatestByOffset.latestLong();
-
-    // When:
-    final Struct res = udaf.aggregate(123L, LatestByOffset.createStruct(STRUCT_LONG, 321L));
-
-    // Then:
-    assertThat(res.getInt64(VAL_FIELD), is(123L));
-  }
-
-  @Test
-  public void shouldComputeLatestNLongs() {
-    // Given:
-    final Udaf<Long, List<Struct>, List<Long>> udaf = LatestByOffset.latestLongs(3);
-
-    // When:
-    final List<Struct> res = udaf
-        .aggregate(123L, Lists.newArrayList(LatestByOffset.createStruct(STRUCT_LONG, 321L)));
-
-    final List<Struct> res2 = udaf
-        .aggregate(543L, res);
-
-    final List<Struct> res3 = udaf
-        .aggregate(654L, res2);
-
-    // Then:
-    assertThat(res3.size(), is(3));
-    assertThat(res3.get(0).get(VAL_FIELD), is(123L));
-    assertThat(res3.get(1).get(VAL_FIELD), is(543L));
-    assertThat(res3.get(2).get(VAL_FIELD), is(654L));
-  }
-
-  @Test
-  public void shouldComputeLatestDouble() {
-    // Given:
-    final Udaf<Double, Struct, Double> udaf = LatestByOffset.latestDouble();
-
-    // When:
-    final Struct res = udaf.aggregate(1.1d, LatestByOffset.createStruct(STRUCT_DOUBLE, 2.2d));
-
-    // Then:
-    assertThat(res.getFloat64(VAL_FIELD), is(1.1d));
-  }
-
-  @Test
-  public void shouldComputeLatestNDoubles() {
-    // Given:
-    final Udaf<Double, List<Struct>, List<Double>> udaf = LatestByOffset.latestDoubles(1);
-
-    // When:
-    final List<Struct> res = udaf
-        .aggregate(1.1d, Lists.newArrayList(EarliestByOffset.createStruct(STRUCT_DOUBLE, 2.2d)));
-
-    // Then:
-    assertThat(res.size(), is(1));
-    assertThat(res.get(0).get(VAL_FIELD), is(1.1d));
-  }
-
-  @Test
-  public void shouldComputeLatestBoolean() {
-    // Given:
-    final Udaf<Boolean, Struct, Boolean> udaf = LatestByOffset.latestBoolean();
-
-    // When:
-    final Struct res = udaf.aggregate(true, LatestByOffset.createStruct(STRUCT_BOOLEAN, false));
-
-    // Then:
-    assertThat(res.getBoolean(VAL_FIELD), is(true));
-  }
-
-  @Test
-  public void shouldComputeLatestNBooleans() {
-    // Given:
-    final Udaf<Boolean, List<Struct>, List<Boolean>> udaf = LatestByOffset.latestBooleans(2);
-
-    // When:
-    final List<Struct> res = udaf
-        .aggregate(true, Lists.newArrayList(LatestByOffset.createStruct(STRUCT_BOOLEAN, false)));
-
-    // Then:
-    assertThat(res.size(), is(2));
-    assertThat(res.get(0).get(VAL_FIELD), is(false));
-    assertThat(res.get(1).get(VAL_FIELD), is(true));
-  }
-
-  @Test
-  public void shouldComputeLatestString() {
-    // Given:
-    final Udaf<String, Struct, String> udaf = LatestByOffset.latestString();
-
-    // When:
-    final Struct res = udaf.aggregate("foo", LatestByOffset.createStruct(STRUCT_STRING, "bar"));
-
-    // Then:
-    assertThat(res.getString(VAL_FIELD), is("foo"));
-  }
-
-  @Test
-  public void shouldComputeLatestNStrings() {
-    // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = LatestByOffset.latestStrings(3);
-
-    // When:
-    final List<Struct> res = udaf.aggregate("boo",
-        Lists.newArrayList(LatestByOffset.createStruct(STRUCT_STRING, "foo"),
-            LatestByOffset.createStruct(STRUCT_STRING, "bar"),
-            LatestByOffset.createStruct(STRUCT_STRING, "baz")));
-
-    // Then:
-    assertThat(res.size(), is(3));
-    assertThat(res.get(0).get(VAL_FIELD), is("bar"));
-    assertThat(res.get(1).get(VAL_FIELD), is("baz"));
-    assertThat(res.get(2).get(VAL_FIELD), is("boo"));
-  }
-
-  @Test
-  public void shouldComputeLatestTimestamp() {
-    // Given:
-    final Udaf<Timestamp, Struct, Timestamp> udaf = LatestByOffset.latestTimestamp();
-
-    // When:
-    final Struct res = udaf.aggregate(new Timestamp(123), LatestByOffset.createStruct(STRUCT_TIMESTAMP, new Timestamp(456)));
-
-    // Then:
-    assertThat(res.get(VAL_FIELD), is(new Timestamp(123)));
-  }
-
-  @Test
-  public void shouldComputeLatestNTimestamps() {
-    // Given:
-    final Udaf<Timestamp, List<Struct>, List<Timestamp>> udaf = LatestByOffset.latestTimestamps(3);
-
-    // When:
-    final List<Struct> res = udaf.aggregate(new Timestamp(123),
-        Lists.newArrayList(LatestByOffset.createStruct(STRUCT_TIMESTAMP, new Timestamp(1)),
-            LatestByOffset.createStruct(STRUCT_TIMESTAMP, new Timestamp(2)),
-            LatestByOffset.createStruct(STRUCT_TIMESTAMP, new Timestamp(3))));
-
-    // Then:
-    assertThat(res.size(), is(3));
-    assertThat(res.get(0).get(VAL_FIELD), is(new Timestamp(2)));
-    assertThat(res.get(1).get(VAL_FIELD), is(new Timestamp(3)));
-    assertThat(res.get(2).get(VAL_FIELD), is(new Timestamp(123)));
-  }
-
-  @Test
-  public void shouldComputeLatestTime() {
-    // Given:
-    final Udaf<Time, Struct, Time> udaf = LatestByOffset.latestTime();
-
-    // When:
-    final Struct res = udaf.aggregate(new Time(1), LatestByOffset.createStruct(STRUCT_TIME, new Time(5)));
-
-    // Then:
-    assertThat(res.get(VAL_FIELD), is(new Time(1)));
-  }
-
-  @Test
-  public void shouldComputeLatestNTimes() {
-    // Given:
-    final Udaf<Time, List<Struct>, List<Time>> udaf = LatestByOffset.latestTimes(3);
-
-    // When:
-    final List<Struct> res = udaf.aggregate(new Time(3),
-        Lists.newArrayList(LatestByOffset.createStruct(STRUCT_TIME, new Time(6)),
-            LatestByOffset.createStruct(STRUCT_TIME, new Time(5)),
-            LatestByOffset.createStruct(STRUCT_TIME, new Time(4))));
-
-    // Then:
-    assertThat(res.size(), is(3));
-    assertThat(res.get(0).get(VAL_FIELD), is(new Time(5)));
-    assertThat(res.get(1).get(VAL_FIELD), is(new Time(4)));
-    assertThat(res.get(2).get(VAL_FIELD), is(new Time(3)));
-  }
-
-  @Test
-  public void shouldComputeLatestDate() {
-    // Given:
-    final Udaf<Date, Struct, Date> udaf = LatestByOffset.latestDate();
-
-    // When:
-    final Struct res = udaf.aggregate(new Date(123), LatestByOffset.createStruct(STRUCT_DATE, new Date(456)));
-
-    // Then:
-    assertThat(res.get(VAL_FIELD), is(new Date(123)));
-  }
-
-  @Test
-  public void shouldComputeLatestNDates() {
-    // Given:
-    final Udaf<Date, List<Struct>, List<Date>> udaf = LatestByOffset.latestDates(3);
-
-    // When:
-    final List<Struct> res = udaf.aggregate(new Date(123),
-        Lists.newArrayList(LatestByOffset.createStruct(STRUCT_DATE, new Date(1)),
-            LatestByOffset.createStruct(STRUCT_DATE, new Date(2)),
-            LatestByOffset.createStruct(STRUCT_DATE, new Date(3))));
-
-    // Then:
-    assertThat(res.size(), is(3));
-    assertThat(res.get(0).get(VAL_FIELD), is(new Date(2)));
-    assertThat(res.get(1).get(VAL_FIELD), is(new Date(3)));
-    assertThat(res.get(2).get(VAL_FIELD), is(new Date(123)));
-  }
-
-  @Test
-  public void shouldComputeLatestBytes() {
-    // Given:
-    final Udaf<ByteBuffer, Struct, ByteBuffer> udaf = LatestByOffset.latestBytes();
-
-    // When:
-    final Struct res = udaf.aggregate(
-        ByteBuffer.wrap(new byte[] { 123 }),
-        LatestByOffset.createStruct(STRUCT_BYTES, ByteBuffer.wrap(new byte[] { 23 })));
-
-    // Then:
-    assertThat(res.get(VAL_FIELD), is(ByteBuffer.wrap(new byte[] { 123 })));
-  }
-
-  @Test
-  public void shouldComputeLatestNBytes() {
-    // Given:
-    final Udaf<ByteBuffer, List<Struct>, List<ByteBuffer>> udaf = LatestByOffset.latestBytes(3);
-
-    // When:
-    final List<Struct> res = udaf.aggregate(ByteBuffer.wrap(new byte[] { 123 }),
-        Lists.newArrayList(LatestByOffset.createStruct(STRUCT_BYTES, ByteBuffer.wrap(new byte[] { 1 })),
-            LatestByOffset.createStruct(STRUCT_BYTES, ByteBuffer.wrap(new byte[] { 2 })),
-            LatestByOffset.createStruct(STRUCT_BYTES, ByteBuffer.wrap(new byte[] { 3 }))));
-
-    // Then:
-    assertThat(res.size(), is(3));
-    assertThat(res.get(0).get(VAL_FIELD), is(ByteBuffer.wrap(new byte[] { 2 })));
-    assertThat(res.get(1).get(VAL_FIELD), is(ByteBuffer.wrap(new byte[] { 3 })));
-    assertThat(res.get(2).get(VAL_FIELD), is(ByteBuffer.wrap(new byte[] { 123 })));
-  }
-
-  @Test
-  public void shouldNotAcceptFirstNullAsLatest() {
-    // Given:
-    final Udaf<String, Struct, String> udaf = LatestByOffset.latestString(true);
-
-    // When:
-    final Struct res = udaf
-        .aggregate(null, udaf.initialize());
-
-    // Then:
-    assertThat(res.getString(VAL_FIELD), is(nullValue()));
-
-    // When:
-    final Struct res2 = udaf
-        .aggregate("value", res);
-
-    // Then:
-    assertThat(res2.getString(VAL_FIELD), is("value"));
-  }
-
-  @Test
-  public void shouldAcceptFirstNullAsLatest() {
-    // Given:
-    final Udaf<String, Struct, String> udaf = LatestByOffset.latestString(false);
-
-    // When:
-    final Struct res = udaf
-        .aggregate(null, udaf.initialize());
-
-    // Then:
-    assertThat(res.getString(VAL_FIELD), is(nullValue()));
-  }
-
-  @Test
-  public void shouldNotAcceptFirstNullAsLatestN() {
-    // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = LatestByOffset
-        .latestStrings(2, true);
-
-    // When:
-    final List<Struct> res = udaf
-        .aggregate(null, udaf.initialize());
-
-    // Then:
-    assertThat(res, is(empty()));
-  }
-
-  @Test
-  public void shouldAcceptFirstNullAsLatestN() {
-    // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = LatestByOffset
-        .latestStrings(2, false);
-
-    // When:
-    final List<Struct> res = udaf
-        .aggregate(null, udaf.initialize());
-
-    // Then:
-    assertThat(res, hasSize(1));
-    assertThat(res.get(0).getString(VAL_FIELD), is(nullValue()));
-  }
-
-  @Test
-  public void shouldNotAcceptSubsequentNullAsLatest() {
-    // Given:
-    final Udaf<String, Struct, String> udaf = LatestByOffset.latestString(true);
-
-    final Struct aggregate = udaf.aggregate("value", udaf.initialize());
-
-    // When:
-    final Struct res = udaf
-        .aggregate(null, aggregate);
-
-    // Then:
-    assertThat(res.getString(VAL_FIELD), is("value"));
-  }
-
-  @Test
-  public void shouldAcceptSubsequentNullAsLatest() {
-    // Given:
-    final Udaf<String, Struct, String> udaf = LatestByOffset.latestString(false);
-
-    final Struct aggregate = udaf.aggregate("value", udaf.initialize());
-
-    // When:
-    final Struct res = udaf
-        .aggregate(null, aggregate);
-
-    // Then:
-    assertThat(res.getString(VAL_FIELD), is(nullValue()));
-  }
-
-  @Test
-  public void shouldNotAcceptSubsequentNullAsLatestN() {
-    // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = LatestByOffset
-        .latestStrings(2, true);
-
-    final List<Struct> aggregate = udaf.aggregate("bar", udaf.initialize());
-
-    // When:
-    final List<Struct> res = udaf.aggregate(null, aggregate);
-
-    // Then:
-    assertThat(res, hasSize(1));
-    assertThat(res.get(0).getString(VAL_FIELD), is("bar"));
-  }
-
-  @Test
-  public void shouldAcceptSubsequentNullAsLatestN() {
-    // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = LatestByOffset
-        .latestStrings(2, false);
-
-    final List<Struct> aggregate = udaf.aggregate("bar", udaf.initialize());
-
-    // When:
-    final List<Struct> res = udaf.aggregate(null, aggregate);
-
-    // Then:
-    assertThat(res, hasSize(2));
-    assertThat(res.get(0).getString(VAL_FIELD), is("bar"));
-    assertThat(res.get(1).getString(VAL_FIELD), is(nullValue()));
-  }
-
-  @Test
-  public void shouldMapInitialized() {
-    // Given:
-    final Udaf<String, Struct, String> udaf = LatestByOffset.latestString();
-
-    final Struct init = udaf.initialize();
-
-    // When:
-    final String result = udaf.map(init);
-
-    // Then:
-    assertThat(result, is(nullValue()));
-  }
-
-  @Test
-  public void shouldMergeAndMapInitialized() {
-    // Given:
-    final Udaf<String, Struct, String> udaf = LatestByOffset.latestString();
-
-    final Struct init1 = udaf.initialize();
-    final Struct init2 = udaf.initialize();
-
-    // When:
-    final Struct merged = udaf.merge(init1, init2);
-    final String result = udaf.map(merged);
-
-    // Then:
-    assertThat(result, is(nullValue()));
-  }
-
-  @Test
-  public void shouldMapInitializedN() {
-    // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = LatestByOffset.latestStrings(2);
-
-    final List<Struct> init = udaf.initialize();
-
-    // When:
-    final List<String> result = udaf.map(init);
-
-    // Then:
-    assertThat(result, is(empty()));
-  }
-
-  @Test
-  public void shouldMergeAndMapInitializedN() {
-    // Given:
-    final Udaf<String, List<Struct>, List<String>> udaf = LatestByOffset.latestStrings(2);
-
-    final List<Struct> init1 = udaf.initialize();
-    final List<Struct> init2 = udaf.initialize();
-
-    // When:
-    final List<Struct> merged = udaf.merge(init1, init2);
-    final List<String> result = udaf.map(merged);
-
-    // Then:
-    assertThat(result, is(empty()));
-  }
-}
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_an_array_added/7.2.0_1647304272090/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_an_array_added/7.2.0_1647304272090/plan.json
new file mode 100644
index 000000000000..ae30bfe8121d
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_an_array_added/7.2.0_1647304272090/plan.json
@@ -0,0 +1,234 @@
+{
+  "plan" : [ {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE STREAM INPUT (ID BIGINT KEY, F0 INTEGER, F1 BIGINT, F2 DOUBLE, F3 BOOLEAN, F4 STRING, F5 TIMESTAMP, F6 TIME, F7 DATE, F8 BYTES, F9 ARRAY<INTEGER>) WITH (KAFKA_TOPIC='test_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');",
+    "ddlCommand" : {
+      "@type" : "createStreamV1",
+      "sourceName" : "INPUT",
+      "schema" : "`ID` BIGINT KEY, `F0` INTEGER, `F1` BIGINT, `F2` DOUBLE, `F3` BOOLEAN, `F4` STRING, `F5` TIMESTAMP, `F6` TIME, `F7` DATE, `F8` BYTES, `F9` ARRAY<INTEGER>",
+      "topicName" : "test_topic",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    }
+  }, {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE TABLE OUTPUT AS SELECT\n  INPUT.ID ID,\n  LATEST_BY_OFFSET(INPUT.F0) L0,\n  LATEST_BY_OFFSET(INPUT.F1) L1,\n  LATEST_BY_OFFSET(INPUT.F2) L2,\n  LATEST_BY_OFFSET(INPUT.F3) L3,\n  LATEST_BY_OFFSET(INPUT.F4) L4,\n  LATEST_BY_OFFSET(INPUT.F5) L5,\n  LATEST_BY_OFFSET(INPUT.F6) L6,\n  LATEST_BY_OFFSET(INPUT.F7) L7,\n  LATEST_BY_OFFSET(INPUT.F8) L8,\n  LATEST_BY_OFFSET(INPUT.F9) L9\nFROM INPUT INPUT\nGROUP BY INPUT.ID\nEMIT CHANGES",
+    "ddlCommand" : {
+      "@type" : "createTableV1",
+      "sourceName" : "OUTPUT",
+      "schema" : "`ID` BIGINT KEY, `L0` INTEGER, `L1` BIGINT, `L2` DOUBLE, `L3` BOOLEAN, `L4` STRING, `L5` TIMESTAMP, `L6` TIME, `L7` DATE, `L8` BYTES, `L9` ARRAY<INTEGER>",
+      "topicName" : "OUTPUT",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    },
+    "queryPlan" : {
+      "sources" : [ "INPUT" ],
+      "sink" : "OUTPUT",
+      "physicalPlan" : {
+        "@type" : "tableSinkV1",
+        "properties" : {
+          "queryContext" : "OUTPUT"
+        },
+        "source" : {
+          "@type" : "tableSelectV1",
+          "properties" : {
+            "queryContext" : "Aggregate/Project"
+          },
+          "source" : {
+            "@type" : "streamAggregateV1",
+            "properties" : {
+              "queryContext" : "Aggregate/Aggregate"
+            },
+            "source" : {
+              "@type" : "streamGroupByKeyV1",
+              "properties" : {
+                "queryContext" : "Aggregate/GroupBy"
+              },
+              "source" : {
+                "@type" : "streamSelectV1",
+                "properties" : {
+                  "queryContext" : "Aggregate/Prepare"
+                },
+                "source" : {
+                  "@type" : "streamSourceV1",
+                  "properties" : {
+                    "queryContext" : "KsqlTopic/Source"
+                  },
+                  "topicName" : "test_topic",
+                  "formats" : {
+                    "keyFormat" : {
+                      "format" : "KAFKA"
+                    },
+                    "valueFormat" : {
+                      "format" : "JSON"
+                    }
+                  },
+                  "sourceSchema" : "`ID` BIGINT KEY, `F0` INTEGER, `F1` BIGINT, `F2` DOUBLE, `F3` BOOLEAN, `F4` STRING, `F5` TIMESTAMP, `F6` TIME, `F7` DATE, `F8` BYTES, `F9` ARRAY<INTEGER>",
+                  "pseudoColumnVersion" : 1
+                },
+                "keyColumnNames" : [ "ID" ],
+                "selectExpressions" : [ "ID AS ID", "F0 AS F0", "F1 AS F1", "F2 AS F2", "F3 AS F3", "F4 AS F4", "F5 AS F5", "F6 AS F6", "F7 AS F7", "F8 AS F8", "F9 AS F9" ]
+              },
+              "internalFormats" : {
+                "keyFormat" : {
+                  "format" : "KAFKA"
+                },
+                "valueFormat" : {
+                  "format" : "JSON"
+                }
+              }
+            },
+            "internalFormats" : {
+              "keyFormat" : {
+                "format" : "KAFKA"
+              },
+              "valueFormat" : {
+                "format" : "JSON"
+              }
+            },
+            "nonAggregateColumns" : [ "ID", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9" ],
+            "aggregationFunctions" : [ "LATEST_BY_OFFSET(F0)", "LATEST_BY_OFFSET(F1)", "LATEST_BY_OFFSET(F2)", "LATEST_BY_OFFSET(F3)", "LATEST_BY_OFFSET(F4)", "LATEST_BY_OFFSET(F5)", "LATEST_BY_OFFSET(F6)", "LATEST_BY_OFFSET(F7)", "LATEST_BY_OFFSET(F8)", "LATEST_BY_OFFSET(F9)" ]
+          },
+          "keyColumnNames" : [ "ID" ],
+          "selectExpressions" : [ "KSQL_AGG_VARIABLE_0 AS L0", "KSQL_AGG_VARIABLE_1 AS L1", "KSQL_AGG_VARIABLE_2 AS L2", "KSQL_AGG_VARIABLE_3 AS L3", "KSQL_AGG_VARIABLE_4 AS L4", "KSQL_AGG_VARIABLE_5 AS L5", "KSQL_AGG_VARIABLE_6 AS L6", "KSQL_AGG_VARIABLE_7 AS L7", "KSQL_AGG_VARIABLE_8 AS L8", "KSQL_AGG_VARIABLE_9 AS L9" ],
+          "internalFormats" : {
+            "keyFormat" : {
+              "format" : "KAFKA"
+            },
+            "valueFormat" : {
+              "format" : "JSON"
+            }
+          }
+        },
+        "formats" : {
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        },
+        "topicName" : "OUTPUT"
+      },
+      "queryId" : "CTAS_OUTPUT_0"
+    }
+  } ],
+  "configs" : {
+    "ksql.extension.dir" : "ext",
+    "ksql.streams.cache.max.bytes.buffering" : "0",
+    "metric.reporters" : "",
+    "ksql.query.status.running.threshold.seconds" : "300",
+    "ksql.connect.basic.auth.credentials.reload" : "false",
+    "ksql.output.topic.name.prefix" : "",
+    "ksql.query.pull.stream.enabled" : "true",
+    "ksql.query.push.v2.interpreter.enabled" : "true",
+    "ksql.queryanonymizer.logs_enabled" : "true",
+    "ksql.variable.substitution.enable" : "true",
+    "ksql.streams.shutdown.timeout.ms" : "300000",
+    "ksql.query.pull.max.allowed.offset.lag" : "9223372036854775807",
+    "ksql.query.pull.max.qps" : "2147483647",
+    "ksql.access.validator.enable" : "auto",
+    "ksql.streams.bootstrap.servers" : "localhost:0",
+    "ksql.query.pull.metrics.enabled" : "true",
+    "ksql.metrics.extension" : null,
+    "ksql.query.push.v2.alos.enabled" : "true",
+    "ksql.query.push.v2.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.query.pull.range.scan.enabled" : "true",
+    "ksql.transient.query.cleanup.service.initial.delay.seconds" : "600",
+    "ksql.hidden.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.lambdas.enabled" : "true",
+    "ksql.source.table.materialization.enabled" : "true",
+    "ksql.query.pull.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.sink.window.change.log.additional.retention" : "1000000",
+    "ksql.query.persistent.active.limit" : "2147483647",
+    "ksql.persistence.wrap.single.values" : null,
+    "ksql.query.transient.max.bytes.buffering.total" : "-1",
+    "ksql.connect.basic.auth.credentials.source" : "NONE",
+    "ksql.schema.registry.url" : "schema_registry.url:0",
+    "ksql.properties.overrides.denylist" : "",
+    "ksql.service.id" : "some.ksql.service.id",
+    "ksql.query.push.v2.max.catchup.consumers" : "5",
+    "ksql.query.push.v2.enabled" : "false",
+    "ksql.transient.query.cleanup.service.enable" : "true",
+    "ksql.query.push.v2.metrics.enabled" : "true",
+    "ksql.rowpartition.rowoffset.enabled" : "true",
+    "ksql.streams.commit.interval.ms" : "2000",
+    "ksql.query.pull.table.scan.enabled" : "true",
+    "ksql.streams.auto.commit.interval.ms" : "0",
+    "ksql.streams.topology.optimization" : "all",
+    "ksql.endpoint.migrate.query" : "true",
+    "ksql.query.push.v2.registry.installed" : "false",
+    "ksql.streams.num.stream.threads" : "4",
+    "ksql.metrics.tags.custom" : "",
+    "ksql.query.push.v2.catchup.consumer.msg.window" : "50",
+    "ksql.runtime.feature.shared.enabled" : "false",
+    "ksql.udf.collect.metrics" : "false",
+    "ksql.new.query.planner.enabled" : "false",
+    "ksql.connect.request.headers.plugin" : null,
+    "ksql.security.extension.class" : null,
+    "ksql.transient.prefix" : "transient_",
+    "ksql.headers.columns.enabled" : "true",
+    "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler",
+    "ksql.connect.request.timeout.ms" : "5000",
+    "ksql.query.pull.enable.standby.reads" : "false",
+    "ksql.persistence.default.format.key" : "KAFKA",
+    "ksql.query.persistent.max.bytes.buffering.total" : "-1",
+    "ksql.query.error.max.queue.size" : "10",
+    "ksql.query.cleanup.shutdown.timeout.ms" : "30000",
+    "ksql.internal.topic.min.insync.replicas" : "1",
+    "ksql.internal.topic.replicas" : "1",
+    "ksql.insert.into.values.enabled" : "true",
+    "ksql.queryanonymizer.cluster_namespace" : null,
+    "ksql.create.or.replace.enabled" : "true",
+    "ksql.shared.runtimes.count" : "8",
+    "ksql.cast.strings.preserve.nulls" : "true",
+    "ksql.authorization.cache.max.entries" : "10000",
+    "ksql.pull.queries.enable" : "true",
+    "ksql.query.pull.consistency.token.enabled" : "true",
+    "ksql.transient.query.cleanup.service.period.seconds" : "600",
+    "ksql.suppress.enabled" : "false",
+    "ksql.readonly.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.connect.basic.auth.credentials.file" : "",
+    "ksql.authorization.cache.expiry.time.secs" : "30",
+    "ksql.query.retry.backoff.initial.ms" : "15000",
+    "ksql.query.pull.max.concurrent.requests" : "2147483647",
+    "ksql.streams.auto.offset.reset" : "earliest",
+    "ksql.connect.url" : "http://localhost:8083",
+    "ksql.query.push.v2.new.latest.delay.ms" : "5000",
+    "ksql.query.push.v2.latest.reset.age.ms" : "30000",
+    "ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
+    "ksql.query.pull.interpreter.enabled" : "true",
+    "ksql.query.pull.limit.clause.enabled" : "true",
+    "ksql.connect.error.handler" : null,
+    "ksql.query.pull.router.thread.pool.size" : "50",
+    "ksql.query.push.v2.continuation.tokens.enabled" : "false",
+    "ksql.query.retry.backoff.max.ms" : "900000",
+    "ksql.timestamp.throw.on.invalid" : "false",
+    "ksql.persistence.default.format.value" : null,
+    "ksql.udfs.enabled" : "true",
+    "ksql.udf.enable.security.manager" : "true",
+    "ksql.connect.worker.config" : "",
+    "ksql.nested.error.set.null" : "true",
+    "ksql.query.pull.thread.pool.size" : "50",
+    "ksql.persistent.prefix" : "query_",
+    "ksql.metastore.backup.location" : "",
+    "ksql.error.classifier.regex" : "",
+    "ksql.suppress.buffer.size.bytes" : "-1"
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_an_array_added/7.2.0_1647304272090/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_an_array_added/7.2.0_1647304272090/spec.json
new file mode 100644
index 000000000000..641cbf46ce82
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_an_array_added/7.2.0_1647304272090/spec.json
@@ -0,0 +1,241 @@
+{
+  "version" : "7.2.0",
+  "timestamp" : 1647304272090,
+  "path" : "query-validation-tests/latest-offset-udaf.json",
+  "schemas" : {
+    "CTAS_OUTPUT_0.Aggregate.Project" : {
+      "schema" : "`ID` BIGINT KEY, `L0` INTEGER, `L1` BIGINT, `L2` DOUBLE, `L3` BOOLEAN, `L4` STRING, `L5` TIMESTAMP, `L6` TIME, `L7` DATE, `L8` BYTES, `L9` ARRAY<INTEGER>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.GroupBy" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` INTEGER, `F1` BIGINT, `F2` DOUBLE, `F3` BOOLEAN, `F4` STRING, `F5` TIMESTAMP, `F6` TIME, `F7` DATE, `F8` BYTES, `F9` ARRAY<INTEGER>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.KsqlTopic.Source" : {
+      "schema" : "`ID` BIGINT KEY, `F0` INTEGER, `F1` BIGINT, `F2` DOUBLE, `F3` BOOLEAN, `F4` STRING, `F5` TIMESTAMP, `F6` TIME, `F7` DATE, `F8` BYTES, `F9` ARRAY<INTEGER>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` INTEGER, `F1` BIGINT, `F2` DOUBLE, `F3` BOOLEAN, `F4` STRING, `F5` TIMESTAMP, `F6` TIME, `F7` DATE, `F8` BYTES, `F9` ARRAY<INTEGER>, `KSQL_AGG_VARIABLE_0` STRUCT<`SEQ` BIGINT, `VAL` INTEGER>, `KSQL_AGG_VARIABLE_1` STRUCT<`SEQ` BIGINT, `VAL` BIGINT>, `KSQL_AGG_VARIABLE_2` STRUCT<`SEQ` BIGINT, `VAL` DOUBLE>, `KSQL_AGG_VARIABLE_3` STRUCT<`SEQ` BIGINT, `VAL` BOOLEAN>, `KSQL_AGG_VARIABLE_4` STRUCT<`SEQ` BIGINT, `VAL` STRING>, `KSQL_AGG_VARIABLE_5` STRUCT<`SEQ` BIGINT, `VAL` TIMESTAMP>, `KSQL_AGG_VARIABLE_6` STRUCT<`SEQ` BIGINT, `VAL` TIME>, `KSQL_AGG_VARIABLE_7` STRUCT<`SEQ` BIGINT, `VAL` DATE>, `KSQL_AGG_VARIABLE_8` STRUCT<`SEQ` BIGINT, `VAL` BYTES>, `KSQL_AGG_VARIABLE_9` STRUCT<`SEQ` BIGINT, `VAL` ARRAY<INTEGER>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.OUTPUT" : {
+      "schema" : "`ID` BIGINT KEY, `L0` INTEGER, `L1` BIGINT, `L2` DOUBLE, `L3` BOOLEAN, `L4` STRING, `L5` TIMESTAMP, `L6` TIME, `L7` DATE, `L8` BYTES, `L9` ARRAY<INTEGER>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    }
+  },
+  "testCase" : {
+    "name" : "latest by offset with an array added",
+    "inputs" : [ {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : 12,
+        "F1" : 1000,
+        "F2" : 1.23,
+        "F3" : true,
+        "F4" : "foo",
+        "F5" : 12,
+        "F6" : 123,
+        "F7" : 1234,
+        "F8" : "YQ==",
+        "F9" : [ 0, 0, 1, 0, -1 ]
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : 12,
+        "F1" : 1000,
+        "F2" : 1.23,
+        "F3" : true,
+        "F4" : "foo",
+        "F5" : 12,
+        "F6" : 123,
+        "F7" : 1234,
+        "F8" : "YQ==",
+        "F9" : [ 0, 0, 1, 0, -1 ]
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : 21,
+        "F1" : 2000,
+        "F2" : 2.23,
+        "F3" : false,
+        "F4" : "foo",
+        "F5" : 34,
+        "F6" : 234,
+        "F7" : 2345,
+        "F8" : "Yg==",
+        "F9" : [ 1, 2, 3, 4, -1 ]
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : 21,
+        "F1" : 2000,
+        "F2" : 2.23,
+        "F3" : false,
+        "F4" : "foo",
+        "F5" : 34,
+        "F6" : 234,
+        "F7" : 2345,
+        "F8" : "Yg==",
+        "F9" : [ 1, 2, 3, 4, -1 ]
+      }
+    } ],
+    "outputs" : [ {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : 12,
+        "L1" : 1000,
+        "L2" : 1.23,
+        "L3" : true,
+        "L4" : "foo",
+        "L5" : 12,
+        "L6" : 123,
+        "L7" : 1234,
+        "L8" : "YQ==",
+        "L9" : [ 0, 0, 1, 0, -1 ]
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : 12,
+        "L1" : 1000,
+        "L2" : 1.23,
+        "L3" : true,
+        "L4" : "foo",
+        "L5" : 12,
+        "L6" : 123,
+        "L7" : 1234,
+        "L8" : "YQ==",
+        "L9" : [ 0, 0, 1, 0, -1 ]
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : 21,
+        "L1" : 2000,
+        "L2" : 2.23,
+        "L3" : false,
+        "L4" : "foo",
+        "L5" : 34,
+        "L6" : 234,
+        "L7" : 2345,
+        "L8" : "Yg==",
+        "L9" : [ 1, 2, 3, 4, -1 ]
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : 21,
+        "L1" : 2000,
+        "L2" : 2.23,
+        "L3" : false,
+        "L4" : "foo",
+        "L5" : 34,
+        "L6" : 234,
+        "L7" : 2345,
+        "L8" : "Yg==",
+        "L9" : [ 1, 2, 3, 4, -1 ]
+      }
+    } ],
+    "topics" : [ {
+      "name" : "OUTPUT",
+      "replicas" : 1,
+      "numPartitions" : 4
+    }, {
+      "name" : "test_topic",
+      "replicas" : 1,
+      "numPartitions" : 4
+    } ],
+    "statements" : [ "CREATE STREAM INPUT (ID BIGINT KEY, F0 INT, F1 BIGINT, F2 DOUBLE, F3 BOOLEAN, F4 STRING, F5 TIMESTAMP, F6 TIME, F7 DATE, F8 BYTES, F9 ARRAY<INT>) WITH (kafka_topic='test_topic', value_format='JSON');", "CREATE TABLE OUTPUT AS SELECT ID, LATEST_BY_OFFSET(F0) AS L0, LATEST_BY_OFFSET(F1) AS L1, LATEST_BY_OFFSET(F2) AS L2, LATEST_BY_OFFSET(F3) AS L3, LATEST_BY_OFFSET(F4) AS L4, LATEST_BY_OFFSET(F5) AS L5, LATEST_BY_OFFSET(F6) AS L6, LATEST_BY_OFFSET(F7) AS L7, LATEST_BY_OFFSET(F8) AS L8, LATEST_BY_OFFSET(F9) AS L9 FROM INPUT GROUP BY ID;" ],
+    "post" : {
+      "sources" : [ {
+        "name" : "INPUT",
+        "type" : "STREAM",
+        "schema" : "`ID` BIGINT KEY, `F0` INTEGER, `F1` BIGINT, `F2` DOUBLE, `F3` BOOLEAN, `F4` STRING, `F5` TIMESTAMP, `F6` TIME, `F7` DATE, `F8` BYTES, `F9` ARRAY<INTEGER>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      }, {
+        "name" : "OUTPUT",
+        "type" : "TABLE",
+        "schema" : "`ID` BIGINT KEY, `L0` INTEGER, `L1` BIGINT, `L2` DOUBLE, `L3` BOOLEAN, `L4` STRING, `L5` TIMESTAMP, `L6` TIME, `L7` DATE, `L8` BYTES, `L9` ARRAY<INTEGER>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      } ],
+      "topics" : {
+        "topics" : [ {
+          "name" : "test_topic",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        }, {
+          "name" : "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        }, {
+          "name" : "OUTPUT",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        } ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_an_array_added/7.2.0_1647304272090/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_an_array_added/7.2.0_1647304272090/topology
new file mode 100644
index 000000000000..e000b160c4db
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_an_array_added/7.2.0_1647304272090/topology
@@ -0,0 +1,25 @@
+Topologies:
+   Sub-topology: 0
+    Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic])
+      --> KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: [])
+      --> Aggregate-Prepare
+      <-- KSTREAM-SOURCE-0000000000
+    Processor: Aggregate-Prepare (stores: [])
+      --> KSTREAM-AGGREGATE-0000000003
+      <-- KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize])
+      --> Aggregate-Aggregate-ToOutputSchema
+      <-- Aggregate-Prepare
+    Processor: Aggregate-Aggregate-ToOutputSchema (stores: [])
+      --> Aggregate-Project
+      <-- KSTREAM-AGGREGATE-0000000003
+    Processor: Aggregate-Project (stores: [])
+      --> KTABLE-TOSTREAM-0000000006
+      <-- Aggregate-Aggregate-ToOutputSchema
+    Processor: KTABLE-TOSTREAM-0000000006 (stores: [])
+      --> KSTREAM-SINK-0000000007
+      <-- Aggregate-Project
+    Sink: KSTREAM-SINK-0000000007 (topic: OUTPUT)
+      <-- KTABLE-TOSTREAM-0000000006
+
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1647304271909/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1647304271909/plan.json
new file mode 100644
index 000000000000..8f7d226e5d9e
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1647304271909/plan.json
@@ -0,0 +1,234 @@
+{
+  "plan" : [ {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE STREAM INPUT (ID BIGINT KEY, F0 ARRAY<STRUCT<A STRING, M MAP<STRING, DOUBLE>>>) WITH (KAFKA_TOPIC='test_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');",
+    "ddlCommand" : {
+      "@type" : "createStreamV1",
+      "sourceName" : "INPUT",
+      "schema" : "`ID` BIGINT KEY, `F0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+      "topicName" : "test_topic",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    }
+  }, {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE TABLE OUTPUT AS SELECT\n  INPUT.ID ID,\n  LATEST_BY_OFFSET(INPUT.F0) L0\nFROM INPUT INPUT\nGROUP BY INPUT.ID\nEMIT CHANGES",
+    "ddlCommand" : {
+      "@type" : "createTableV1",
+      "sourceName" : "OUTPUT",
+      "schema" : "`ID` BIGINT KEY, `L0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+      "topicName" : "OUTPUT",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    },
+    "queryPlan" : {
+      "sources" : [ "INPUT" ],
+      "sink" : "OUTPUT",
+      "physicalPlan" : {
+        "@type" : "tableSinkV1",
+        "properties" : {
+          "queryContext" : "OUTPUT"
+        },
+        "source" : {
+          "@type" : "tableSelectV1",
+          "properties" : {
+            "queryContext" : "Aggregate/Project"
+          },
+          "source" : {
+            "@type" : "streamAggregateV1",
+            "properties" : {
+              "queryContext" : "Aggregate/Aggregate"
+            },
+            "source" : {
+              "@type" : "streamGroupByKeyV1",
+              "properties" : {
+                "queryContext" : "Aggregate/GroupBy"
+              },
+              "source" : {
+                "@type" : "streamSelectV1",
+                "properties" : {
+                  "queryContext" : "Aggregate/Prepare"
+                },
+                "source" : {
+                  "@type" : "streamSourceV1",
+                  "properties" : {
+                    "queryContext" : "KsqlTopic/Source"
+                  },
+                  "topicName" : "test_topic",
+                  "formats" : {
+                    "keyFormat" : {
+                      "format" : "KAFKA"
+                    },
+                    "valueFormat" : {
+                      "format" : "JSON"
+                    }
+                  },
+                  "sourceSchema" : "`ID` BIGINT KEY, `F0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+                  "pseudoColumnVersion" : 1
+                },
+                "keyColumnNames" : [ "ID" ],
+                "selectExpressions" : [ "ID AS ID", "F0 AS F0" ]
+              },
+              "internalFormats" : {
+                "keyFormat" : {
+                  "format" : "KAFKA"
+                },
+                "valueFormat" : {
+                  "format" : "JSON"
+                }
+              }
+            },
+            "internalFormats" : {
+              "keyFormat" : {
+                "format" : "KAFKA"
+              },
+              "valueFormat" : {
+                "format" : "JSON"
+              }
+            },
+            "nonAggregateColumns" : [ "ID", "F0" ],
+            "aggregationFunctions" : [ "LATEST_BY_OFFSET(F0)" ]
+          },
+          "keyColumnNames" : [ "ID" ],
+          "selectExpressions" : [ "KSQL_AGG_VARIABLE_0 AS L0" ],
+          "internalFormats" : {
+            "keyFormat" : {
+              "format" : "KAFKA"
+            },
+            "valueFormat" : {
+              "format" : "JSON"
+            }
+          }
+        },
+        "formats" : {
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        },
+        "topicName" : "OUTPUT"
+      },
+      "queryId" : "CTAS_OUTPUT_0"
+    }
+  } ],
+  "configs" : {
+    "ksql.extension.dir" : "ext",
+    "ksql.streams.cache.max.bytes.buffering" : "0",
+    "metric.reporters" : "",
+    "ksql.query.status.running.threshold.seconds" : "300",
+    "ksql.connect.basic.auth.credentials.reload" : "false",
+    "ksql.output.topic.name.prefix" : "",
+    "ksql.query.pull.stream.enabled" : "true",
+    "ksql.query.push.v2.interpreter.enabled" : "true",
+    "ksql.queryanonymizer.logs_enabled" : "true",
+    "ksql.variable.substitution.enable" : "true",
+    "ksql.streams.shutdown.timeout.ms" : "300000",
+    "ksql.query.pull.max.allowed.offset.lag" : "9223372036854775807",
+    "ksql.query.pull.max.qps" : "2147483647",
+    "ksql.access.validator.enable" : "auto",
+    "ksql.streams.bootstrap.servers" : "localhost:0",
+    "ksql.query.pull.metrics.enabled" : "true",
+    "ksql.metrics.extension" : null,
+    "ksql.query.push.v2.alos.enabled" : "true",
+    "ksql.query.push.v2.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.query.pull.range.scan.enabled" : "true",
+    "ksql.transient.query.cleanup.service.initial.delay.seconds" : "600",
+    "ksql.hidden.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.lambdas.enabled" : "true",
+    "ksql.source.table.materialization.enabled" : "true",
+    "ksql.query.pull.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.sink.window.change.log.additional.retention" : "1000000",
+    "ksql.query.persistent.active.limit" : "2147483647",
+    "ksql.persistence.wrap.single.values" : null,
+    "ksql.query.transient.max.bytes.buffering.total" : "-1",
+    "ksql.connect.basic.auth.credentials.source" : "NONE",
+    "ksql.schema.registry.url" : "schema_registry.url:0",
+    "ksql.properties.overrides.denylist" : "",
+    "ksql.service.id" : "some.ksql.service.id",
+    "ksql.query.push.v2.max.catchup.consumers" : "5",
+    "ksql.query.push.v2.enabled" : "false",
+    "ksql.transient.query.cleanup.service.enable" : "true",
+    "ksql.query.push.v2.metrics.enabled" : "true",
+    "ksql.rowpartition.rowoffset.enabled" : "true",
+    "ksql.streams.commit.interval.ms" : "2000",
+    "ksql.query.pull.table.scan.enabled" : "true",
+    "ksql.streams.auto.commit.interval.ms" : "0",
+    "ksql.streams.topology.optimization" : "all",
+    "ksql.endpoint.migrate.query" : "true",
+    "ksql.query.push.v2.registry.installed" : "false",
+    "ksql.streams.num.stream.threads" : "4",
+    "ksql.metrics.tags.custom" : "",
+    "ksql.query.push.v2.catchup.consumer.msg.window" : "50",
+    "ksql.runtime.feature.shared.enabled" : "false",
+    "ksql.udf.collect.metrics" : "false",
+    "ksql.new.query.planner.enabled" : "false",
+    "ksql.connect.request.headers.plugin" : null,
+    "ksql.security.extension.class" : null,
+    "ksql.transient.prefix" : "transient_",
+    "ksql.headers.columns.enabled" : "true",
+    "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler",
+    "ksql.connect.request.timeout.ms" : "5000",
+    "ksql.query.pull.enable.standby.reads" : "false",
+    "ksql.persistence.default.format.key" : "KAFKA",
+    "ksql.query.persistent.max.bytes.buffering.total" : "-1",
+    "ksql.query.error.max.queue.size" : "10",
+    "ksql.query.cleanup.shutdown.timeout.ms" : "30000",
+    "ksql.internal.topic.min.insync.replicas" : "1",
+    "ksql.internal.topic.replicas" : "1",
+    "ksql.insert.into.values.enabled" : "true",
+    "ksql.queryanonymizer.cluster_namespace" : null,
+    "ksql.create.or.replace.enabled" : "true",
+    "ksql.shared.runtimes.count" : "8",
+    "ksql.cast.strings.preserve.nulls" : "true",
+    "ksql.authorization.cache.max.entries" : "10000",
+    "ksql.pull.queries.enable" : "true",
+    "ksql.query.pull.consistency.token.enabled" : "true",
+    "ksql.transient.query.cleanup.service.period.seconds" : "600",
+    "ksql.suppress.enabled" : "false",
+    "ksql.readonly.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.connect.basic.auth.credentials.file" : "",
+    "ksql.authorization.cache.expiry.time.secs" : "30",
+    "ksql.query.retry.backoff.initial.ms" : "15000",
+    "ksql.query.pull.max.concurrent.requests" : "2147483647",
+    "ksql.streams.auto.offset.reset" : "earliest",
+    "ksql.connect.url" : "http://localhost:8083",
+    "ksql.query.push.v2.new.latest.delay.ms" : "5000",
+    "ksql.query.push.v2.latest.reset.age.ms" : "30000",
+    "ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
+    "ksql.query.pull.interpreter.enabled" : "true",
+    "ksql.query.pull.limit.clause.enabled" : "true",
+    "ksql.connect.error.handler" : null,
+    "ksql.query.pull.router.thread.pool.size" : "50",
+    "ksql.query.push.v2.continuation.tokens.enabled" : "false",
+    "ksql.query.retry.backoff.max.ms" : "900000",
+    "ksql.timestamp.throw.on.invalid" : "false",
+    "ksql.persistence.default.format.value" : null,
+    "ksql.udfs.enabled" : "true",
+    "ksql.udf.enable.security.manager" : "true",
+    "ksql.connect.worker.config" : "",
+    "ksql.nested.error.set.null" : "true",
+    "ksql.query.pull.thread.pool.size" : "50",
+    "ksql.persistent.prefix" : "query_",
+    "ksql.metastore.backup.location" : "",
+    "ksql.error.classifier.regex" : "",
+    "ksql.suppress.buffer.size.bytes" : "-1"
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1647304271909/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1647304271909/spec.json
new file mode 100644
index 000000000000..65e3e0d76b5b
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1647304271909/spec.json
@@ -0,0 +1,219 @@
+{
+  "version" : "7.2.0",
+  "timestamp" : 1647304271909,
+  "path" : "query-validation-tests/latest-offset-udaf.json",
+  "schemas" : {
+    "CTAS_OUTPUT_0.Aggregate.Project" : {
+      "schema" : "`ID` BIGINT KEY, `L0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.GroupBy" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.KsqlTopic.Source" : {
+      "schema" : "`ID` BIGINT KEY, `F0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>, `KSQL_AGG_VARIABLE_0` STRUCT<`SEQ` BIGINT, `VAL` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.OUTPUT" : {
+      "schema" : "`ID` BIGINT KEY, `L0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    }
+  },
+  "testCase" : {
+    "name" : "latest by offset with arrays, structs, and maps",
+    "inputs" : [ {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : [ {
+          "A" : "Early0",
+          "M" : {
+            "Early0" : 1.234
+          }
+        }, {
+          "A" : "Early2",
+          "M" : {
+            "Early2" : 1.23456
+          }
+        } ]
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : [ {
+          "A" : "Early1",
+          "M" : {
+            "Early0" : 2.345
+          }
+        } ]
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : [ {
+          "A" : "Later0",
+          "M" : {
+            "Early0" : 3.45
+          }
+        } ]
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : [ {
+          "A" : "Later1",
+          "M" : {
+            "Early0" : 4.56
+          }
+        } ]
+      }
+    } ],
+    "outputs" : [ {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : [ {
+          "A" : "Early0",
+          "M" : {
+            "Early0" : 1.234
+          }
+        }, {
+          "A" : "Early2",
+          "M" : {
+            "Early2" : 1.23456
+          }
+        } ]
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : [ {
+          "A" : "Early1",
+          "M" : {
+            "Early0" : 2.345
+          }
+        } ]
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : [ {
+          "A" : "Later0",
+          "M" : {
+            "Early0" : 3.45
+          }
+        } ]
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : [ {
+          "A" : "Later1",
+          "M" : {
+            "Early0" : 4.56
+          }
+        } ]
+      }
+    } ],
+    "topics" : [ {
+      "name" : "OUTPUT",
+      "replicas" : 1,
+      "numPartitions" : 4
+    }, {
+      "name" : "test_topic",
+      "replicas" : 1,
+      "numPartitions" : 4
+    } ],
+    "statements" : [ "CREATE STREAM INPUT (ID BIGINT KEY, F0 ARRAY<STRUCT<A VARCHAR, M MAP<STRING, DOUBLE>>>) WITH (kafka_topic='test_topic', value_format='JSON');", "CREATE TABLE OUTPUT AS SELECT ID, LATEST_BY_OFFSET(F0) AS L0 FROM INPUT GROUP BY ID;" ],
+    "post" : {
+      "sources" : [ {
+        "name" : "INPUT",
+        "type" : "STREAM",
+        "schema" : "`ID` BIGINT KEY, `F0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      }, {
+        "name" : "OUTPUT",
+        "type" : "TABLE",
+        "schema" : "`ID` BIGINT KEY, `L0` ARRAY<STRUCT<`A` STRING, `M` MAP<STRING, DOUBLE>>>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      } ],
+      "topics" : {
+        "topics" : [ {
+          "name" : "test_topic",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        }, {
+          "name" : "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        }, {
+          "name" : "OUTPUT",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        } ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1647304271909/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1647304271909/topology
new file mode 100644
index 000000000000..e000b160c4db
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_arrays,_structs,_and_maps/7.2.0_1647304271909/topology
@@ -0,0 +1,25 @@
+Topologies:
+   Sub-topology: 0
+    Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic])
+      --> KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: [])
+      --> Aggregate-Prepare
+      <-- KSTREAM-SOURCE-0000000000
+    Processor: Aggregate-Prepare (stores: [])
+      --> KSTREAM-AGGREGATE-0000000003
+      <-- KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize])
+      --> Aggregate-Aggregate-ToOutputSchema
+      <-- Aggregate-Prepare
+    Processor: Aggregate-Aggregate-ToOutputSchema (stores: [])
+      --> Aggregate-Project
+      <-- KSTREAM-AGGREGATE-0000000003
+    Processor: Aggregate-Project (stores: [])
+      --> KTABLE-TOSTREAM-0000000006
+      <-- Aggregate-Aggregate-ToOutputSchema
+    Processor: KTABLE-TOSTREAM-0000000006 (stores: [])
+      --> KSTREAM-SINK-0000000007
+      <-- Aggregate-Project
+    Sink: KSTREAM-SINK-0000000007 (topic: OUTPUT)
+      <-- KTABLE-TOSTREAM-0000000006
+
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_decimals/7.2.0_1647304272361/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_decimals/7.2.0_1647304272361/plan.json
new file mode 100644
index 000000000000..ef74491591fe
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_decimals/7.2.0_1647304272361/plan.json
@@ -0,0 +1,234 @@
+{
+  "plan" : [ {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE STREAM INPUT (ID BIGINT KEY, F0 DECIMAL(3, 2)) WITH (KAFKA_TOPIC='test_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');",
+    "ddlCommand" : {
+      "@type" : "createStreamV1",
+      "sourceName" : "INPUT",
+      "schema" : "`ID` BIGINT KEY, `F0` DECIMAL(3, 2)",
+      "topicName" : "test_topic",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    }
+  }, {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE TABLE OUTPUT AS SELECT\n  INPUT.ID ID,\n  LATEST_BY_OFFSET(INPUT.F0, true) L0\nFROM INPUT INPUT\nGROUP BY INPUT.ID\nEMIT CHANGES",
+    "ddlCommand" : {
+      "@type" : "createTableV1",
+      "sourceName" : "OUTPUT",
+      "schema" : "`ID` BIGINT KEY, `L0` DECIMAL(3, 2)",
+      "topicName" : "OUTPUT",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    },
+    "queryPlan" : {
+      "sources" : [ "INPUT" ],
+      "sink" : "OUTPUT",
+      "physicalPlan" : {
+        "@type" : "tableSinkV1",
+        "properties" : {
+          "queryContext" : "OUTPUT"
+        },
+        "source" : {
+          "@type" : "tableSelectV1",
+          "properties" : {
+            "queryContext" : "Aggregate/Project"
+          },
+          "source" : {
+            "@type" : "streamAggregateV1",
+            "properties" : {
+              "queryContext" : "Aggregate/Aggregate"
+            },
+            "source" : {
+              "@type" : "streamGroupByKeyV1",
+              "properties" : {
+                "queryContext" : "Aggregate/GroupBy"
+              },
+              "source" : {
+                "@type" : "streamSelectV1",
+                "properties" : {
+                  "queryContext" : "Aggregate/Prepare"
+                },
+                "source" : {
+                  "@type" : "streamSourceV1",
+                  "properties" : {
+                    "queryContext" : "KsqlTopic/Source"
+                  },
+                  "topicName" : "test_topic",
+                  "formats" : {
+                    "keyFormat" : {
+                      "format" : "KAFKA"
+                    },
+                    "valueFormat" : {
+                      "format" : "JSON"
+                    }
+                  },
+                  "sourceSchema" : "`ID` BIGINT KEY, `F0` DECIMAL(3, 2)",
+                  "pseudoColumnVersion" : 1
+                },
+                "keyColumnNames" : [ "ID" ],
+                "selectExpressions" : [ "ID AS ID", "F0 AS F0", "true AS KSQL_INTERNAL_COL_2" ]
+              },
+              "internalFormats" : {
+                "keyFormat" : {
+                  "format" : "KAFKA"
+                },
+                "valueFormat" : {
+                  "format" : "JSON"
+                }
+              }
+            },
+            "internalFormats" : {
+              "keyFormat" : {
+                "format" : "KAFKA"
+              },
+              "valueFormat" : {
+                "format" : "JSON"
+              }
+            },
+            "nonAggregateColumns" : [ "ID", "F0" ],
+            "aggregationFunctions" : [ "LATEST_BY_OFFSET(F0, true)" ]
+          },
+          "keyColumnNames" : [ "ID" ],
+          "selectExpressions" : [ "KSQL_AGG_VARIABLE_0 AS L0" ],
+          "internalFormats" : {
+            "keyFormat" : {
+              "format" : "KAFKA"
+            },
+            "valueFormat" : {
+              "format" : "JSON"
+            }
+          }
+        },
+        "formats" : {
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        },
+        "topicName" : "OUTPUT"
+      },
+      "queryId" : "CTAS_OUTPUT_0"
+    }
+  } ],
+  "configs" : {
+    "ksql.extension.dir" : "ext",
+    "ksql.streams.cache.max.bytes.buffering" : "0",
+    "metric.reporters" : "",
+    "ksql.query.status.running.threshold.seconds" : "300",
+    "ksql.connect.basic.auth.credentials.reload" : "false",
+    "ksql.output.topic.name.prefix" : "",
+    "ksql.query.pull.stream.enabled" : "true",
+    "ksql.query.push.v2.interpreter.enabled" : "true",
+    "ksql.queryanonymizer.logs_enabled" : "true",
+    "ksql.variable.substitution.enable" : "true",
+    "ksql.streams.shutdown.timeout.ms" : "300000",
+    "ksql.query.pull.max.allowed.offset.lag" : "9223372036854775807",
+    "ksql.query.pull.max.qps" : "2147483647",
+    "ksql.access.validator.enable" : "auto",
+    "ksql.streams.bootstrap.servers" : "localhost:0",
+    "ksql.query.pull.metrics.enabled" : "true",
+    "ksql.metrics.extension" : null,
+    "ksql.query.push.v2.alos.enabled" : "true",
+    "ksql.query.push.v2.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.query.pull.range.scan.enabled" : "true",
+    "ksql.transient.query.cleanup.service.initial.delay.seconds" : "600",
+    "ksql.hidden.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.lambdas.enabled" : "true",
+    "ksql.source.table.materialization.enabled" : "true",
+    "ksql.query.pull.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.sink.window.change.log.additional.retention" : "1000000",
+    "ksql.query.persistent.active.limit" : "2147483647",
+    "ksql.persistence.wrap.single.values" : null,
+    "ksql.query.transient.max.bytes.buffering.total" : "-1",
+    "ksql.connect.basic.auth.credentials.source" : "NONE",
+    "ksql.schema.registry.url" : "schema_registry.url:0",
+    "ksql.properties.overrides.denylist" : "",
+    "ksql.service.id" : "some.ksql.service.id",
+    "ksql.query.push.v2.max.catchup.consumers" : "5",
+    "ksql.query.push.v2.enabled" : "false",
+    "ksql.transient.query.cleanup.service.enable" : "true",
+    "ksql.query.push.v2.metrics.enabled" : "true",
+    "ksql.rowpartition.rowoffset.enabled" : "true",
+    "ksql.streams.commit.interval.ms" : "2000",
+    "ksql.query.pull.table.scan.enabled" : "true",
+    "ksql.streams.auto.commit.interval.ms" : "0",
+    "ksql.streams.topology.optimization" : "all",
+    "ksql.endpoint.migrate.query" : "true",
+    "ksql.query.push.v2.registry.installed" : "false",
+    "ksql.streams.num.stream.threads" : "4",
+    "ksql.metrics.tags.custom" : "",
+    "ksql.query.push.v2.catchup.consumer.msg.window" : "50",
+    "ksql.runtime.feature.shared.enabled" : "false",
+    "ksql.udf.collect.metrics" : "false",
+    "ksql.new.query.planner.enabled" : "false",
+    "ksql.connect.request.headers.plugin" : null,
+    "ksql.security.extension.class" : null,
+    "ksql.transient.prefix" : "transient_",
+    "ksql.headers.columns.enabled" : "true",
+    "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler",
+    "ksql.connect.request.timeout.ms" : "5000",
+    "ksql.query.pull.enable.standby.reads" : "false",
+    "ksql.persistence.default.format.key" : "KAFKA",
+    "ksql.query.persistent.max.bytes.buffering.total" : "-1",
+    "ksql.query.error.max.queue.size" : "10",
+    "ksql.query.cleanup.shutdown.timeout.ms" : "30000",
+    "ksql.internal.topic.min.insync.replicas" : "1",
+    "ksql.internal.topic.replicas" : "1",
+    "ksql.insert.into.values.enabled" : "true",
+    "ksql.queryanonymizer.cluster_namespace" : null,
+    "ksql.create.or.replace.enabled" : "true",
+    "ksql.shared.runtimes.count" : "8",
+    "ksql.cast.strings.preserve.nulls" : "true",
+    "ksql.authorization.cache.max.entries" : "10000",
+    "ksql.pull.queries.enable" : "true",
+    "ksql.query.pull.consistency.token.enabled" : "true",
+    "ksql.transient.query.cleanup.service.period.seconds" : "600",
+    "ksql.suppress.enabled" : "false",
+    "ksql.readonly.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.connect.basic.auth.credentials.file" : "",
+    "ksql.authorization.cache.expiry.time.secs" : "30",
+    "ksql.query.retry.backoff.initial.ms" : "15000",
+    "ksql.query.pull.max.concurrent.requests" : "2147483647",
+    "ksql.streams.auto.offset.reset" : "earliest",
+    "ksql.connect.url" : "http://localhost:8083",
+    "ksql.query.push.v2.new.latest.delay.ms" : "5000",
+    "ksql.query.push.v2.latest.reset.age.ms" : "30000",
+    "ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
+    "ksql.query.pull.interpreter.enabled" : "true",
+    "ksql.query.pull.limit.clause.enabled" : "true",
+    "ksql.connect.error.handler" : null,
+    "ksql.query.pull.router.thread.pool.size" : "50",
+    "ksql.query.push.v2.continuation.tokens.enabled" : "false",
+    "ksql.query.retry.backoff.max.ms" : "900000",
+    "ksql.timestamp.throw.on.invalid" : "false",
+    "ksql.persistence.default.format.value" : null,
+    "ksql.udfs.enabled" : "true",
+    "ksql.udf.enable.security.manager" : "true",
+    "ksql.connect.worker.config" : "",
+    "ksql.nested.error.set.null" : "true",
+    "ksql.query.pull.thread.pool.size" : "50",
+    "ksql.persistent.prefix" : "query_",
+    "ksql.metastore.backup.location" : "",
+    "ksql.error.classifier.regex" : "",
+    "ksql.suppress.buffer.size.bytes" : "-1"
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_decimals/7.2.0_1647304272361/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_decimals/7.2.0_1647304272361/spec.json
new file mode 100644
index 000000000000..2191ffc9463d
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_decimals/7.2.0_1647304272361/spec.json
@@ -0,0 +1,145 @@
+{
+  "version" : "7.2.0",
+  "timestamp" : 1647304272361,
+  "path" : "query-validation-tests/latest-offset-udaf.json",
+  "schemas" : {
+    "CTAS_OUTPUT_0.Aggregate.Project" : {
+      "schema" : "`ID` BIGINT KEY, `L0` DECIMAL(3, 2)",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.GroupBy" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` DECIMAL(3, 2), `KSQL_INTERNAL_COL_2` BOOLEAN",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.KsqlTopic.Source" : {
+      "schema" : "`ID` BIGINT KEY, `F0` DECIMAL(3, 2)",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` DECIMAL(3, 2), `KSQL_AGG_VARIABLE_0` STRUCT<`SEQ` BIGINT, `VAL` DECIMAL(3, 2)>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.OUTPUT" : {
+      "schema" : "`ID` BIGINT KEY, `L0` DECIMAL(3, 2)",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    }
+  },
+  "testCase" : {
+    "name" : "latest by offset with decimals",
+    "inputs" : [ {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : "3.4"
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : "8.9"
+      }
+    } ],
+    "outputs" : [ {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : "3.40"
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : "8.90"
+      }
+    } ],
+    "topics" : [ {
+      "name" : "OUTPUT",
+      "replicas" : 1,
+      "numPartitions" : 4
+    }, {
+      "name" : "test_topic",
+      "replicas" : 1,
+      "numPartitions" : 4
+    } ],
+    "statements" : [ "CREATE STREAM INPUT (ID BIGINT KEY, F0 DECIMAL(3,2)) WITH (kafka_topic='test_topic', value_format='JSON');", "CREATE TABLE OUTPUT AS SELECT ID, LATEST_BY_OFFSET(F0, true) AS L0 FROM INPUT GROUP BY ID;" ],
+    "post" : {
+      "sources" : [ {
+        "name" : "INPUT",
+        "type" : "STREAM",
+        "schema" : "`ID` BIGINT KEY, `F0` DECIMAL(3, 2)",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      }, {
+        "name" : "OUTPUT",
+        "type" : "TABLE",
+        "schema" : "`ID` BIGINT KEY, `L0` DECIMAL(3, 2)",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      } ],
+      "topics" : {
+        "topics" : [ {
+          "name" : "test_topic",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        }, {
+          "name" : "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        }, {
+          "name" : "OUTPUT",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        } ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_decimals/7.2.0_1647304272361/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_decimals/7.2.0_1647304272361/topology
new file mode 100644
index 000000000000..e000b160c4db
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_decimals/7.2.0_1647304272361/topology
@@ -0,0 +1,25 @@
+Topologies:
+   Sub-topology: 0
+    Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic])
+      --> KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: [])
+      --> Aggregate-Prepare
+      <-- KSTREAM-SOURCE-0000000000
+    Processor: Aggregate-Prepare (stores: [])
+      --> KSTREAM-AGGREGATE-0000000003
+      <-- KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize])
+      --> Aggregate-Aggregate-ToOutputSchema
+      <-- Aggregate-Prepare
+    Processor: Aggregate-Aggregate-ToOutputSchema (stores: [])
+      --> Aggregate-Project
+      <-- KSTREAM-AGGREGATE-0000000003
+    Processor: Aggregate-Project (stores: [])
+      --> KTABLE-TOSTREAM-0000000006
+      <-- Aggregate-Aggregate-ToOutputSchema
+    Processor: KTABLE-TOSTREAM-0000000006 (stores: [])
+      --> KSTREAM-SINK-0000000007
+      <-- Aggregate-Project
+    Sink: KSTREAM-SINK-0000000007 (topic: OUTPUT)
+      <-- KTABLE-TOSTREAM-0000000006
+
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_maps/7.2.0_1647304271978/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_maps/7.2.0_1647304271978/plan.json
new file mode 100644
index 000000000000..9e39a2b0d541
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_maps/7.2.0_1647304271978/plan.json
@@ -0,0 +1,234 @@
+{
+  "plan" : [ {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE STREAM INPUT (ID BIGINT KEY, F0 MAP<STRING, DOUBLE>) WITH (KAFKA_TOPIC='test_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');",
+    "ddlCommand" : {
+      "@type" : "createStreamV1",
+      "sourceName" : "INPUT",
+      "schema" : "`ID` BIGINT KEY, `F0` MAP<STRING, DOUBLE>",
+      "topicName" : "test_topic",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    }
+  }, {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE TABLE OUTPUT AS SELECT\n  INPUT.ID ID,\n  LATEST_BY_OFFSET(INPUT.F0) L0\nFROM INPUT INPUT\nGROUP BY INPUT.ID\nEMIT CHANGES",
+    "ddlCommand" : {
+      "@type" : "createTableV1",
+      "sourceName" : "OUTPUT",
+      "schema" : "`ID` BIGINT KEY, `L0` MAP<STRING, DOUBLE>",
+      "topicName" : "OUTPUT",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    },
+    "queryPlan" : {
+      "sources" : [ "INPUT" ],
+      "sink" : "OUTPUT",
+      "physicalPlan" : {
+        "@type" : "tableSinkV1",
+        "properties" : {
+          "queryContext" : "OUTPUT"
+        },
+        "source" : {
+          "@type" : "tableSelectV1",
+          "properties" : {
+            "queryContext" : "Aggregate/Project"
+          },
+          "source" : {
+            "@type" : "streamAggregateV1",
+            "properties" : {
+              "queryContext" : "Aggregate/Aggregate"
+            },
+            "source" : {
+              "@type" : "streamGroupByKeyV1",
+              "properties" : {
+                "queryContext" : "Aggregate/GroupBy"
+              },
+              "source" : {
+                "@type" : "streamSelectV1",
+                "properties" : {
+                  "queryContext" : "Aggregate/Prepare"
+                },
+                "source" : {
+                  "@type" : "streamSourceV1",
+                  "properties" : {
+                    "queryContext" : "KsqlTopic/Source"
+                  },
+                  "topicName" : "test_topic",
+                  "formats" : {
+                    "keyFormat" : {
+                      "format" : "KAFKA"
+                    },
+                    "valueFormat" : {
+                      "format" : "JSON"
+                    }
+                  },
+                  "sourceSchema" : "`ID` BIGINT KEY, `F0` MAP<STRING, DOUBLE>",
+                  "pseudoColumnVersion" : 1
+                },
+                "keyColumnNames" : [ "ID" ],
+                "selectExpressions" : [ "ID AS ID", "F0 AS F0" ]
+              },
+              "internalFormats" : {
+                "keyFormat" : {
+                  "format" : "KAFKA"
+                },
+                "valueFormat" : {
+                  "format" : "JSON"
+                }
+              }
+            },
+            "internalFormats" : {
+              "keyFormat" : {
+                "format" : "KAFKA"
+              },
+              "valueFormat" : {
+                "format" : "JSON"
+              }
+            },
+            "nonAggregateColumns" : [ "ID", "F0" ],
+            "aggregationFunctions" : [ "LATEST_BY_OFFSET(F0)" ]
+          },
+          "keyColumnNames" : [ "ID" ],
+          "selectExpressions" : [ "KSQL_AGG_VARIABLE_0 AS L0" ],
+          "internalFormats" : {
+            "keyFormat" : {
+              "format" : "KAFKA"
+            },
+            "valueFormat" : {
+              "format" : "JSON"
+            }
+          }
+        },
+        "formats" : {
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        },
+        "topicName" : "OUTPUT"
+      },
+      "queryId" : "CTAS_OUTPUT_0"
+    }
+  } ],
+  "configs" : {
+    "ksql.extension.dir" : "ext",
+    "ksql.streams.cache.max.bytes.buffering" : "0",
+    "metric.reporters" : "",
+    "ksql.query.status.running.threshold.seconds" : "300",
+    "ksql.connect.basic.auth.credentials.reload" : "false",
+    "ksql.output.topic.name.prefix" : "",
+    "ksql.query.pull.stream.enabled" : "true",
+    "ksql.query.push.v2.interpreter.enabled" : "true",
+    "ksql.queryanonymizer.logs_enabled" : "true",
+    "ksql.variable.substitution.enable" : "true",
+    "ksql.streams.shutdown.timeout.ms" : "300000",
+    "ksql.query.pull.max.allowed.offset.lag" : "9223372036854775807",
+    "ksql.query.pull.max.qps" : "2147483647",
+    "ksql.access.validator.enable" : "auto",
+    "ksql.streams.bootstrap.servers" : "localhost:0",
+    "ksql.query.pull.metrics.enabled" : "true",
+    "ksql.metrics.extension" : null,
+    "ksql.query.push.v2.alos.enabled" : "true",
+    "ksql.query.push.v2.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.query.pull.range.scan.enabled" : "true",
+    "ksql.transient.query.cleanup.service.initial.delay.seconds" : "600",
+    "ksql.hidden.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.lambdas.enabled" : "true",
+    "ksql.source.table.materialization.enabled" : "true",
+    "ksql.query.pull.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.sink.window.change.log.additional.retention" : "1000000",
+    "ksql.query.persistent.active.limit" : "2147483647",
+    "ksql.persistence.wrap.single.values" : null,
+    "ksql.query.transient.max.bytes.buffering.total" : "-1",
+    "ksql.connect.basic.auth.credentials.source" : "NONE",
+    "ksql.schema.registry.url" : "schema_registry.url:0",
+    "ksql.properties.overrides.denylist" : "",
+    "ksql.service.id" : "some.ksql.service.id",
+    "ksql.query.push.v2.max.catchup.consumers" : "5",
+    "ksql.query.push.v2.enabled" : "false",
+    "ksql.transient.query.cleanup.service.enable" : "true",
+    "ksql.query.push.v2.metrics.enabled" : "true",
+    "ksql.rowpartition.rowoffset.enabled" : "true",
+    "ksql.streams.commit.interval.ms" : "2000",
+    "ksql.query.pull.table.scan.enabled" : "true",
+    "ksql.streams.auto.commit.interval.ms" : "0",
+    "ksql.streams.topology.optimization" : "all",
+    "ksql.endpoint.migrate.query" : "true",
+    "ksql.query.push.v2.registry.installed" : "false",
+    "ksql.streams.num.stream.threads" : "4",
+    "ksql.metrics.tags.custom" : "",
+    "ksql.query.push.v2.catchup.consumer.msg.window" : "50",
+    "ksql.runtime.feature.shared.enabled" : "false",
+    "ksql.udf.collect.metrics" : "false",
+    "ksql.new.query.planner.enabled" : "false",
+    "ksql.connect.request.headers.plugin" : null,
+    "ksql.security.extension.class" : null,
+    "ksql.transient.prefix" : "transient_",
+    "ksql.headers.columns.enabled" : "true",
+    "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler",
+    "ksql.connect.request.timeout.ms" : "5000",
+    "ksql.query.pull.enable.standby.reads" : "false",
+    "ksql.persistence.default.format.key" : "KAFKA",
+    "ksql.query.persistent.max.bytes.buffering.total" : "-1",
+    "ksql.query.error.max.queue.size" : "10",
+    "ksql.query.cleanup.shutdown.timeout.ms" : "30000",
+    "ksql.internal.topic.min.insync.replicas" : "1",
+    "ksql.internal.topic.replicas" : "1",
+    "ksql.insert.into.values.enabled" : "true",
+    "ksql.queryanonymizer.cluster_namespace" : null,
+    "ksql.create.or.replace.enabled" : "true",
+    "ksql.shared.runtimes.count" : "8",
+    "ksql.cast.strings.preserve.nulls" : "true",
+    "ksql.authorization.cache.max.entries" : "10000",
+    "ksql.pull.queries.enable" : "true",
+    "ksql.query.pull.consistency.token.enabled" : "true",
+    "ksql.transient.query.cleanup.service.period.seconds" : "600",
+    "ksql.suppress.enabled" : "false",
+    "ksql.readonly.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.connect.basic.auth.credentials.file" : "",
+    "ksql.authorization.cache.expiry.time.secs" : "30",
+    "ksql.query.retry.backoff.initial.ms" : "15000",
+    "ksql.query.pull.max.concurrent.requests" : "2147483647",
+    "ksql.streams.auto.offset.reset" : "earliest",
+    "ksql.connect.url" : "http://localhost:8083",
+    "ksql.query.push.v2.new.latest.delay.ms" : "5000",
+    "ksql.query.push.v2.latest.reset.age.ms" : "30000",
+    "ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
+    "ksql.query.pull.interpreter.enabled" : "true",
+    "ksql.query.pull.limit.clause.enabled" : "true",
+    "ksql.connect.error.handler" : null,
+    "ksql.query.pull.router.thread.pool.size" : "50",
+    "ksql.query.push.v2.continuation.tokens.enabled" : "false",
+    "ksql.query.retry.backoff.max.ms" : "900000",
+    "ksql.timestamp.throw.on.invalid" : "false",
+    "ksql.persistence.default.format.value" : null,
+    "ksql.udfs.enabled" : "true",
+    "ksql.udf.enable.security.manager" : "true",
+    "ksql.connect.worker.config" : "",
+    "ksql.nested.error.set.null" : "true",
+    "ksql.query.pull.thread.pool.size" : "50",
+    "ksql.persistent.prefix" : "query_",
+    "ksql.metastore.backup.location" : "",
+    "ksql.error.classifier.regex" : "",
+    "ksql.suppress.buffer.size.bytes" : "-1"
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_maps/7.2.0_1647304271978/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_maps/7.2.0_1647304271978/spec.json
new file mode 100644
index 000000000000..618de5cd05b9
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_maps/7.2.0_1647304271978/spec.json
@@ -0,0 +1,185 @@
+{
+  "version" : "7.2.0",
+  "timestamp" : 1647304271978,
+  "path" : "query-validation-tests/latest-offset-udaf.json",
+  "schemas" : {
+    "CTAS_OUTPUT_0.Aggregate.Project" : {
+      "schema" : "`ID` BIGINT KEY, `L0` MAP<STRING, DOUBLE>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.GroupBy" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` MAP<STRING, DOUBLE>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.KsqlTopic.Source" : {
+      "schema" : "`ID` BIGINT KEY, `F0` MAP<STRING, DOUBLE>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` MAP<STRING, DOUBLE>, `KSQL_AGG_VARIABLE_0` STRUCT<`SEQ` BIGINT, `VAL` MAP<STRING, DOUBLE>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.OUTPUT" : {
+      "schema" : "`ID` BIGINT KEY, `L0` MAP<STRING, DOUBLE>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    }
+  },
+  "testCase" : {
+    "name" : "latest by offset with maps",
+    "inputs" : [ {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : {
+          "Early0" : 1.234
+        }
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : {
+          "Early1" : 2.3456789
+        }
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : {
+          "Later0" : 3.6789
+        }
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : {
+          "Later1" : 4
+        }
+      }
+    } ],
+    "outputs" : [ {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : {
+          "Early0" : 1.234
+        }
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : {
+          "Early1" : 2.3456789
+        }
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : {
+          "Later0" : 3.6789
+        }
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : {
+          "Later1" : 4.0
+        }
+      }
+    } ],
+    "topics" : [ {
+      "name" : "OUTPUT",
+      "replicas" : 1,
+      "numPartitions" : 4
+    }, {
+      "name" : "test_topic",
+      "replicas" : 1,
+      "numPartitions" : 4
+    } ],
+    "statements" : [ "CREATE STREAM INPUT (ID BIGINT KEY, F0 MAP<STRING, DOUBLE>) WITH (kafka_topic='test_topic', value_format='JSON');", "CREATE TABLE OUTPUT AS SELECT ID, LATEST_BY_OFFSET(F0) AS L0 FROM INPUT GROUP BY ID;" ],
+    "post" : {
+      "sources" : [ {
+        "name" : "INPUT",
+        "type" : "STREAM",
+        "schema" : "`ID` BIGINT KEY, `F0` MAP<STRING, DOUBLE>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      }, {
+        "name" : "OUTPUT",
+        "type" : "TABLE",
+        "schema" : "`ID` BIGINT KEY, `L0` MAP<STRING, DOUBLE>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      } ],
+      "topics" : {
+        "topics" : [ {
+          "name" : "test_topic",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        }, {
+          "name" : "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        }, {
+          "name" : "OUTPUT",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        } ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_maps/7.2.0_1647304271978/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_maps/7.2.0_1647304271978/topology
new file mode 100644
index 000000000000..e000b160c4db
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_maps/7.2.0_1647304271978/topology
@@ -0,0 +1,25 @@
+Topologies:
+   Sub-topology: 0
+    Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic])
+      --> KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: [])
+      --> Aggregate-Prepare
+      <-- KSTREAM-SOURCE-0000000000
+    Processor: Aggregate-Prepare (stores: [])
+      --> KSTREAM-AGGREGATE-0000000003
+      <-- KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize])
+      --> Aggregate-Aggregate-ToOutputSchema
+      <-- Aggregate-Prepare
+    Processor: Aggregate-Aggregate-ToOutputSchema (stores: [])
+      --> Aggregate-Project
+      <-- KSTREAM-AGGREGATE-0000000003
+    Processor: Aggregate-Project (stores: [])
+      --> KTABLE-TOSTREAM-0000000006
+      <-- Aggregate-Aggregate-ToOutputSchema
+    Processor: KTABLE-TOSTREAM-0000000006 (stores: [])
+      --> KSTREAM-SINK-0000000007
+      <-- Aggregate-Project
+    Sink: KSTREAM-SINK-0000000007 (topic: OUTPUT)
+      <-- KTABLE-TOSTREAM-0000000006
+
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_structs/7.2.0_1647304272034/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_structs/7.2.0_1647304272034/plan.json
new file mode 100644
index 000000000000..7c51db28e85a
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_structs/7.2.0_1647304272034/plan.json
@@ -0,0 +1,234 @@
+{
+  "plan" : [ {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE STREAM INPUT (ID BIGINT KEY, F0 STRUCT<A STRING, B BIGINT>) WITH (KAFKA_TOPIC='test_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');",
+    "ddlCommand" : {
+      "@type" : "createStreamV1",
+      "sourceName" : "INPUT",
+      "schema" : "`ID` BIGINT KEY, `F0` STRUCT<`A` STRING, `B` BIGINT>",
+      "topicName" : "test_topic",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    }
+  }, {
+    "@type" : "ksqlPlanV1",
+    "statementText" : "CREATE TABLE OUTPUT AS SELECT\n  INPUT.ID ID,\n  LATEST_BY_OFFSET(INPUT.F0) L0\nFROM INPUT INPUT\nGROUP BY INPUT.ID\nEMIT CHANGES",
+    "ddlCommand" : {
+      "@type" : "createTableV1",
+      "sourceName" : "OUTPUT",
+      "schema" : "`ID` BIGINT KEY, `L0` STRUCT<`A` STRING, `B` BIGINT>",
+      "topicName" : "OUTPUT",
+      "formats" : {
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : {
+          "format" : "JSON"
+        }
+      },
+      "orReplace" : false,
+      "isSource" : false
+    },
+    "queryPlan" : {
+      "sources" : [ "INPUT" ],
+      "sink" : "OUTPUT",
+      "physicalPlan" : {
+        "@type" : "tableSinkV1",
+        "properties" : {
+          "queryContext" : "OUTPUT"
+        },
+        "source" : {
+          "@type" : "tableSelectV1",
+          "properties" : {
+            "queryContext" : "Aggregate/Project"
+          },
+          "source" : {
+            "@type" : "streamAggregateV1",
+            "properties" : {
+              "queryContext" : "Aggregate/Aggregate"
+            },
+            "source" : {
+              "@type" : "streamGroupByKeyV1",
+              "properties" : {
+                "queryContext" : "Aggregate/GroupBy"
+              },
+              "source" : {
+                "@type" : "streamSelectV1",
+                "properties" : {
+                  "queryContext" : "Aggregate/Prepare"
+                },
+                "source" : {
+                  "@type" : "streamSourceV1",
+                  "properties" : {
+                    "queryContext" : "KsqlTopic/Source"
+                  },
+                  "topicName" : "test_topic",
+                  "formats" : {
+                    "keyFormat" : {
+                      "format" : "KAFKA"
+                    },
+                    "valueFormat" : {
+                      "format" : "JSON"
+                    }
+                  },
+                  "sourceSchema" : "`ID` BIGINT KEY, `F0` STRUCT<`A` STRING, `B` BIGINT>",
+                  "pseudoColumnVersion" : 1
+                },
+                "keyColumnNames" : [ "ID" ],
+                "selectExpressions" : [ "ID AS ID", "F0 AS F0" ]
+              },
+              "internalFormats" : {
+                "keyFormat" : {
+                  "format" : "KAFKA"
+                },
+                "valueFormat" : {
+                  "format" : "JSON"
+                }
+              }
+            },
+            "internalFormats" : {
+              "keyFormat" : {
+                "format" : "KAFKA"
+              },
+              "valueFormat" : {
+                "format" : "JSON"
+              }
+            },
+            "nonAggregateColumns" : [ "ID", "F0" ],
+            "aggregationFunctions" : [ "LATEST_BY_OFFSET(F0)" ]
+          },
+          "keyColumnNames" : [ "ID" ],
+          "selectExpressions" : [ "KSQL_AGG_VARIABLE_0 AS L0" ],
+          "internalFormats" : {
+            "keyFormat" : {
+              "format" : "KAFKA"
+            },
+            "valueFormat" : {
+              "format" : "JSON"
+            }
+          }
+        },
+        "formats" : {
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        },
+        "topicName" : "OUTPUT"
+      },
+      "queryId" : "CTAS_OUTPUT_0"
+    }
+  } ],
+  "configs" : {
+    "ksql.extension.dir" : "ext",
+    "ksql.streams.cache.max.bytes.buffering" : "0",
+    "metric.reporters" : "",
+    "ksql.query.status.running.threshold.seconds" : "300",
+    "ksql.connect.basic.auth.credentials.reload" : "false",
+    "ksql.output.topic.name.prefix" : "",
+    "ksql.query.pull.stream.enabled" : "true",
+    "ksql.query.push.v2.interpreter.enabled" : "true",
+    "ksql.queryanonymizer.logs_enabled" : "true",
+    "ksql.variable.substitution.enable" : "true",
+    "ksql.streams.shutdown.timeout.ms" : "300000",
+    "ksql.query.pull.max.allowed.offset.lag" : "9223372036854775807",
+    "ksql.query.pull.max.qps" : "2147483647",
+    "ksql.access.validator.enable" : "auto",
+    "ksql.streams.bootstrap.servers" : "localhost:0",
+    "ksql.query.pull.metrics.enabled" : "true",
+    "ksql.metrics.extension" : null,
+    "ksql.query.push.v2.alos.enabled" : "true",
+    "ksql.query.push.v2.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.query.pull.range.scan.enabled" : "true",
+    "ksql.transient.query.cleanup.service.initial.delay.seconds" : "600",
+    "ksql.hidden.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.lambdas.enabled" : "true",
+    "ksql.source.table.materialization.enabled" : "true",
+    "ksql.query.pull.max.hourly.bandwidth.megabytes" : "2147483647",
+    "ksql.sink.window.change.log.additional.retention" : "1000000",
+    "ksql.query.persistent.active.limit" : "2147483647",
+    "ksql.persistence.wrap.single.values" : null,
+    "ksql.query.transient.max.bytes.buffering.total" : "-1",
+    "ksql.connect.basic.auth.credentials.source" : "NONE",
+    "ksql.schema.registry.url" : "schema_registry.url:0",
+    "ksql.properties.overrides.denylist" : "",
+    "ksql.service.id" : "some.ksql.service.id",
+    "ksql.query.push.v2.max.catchup.consumers" : "5",
+    "ksql.query.push.v2.enabled" : "false",
+    "ksql.transient.query.cleanup.service.enable" : "true",
+    "ksql.query.push.v2.metrics.enabled" : "true",
+    "ksql.rowpartition.rowoffset.enabled" : "true",
+    "ksql.streams.commit.interval.ms" : "2000",
+    "ksql.query.pull.table.scan.enabled" : "true",
+    "ksql.streams.auto.commit.interval.ms" : "0",
+    "ksql.streams.topology.optimization" : "all",
+    "ksql.endpoint.migrate.query" : "true",
+    "ksql.query.push.v2.registry.installed" : "false",
+    "ksql.streams.num.stream.threads" : "4",
+    "ksql.metrics.tags.custom" : "",
+    "ksql.query.push.v2.catchup.consumer.msg.window" : "50",
+    "ksql.runtime.feature.shared.enabled" : "false",
+    "ksql.udf.collect.metrics" : "false",
+    "ksql.new.query.planner.enabled" : "false",
+    "ksql.connect.request.headers.plugin" : null,
+    "ksql.security.extension.class" : null,
+    "ksql.transient.prefix" : "transient_",
+    "ksql.headers.columns.enabled" : "true",
+    "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler",
+    "ksql.connect.request.timeout.ms" : "5000",
+    "ksql.query.pull.enable.standby.reads" : "false",
+    "ksql.persistence.default.format.key" : "KAFKA",
+    "ksql.query.persistent.max.bytes.buffering.total" : "-1",
+    "ksql.query.error.max.queue.size" : "10",
+    "ksql.query.cleanup.shutdown.timeout.ms" : "30000",
+    "ksql.internal.topic.min.insync.replicas" : "1",
+    "ksql.internal.topic.replicas" : "1",
+    "ksql.insert.into.values.enabled" : "true",
+    "ksql.queryanonymizer.cluster_namespace" : null,
+    "ksql.create.or.replace.enabled" : "true",
+    "ksql.shared.runtimes.count" : "8",
+    "ksql.cast.strings.preserve.nulls" : "true",
+    "ksql.authorization.cache.max.entries" : "10000",
+    "ksql.pull.queries.enable" : "true",
+    "ksql.query.pull.consistency.token.enabled" : "true",
+    "ksql.transient.query.cleanup.service.period.seconds" : "600",
+    "ksql.suppress.enabled" : "false",
+    "ksql.readonly.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses",
+    "ksql.connect.basic.auth.credentials.file" : "",
+    "ksql.authorization.cache.expiry.time.secs" : "30",
+    "ksql.query.retry.backoff.initial.ms" : "15000",
+    "ksql.query.pull.max.concurrent.requests" : "2147483647",
+    "ksql.streams.auto.offset.reset" : "earliest",
+    "ksql.connect.url" : "http://localhost:8083",
+    "ksql.query.push.v2.new.latest.delay.ms" : "5000",
+    "ksql.query.push.v2.latest.reset.age.ms" : "30000",
+    "ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
+    "ksql.query.pull.interpreter.enabled" : "true",
+    "ksql.query.pull.limit.clause.enabled" : "true",
+    "ksql.connect.error.handler" : null,
+    "ksql.query.pull.router.thread.pool.size" : "50",
+    "ksql.query.push.v2.continuation.tokens.enabled" : "false",
+    "ksql.query.retry.backoff.max.ms" : "900000",
+    "ksql.timestamp.throw.on.invalid" : "false",
+    "ksql.persistence.default.format.value" : null,
+    "ksql.udfs.enabled" : "true",
+    "ksql.udf.enable.security.manager" : "true",
+    "ksql.connect.worker.config" : "",
+    "ksql.nested.error.set.null" : "true",
+    "ksql.query.pull.thread.pool.size" : "50",
+    "ksql.persistent.prefix" : "query_",
+    "ksql.metastore.backup.location" : "",
+    "ksql.error.classifier.regex" : "",
+    "ksql.suppress.buffer.size.bytes" : "-1"
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_structs/7.2.0_1647304272034/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_structs/7.2.0_1647304272034/spec.json
new file mode 100644
index 000000000000..a463846a9430
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_structs/7.2.0_1647304272034/spec.json
@@ -0,0 +1,193 @@
+{
+  "version" : "7.2.0",
+  "timestamp" : 1647304272034,
+  "path" : "query-validation-tests/latest-offset-udaf.json",
+  "schemas" : {
+    "CTAS_OUTPUT_0.Aggregate.Project" : {
+      "schema" : "`ID` BIGINT KEY, `L0` STRUCT<`A` STRING, `B` BIGINT>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.GroupBy" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` STRUCT<`A` STRING, `B` BIGINT>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.KsqlTopic.Source" : {
+      "schema" : "`ID` BIGINT KEY, `F0` STRUCT<`A` STRING, `B` BIGINT>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize" : {
+      "schema" : "`ID` BIGINT KEY, `ID` BIGINT, `F0` STRUCT<`A` STRING, `B` BIGINT>, `KSQL_AGG_VARIABLE_0` STRUCT<`SEQ` BIGINT, `VAL` STRUCT<`A` STRING, `B` BIGINT>>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    },
+    "CTAS_OUTPUT_0.OUTPUT" : {
+      "schema" : "`ID` BIGINT KEY, `L0` STRUCT<`A` STRING, `B` BIGINT>",
+      "keyFormat" : {
+        "format" : "KAFKA"
+      },
+      "valueFormat" : {
+        "format" : "JSON"
+      }
+    }
+  },
+  "testCase" : {
+    "name" : "latest by offset with structs",
+    "inputs" : [ {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : {
+          "A" : "Early0",
+          "B" : 1
+        }
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : {
+          "A" : "Early1",
+          "B" : 2
+        }
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 0,
+      "value" : {
+        "F0" : {
+          "A" : "Later0",
+          "B" : 3
+        }
+      }
+    }, {
+      "topic" : "test_topic",
+      "key" : 1,
+      "value" : {
+        "F0" : {
+          "A" : "Later1",
+          "B" : 4
+        }
+      }
+    } ],
+    "outputs" : [ {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : {
+          "A" : "Early0",
+          "B" : 1
+        }
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : {
+          "A" : "Early1",
+          "B" : 2
+        }
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 0,
+      "value" : {
+        "L0" : {
+          "A" : "Later0",
+          "B" : 3
+        }
+      }
+    }, {
+      "topic" : "OUTPUT",
+      "key" : 1,
+      "value" : {
+        "L0" : {
+          "A" : "Later1",
+          "B" : 4
+        }
+      }
+    } ],
+    "topics" : [ {
+      "name" : "OUTPUT",
+      "replicas" : 1,
+      "numPartitions" : 4
+    }, {
+      "name" : "test_topic",
+      "replicas" : 1,
+      "numPartitions" : 4
+    } ],
+    "statements" : [ "CREATE STREAM INPUT (ID BIGINT KEY, F0 STRUCT<A VARCHAR, B BIGINT>) WITH (kafka_topic='test_topic', value_format='JSON');", "CREATE TABLE OUTPUT AS SELECT ID, LATEST_BY_OFFSET(F0) AS L0 FROM INPUT GROUP BY ID;" ],
+    "post" : {
+      "sources" : [ {
+        "name" : "INPUT",
+        "type" : "STREAM",
+        "schema" : "`ID` BIGINT KEY, `F0` STRUCT<`A` STRING, `B` BIGINT>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      }, {
+        "name" : "OUTPUT",
+        "type" : "TABLE",
+        "schema" : "`ID` BIGINT KEY, `L0` STRUCT<`A` STRING, `B` BIGINT>",
+        "keyFormat" : {
+          "format" : "KAFKA"
+        },
+        "valueFormat" : "JSON",
+        "keyFeatures" : [ ],
+        "valueFeatures" : [ ],
+        "isSource" : false
+      } ],
+      "topics" : {
+        "topics" : [ {
+          "name" : "test_topic",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        }, {
+          "name" : "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          }
+        }, {
+          "name" : "OUTPUT",
+          "keyFormat" : {
+            "format" : "KAFKA"
+          },
+          "valueFormat" : {
+            "format" : "JSON"
+          },
+          "partitions" : 4
+        } ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_structs/7.2.0_1647304272034/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_structs/7.2.0_1647304272034/topology
new file mode 100644
index 000000000000..e000b160c4db
--- /dev/null
+++ b/ksqldb-functional-tests/src/test/resources/historical_plans/latest-offset-udaf_-_latest_by_offset_with_structs/7.2.0_1647304272034/topology
@@ -0,0 +1,25 @@
+Topologies:
+   Sub-topology: 0
+    Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic])
+      --> KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: [])
+      --> Aggregate-Prepare
+      <-- KSTREAM-SOURCE-0000000000
+    Processor: Aggregate-Prepare (stores: [])
+      --> KSTREAM-AGGREGATE-0000000003
+      <-- KSTREAM-TRANSFORMVALUES-0000000001
+    Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize])
+      --> Aggregate-Aggregate-ToOutputSchema
+      <-- Aggregate-Prepare
+    Processor: Aggregate-Aggregate-ToOutputSchema (stores: [])
+      --> Aggregate-Project
+      <-- KSTREAM-AGGREGATE-0000000003
+    Processor: Aggregate-Project (stores: [])
+      --> KTABLE-TOSTREAM-0000000006
+      <-- Aggregate-Aggregate-ToOutputSchema
+    Processor: KTABLE-TOSTREAM-0000000006 (stores: [])
+      --> KSTREAM-SINK-0000000007
+      <-- Aggregate-Project
+    Sink: KSTREAM-SINK-0000000007 (topic: OUTPUT)
+      <-- KTABLE-TOSTREAM-0000000006
+
diff --git a/ksqldb-functional-tests/src/test/resources/query-validation-tests/latest-offset-udaf.json b/ksqldb-functional-tests/src/test/resources/query-validation-tests/latest-offset-udaf.json
index 444540c24521..8d1a77d81850 100644
--- a/ksqldb-functional-tests/src/test/resources/query-validation-tests/latest-offset-udaf.json
+++ b/ksqldb-functional-tests/src/test/resources/query-validation-tests/latest-offset-udaf.json
@@ -3,6 +3,85 @@
     "Tests covering the use of the LATEST_BY_OFFSET aggregate function"
   ],
   "tests": [
+    {
+      "name": "latest by offset with arrays, structs, and maps",
+      "statements": [
+        "CREATE STREAM INPUT (ID BIGINT KEY, F0 ARRAY<STRUCT<A VARCHAR, M MAP<STRING, DOUBLE>>>) WITH (kafka_topic='test_topic', value_format='JSON');",
+        "CREATE TABLE OUTPUT AS SELECT ID, LATEST_BY_OFFSET(F0) AS L0 FROM INPUT GROUP BY ID;"
+      ],
+      "inputs": [
+        {"topic": "test_topic", "key": 0, "value": {"F0": [{"A": "Early0", "M": {"Early0": 1.234}}, {"A": "Early2", "M": {"Early2": 1.23456}}]}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": [{"A": "Early1", "M": {"Early0": 2.345}}]}},
+        {"topic": "test_topic", "key": 0, "value": {"F0": [{"A": "Later0", "M": {"Early0": 3.45}}]}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": [{"A": "Later1", "M": {"Early0": 4.56}}]}}
+      ],
+      "outputs": [
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": [{"A": "Early0", "M": {"Early0": 1.234}}, {"A": "Early2", "M": {"Early2": 1.23456}}]}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": [{"A": "Early1", "M": {"Early0": 2.345}}]}},
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": [{"A": "Later0", "M": {"Early0": 3.45}}]}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": [{"A": "Later1", "M": {"Early0": 4.56}}]}}
+      ]
+    },
+    {
+      "name": "latest by offset with maps",
+      "statements": [
+        "CREATE STREAM INPUT (ID BIGINT KEY, F0 MAP<STRING, DOUBLE>) WITH (kafka_topic='test_topic', value_format='JSON');",
+        "CREATE TABLE OUTPUT AS SELECT ID, LATEST_BY_OFFSET(F0) AS L0 FROM INPUT GROUP BY ID;"
+      ],
+      "inputs": [
+        {"topic": "test_topic", "key": 0, "value": {"F0": {"Early0": 1.234}}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": {"Early1": 2.3456789}}},
+        {"topic": "test_topic", "key": 0, "value": {"F0": {"Later0": 3.6789}}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": {"Later1": 4}}}
+      ],
+      "outputs": [
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": {"Early0": 1.234}}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": {"Early1": 2.3456789}}},
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": {"Later0": 3.6789}}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": {"Later1": 4.0}}}
+      ]
+    },
+    {
+      "name": "latest by offset with structs",
+      "statements": [
+        "CREATE STREAM INPUT (ID BIGINT KEY, F0 STRUCT<A VARCHAR, B BIGINT>) WITH (kafka_topic='test_topic', value_format='JSON');",
+        "CREATE TABLE OUTPUT AS SELECT ID, LATEST_BY_OFFSET(F0) AS L0 FROM INPUT GROUP BY ID;"
+      ],
+      "inputs": [
+        {"topic": "test_topic", "key": 0, "value": {"F0": {"A": "Early0", "B": 1}}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": {"A": "Early1", "B": 2}}},
+        {"topic": "test_topic", "key": 0, "value": {"F0": {"A": "Later0", "B": 3}}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": {"A": "Later1", "B": 4}}}
+      ],
+      "outputs": [
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": {"A": "Early0", "B": 1}}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": {"A": "Early1", "B": 2}}},
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": {"A": "Later0", "B": 3}}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": {"A": "Later1", "B": 4}}}
+      ]
+    },
+    {
+      "name": "latest by offset with an array added",
+      "statements": [
+        "CREATE STREAM INPUT (ID BIGINT KEY, F0 INT, F1 BIGINT, F2 DOUBLE, F3 BOOLEAN, F4 STRING, F5 TIMESTAMP, F6 TIME, F7 DATE, F8 BYTES, F9 ARRAY<INT>) WITH (kafka_topic='test_topic', value_format='JSON');",
+        "CREATE TABLE OUTPUT AS SELECT ID, LATEST_BY_OFFSET(F0) AS L0, LATEST_BY_OFFSET(F1) AS L1, LATEST_BY_OFFSET(F2) AS L2, LATEST_BY_OFFSET(F3) AS L3, LATEST_BY_OFFSET(F4) AS L4, LATEST_BY_OFFSET(F5) AS L5, LATEST_BY_OFFSET(F6) AS L6, LATEST_BY_OFFSET(F7) AS L7, LATEST_BY_OFFSET(F8) AS L8, LATEST_BY_OFFSET(F9) AS L9 FROM INPUT GROUP BY ID;"
+      ],
+      "inputs": [
+        {"topic": "test_topic", "key": 0, "value": {"F0": 12, "F1": 1000, "F2": 1.23, "F3": true, "F4": "foo", "F5": 12, "F6": 123, "F7": 1234, "F8": "YQ==", "F9": [0,0,1,0,-1]}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": 12, "F1": 1000, "F2": 1.23, "F3": true, "F4": "foo", "F5": 12, "F6": 123, "F7": 1234, "F8": "YQ==", "F9": [0,0,1,0,-1]}},
+        {"topic": "test_topic", "key": 0, "value": {"F0": 21, "F1": 2000, "F2": 2.23, "F3": false, "F4": "foo", "F5": 34, "F6": 234, "F7": 2345, "F8": "Yg==", "F9": [1,2,3,4,-1]}},
+        {"topic": "test_topic", "key": 1, "value": {"F0": 21, "F1": 2000, "F2": 2.23, "F3": false, "F4": "foo", "F5": 34, "F6": 234, "F7": 2345, "F8": "Yg==", "F9": [1,2,3,4,-1]}}
+      ],
+      "outputs": [
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": 12, "L1": 1000, "L2": 1.23, "L3": true, "L4": "foo", "L5": 12, "L6": 123, "L7": 1234, "L8": "YQ==", "L9": [0,0,1,0,-1]}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": 12, "L1": 1000, "L2": 1.23, "L3": true, "L4": "foo", "L5": 12, "L6": 123, "L7": 1234, "L8": "YQ==", "L9": [0,0,1,0,-1]}},
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": 21, "L1": 2000, "L2": 2.23, "L3": false, "L4":
+        "foo", "L5": 34, "L6": 234, "L7": 2345, "L8": "Yg==", "L9": [1,2,3,4,-1]}},
+        {"topic": "OUTPUT", "key": 1, "value": {"L0": 21, "L1": 2000, "L2": 2.23, "L3": false, "L4":
+        "foo", "L5": 34, "L6": 234, "L7": 2345, "L8": "Yg==", "L9": [1,2,3,4,-1]}}
+      ]
+    },
+
     {
       "name": "latest by offset",
       "statements": [
@@ -22,6 +101,21 @@
         {"topic": "OUTPUT", "key": 1, "value": {"L0": 21, "L1": 2000, "L2": 2.23, "L3": false, "L4": "bar", "L5": 34, "L6": 234, "L7": 2345, "L8": "Yg=="}}
       ]
     },
+    {
+      "name": "latest by offset with decimals",
+      "statements": [
+        "CREATE STREAM INPUT (ID BIGINT KEY, F0 DECIMAL(3,2)) WITH (kafka_topic='test_topic', value_format='JSON');",
+        "CREATE TABLE OUTPUT AS SELECT ID, LATEST_BY_OFFSET(F0, true) AS L0 FROM INPUT GROUP BY ID;"
+      ],
+      "inputs": [
+        {"topic": "test_topic", "key": 0, "value": {"F0": "3.4"}},
+        {"topic": "test_topic", "key": 0, "value": {"F0": "8.9"}}
+      ],
+      "outputs": [
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": "3.40"}},
+        {"topic": "OUTPUT", "key": 0, "value": {"L0": "8.90"}}
+      ]
+    },
     {
       "name": "nulls ignored - single",
       "statements": [

From 88803b8dbdf4c59726df9ac5ed0d1c6b955ae8aa Mon Sep 17 00:00:00 2001
From: Jim Hughes <jhughes@confluent.io>
Date: Mon, 14 Mar 2022 22:46:29 -0400
Subject: [PATCH 5/5] test: Fixing unit test.

---
 .../test/java/io/confluent/ksql/function/UdfLoaderTest.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ksqldb-engine/src/test/java/io/confluent/ksql/function/UdfLoaderTest.java b/ksqldb-engine/src/test/java/io/confluent/ksql/function/UdfLoaderTest.java
index dfa3910b673c..2b3ffacaa3ab 100644
--- a/ksqldb-engine/src/test/java/io/confluent/ksql/function/UdfLoaderTest.java
+++ b/ksqldb-engine/src/test/java/io/confluent/ksql/function/UdfLoaderTest.java
@@ -979,7 +979,8 @@ public void shouldThrowIfMissingInputTypeSchema() throws Exception {
     );
 
     // Then:
-    assertThat(e.getMessage(), containsString("Must specify 'paramSchema' for STRUCT parameter in @UdafFactory."));
+    assertThat(e.getMessage(), containsString("Must specify 'paramSchema' for STRUCT"
+        + " parameter in @UdafFactory or implement getAggregateSqlType()/getReturnSqlType()."));
   }
 
   @Test