Skip to content

Commit 01cfe92

Browse files
committed
Relocate packages to better organize sources
Signed-off-by: Marvin Froeder <marvin@datasqrl.com>
1 parent b20e793 commit 01cfe92

File tree

28 files changed

+36
-34
lines changed

28 files changed

+36
-34
lines changed

connectors/postgresql-connector/src/main/java/com/datasqrl/vector/PostgresVectorTypeSerializer.java renamed to connectors/postgresql-connector/src/main/java/com/datasqrl/connector/postgresql/type/PostgresVectorTypeSerializer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.vector;
16+
package com.datasqrl.connector.postgresql.type;
1717

18-
import com.datasqrl.connector.postgresql.type.JdbcTypeSerializer;
1918
import com.datasqrl.connector.postgresql.type.JdbcTypeSerializer.GenericDeserializationConverter;
2019
import com.datasqrl.connector.postgresql.type.JdbcTypeSerializer.GenericSerializationConverter;
2120
import com.datasqrl.types.vector.FlinkVectorType;
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
com.datasqrl.connector.postgresql.type.PostgresRowTypeSerializer
2-
com.datasqrl.connector.postgresql.type.PostgresJsonTypeSerializer
2+
com.datasqrl.connector.postgresql.type.PostgresJsonTypeSerializer
3+
com.datasqrl.connector.postgresql.type.PostgresVectorTypeSerializer

connectors/postgresql-connector/src/test/java/com/datasqrl/connector/postgresql/jdbc/FlinkJdbcTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void testFlinkWithPostgres() throws Exception {
102102

103103
// Register tables in the environment
104104
tableEnv.executeSql(
105-
"CREATE TEMPORARY FUNCTION IF NOT EXISTS `tojson` AS 'com.datasqrl.json.ToJson' LANGUAGE JAVA");
105+
"CREATE TEMPORARY FUNCTION IF NOT EXISTS `tojson` AS 'com.datasqrl.types.json.functions.ToJson' LANGUAGE JAVA");
106106
tableEnv.executeSql(createSourceTable);
107107
tableEnv.executeSql(createSinkTable);
108108

types/json-type/src/main/java/com/datasqrl/json/ArrayAgg.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/ArrayAgg.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

1818
import java.util.List;
1919
import lombok.Value;

types/json-type/src/main/java/com/datasqrl/json/JsonArray.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonArray.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

18-
import static com.datasqrl.json.JsonFunctions.createJsonArgumentTypeStrategy;
19-
import static com.datasqrl.json.JsonFunctions.createJsonType;
18+
import static com.datasqrl.types.json.functions.JsonFunctions.createJsonArgumentTypeStrategy;
19+
import static com.datasqrl.types.json.functions.JsonFunctions.createJsonType;
2020

2121
import com.datasqrl.function.AutoRegisterSystemFunction;
2222
import com.datasqrl.types.json.FlinkJsonType;

types/json-type/src/main/java/com/datasqrl/json/JsonArrayAgg.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonArrayAgg.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

1818
import com.datasqrl.types.json.FlinkJsonType;
1919
import java.util.ArrayList;

types/json-type/src/main/java/com/datasqrl/json/JsonConcat.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonConcat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

1818
import com.datasqrl.function.AutoRegisterSystemFunction;
1919
import com.datasqrl.types.json.FlinkJsonType;

types/json-type/src/main/java/com/datasqrl/json/JsonExists.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonExists.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

1818
import com.datasqrl.function.AutoRegisterSystemFunction;
1919
import com.datasqrl.types.json.FlinkJsonType;

types/json-type/src/main/java/com/datasqrl/json/JsonExtract.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonExtract.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

1818
import com.datasqrl.function.AutoRegisterSystemFunction;
1919
import com.datasqrl.types.json.FlinkJsonType;

types/json-type/src/main/java/com/datasqrl/json/JsonFunctions.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonFunctions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

1818
import com.datasqrl.types.json.FlinkJsonType;
1919
import org.apache.flink.table.api.DataTypes;

types/json-type/src/main/java/com/datasqrl/json/JsonObject.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonObject.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

18-
import static com.datasqrl.json.JsonFunctions.createJsonArgumentTypeStrategy;
18+
import static com.datasqrl.types.json.functions.JsonFunctions.createJsonArgumentTypeStrategy;
1919

2020
import com.datasqrl.function.AutoRegisterSystemFunction;
2121
import com.datasqrl.types.json.FlinkJsonType;

types/json-type/src/main/java/com/datasqrl/json/JsonObjectAgg.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonObjectAgg.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

1818
import com.datasqrl.types.json.FlinkJsonType;
1919
import com.datasqrl.types.json.FlinkJsonTypeSerializer;

types/json-type/src/main/java/com/datasqrl/json/JsonQuery.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

1818
import com.datasqrl.function.AutoRegisterSystemFunction;
1919
import com.datasqrl.types.json.FlinkJsonType;

types/json-type/src/main/java/com/datasqrl/json/JsonToString.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/JsonToString.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

1818
import com.datasqrl.function.AutoRegisterSystemFunction;
1919
import com.datasqrl.types.json.FlinkJsonType;

types/json-type/src/main/java/com/datasqrl/json/ObjectAgg.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/ObjectAgg.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

