Skip to content

Replace jsqlparser with antlr gramma #1298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfallows merged 26 commits into from
Oct 22, 2024
Merged

Replace jsqlparser with antlr gramma #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
57984ca
Initial implementation
akrambek Oct 15, 2024
66622a5
WIP
akrambek Oct 15, 2024
1b0c5ab
Fix typo
akrambek Oct 15, 2024
a99a47b
Refactor code
akrambek Oct 16, 2024
c158553
Refactor
akrambek Oct 16, 2024
5393150
WIP
akrambek Oct 16, 2024
5cf9acd
WIP
akrambek Oct 16, 2024
67aacf6
WIP
akrambek Oct 17, 2024
449e63a
Revert back change
akrambek Oct 17, 2024
526fc5a
WIP
akrambek Oct 17, 2024
3a9a483
WIP
akrambek Oct 17, 2024
9af3f60
WIP
akrambek Oct 18, 2024
4704dda
WIP
akrambek Oct 18, 2024
6ba3bce
WIP
akrambek Oct 18, 2024
ae8264e
WIP only create function left
akrambek Oct 18, 2024
982a955
WIP
akrambek Oct 18, 2024
5d4414d
Checkpoint
akrambek Oct 18, 2024
e28d843
Remove regenerated files
akrambek Oct 18, 2024
e578609
Clean up
akrambek Oct 18, 2024
af43caf
update module-info.xml
akrambek Oct 18, 2024
89787ef
update module-info
akrambek Oct 18, 2024
e344a81
Fix parsing
akrambek Oct 18, 2024
8a89a81
Fix remaining issues
akrambek Oct 18, 2024
521343a
Applied feedback from PR
akrambek Oct 18, 2024
47c5854
avoid object creation
akrambek Oct 22, 2024
0710b08
Remove comments
akrambek Oct 22, 2024
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
1 change: 0 additions & 1 deletion cloud/docker-image/src/main/docker/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
<include>org/junit/**</include>
<include>com/google/**</include>
<include>org/checkerframework/**</include>
<include>com/github/jsqlparser/**</include>

@jfallows jfallows Oct 18, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

</includes>
</fileSet>
</fileSets>
Expand Down
2 changes: 1 addition & 1 deletion incubator/binding-pgsql-kafka/NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ WARRANTIES OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.

This project includes:
JSQLParser library under GNU Library or Lesser General Public License (LGPL) V2.1 or The Apache Software License, Version 2.0
zilla::incubator::binding-pgsql under Aklivity Community License Agreement

7 changes: 3 additions & 4 deletions incubator/binding-pgsql-kafka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</licenses>

<properties>
<jacoco.coverage.ratio>0.82</jacoco.coverage.ratio>
<jacoco.coverage.ratio>0.86</jacoco.coverage.ratio>
<jacoco.missed.count>0</jacoco.missed.count>
</properties>

Expand All @@ -42,8 +42,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.jsqlparser</groupId>
<artifactId>jsqlparser</artifactId>
<groupId>io.aklivity.zilla</groupId>
<artifactId>binding-pgsql</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down Expand Up @@ -195,7 +195,6 @@
<configuration>
<excludes>
<exclude>io/aklivity/zilla/runtime/binding/pgsql/kafka/internal/types/**/*.class</exclude>
<exclude>net/sf/jsqlparser/parser/*</exclude>
</excludes>
<rules>
<rule>
Expand Down
40 changes: 7 additions & 33 deletions ...ty/zilla/runtime/binding/pgsql/kafka/internal/schema/PgsqlKafkaKeyAvroSchemaTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@
*/
package io.aklivity.zilla.runtime.binding.pgsql.kafka.internal.schema;

import java.util.List;
import java.util.Map;

import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
import net.sf.jsqlparser.statement.create.table.CreateTable;
import net.sf.jsqlparser.statement.create.table.Index;
import io.aklivity.zilla.runtime.binding.pgsql.parser.model.TableInfo;

