opensource/WrenAI
3
0
Fork 0
mirror of https://github.com/Canner/WrenAI.git synced 2026-09-24 23:29:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move PG Types to cml-spi (#10)

Browse Source 
* move pg types to cml-spi

* fix copyright statements
This commit is contained in:
Jia-Xuan Liu
2022-05-23 17:36:25 +08:00
committed by GitHub
parent 9de9275bd1
commit e5d6cb5a75
82 changed files with 223 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/cml-main/pom.xml
-47
View File
@@ -32,11 +32,6 @@
<artifactId>log</artifactId>
</dependency>
<dependency>
<groupId>com.carrotsearch</groupId>
<artifactId>hppc</artifactId>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
@@ -63,11 +58,6 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -83,51 +73,14 @@
<artifactId>guice</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>io.cml</groupId>
<artifactId>cml-spi</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>${dep.antlr.version}</version>
<executions>
<execution>
<goals>
<goal>antlr4</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
core/cml-main/src/main/java/io/cml/connector/bigquery/BigQueryConnector.java
+1 -1
View File
@@ -30,7 +30,7 @@ import io.cml.spi.connector.Connector;
import io.cml.spi.metadata.MetadataUtil;
import io.cml.spi.metadata.SchemaTableName;
import io.cml.spi.metadata.TableMetadata;
import io.cml.type.VarcharType;
import io.cml.spi.type.VarcharType;
import javax.inject.Inject;
core/cml-postgres-wire-protocol/pom.xml
-5
View File
@@ -54,11 +54,6 @@
<artifactId>guice</artifactId>
</dependency>
<dependency>
<groupId>io.cml</groupId>
<artifactId>cml-main</artifactId>
</dependency>
<dependency>
<groupId>io.cml</groupId>
<artifactId>cml-spi</artifactId>
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/builder/BigQueryPgCatalogTableBuilder.java
+3 -3
View File
@@ -32,9 +32,9 @@ import static io.cml.pgcatalog.builder.BigQueryUtils.createOrReplaceAllColumn;
import static io.cml.pgcatalog.builder.BigQueryUtils.createOrReplaceAllTable;
import static io.cml.pgcatalog.builder.BigQueryUtils.getOidToBqType;
import static io.cml.pgcatalog.builder.PgCatalogTableBuilderUtils.generatePgTypeRecords;
import static io.cml.type.CharType.CHAR;
import static io.cml.type.RegprocType.REGPROC;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.CharType.CHAR;
import static io.cml.spi.type.RegprocType.REGPROC;
import static io.cml.spi.type.VarcharType.VARCHAR;
import static java.lang.String.format;
import static java.util.stream.Collectors.joining;
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/builder/BigQueryPgFunctionBuilder.java
+2 -2
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,7 +25,7 @@ import java.util.Locale;
import static io.cml.pgcatalog.PgCatalogUtils.PG_CATALOG_NAME;
import static io.cml.pgcatalog.builder.BigQueryUtils.getOidToBqType;
import static io.cml.spi.metadata.StandardErrorCode.GENERIC_INTERNAL_ERROR;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.VarcharType.VARCHAR;
import static java.lang.String.format;
public class BigQueryPgFunctionBuilder
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/builder/BigQueryUtils.java
+22 -22
View File
@@ -16,33 +16,33 @@ package io.cml.pgcatalog.builder;
import com.google.common.collect.ImmutableMap;
import io.cml.spi.connector.Connector;
import io.cml.type.PGArray;
import io.cml.spi.type.PGArray;
import java.util.List;
import java.util.Map;
import static io.cml.pgcatalog.PgCatalogUtils.CML_TEMP_NAME;
import static io.cml.type.BigIntType.BIGINT;
import static io.cml.type.BooleanType.BOOLEAN;
import static io.cml.type.BpCharType.BPCHAR;
import static io.cml.type.ByteaType.BYTEA;
import static io.cml.type.CharType.CHAR;
import static io.cml.type.DateType.DATE;
import static io.cml.type.DoubleType.DOUBLE;
import static io.cml.type.InetType.INET;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.JsonType.JSON;
import static io.cml.type.NumericType.NUMERIC;
import static io.cml.type.OidType.OID_INSTANCE;
import static io.cml.type.RealType.REAL;
import static io.cml.type.RegprocType.REGPROC;
import static io.cml.type.SmallIntType.SMALLINT;
import static io.cml.type.TimestampType.TIMESTAMP;
import static io.cml.type.TimestampWithTimeZoneType.TIMESTAMP_WITH_TIMEZONE;
import static io.cml.type.UuidType.UUID;
import static io.cml.type.VarcharType.NameType.NAME;
import static io.cml.type.VarcharType.TextType.TEXT;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.BigIntType.BIGINT;
import static io.cml.spi.type.BooleanType.BOOLEAN;
import static io.cml.spi.type.BpCharType.BPCHAR;
import static io.cml.spi.type.ByteaType.BYTEA;
import static io.cml.spi.type.CharType.CHAR;
import static io.cml.spi.type.DateType.DATE;
import static io.cml.spi.type.DoubleType.DOUBLE;
import static io.cml.spi.type.InetType.INET;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.JsonType.JSON;
import static io.cml.spi.type.NumericType.NUMERIC;
import static io.cml.spi.type.OidType.OID_INSTANCE;
import static io.cml.spi.type.RealType.REAL;
import static io.cml.spi.type.RegprocType.REGPROC;
import static io.cml.spi.type.SmallIntType.SMALLINT;
import static io.cml.spi.type.TimestampType.TIMESTAMP;
import static io.cml.spi.type.TimestampWithTimeZoneType.TIMESTAMP_WITH_TIMEZONE;
import static io.cml.spi.type.UuidType.UUID;
import static io.cml.spi.type.VarcharType.NameType.NAME;
import static io.cml.spi.type.VarcharType.TextType.TEXT;
import static io.cml.spi.type.VarcharType.VARCHAR;
import static java.lang.String.format;
public final class BigQueryUtils
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/builder/PgCatalogTableBuilderUtils.java
+1 -1
View File
@@ -17,7 +17,7 @@ package io.cml.pgcatalog.builder;
import com.google.common.collect.Streams;
import io.cml.pgcatalog.OidHash;
import io.cml.pgcatalog.table.PgCatalogTable;
import io.cml.type.PGTypes;
import io.cml.spi.type.PGTypes;
import java.util.List;
import java.util.Map;
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/builder/PgFunctionBuilder.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/function/PgFunction.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/function/PgFunctions.java
+4 -4
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,9 +19,9 @@ import com.google.common.collect.ImmutableList;
import static io.cml.pgcatalog.function.PgFunction.Argument.argument;
import static io.cml.pgcatalog.function.PgFunction.Language.SQL;
import static io.cml.pgcatalog.function.PgFunction.builder;
import static io.cml.type.BigIntType.BIGINT;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.BigIntType.BIGINT;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.VarcharType.VARCHAR;
public final class PgFunctions
{
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/regtype/BigQueryPgMetadata.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/regtype/PgMetadata.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/regtype/RegClassFactory.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/regtype/RegObject.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/regtype/RegObjectFactory.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/regtype/RegProcFactory.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/CharacterSets.java
+1 -1
View File
@@ -17,7 +17,7 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.VarcharType.VARCHAR;
public class CharacterSets
extends PgCatalogTable
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/KeyColumnUsage.java
+1 -1
View File
@@ -16,7 +16,7 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.VarcharType.VARCHAR;
public class KeyColumnUsage
extends PgCatalogTable
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAmTable.java
+3 -3
View File
@@ -16,9 +16,9 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.CharType.CHAR;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.CharType.CHAR;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* this table is unused in Cannerflow, so just an empty table
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAttrdefTable.java
+2 -2
View File
@@ -17,8 +17,8 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* this table is unused in Cannerflow, so just an empty table
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAttributeTable.java
+5 -5
View File
@@ -16,11 +16,11 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.BooleanType.BOOLEAN;
import static io.cml.type.CharType.CHAR;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.PGArray.VARCHAR_ARRAY;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.BooleanType.BOOLEAN;
import static io.cml.spi.type.CharType.CHAR;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.PGArray.VARCHAR_ARRAY;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* this table is unused in Cannerflow, so just an empty table
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgClassTable.java
+6 -6
View File
@@ -15,14 +15,14 @@
package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import io.cml.type.BooleanType;
import io.cml.spi.type.BooleanType;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.BooleanType.BOOLEAN;
import static io.cml.type.DoubleType.DOUBLE;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.PGArray.VARCHAR_ARRAY;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.BooleanType.BOOLEAN;
import static io.cml.spi.type.DoubleType.DOUBLE;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.PGArray.VARCHAR_ARRAY;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* @see <a href="https://www.postgresql.org/docs/13/catalog-pg-class.html">PostgreSQL pg_class</a>
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgConstraintTable.java
+5 -5
View File
@@ -17,11 +17,11 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.BooleanType.BOOLEAN;
import static io.cml.type.CharType.CHAR;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.PGArray.INT4_ARRAY;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.BooleanType.BOOLEAN;
import static io.cml.spi.type.CharType.CHAR;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.PGArray.INT4_ARRAY;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* this table is unused in Cannerflow, so just an empty table
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgDatabaseTable.java
+4 -4
View File
@@ -16,10 +16,10 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.type.BooleanType.BOOLEAN;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.PGArray.VARCHAR_ARRAY;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.BooleanType.BOOLEAN;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.PGArray.VARCHAR_ARRAY;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* @see <a href="https://www.postgresql.org/docs/10/catalog-pg-database.html">PostgreSQL pg_database</a>
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgDescriptionTable.java
+2 -2
View File
@@ -17,8 +17,8 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* this table is unused in Cannerflow, so just an empty table
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgEnumTable.java
+3 -3
View File
@@ -17,9 +17,9 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.DoubleType.DOUBLE;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.DoubleType.DOUBLE;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* this table is unused in Cannerflow, so just an empty table
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgIndexTable.java
+4 -4
View File
@@ -17,10 +17,10 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.BooleanType.BOOLEAN;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.PGArray.INT4_ARRAY;
import static io.cml.type.PGArray.VARCHAR_ARRAY;
import static io.cml.spi.type.BooleanType.BOOLEAN;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.PGArray.INT4_ARRAY;
import static io.cml.spi.type.PGArray.VARCHAR_ARRAY;
/**
* this table is unused in Cannerflow, so just an empty table
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgNamespaceTable.java
+3 -3
View File
@@ -17,9 +17,9 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.PGArray.VARCHAR_ARRAY;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.PGArray.VARCHAR_ARRAY;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* @see <a href="https://www.postgresql.org/docs/13/catalog-pg-namespace.html">PostgreSQL pg_namespace</a>
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgProcTable.java
+9 -9
View File
@@ -17,15 +17,15 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.BooleanType.BOOLEAN;
import static io.cml.type.CharType.CHAR;
import static io.cml.type.DoubleType.DOUBLE;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.PGArray.CHAR_ARRAY;
import static io.cml.type.PGArray.INT4_ARRAY;
import static io.cml.type.PGArray.VARCHAR_ARRAY;
import static io.cml.type.RegprocType.REGPROC;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.BooleanType.BOOLEAN;
import static io.cml.spi.type.CharType.CHAR;
import static io.cml.spi.type.DoubleType.DOUBLE;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.PGArray.CHAR_ARRAY;
import static io.cml.spi.type.PGArray.INT4_ARRAY;
import static io.cml.spi.type.PGArray.VARCHAR_ARRAY;
import static io.cml.spi.type.RegprocType.REGPROC;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* @see <a href="https://www.postgresql.org/docs/13/catalog-pg-proc.html">PostgreSQL pg_proc</a>
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgRangeTable.java
+2 -2
View File
@@ -16,8 +16,8 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* this table is unused in Cannerflow, so just an empty table
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgRolesTable.java
+5 -5
View File
@@ -16,11 +16,11 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.type.BooleanType.BOOLEAN;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.PGArray.VARCHAR_ARRAY;
import static io.cml.type.TimestampWithTimeZoneType.TIMESTAMP_WITH_TIMEZONE;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.BooleanType.BOOLEAN;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.PGArray.VARCHAR_ARRAY;
import static io.cml.spi.type.TimestampWithTimeZoneType.TIMESTAMP_WITH_TIMEZONE;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* this table is unused in Cannerflow, so just an empty table
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgSettingsTable.java
+4 -4
View File
@@ -15,10 +15,10 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.type.BooleanType.BOOLEAN;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.PGArray.VARCHAR_ARRAY;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.BooleanType.BOOLEAN;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.PGArray.VARCHAR_ARRAY;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* this table is unused in Cannerflow, so just an empty table
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgTablespaceTable.java
+3 -3
View File
@@ -17,9 +17,9 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.PGArray.VARCHAR_ARRAY;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.PGArray.VARCHAR_ARRAY;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* this table is unused in Cannerflow, so just an empty table
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgTypeTable.java
+5 -5
View File
@@ -16,11 +16,11 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.BooleanType.BOOLEAN;
import static io.cml.type.CharType.CHAR;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.RegprocType.REGPROC;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.BooleanType.BOOLEAN;
import static io.cml.spi.type.CharType.CHAR;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.RegprocType.REGPROC;
import static io.cml.spi.type.VarcharType.VARCHAR;
/**
* @see <a href="https://www.postgresql.org/docs/8.4/catalog-pg-type.html#CATALOG-TYPCATEGORY-TABLE">PostgreSQL pg_type</a>
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/ReferentialConstraints.java
+1 -1
View File
@@ -17,7 +17,7 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.VarcharType.VARCHAR;
public class ReferentialConstraints
extends PgCatalogTable
core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/TableConstraints.java
+1 -1
View File
@@ -17,7 +17,7 @@ package io.cml.pgcatalog.table;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.VarcharType.VARCHAR;
public class TableConstraints
extends PgCatalogTable
core/cml-postgres-wire-protocol/src/main/java/io/cml/sql/PgOidTypeTableInfo.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/main/java/io/cml/sql/RegObjectInterpreter.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/main/java/io/cml/wireprotocol/BaseRewriteVisitor.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/main/java/io/cml/wireprotocol/PostgresWireProtocol.java
+1 -1
View File
@@ -19,7 +19,7 @@ import io.airlift.log.Logger;
import io.cml.spi.CmlException;
import io.cml.spi.Column;
import io.cml.spi.type.PGType;
import io.cml.type.PGTypes;
import io.cml.spi.type.PGTypes;
import io.cml.wireprotocol.ssl.SslReqHandler;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
core/cml-postgres-wire-protocol/src/main/java/io/cml/wireprotocol/ssl/SslContextProvider.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/test/java/io/cml/pgcatalog/regtype/TestingPgMetadata.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-postgres-wire-protocol/src/test/java/io/cml/wireprotocol/TestPostgreSqlRewrite.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-server/src/main/java/io/cml/server/module/BigQueryConnectorModule.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-server/src/main/java/io/cml/server/module/PostgresWireProtocolModule.java
+1 -1
View File
@@ -3,7 +3,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
core/cml-spi/pom.xml
+37
View File
@@ -23,6 +23,11 @@
<artifactId>log</artifactId>
</dependency>
<dependency>
<groupId>com.carrotsearch</groupId>
<artifactId>hppc</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
@@ -34,11 +39,26 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -101,4 +121,21 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>${dep.antlr.version}</version>
<executions>
<execution>
<goals>
<goal>antlr4</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
core/cml-main/src/main/antlr4/io/cml/spi/type/parser/antlr/v4/PgArray.g4 → core/cml-spi/src/main/antlr4/io/cml/spi/type/parser/antlr/v4/PgArray.g4
View File
core/cml-main/src/main/antlr4/io/cml/spi/type/parser/antlr/v4/PgDateTimeFormat.g4 → core/cml-spi/src/main/antlr4/io/cml/spi/type/parser/antlr/v4/PgDateTimeFormat.g4
View File
core/cml-main/src/main/antlr4/io/cml/spi/type/parser/antlr/v4/PgNumericFormat.g4 → core/cml-spi/src/main/antlr4/io/cml/spi/type/parser/antlr/v4/PgNumericFormat.g4
View File
core/cml-main/src/main/java/io/cml/type/AnyType.java → core/cml-spi/src/main/java/io/cml/spi/type/AnyType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/BaseTimestampType.java → core/cml-spi/src/main/java/io/cml/spi/type/BaseTimestampType.java
+3 -6
View File
@@ -12,16 +12,13 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
import static com.google.common.base.Preconditions.checkArgument;
import static io.cml.type.PgDatetimeUtils.toPgTimestamp;
import static io.cml.type.PgDatetimeUtils.toTrinoTimestamp;
import static java.lang.String.format;
abstract class BaseTimestampType
@@ -39,7 +36,7 @@ abstract class BaseTimestampType
public int writeAsBinary(ByteBuf buffer, @Nonnull Object value)
{
buffer.writeInt(TYPE_LEN);
buffer.writeLong(toPgTimestamp((long) value));
buffer.writeLong(PgDatetimeUtils.toPgTimestamp((long) value));
return INT32_BYTE_SIZE + TYPE_LEN;
}
@@ -60,6 +57,6 @@ abstract class BaseTimestampType
{
checkArgument(valueLength == TYPE_LEN, format("valueLength must be %s because timestamp is a 64 bit long. Actual length is %s", TYPE_LEN, valueLength));
long microSecondsSince2K = buffer.readLong();
return toTrinoTimestamp(microSecondsSince2K);
return PgDatetimeUtils.toTrinoTimestamp(microSecondsSince2K);
}
}
core/cml-main/src/main/java/io/cml/type/BigIntType.java → core/cml-spi/src/main/java/io/cml/spi/type/BigIntType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/BooleanType.java → core/cml-spi/src/main/java/io/cml/spi/type/BooleanType.java
+1 -2
View File
@@ -12,10 +12,9 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import com.google.common.collect.ImmutableSet;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/BpCharType.java → core/cml-spi/src/main/java/io/cml/spi/type/BpCharType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/ByteaType.java → core/cml-spi/src/main/java/io/cml/spi/type/ByteaType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import org.apache.commons.codec.binary.Hex;
core/cml-main/src/main/java/io/cml/type/CharType.java → core/cml-spi/src/main/java/io/cml/spi/type/CharType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/DateType.java → core/cml-spi/src/main/java/io/cml/spi/type/DateType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/DoubleType.java → core/cml-spi/src/main/java/io/cml/spi/type/DoubleType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/HstoreType.java → core/cml-spi/src/main/java/io/cml/spi/type/HstoreType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import java.util.Map;
core/cml-main/src/main/java/io/cml/type/InetType.java → core/cml-spi/src/main/java/io/cml/spi/type/InetType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/IntegerType.java → core/cml-spi/src/main/java/io/cml/spi/type/IntegerType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/IntervalType.java → core/cml-spi/src/main/java/io/cml/spi/type/IntervalType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import org.joda.time.Period;
core/cml-main/src/main/java/io/cml/type/JsonType.java → core/cml-spi/src/main/java/io/cml/spi/type/JsonType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/NumericType.java → core/cml-spi/src/main/java/io/cml/spi/type/NumericType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/OidType.java → core/cml-spi/src/main/java/io/cml/spi/type/OidType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import java.nio.charset.StandardCharsets;
core/cml-main/src/main/java/io/cml/type/PGArray.java → core/cml-spi/src/main/java/io/cml/spi/type/PGArray.java
+8 -11
View File
@@ -12,12 +12,11 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import com.google.common.collect.ImmutableList;
import com.google.common.primitives.Bytes;
import io.cml.spi.type.PGType;
import io.cml.type.parser.PgArrayParserWrapper;
import io.cml.spi.type.parser.PgArrayParserWrapper;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
@@ -25,12 +24,10 @@ import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
import static io.cml.type.BooleanType.BOOLEAN;
import static io.cml.type.CharType.CHAR;
import static io.cml.type.DateType.DATE;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.OidType.OID_INSTANCE;
import static io.cml.type.UuidType.UUID;
import static io.cml.spi.type.BooleanType.BOOLEAN;
import static io.cml.spi.type.CharType.CHAR;
import static io.cml.spi.type.DateType.DATE;
import static io.cml.spi.type.IntegerType.INTEGER;
public class PGArray
extends PGType<List<Object>>
@@ -39,7 +36,7 @@ public class PGArray
public static final PGArray BPCHAR_ARRAY = new PGArray(1014, BpCharType.BPCHAR);
public static final PGArray INT2_ARRAY = new PGArray(1005, SmallIntType.SMALLINT);
public static final PGArray INT4_ARRAY = new PGArray(1007, INTEGER);
public static final PGArray OID_ARRAY = new PGArray(1028, OID_INSTANCE);
public static final PGArray OID_ARRAY = new PGArray(1028, OidType.OID_INSTANCE);
public static final PGArray INT8_ARRAY = new PGArray(1016, BigIntType.BIGINT);
public static final PGArray FLOAT4_ARRAY = new PGArray(1021, RealType.REAL);
public static final PGArray FLOAT8_ARRAY = new PGArray(1022, DoubleType.DOUBLE);
@@ -52,7 +49,7 @@ public class PGArray
public static final PGArray TIMESTAMP_WITH_TIMEZONE_ARRAY = new PGArray(1185, TimestampWithTimeZoneType.TIMESTAMP_WITH_TIMEZONE);
public static final PGArray TIMESTAMP_ARRAY = new PGArray(1115, TimestampType.TIMESTAMP);
public static final PGArray DATE_ARRAY = new PGArray(1182, DATE);
public static final PGArray UUID_ARRAY = new PGArray(2951, UUID);
public static final PGArray UUID_ARRAY = new PGArray(2951, UuidType.UUID);
public static final PGArray BYTEA_ARRAY = new PGArray(1001, ByteaType.BYTEA);
public static final PGArray INET_ARRAY = new PGArray(1041, InetType.INET);
public static final PGArray EMPTY_RECORD_ARRAY = new PGArray(2287, RecordType.EMPTY_RECORD);
core/cml-main/src/main/java/io/cml/type/PGTypes.java → core/cml-spi/src/main/java/io/cml/spi/type/PGTypes.java
+24 -36
View File
@@ -12,39 +12,27 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import com.google.common.collect.ImmutableMap;
import io.cml.spi.type.PGType;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import static io.cml.type.AnyType.ANY;
import static io.cml.type.BigIntType.BIGINT;
import static io.cml.type.BooleanType.BOOLEAN;
import static io.cml.type.BpCharType.BPCHAR;
import static io.cml.type.ByteaType.BYTEA;
import static io.cml.type.CharType.CHAR;
import static io.cml.type.DateType.DATE;
import static io.cml.type.DoubleType.DOUBLE;
import static io.cml.type.HstoreType.HSTORE;
import static io.cml.type.InetType.INET;
import static io.cml.type.IntegerType.INTEGER;
import static io.cml.type.JsonType.JSON;
import static io.cml.type.NumericType.NUMERIC;
import static io.cml.type.OidType.OID_INSTANCE;
import static io.cml.type.RealType.REAL;
import static io.cml.type.RecordType.EMPTY_RECORD;
import static io.cml.type.SmallIntType.SMALLINT;
import static io.cml.type.TimestampType.TIMESTAMP;
import static io.cml.type.TimestampWithTimeZoneType.TIMESTAMP_WITH_TIMEZONE;
import static io.cml.type.UuidType.UUID;
import static io.cml.type.VarcharType.NameType.NAME;
import static io.cml.type.VarcharType.TextType.TEXT;
import static io.cml.type.VarcharType.VARCHAR;
import static io.cml.spi.type.BigIntType.BIGINT;
import static io.cml.spi.type.BooleanType.BOOLEAN;
import static io.cml.spi.type.CharType.CHAR;
import static io.cml.spi.type.DateType.DATE;
import static io.cml.spi.type.HstoreType.HSTORE;
import static io.cml.spi.type.IntegerType.INTEGER;
import static io.cml.spi.type.RealType.REAL;
import static io.cml.spi.type.SmallIntType.SMALLINT;
import static io.cml.spi.type.TimestampType.TIMESTAMP;
import static io.cml.spi.type.VarcharType.NameType.NAME;
import static io.cml.spi.type.VarcharType.TextType.TEXT;
import static io.cml.spi.type.VarcharType.VARCHAR;
import static java.lang.String.format;
public final class PGTypes
@@ -60,26 +48,26 @@ public final class PGTypes
TYPE_TABLE.put(INTEGER.oid(), INTEGER);
TYPE_TABLE.put(BIGINT.oid(), BIGINT);
TYPE_TABLE.put(REAL.oid(), REAL);
TYPE_TABLE.put(DOUBLE.oid(), DOUBLE);
TYPE_TABLE.put(NUMERIC.oid(), NUMERIC);
TYPE_TABLE.put(DoubleType.DOUBLE.oid(), DoubleType.DOUBLE);
TYPE_TABLE.put(NumericType.NUMERIC.oid(), NumericType.NUMERIC);
TYPE_TABLE.put(VARCHAR.oid(), VARCHAR);
TYPE_TABLE.put(CHAR.oid(), CHAR);
TYPE_TABLE.put(JSON.oid(), JSON);
TYPE_TABLE.put(JsonType.JSON.oid(), JsonType.JSON);
TYPE_TABLE.put(TIMESTAMP.oid(), TIMESTAMP);
TYPE_TABLE.put(TIMESTAMP_WITH_TIMEZONE.oid(), TIMESTAMP_WITH_TIMEZONE);
TYPE_TABLE.put(TimestampWithTimeZoneType.TIMESTAMP_WITH_TIMEZONE.oid(), TimestampWithTimeZoneType.TIMESTAMP_WITH_TIMEZONE);
TYPE_TABLE.put(TEXT.oid(), TEXT);
TYPE_TABLE.put(NAME.oid(), NAME);
TYPE_TABLE.put(OID_INSTANCE.oid(), OID_INSTANCE);
TYPE_TABLE.put(OidType.OID_INSTANCE.oid(), OidType.OID_INSTANCE);
TYPE_TABLE.put(DATE.oid(), DATE);
TYPE_TABLE.put(BYTEA.oid(), BYTEA);
TYPE_TABLE.put(BPCHAR.oid(), BPCHAR);
TYPE_TABLE.put(ByteaType.BYTEA.oid(), ByteaType.BYTEA);
TYPE_TABLE.put(BpCharType.BPCHAR.oid(), BpCharType.BPCHAR);
// we handle all unspecified type as text type.
TYPE_TABLE.put(0, TEXT);
TYPE_TABLE.put(INET.oid(), INET);
TYPE_TABLE.put(EMPTY_RECORD.oid(), EMPTY_RECORD);
TYPE_TABLE.put(InetType.INET.oid(), InetType.INET);
TYPE_TABLE.put(RecordType.EMPTY_RECORD.oid(), RecordType.EMPTY_RECORD);
// Just need a fake instance to do type mapping. We never use the field.
TYPE_TABLE.put(HSTORE.oid(), HSTORE);
TYPE_TABLE.put(UUID.oid(), UUID);
TYPE_TABLE.put(UuidType.UUID.oid(), UuidType.UUID);
ImmutableMap.Builder<Integer, PGArray> innerToPgTypeBuilder = ImmutableMap.builder();
// initial collection types
@@ -92,7 +80,7 @@ public final class PGTypes
TYPES = new HashSet<>(TYPE_TABLE.values());
// the following polymorphic types are added manually,
// because there are no corresponding data types in Cannerflow
TYPES.add(ANY);
TYPES.add(AnyType.ANY);
}
public static Iterable<PGType<?>> pgTypes()
core/cml-main/src/main/java/io/cml/type/PgDatetimeUtils.java → core/cml-spi/src/main/java/io/cml/spi/type/PgDatetimeUtils.java
+1 -1
View File
@@ -12,7 +12,7 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
public final class PgDatetimeUtils
{
core/cml-main/src/main/java/io/cml/type/PgOidVectorType.java → core/cml-spi/src/main/java/io/cml/spi/type/PgOidVectorType.java
+1 -2
View File
@@ -12,10 +12,9 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import com.google.common.base.Joiner;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import java.nio.charset.StandardCharsets;
core/cml-main/src/main/java/io/cml/type/RealType.java → core/cml-spi/src/main/java/io/cml/spi/type/RealType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/RecordType.java → core/cml-spi/src/main/java/io/cml/spi/type/RecordType.java
+2 -3
View File
@@ -12,17 +12,16 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import com.carrotsearch.hppc.ByteArrayList;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import java.util.List;
import java.util.Map;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static io.cml.type.PGArray.EMPTY_RECORD_ARRAY;
import static io.cml.spi.type.PGArray.EMPTY_RECORD_ARRAY;
public class RecordType
extends PGType<Map<String, Object>>
core/cml-main/src/main/java/io/cml/type/RegprocType.java → core/cml-spi/src/main/java/io/cml/spi/type/RegprocType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/SmallIntType.java → core/cml-spi/src/main/java/io/cml/spi/type/SmallIntType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/TimestampType.java → core/cml-spi/src/main/java/io/cml/spi/type/TimestampType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/TimestampWithTimeZoneType.java → core/cml-spi/src/main/java/io/cml/spi/type/TimestampWithTimeZoneType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/TinyIntType.java → core/cml-spi/src/main/java/io/cml/spi/type/TinyIntType.java
+1 -2
View File
@@ -12,10 +12,9 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.CmlException;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/UuidType.java → core/cml-spi/src/main/java/io/cml/spi/type/UuidType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/VarcharType.java → core/cml-spi/src/main/java/io/cml/spi/type/VarcharType.java
+1 -2
View File
@@ -12,9 +12,8 @@
* limitations under the License.
*/
package io.cml.type;
package io.cml.spi.type;
import io.cml.spi.type.PGType;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nonnull;
core/cml-main/src/main/java/io/cml/type/parser/PgArrayASTVisitor.java → core/cml-spi/src/main/java/io/cml/spi/type/parser/PgArrayASTVisitor.java
+1 -1
View File
@@ -12,7 +12,7 @@
* limitations under the License.
*/
package io.cml.type.parser;
package io.cml.spi.type.parser;
import com.carrotsearch.hppc.ByteArrayList;
import io.cml.spi.type.parser.antlr.v4.PgArrayBaseVisitor;
core/cml-main/src/main/java/io/cml/type/parser/PgArrayParserWrapper.java → core/cml-spi/src/main/java/io/cml/spi/type/parser/PgArrayParserWrapper.java
+1 -1
View File
@@ -12,7 +12,7 @@
* limitations under the License.
*/
package io.cml.type.parser;
package io.cml.spi.type.parser;
import io.cml.spi.CmlException;
import io.cml.spi.type.parser.antlr.v4.PgArrayLexer;
core/cml-main/src/main/java/io/cml/type/parser/PgDateTimeFormatParserWrapper.java → core/cml-spi/src/main/java/io/cml/spi/type/parser/PgDateTimeFormatParserWrapper.java
+1 -1
View File
@@ -12,7 +12,7 @@
* limitations under the License.
*/
package io.cml.type.parser;
package io.cml.spi.type.parser;
import io.cml.spi.CmlException;
import io.cml.spi.type.parser.antlr.v4.PgDateTimeFormatBaseVisitor;
core/cml-main/src/main/java/io/cml/type/parser/PgNumericFormatParserWrapper.java → core/cml-spi/src/main/java/io/cml/spi/type/parser/PgNumericFormatParserWrapper.java
+2 -3
View File
@@ -12,7 +12,7 @@
* limitations under the License.
*/
package io.cml.type.parser;
package io.cml.spi.type.parser;
import io.cml.spi.CmlException;
import io.cml.spi.type.parser.antlr.v4.PgNumericFormatBaseVisitor;
@@ -27,7 +27,6 @@ import org.antlr.v4.runtime.Recognizer;
import org.antlr.v4.runtime.tree.ParseTree;
import static io.cml.spi.metadata.StandardErrorCode.GENERIC_INTERNAL_ERROR;
import static java.lang.String.format;
public final class PgNumericFormatParserWrapper
{
@@ -108,7 +107,7 @@ public final class PgNumericFormatParserWrapper
@Override
public String visitNonReservedPattern(PgNumericFormatParser.NonReservedPatternContext ctx)
{
throw new CmlException(GENERIC_INTERNAL_ERROR, format("we didn't support the pattern %s.", ctx.getText()));
throw new CmlException(GENERIC_INTERNAL_ERROR, String.format("we didn't support the pattern %s.", ctx.getText()));
}
}
}