1818
import java.util.Map;
1919
import lombok.Getter;

types/json-type/src/main/java/com/datasqrl/json/ToJson.java renamed to types/json-type/src/main/java/com/datasqrl/types/json/functions/ToJson.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.json;
16+
package com.datasqrl.types.json.functions;
1717

1818
import com.datasqrl.function.AutoRegisterSystemFunction;
1919
import com.datasqrl.types.json.FlinkJsonType;

types/json-type/src/test/java/com/datasqrl/json/JsonFunctionsTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
import static org.junit.jupiter.api.Assertions.assertTrue;
2424

2525
import com.datasqrl.types.json.FlinkJsonType;
26+
import com.datasqrl.types.json.functions.ArrayAgg;
27+
import com.datasqrl.types.json.functions.JsonFunctions;
28+
import com.datasqrl.types.json.functions.ObjectAgg;
2629
import lombok.SneakyThrows;
2730
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
2831
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;

types/vector-type/src/main/java/com/datasqrl/vector/AsciiTextTestEmbed.java renamed to types/vector-type/src/main/java/com/datasqrl/types/vector/functions/AsciiTextTestEmbed.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.vector;
16+
package com.datasqrl.types.vector.functions;
1717

1818
import com.datasqrl.function.AutoRegisterSystemFunction;
1919
import com.datasqrl.types.vector.FlinkVectorType;

types/vector-type/src/main/java/com/datasqrl/vector/Center.java renamed to types/vector-type/src/main/java/com/datasqrl/types/vector/functions/Center.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.vector;
16+
package com.datasqrl.types.vector.functions;
1717

18-
import static com.datasqrl.vector.VectorFunctions.VEC_TO_DOUBLE;
19-
import static com.datasqrl.vector.VectorFunctions.convert;
18+
import static com.datasqrl.types.vector.functions.VectorFunctions.VEC_TO_DOUBLE;
19+
import static com.datasqrl.types.vector.functions.VectorFunctions.convert;
2020

2121
import com.datasqrl.types.vector.FlinkVectorType;
2222
import org.apache.flink.table.functions.AggregateFunction;

types/vector-type/src/main/java/com/datasqrl/vector/CenterAccumulator.java renamed to types/vector-type/src/main/java/com/datasqrl/types/vector/functions/CenterAccumulator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.vector;
16+
package com.datasqrl.types.vector.functions;
1717

1818
// import com.google.common.base.Preconditions;
1919

types/vector-type/src/main/java/com/datasqrl/vector/CosineDistance.java renamed to types/vector-type/src/main/java/com/datasqrl/types/vector/functions/CosineDistance.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.vector;
16+
package com.datasqrl.types.vector.functions;
1717

1818
import com.datasqrl.types.vector.FlinkVectorType;
1919

types/vector-type/src/main/java/com/datasqrl/vector/CosineSimilarity.java renamed to types/vector-type/src/main/java/com/datasqrl/types/vector/functions/CosineSimilarity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.vector;
16+
package com.datasqrl.types.vector.functions;
1717

18-
import static com.datasqrl.vector.VectorFunctions.VEC_TO_DOUBLE;
18+
import static com.datasqrl.types.vector.functions.VectorFunctions.VEC_TO_DOUBLE;
1919

2020
import com.datasqrl.function.AutoRegisterSystemFunction;
2121
import com.datasqrl.types.vector.FlinkVectorType;

types/vector-type/src/main/java/com/datasqrl/vector/DoubleToVector.java renamed to types/vector-type/src/main/java/com/datasqrl/types/vector/functions/DoubleToVector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.vector;
16+
package com.datasqrl.types.vector.functions;
1717

1818
import com.datasqrl.function.AutoRegisterSystemFunction;
1919
import com.datasqrl.types.vector.FlinkVectorType;

types/vector-type/src/main/java/com/datasqrl/vector/EuclideanDistance.java renamed to types/vector-type/src/main/java/com/datasqrl/types/vector/functions/EuclideanDistance.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.vector;
16+
package com.datasqrl.types.vector.functions;
1717

18-
import static com.datasqrl.vector.VectorFunctions.VEC_TO_DOUBLE;
18+
import static com.datasqrl.types.vector.functions.VectorFunctions.VEC_TO_DOUBLE;
1919

2020
import com.datasqrl.function.AutoRegisterSystemFunction;
2121
import com.datasqrl.types.vector.FlinkVectorType;

types/vector-type/src/main/java/com/datasqrl/vector/VectorFunctions.java renamed to types/vector-type/src/main/java/com/datasqrl/types/vector/functions/VectorFunctions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.vector;
16+
package com.datasqrl.types.vector.functions;
1717

1818
import com.datasqrl.types.vector.FlinkVectorType;
1919
import java.util.Set;

types/vector-type/src/main/java/com/datasqrl/vector/VectorToDouble.java renamed to types/vector-type/src/main/java/com/datasqrl/types/vector/functions/VectorToDouble.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datasqrl.vector;
16+
package com.datasqrl.types.vector.functions;
1717

1818
import com.datasqrl.function.AutoRegisterSystemFunction;
1919
import com.datasqrl.types.vector.FlinkVectorType;

types/vector-type/src/main/resources/META-INF/services/com.datasqrl.type.JdbcTypeSerializer

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)