Relocate packages to better organize sources

velo · velo · commit 620761e1b0b8 · 2025-04-21T10:08:13.000-03:00
Signed-off-by: Marvin Froeder &lt;marvin@datasqrl.com&gt;
diff --git a/connectors/postgresql-connector/src/main/java/com/datasqrl/connector/postgresql/type/PostgresVectorTypeSerializer.java b/connectors/postgresql-connector/src/main/java/com/datasqrl/connector/postgresql/type/PostgresVectorTypeSerializer.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.vector;
+package com.datasqrl.connector.postgresql.type;
 
-import com.datasqrl.connector.postgresql.type.JdbcTypeSerializer;
 import com.datasqrl.connector.postgresql.type.JdbcTypeSerializer.GenericDeserializationConverter;
 import com.datasqrl.connector.postgresql.type.JdbcTypeSerializer.GenericSerializationConverter;
 import com.datasqrl.types.vector.FlinkVectorType;
diff --git a/connectors/postgresql-connector/src/main/resources/META-INF/services/com.datasqrl.connector.postgresql.type.JdbcTypeSerializer b/connectors/postgresql-connector/src/main/resources/META-INF/services/com.datasqrl.connector.postgresql.type.JdbcTypeSerializer
@@ -1,2 +1,3 @@
 com.datasqrl.connector.postgresql.type.PostgresRowTypeSerializer
-com.datasqrl.connector.postgresql.type.PostgresJsonTypeSerializer
+com.datasqrl.connector.postgresql.type.PostgresJsonTypeSerializer
+com.datasqrl.connector.postgresql.type.PostgresVectorTypeSerializer
diff --git a/connectors/postgresql-connector/src/test/java/com/datasqrl/connector/postgresql/jdbc/FlinkJdbcTest.java b/connectors/postgresql-connector/src/test/java/com/datasqrl/connector/postgresql/jdbc/FlinkJdbcTest.java
@@ -102,7 +102,7 @@ public void testFlinkWithPostgres() throws Exception {
 
       // Register tables in the environment
       tableEnv.executeSql(
-          "CREATE TEMPORARY FUNCTION IF NOT EXISTS `tojson` AS 'com.datasqrl.json.ToJson' LANGUAGE JAVA");
+          "CREATE TEMPORARY FUNCTION IF NOT EXISTS `tojson` AS 'com.datasqrl.types.json.functions.ToJson' LANGUAGE JAVA");
       tableEnv.executeSql(createSourceTable);
       tableEnv.executeSql(createSinkTable);
 
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/ArrayAgg.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/ArrayAgg.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
 import java.util.List;
 import lombok.Value;
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonArray.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonArray.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
-import static com.datasqrl.json.JsonFunctions.createJsonArgumentTypeStrategy;
-import static com.datasqrl.json.JsonFunctions.createJsonType;
+import static com.datasqrl.types.json.functions.JsonFunctions.createJsonArgumentTypeStrategy;
+import static com.datasqrl.types.json.functions.JsonFunctions.createJsonType;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.json.FlinkJsonType;
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonArrayAgg.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonArrayAgg.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
 import com.datasqrl.types.json.FlinkJsonType;
 import java.util.ArrayList;
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonConcat.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonConcat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.json.FlinkJsonType;
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonExists.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonExists.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.json.FlinkJsonType;
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonExtract.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonExtract.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.json.FlinkJsonType;
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonFunctions.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonFunctions.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
 import com.datasqrl.types.json.FlinkJsonType;
 import org.apache.flink.table.api.DataTypes;
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonObject.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonObject.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
-import static com.datasqrl.json.JsonFunctions.createJsonArgumentTypeStrategy;
+import static com.datasqrl.types.json.functions.JsonFunctions.createJsonArgumentTypeStrategy;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.json.FlinkJsonType;
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonObjectAgg.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonObjectAgg.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
 import com.datasqrl.types.json.FlinkJsonType;
 import com.datasqrl.types.json.FlinkJsonTypeSerializer;
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonQuery.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonQuery.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.json.FlinkJsonType;
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonToString.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonToString.java
@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.json.FlinkJsonType;
 import com.google.auto.service.AutoService;
 import org.apache.flink.table.functions.ScalarFunction;
 
 @AutoService(AutoRegisterSystemFunction.class)
