Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions sql-to-dbsp-compiler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,14 +213,3 @@ This executor is a combination of the DBSP executor and the JDBC
executor, using a real database to store data in tables, but using
DBSP as a query engine. It should be able to execute all SqlLogicTest
queries that are supported by the underlying database.

### Postgres tests

We are manually converting Postgres tests
<https://github.com/postgres/postgres/blob/master/src/test/regress/expected>
to run on DBSP, since the Postgres SQL syntax is too different from
the Calcite syntax (especially in the functions supported). In some
cases the semantics of Postgres SQL is different from Calcite; for
example, in Postgres the days of the week are numbered from 0, where 0
is Sunday, but in Calcite the days of the week are numbered from 1,
where 1 is Sunday. In such cases we have to change the tests.
13 changes: 12 additions & 1 deletion sql-to-dbsp-compiler/SQL-compiler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<maven.compiler.target>19</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<calcite.version>1.42.0</calcite.version>
<jackson.version>2.17.1</jackson.version>
<jackson.version>2.21.1</jackson.version>
<janino.version>3.1.12</janino.version>
</properties>

Expand Down Expand Up @@ -247,6 +247,11 @@
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
Expand Down Expand Up @@ -295,6 +300,12 @@
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-core</artifactId>
<version>1.27.0</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,8 @@ public void asJson(ToJsonInnerVisitor visitor) {

public static Properties fromJson(JsonNode node) {
Properties result = new Properties();
var it = node.fields();
while (it.hasNext()) {
var entry = it.next();
for (var entry: node.properties())
result.propertyValue.put(entry.getKey(), new PropertyValue(entry.getValue().asText()));
}
return result;
}
}
2 changes: 1 addition & 1 deletion sql-to-dbsp-compiler/simulator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<maven.compiler.source>19</maven.compiler.source>
<maven.compiler.target>19</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jackson.version>2.17.1</jackson.version>
<jackson.version>2.21.1</jackson.version>
</properties>

<dependencies>
Expand Down
Empty file.
5 changes: 5 additions & 0 deletions sql-to-dbsp-compiler/slt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@
</build>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.21</version>
</dependency>
<dependency>
<groupId>com.feldera</groupId>
<artifactId>SQL-compiler</artifactId>
Expand Down
Loading