public class PgsqlKafkaKeyAvroSchemaTemplate extends PgsqlKafkaAvroSchemaTemplate
{
Expand All @@ -35,12 +33,12 @@ public PgsqlKafkaKeyAvroSchemaTemplate(

public String generateSchema(
String database,
CreateTable createTable)
TableInfo createTable)
{
schemaBuilder.setLength(0);

final String newNamespace = namespace.replace(DATABASE_PLACEHOLDER, database);
final String recordName = String.format("%s_key", createTable.getTable().getName());
final String recordName = String.format("%s_key", createTable.name());

schemaBuilder.append("{\n");
schemaBuilder.append("\"schemaType\": \"AVRO\",\n");
Expand All @@ -52,10 +50,10 @@ public String generateSchema(
schemaBuilder.append(" \\\"namespace\\\": \\\"").append(newNamespace).append("\\\",");
schemaBuilder.append(" \\\"fields\\\": [");

for (ColumnDefinition column : createTable.getColumnDefinitions())
for (Map.Entry<String, String> column : createTable.columns().entrySet())
{
String fieldName = column.getColumnName();
String pgsqlType = column.getColDataType().getDataType();
String fieldName = column.getKey();
String pgsqlType = column.getValue();

String avroType = convertPgsqlTypeToAvro(pgsqlType);

Expand All @@ -72,28 +70,4 @@ public String generateSchema(

return schemaBuilder.toString();
}

public String primaryKey(
CreateTable statement)
{
String primaryKey = null;

final List<Index> indexes = statement.getIndexes();

if (indexes != null && !indexes.isEmpty())
{
match:
for (Index index : indexes)
{
if ("PRIMARY KEY".equalsIgnoreCase(index.getType()))
{
final List<Index.ColumnParams> primaryKeyColumns = index.getColumns();
primaryKey = primaryKeyColumns.get(0).columnName;
break match;
}
}
}

return primaryKey;
}
}
68 changes: 8 additions & 60 deletions .../zilla/runtime/binding/pgsql/kafka/internal/schema/PgsqlKafkaValueAvroSchemaTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@
*/
package io.aklivity.zilla.runtime.binding.pgsql.kafka.internal.schema;

import java.util.List;
import java.util.Map;

import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
import net.sf.jsqlparser.statement.create.table.CreateTable;
import net.sf.jsqlparser.statement.create.table.Index;
import io.aklivity.zilla.runtime.binding.pgsql.parser.model.TableInfo;

public class PgsqlKafkaValueAvroSchemaTemplate extends PgsqlKafkaAvroSchemaTemplate
{
Expand All @@ -35,88 +33,38 @@ public PgsqlKafkaValueAvroSchemaTemplate(

public String generateSchema(
String database,
CreateTable createTable)
TableInfo createTable)
{
schemaBuilder.setLength(0);

final String newNamespace = namespace.replace(DATABASE_PLACEHOLDER, database);
final String recordName = createTable.getTable().getName();
final String recordName = createTable.name();

schemaBuilder.append("{\n");
schemaBuilder.append("\"schemaType\": \"AVRO\",\n");
schemaBuilder.append("\"schema\": \""); // Begin the schema field
schemaBuilder.append("\"schema\": \"");

// Building the actual Avro schema
schemaBuilder.append("{\\\"type\\\": \\\"record\\\",");
schemaBuilder.append(" \\\"name\\\": \\\"").append(recordName).append("\\\",");
schemaBuilder.append(" \\\"namespace\\\": \\\"").append(newNamespace).append("\\\",");
schemaBuilder.append(" \\\"fields\\\": [");

for (ColumnDefinition column : createTable.getColumnDefinitions())
for (Map.Entry<String, String> column : createTable.columns().entrySet())
{
String fieldName = column.getColumnName();
String pgsqlType = column.getColDataType().getDataType();
String fieldName = column.getKey();
String pgsqlType = column.getValue();

String avroType = convertPgsqlTypeToAvro(pgsqlType);

schemaBuilder.append(" {\\\"name\\\": \\\"").append(fieldName).append("\\\",");
schemaBuilder.append(" \\\"type\\\": ").append(avroType).append("},");
}

// Remove the last comma and close the fields array
schemaBuilder.setLength(schemaBuilder.length() - 1);
schemaBuilder.append("]");

// Closing the Avro schema
schemaBuilder.append("}\"\n}");

return schemaBuilder.toString();
}

public String primaryKey(
CreateTable statement)
{
String primaryKey = null;

final List<Index> indexes = statement.getIndexes();

if (indexes != null && !indexes.isEmpty())
{
match:
for (Index index : indexes)
{
if ("PRIMARY KEY".equalsIgnoreCase(index.getType()))
{
final List<Index.ColumnParams> primaryKeyColumns = index.getColumns();
primaryKey = primaryKeyColumns.get(0).columnName;
break match;
}
}
}

return primaryKey;
}

public int primaryKeyCount(
CreateTable statement)
{
int primaryKeyCount = 0;

final List<Index> indexes = statement.getIndexes();

if (indexes != null && !indexes.isEmpty())
{
match:
for (Index index : indexes)
{
if ("PRIMARY KEY".equalsIgnoreCase(index.getType()))
{
primaryKeyCount = index.getColumns().size();
break match;
}
}
}

return primaryKeyCount;
}
}
Loading