-public class JsonToString extends ScalarFunction
-    implements /* FIXME what to do about the sqrl cast? SqrlCastFunction, */ AutoRegisterSystemFunction {
+public class JsonToString extends ScalarFunction implements AutoRegisterSystemFunction {
 
   public String eval(FlinkJsonType json) {
     if (json == null) {
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/ObjectAgg.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/ObjectAgg.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
 import java.util.Map;
 import lombok.Getter;
diff --git a/types/json-type/src/main/java/com/datasqrl/types/json/functions/ToJson.java b/types/json-type/src/main/java/com/datasqrl/types/json/functions/ToJson.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.json;
+package com.datasqrl.types.json.functions;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.json.FlinkJsonType;
@@ -31,8 +31,7 @@
 
 /** Parses a JSON object from string */
 @AutoService(AutoRegisterSystemFunction.class)
-public class ToJson extends ScalarFunction
-    implements /* FIXME what to do about the sqrl cast?  SqrlCastFunction, */ AutoRegisterSystemFunction {
+public class ToJson extends ScalarFunction implements AutoRegisterSystemFunction {
 
   public static final ObjectMapper mapper = JacksonMapperFactory.createObjectMapper();
 
diff --git a/types/json-type/src/test/java/com/datasqrl/json/JsonFunctionsTest.java b/types/json-type/src/test/java/com/datasqrl/json/JsonFunctionsTest.java
@@ -23,6 +23,9 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.datasqrl.types.json.FlinkJsonType;
+import com.datasqrl.types.json.functions.ArrayAgg;
+import com.datasqrl.types.json.functions.JsonFunctions;
+import com.datasqrl.types.json.functions.ObjectAgg;
 import lombok.SneakyThrows;
 import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
 import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/AsciiTextTestEmbed.java b/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/AsciiTextTestEmbed.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.vector;
+package com.datasqrl.types.vector.functions;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.vector.FlinkVectorType;
diff --git a/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/Center.java b/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/Center.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.vector;
+package com.datasqrl.types.vector.functions;
 
-import static com.datasqrl.vector.VectorFunctions.VEC_TO_DOUBLE;
-import static com.datasqrl.vector.VectorFunctions.convert;
+import static com.datasqrl.types.vector.functions.VectorFunctions.VEC_TO_DOUBLE;
+import static com.datasqrl.types.vector.functions.VectorFunctions.convert;
 
 import com.datasqrl.types.vector.FlinkVectorType;
 import org.apache.flink.table.functions.AggregateFunction;
diff --git a/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/CenterAccumulator.java b/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/CenterAccumulator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.vector;
+package com.datasqrl.types.vector.functions;
 
 // import com.google.common.base.Preconditions;
 
diff --git a/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/CosineDistance.java b/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/CosineDistance.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.vector;
+package com.datasqrl.types.vector.functions;
 
 import com.datasqrl.types.vector.FlinkVectorType;
 
diff --git a/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/CosineSimilarity.java b/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/CosineSimilarity.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.vector;
+package com.datasqrl.types.vector.functions;
 
-import static com.datasqrl.vector.VectorFunctions.VEC_TO_DOUBLE;
+import static com.datasqrl.types.vector.functions.VectorFunctions.VEC_TO_DOUBLE;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.vector.FlinkVectorType;
diff --git a/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/DoubleToVector.java b/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/DoubleToVector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.vector;
+package com.datasqrl.types.vector.functions;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.vector.FlinkVectorType;
@@ -22,8 +22,7 @@
 
 /** Converts a double array to a vector */
 @AutoService(AutoRegisterSystemFunction.class)
-public class DoubleToVector extends ScalarFunction
-    implements /* FIXME what to do about the sqrl cast?  SqrlCastFunction, */ AutoRegisterSystemFunction {
+public class DoubleToVector extends ScalarFunction implements AutoRegisterSystemFunction {
 
   public FlinkVectorType eval(double[] array) {
     return new FlinkVectorType(array);
diff --git a/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/EuclideanDistance.java b/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/EuclideanDistance.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.vector;
+package com.datasqrl.types.vector.functions;
 
-import static com.datasqrl.vector.VectorFunctions.VEC_TO_DOUBLE;
+import static com.datasqrl.types.vector.functions.VectorFunctions.VEC_TO_DOUBLE;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.vector.FlinkVectorType;
diff --git a/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/README.md b/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/README.md
diff --git a/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/VectorFunctions.java b/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/VectorFunctions.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.vector;
+package com.datasqrl.types.vector.functions;
 
 import com.datasqrl.types.vector.FlinkVectorType;
 import java.util.Set;
diff --git a/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/VectorToDouble.java b/types/vector-type/src/main/java/com/datasqrl/types/vector/functions/VectorToDouble.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datasqrl.vector;
+package com.datasqrl.types.vector.functions;
 
 import com.datasqrl.function.AutoRegisterSystemFunction;
 import com.datasqrl.types.vector.FlinkVectorType;
@@ -22,8 +22,7 @@
 
 /** Converts a vector to a double array */
 @AutoService(AutoRegisterSystemFunction.class)
-public class VectorToDouble extends ScalarFunction
-    implements /* FIXME what to do about the sqrl cast?  SqrlCastFunction, */ AutoRegisterSystemFunction {
+public class VectorToDouble extends ScalarFunction implements AutoRegisterSystemFunction {
 
   public double[] eval(FlinkVectorType vectorType) {
     return vectorType.getValue();
diff --git a/types/vector-type/src/main/resources/META-INF/services/com.datasqrl.type.JdbcTypeSerializer b/types/vector-type/src/main/resources/META-INF/services/com.datasqrl.type.JdbcTypeSerializer
