You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2021/04/27 15:59:17 UTC
[GitHub] [pulsar] dlg99 opened a new pull request #10410: Kafka connect sink adaptor to support non-primitive schemas
dlg99 opened a new pull request #10410:
URL: https://github.com/apache/pulsar/pull/10410
### Motivation
This is part two of https://github.com/apache/pulsar/pull/9927
It adds support of non-primitive schemas (avro, json) to kafka adaptor sink.
### Modifications
Added schema support.
### Verifying this change
- [ ] Make sure that the change passes the CI checks.
This change added tests and can be verified as follows:
Added unit tests
### Does this pull request potentially affect one of the following parts:
*If `yes` was chosen, please highlight the changes*
- Dependencies (does it add or upgrade a dependency): kind of. Confluent dependency version was listed twice in pom file, with different version. Fixed that, left the newer version.
- The public API: no
- The schema: no
- The default values of configurations: no
- The wire protocol: no
- The rest endpoints: no
- The admin cli options: no
- Anything that affects deployment: no
### Documentation
- Does this pull request introduce a new feature? (yes / no)
- If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)
- If a feature is not applicable for documentation, explain why?
- If a feature is not documented yet in this PR, please create a followup issue for adding the documentation
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] dlg99 commented on pull request #10410: Kafka connect sink adaptor to support non-primitive schemas
Posted by GitBox <gi...@apache.org>.
dlg99 commented on pull request #10410:
URL: https://github.com/apache/pulsar/pull/10410#issuecomment-856082192
@codelipenghui Can you take a look please?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] dlg99 commented on a change in pull request #10410: Kafka connect sink adaptor to support non-primitive schemas
Posted by GitBox <gi...@apache.org>.
dlg99 commented on a change in pull request #10410:
URL: https://github.com/apache/pulsar/pull/10410#discussion_r644891487
##########
File path: pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/PulsarSchemaToKafkaSchema.java
##########
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pulsar.io.kafka.connect.schema;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ExecutionError;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.connect.data.Date;
+import org.apache.kafka.connect.data.Schema;
+import org.apache.kafka.connect.data.SchemaBuilder;
+import org.apache.pulsar.client.impl.schema.KeyValueSchema;
+import org.apache.pulsar.common.schema.SchemaType;
+import org.apache.pulsar.kafka.shade.io.confluent.connect.avro.AvroData;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+@Slf4j
+public class PulsarSchemaToKafkaSchema {
+ private final static ImmutableMap<SchemaType, Schema> pulsarSchemaTypeToKafkaSchema;
+ private static final AvroData avroData = new AvroData(1000);
+ private static final Cache<byte[], Schema> schemaCache =
+ CacheBuilder.newBuilder().maximumSize(10000)
+ .expireAfterAccess(30, TimeUnit.MINUTES).build();
+
+ static {
+ pulsarSchemaTypeToKafkaSchema = ImmutableMap.<SchemaType, Schema>builder()
+ .put(SchemaType.BOOLEAN, Schema.BOOLEAN_SCHEMA)
+ .put(SchemaType.INT8, Schema.INT8_SCHEMA)
+ .put(SchemaType.INT16, Schema.INT16_SCHEMA)
+ .put(SchemaType.INT32, Schema.INT32_SCHEMA)
+ .put(SchemaType.INT64, Schema.INT64_SCHEMA)
+ .put(SchemaType.FLOAT, Schema.FLOAT32_SCHEMA)
+ .put(SchemaType.DOUBLE, Schema.FLOAT64_SCHEMA)
+ .put(SchemaType.STRING, Schema.STRING_SCHEMA)
+ .put(SchemaType.BYTES, Schema.BYTES_SCHEMA)
+ .put(SchemaType.DATE, Date.SCHEMA)
+ .build();
+ }
+
+ // Parse json to shaded schema
+ private static org.apache.pulsar.kafka.shade.avro.Schema parseAvroSchema(String schemaJson) {
+ final org.apache.pulsar.kafka.shade.avro.Schema.Parser parser = new org.apache.pulsar.kafka.shade.avro.Schema.Parser();
+ parser.setValidateDefaults(false);
+ return parser.parse(schemaJson);
+ }
+
+ public static Schema getKafkaConnectSchema(org.apache.pulsar.client.api.Schema pulsarSchema) {
+ if (pulsarSchema != null && pulsarSchema.getSchemaInfo() != null) {
+ if (pulsarSchemaTypeToKafkaSchema.containsKey(pulsarSchema.getSchemaInfo().getType())) {
+ return pulsarSchemaTypeToKafkaSchema.get(pulsarSchema.getSchemaInfo().getType());
+ }
+
+ try {
+ return schemaCache.get(pulsarSchema.getSchemaInfo().getSchema(), () -> {
+ if (pulsarSchema.getSchemaInfo().getType() == SchemaType.KEY_VALUE) {
+ KeyValueSchema kvSchema = (KeyValueSchema) pulsarSchema;
+ return SchemaBuilder.map(getKafkaConnectSchema(kvSchema.getKeySchema()),
+ getKafkaConnectSchema(kvSchema.getKeySchema()))
Review comment:
reproed in the test and fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] eolivelli commented on a change in pull request #10410: Kafka connect sink adaptor to support non-primitive schemas
Posted by GitBox <gi...@apache.org>.
eolivelli commented on a change in pull request #10410:
URL: https://github.com/apache/pulsar/pull/10410#discussion_r644517290
##########
File path: pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/PulsarSchemaToKafkaSchema.java
##########
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pulsar.io.kafka.connect.schema;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ExecutionError;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.connect.data.Date;
+import org.apache.kafka.connect.data.Schema;
+import org.apache.kafka.connect.data.SchemaBuilder;
+import org.apache.pulsar.client.impl.schema.KeyValueSchema;
+import org.apache.pulsar.common.schema.SchemaType;
+import org.apache.pulsar.kafka.shade.io.confluent.connect.avro.AvroData;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+@Slf4j
+public class PulsarSchemaToKafkaSchema {
+ private final static ImmutableMap<SchemaType, Schema> pulsarSchemaTypeToKafkaSchema;
+ private static final AvroData avroData = new AvroData(1000);
+ private static final Cache<byte[], Schema> schemaCache =
+ CacheBuilder.newBuilder().maximumSize(10000)
+ .expireAfterAccess(30, TimeUnit.MINUTES).build();
+
+ static {
+ pulsarSchemaTypeToKafkaSchema = ImmutableMap.<SchemaType, Schema>builder()
+ .put(SchemaType.BOOLEAN, Schema.BOOLEAN_SCHEMA)
+ .put(SchemaType.INT8, Schema.INT8_SCHEMA)
+ .put(SchemaType.INT16, Schema.INT16_SCHEMA)
+ .put(SchemaType.INT32, Schema.INT32_SCHEMA)
+ .put(SchemaType.INT64, Schema.INT64_SCHEMA)
+ .put(SchemaType.FLOAT, Schema.FLOAT32_SCHEMA)
+ .put(SchemaType.DOUBLE, Schema.FLOAT64_SCHEMA)
+ .put(SchemaType.STRING, Schema.STRING_SCHEMA)
+ .put(SchemaType.BYTES, Schema.BYTES_SCHEMA)
+ .put(SchemaType.DATE, Date.SCHEMA)
+ .build();
+ }
+
+ // Parse json to shaded schema
+ private static org.apache.pulsar.kafka.shade.avro.Schema parseAvroSchema(String schemaJson) {
+ final org.apache.pulsar.kafka.shade.avro.Schema.Parser parser = new org.apache.pulsar.kafka.shade.avro.Schema.Parser();
+ parser.setValidateDefaults(false);
+ return parser.parse(schemaJson);
+ }
+
+ public static Schema getKafkaConnectSchema(org.apache.pulsar.client.api.Schema pulsarSchema) {
+ if (pulsarSchema != null && pulsarSchema.getSchemaInfo() != null) {
+ if (pulsarSchemaTypeToKafkaSchema.containsKey(pulsarSchema.getSchemaInfo().getType())) {
+ return pulsarSchemaTypeToKafkaSchema.get(pulsarSchema.getSchemaInfo().getType());
+ }
+
+ try {
+ return schemaCache.get(pulsarSchema.getSchemaInfo().getSchema(), () -> {
+ if (pulsarSchema.getSchemaInfo().getType() == SchemaType.KEY_VALUE) {
+ KeyValueSchema kvSchema = (KeyValueSchema) pulsarSchema;
+ return SchemaBuilder.map(getKafkaConnectSchema(kvSchema.getKeySchema()),
+ getKafkaConnectSchema(kvSchema.getKeySchema()))
+ .build();
+ }
+ org.apache.pulsar.kafka.shade.avro.Schema avroSchema =
+ parseAvroSchema(new String(pulsarSchema.getSchemaInfo().getSchema(), UTF_8));
+ return avroData.toConnectSchema(avroSchema);
+ });
+ } catch (ExecutionException | UncheckedExecutionException | ExecutionError ee) {
+ logAndThrowOnUnsupportedSchema(pulsarSchema, "Failed to convert to Kafka Schema.", ee);
+ }
+ }
+
+ logAndThrowOnUnsupportedSchema(pulsarSchema, "Schema is required.", null);
+ return null;
+ }
+
+ private static void logAndThrowOnUnsupportedSchema(org.apache.pulsar.client.api.Schema pulsarSchema,
Review comment:
that about returning the IllegalStateException ?
this way you will call the method this way:
`throws logAndThrowOnUnsupportedSchema(pulsarSchema, "Schema is required.", null);`
it will be clearer for the reader and for javac about the outcome of the execution
##########
File path: pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/PulsarSchemaToKafkaSchema.java
##########
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pulsar.io.kafka.connect.schema;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ExecutionError;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.connect.data.Date;
+import org.apache.kafka.connect.data.Schema;
+import org.apache.kafka.connect.data.SchemaBuilder;
+import org.apache.pulsar.client.impl.schema.KeyValueSchema;
+import org.apache.pulsar.common.schema.SchemaType;
+import org.apache.pulsar.kafka.shade.io.confluent.connect.avro.AvroData;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+@Slf4j
+public class PulsarSchemaToKafkaSchema {
+ private final static ImmutableMap<SchemaType, Schema> pulsarSchemaTypeToKafkaSchema;
+ private static final AvroData avroData = new AvroData(1000);
+ private static final Cache<byte[], Schema> schemaCache =
+ CacheBuilder.newBuilder().maximumSize(10000)
+ .expireAfterAccess(30, TimeUnit.MINUTES).build();
+
+ static {
+ pulsarSchemaTypeToKafkaSchema = ImmutableMap.<SchemaType, Schema>builder()
+ .put(SchemaType.BOOLEAN, Schema.BOOLEAN_SCHEMA)
+ .put(SchemaType.INT8, Schema.INT8_SCHEMA)
+ .put(SchemaType.INT16, Schema.INT16_SCHEMA)
+ .put(SchemaType.INT32, Schema.INT32_SCHEMA)
+ .put(SchemaType.INT64, Schema.INT64_SCHEMA)
+ .put(SchemaType.FLOAT, Schema.FLOAT32_SCHEMA)
+ .put(SchemaType.DOUBLE, Schema.FLOAT64_SCHEMA)
+ .put(SchemaType.STRING, Schema.STRING_SCHEMA)
+ .put(SchemaType.BYTES, Schema.BYTES_SCHEMA)
+ .put(SchemaType.DATE, Date.SCHEMA)
+ .build();
+ }
+
+ // Parse json to shaded schema
+ private static org.apache.pulsar.kafka.shade.avro.Schema parseAvroSchema(String schemaJson) {
+ final org.apache.pulsar.kafka.shade.avro.Schema.Parser parser = new org.apache.pulsar.kafka.shade.avro.Schema.Parser();
+ parser.setValidateDefaults(false);
+ return parser.parse(schemaJson);
+ }
+
+ public static Schema getKafkaConnectSchema(org.apache.pulsar.client.api.Schema pulsarSchema) {
+ if (pulsarSchema != null && pulsarSchema.getSchemaInfo() != null) {
+ if (pulsarSchemaTypeToKafkaSchema.containsKey(pulsarSchema.getSchemaInfo().getType())) {
+ return pulsarSchemaTypeToKafkaSchema.get(pulsarSchema.getSchemaInfo().getType());
+ }
+
+ try {
+ return schemaCache.get(pulsarSchema.getSchemaInfo().getSchema(), () -> {
+ if (pulsarSchema.getSchemaInfo().getType() == SchemaType.KEY_VALUE) {
+ KeyValueSchema kvSchema = (KeyValueSchema) pulsarSchema;
+ return SchemaBuilder.map(getKafkaConnectSchema(kvSchema.getKeySchema()),
+ getKafkaConnectSchema(kvSchema.getKeySchema()))
Review comment:
should this be `getValueSchema` ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] dlg99 commented on a change in pull request #10410: Kafka connect sink adaptor to support non-primitive schemas
Posted by GitBox <gi...@apache.org>.
dlg99 commented on a change in pull request #10410:
URL: https://github.com/apache/pulsar/pull/10410#discussion_r644891487
##########
File path: pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/PulsarSchemaToKafkaSchema.java
##########
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pulsar.io.kafka.connect.schema;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ExecutionError;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.connect.data.Date;
+import org.apache.kafka.connect.data.Schema;
+import org.apache.kafka.connect.data.SchemaBuilder;
+import org.apache.pulsar.client.impl.schema.KeyValueSchema;
+import org.apache.pulsar.common.schema.SchemaType;
+import org.apache.pulsar.kafka.shade.io.confluent.connect.avro.AvroData;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+@Slf4j
+public class PulsarSchemaToKafkaSchema {
+ private final static ImmutableMap<SchemaType, Schema> pulsarSchemaTypeToKafkaSchema;
+ private static final AvroData avroData = new AvroData(1000);
+ private static final Cache<byte[], Schema> schemaCache =
+ CacheBuilder.newBuilder().maximumSize(10000)
+ .expireAfterAccess(30, TimeUnit.MINUTES).build();
+
+ static {
+ pulsarSchemaTypeToKafkaSchema = ImmutableMap.<SchemaType, Schema>builder()
+ .put(SchemaType.BOOLEAN, Schema.BOOLEAN_SCHEMA)
+ .put(SchemaType.INT8, Schema.INT8_SCHEMA)
+ .put(SchemaType.INT16, Schema.INT16_SCHEMA)
+ .put(SchemaType.INT32, Schema.INT32_SCHEMA)
+ .put(SchemaType.INT64, Schema.INT64_SCHEMA)
+ .put(SchemaType.FLOAT, Schema.FLOAT32_SCHEMA)
+ .put(SchemaType.DOUBLE, Schema.FLOAT64_SCHEMA)
+ .put(SchemaType.STRING, Schema.STRING_SCHEMA)
+ .put(SchemaType.BYTES, Schema.BYTES_SCHEMA)
+ .put(SchemaType.DATE, Date.SCHEMA)
+ .build();
+ }
+
+ // Parse json to shaded schema
+ private static org.apache.pulsar.kafka.shade.avro.Schema parseAvroSchema(String schemaJson) {
+ final org.apache.pulsar.kafka.shade.avro.Schema.Parser parser = new org.apache.pulsar.kafka.shade.avro.Schema.Parser();
+ parser.setValidateDefaults(false);
+ return parser.parse(schemaJson);
+ }
+
+ public static Schema getKafkaConnectSchema(org.apache.pulsar.client.api.Schema pulsarSchema) {
+ if (pulsarSchema != null && pulsarSchema.getSchemaInfo() != null) {
+ if (pulsarSchemaTypeToKafkaSchema.containsKey(pulsarSchema.getSchemaInfo().getType())) {
+ return pulsarSchemaTypeToKafkaSchema.get(pulsarSchema.getSchemaInfo().getType());
+ }
+
+ try {
+ return schemaCache.get(pulsarSchema.getSchemaInfo().getSchema(), () -> {
+ if (pulsarSchema.getSchemaInfo().getType() == SchemaType.KEY_VALUE) {
+ KeyValueSchema kvSchema = (KeyValueSchema) pulsarSchema;
+ return SchemaBuilder.map(getKafkaConnectSchema(kvSchema.getKeySchema()),
+ getKafkaConnectSchema(kvSchema.getKeySchema()))
Review comment:
reproed in the test and fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] eolivelli merged pull request #10410: Kafka connect sink adaptor to support non-primitive schemas
Posted by GitBox <gi...@apache.org>.
eolivelli merged pull request #10410:
URL: https://github.com/apache/pulsar/pull/10410
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] dlg99 commented on pull request #10410: Kafka connect sink adaptor to support non-primitive schemas
Posted by GitBox <gi...@apache.org>.
dlg99 commented on pull request #10410:
URL: https://github.com/apache/pulsar/pull/10410#issuecomment-827726383
only the last commit is relevant here; the rest are from parent PR
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] eolivelli commented on a change in pull request #10410: Kafka connect sink adaptor to support non-primitive schemas
Posted by GitBox <gi...@apache.org>.
eolivelli commented on a change in pull request #10410:
URL: https://github.com/apache/pulsar/pull/10410#discussion_r644517290
##########
File path: pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/PulsarSchemaToKafkaSchema.java
##########
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pulsar.io.kafka.connect.schema;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ExecutionError;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.connect.data.Date;
+import org.apache.kafka.connect.data.Schema;
+import org.apache.kafka.connect.data.SchemaBuilder;
+import org.apache.pulsar.client.impl.schema.KeyValueSchema;
+import org.apache.pulsar.common.schema.SchemaType;
+import org.apache.pulsar.kafka.shade.io.confluent.connect.avro.AvroData;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+@Slf4j
+public class PulsarSchemaToKafkaSchema {
+ private final static ImmutableMap<SchemaType, Schema> pulsarSchemaTypeToKafkaSchema;
+ private static final AvroData avroData = new AvroData(1000);
+ private static final Cache<byte[], Schema> schemaCache =
+ CacheBuilder.newBuilder().maximumSize(10000)
+ .expireAfterAccess(30, TimeUnit.MINUTES).build();
+
+ static {
+ pulsarSchemaTypeToKafkaSchema = ImmutableMap.<SchemaType, Schema>builder()
+ .put(SchemaType.BOOLEAN, Schema.BOOLEAN_SCHEMA)
+ .put(SchemaType.INT8, Schema.INT8_SCHEMA)
+ .put(SchemaType.INT16, Schema.INT16_SCHEMA)
+ .put(SchemaType.INT32, Schema.INT32_SCHEMA)
+ .put(SchemaType.INT64, Schema.INT64_SCHEMA)
+ .put(SchemaType.FLOAT, Schema.FLOAT32_SCHEMA)
+ .put(SchemaType.DOUBLE, Schema.FLOAT64_SCHEMA)
+ .put(SchemaType.STRING, Schema.STRING_SCHEMA)
+ .put(SchemaType.BYTES, Schema.BYTES_SCHEMA)
+ .put(SchemaType.DATE, Date.SCHEMA)
+ .build();
+ }
+
+ // Parse json to shaded schema
+ private static org.apache.pulsar.kafka.shade.avro.Schema parseAvroSchema(String schemaJson) {
+ final org.apache.pulsar.kafka.shade.avro.Schema.Parser parser = new org.apache.pulsar.kafka.shade.avro.Schema.Parser();
+ parser.setValidateDefaults(false);
+ return parser.parse(schemaJson);
+ }
+
+ public static Schema getKafkaConnectSchema(org.apache.pulsar.client.api.Schema pulsarSchema) {
+ if (pulsarSchema != null && pulsarSchema.getSchemaInfo() != null) {
+ if (pulsarSchemaTypeToKafkaSchema.containsKey(pulsarSchema.getSchemaInfo().getType())) {
+ return pulsarSchemaTypeToKafkaSchema.get(pulsarSchema.getSchemaInfo().getType());
+ }
+
+ try {
+ return schemaCache.get(pulsarSchema.getSchemaInfo().getSchema(), () -> {
+ if (pulsarSchema.getSchemaInfo().getType() == SchemaType.KEY_VALUE) {
+ KeyValueSchema kvSchema = (KeyValueSchema) pulsarSchema;
+ return SchemaBuilder.map(getKafkaConnectSchema(kvSchema.getKeySchema()),
+ getKafkaConnectSchema(kvSchema.getKeySchema()))
+ .build();
+ }
+ org.apache.pulsar.kafka.shade.avro.Schema avroSchema =
+ parseAvroSchema(new String(pulsarSchema.getSchemaInfo().getSchema(), UTF_8));
+ return avroData.toConnectSchema(avroSchema);
+ });
+ } catch (ExecutionException | UncheckedExecutionException | ExecutionError ee) {
+ logAndThrowOnUnsupportedSchema(pulsarSchema, "Failed to convert to Kafka Schema.", ee);
+ }
+ }
+
+ logAndThrowOnUnsupportedSchema(pulsarSchema, "Schema is required.", null);
+ return null;
+ }
+
+ private static void logAndThrowOnUnsupportedSchema(org.apache.pulsar.client.api.Schema pulsarSchema,
Review comment:
that about returning the IllegalStateException ?
this way you will call the method this way:
`throws logAndThrowOnUnsupportedSchema(pulsarSchema, "Schema is required.", null);`
it will be clearer for the reader and for javac about the outcome of the execution
##########
File path: pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/PulsarSchemaToKafkaSchema.java
##########
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pulsar.io.kafka.connect.schema;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ExecutionError;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.connect.data.Date;
+import org.apache.kafka.connect.data.Schema;
+import org.apache.kafka.connect.data.SchemaBuilder;
+import org.apache.pulsar.client.impl.schema.KeyValueSchema;
+import org.apache.pulsar.common.schema.SchemaType;
+import org.apache.pulsar.kafka.shade.io.confluent.connect.avro.AvroData;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+@Slf4j
+public class PulsarSchemaToKafkaSchema {
+ private final static ImmutableMap<SchemaType, Schema> pulsarSchemaTypeToKafkaSchema;
+ private static final AvroData avroData = new AvroData(1000);
+ private static final Cache<byte[], Schema> schemaCache =
+ CacheBuilder.newBuilder().maximumSize(10000)
+ .expireAfterAccess(30, TimeUnit.MINUTES).build();
+
+ static {
+ pulsarSchemaTypeToKafkaSchema = ImmutableMap.<SchemaType, Schema>builder()
+ .put(SchemaType.BOOLEAN, Schema.BOOLEAN_SCHEMA)
+ .put(SchemaType.INT8, Schema.INT8_SCHEMA)
+ .put(SchemaType.INT16, Schema.INT16_SCHEMA)
+ .put(SchemaType.INT32, Schema.INT32_SCHEMA)
+ .put(SchemaType.INT64, Schema.INT64_SCHEMA)
+ .put(SchemaType.FLOAT, Schema.FLOAT32_SCHEMA)
+ .put(SchemaType.DOUBLE, Schema.FLOAT64_SCHEMA)
+ .put(SchemaType.STRING, Schema.STRING_SCHEMA)
+ .put(SchemaType.BYTES, Schema.BYTES_SCHEMA)
+ .put(SchemaType.DATE, Date.SCHEMA)
+ .build();
+ }
+
+ // Parse json to shaded schema
+ private static org.apache.pulsar.kafka.shade.avro.Schema parseAvroSchema(String schemaJson) {
+ final org.apache.pulsar.kafka.shade.avro.Schema.Parser parser = new org.apache.pulsar.kafka.shade.avro.Schema.Parser();
+ parser.setValidateDefaults(false);
+ return parser.parse(schemaJson);
+ }
+
+ public static Schema getKafkaConnectSchema(org.apache.pulsar.client.api.Schema pulsarSchema) {
+ if (pulsarSchema != null && pulsarSchema.getSchemaInfo() != null) {
+ if (pulsarSchemaTypeToKafkaSchema.containsKey(pulsarSchema.getSchemaInfo().getType())) {
+ return pulsarSchemaTypeToKafkaSchema.get(pulsarSchema.getSchemaInfo().getType());
+ }
+
+ try {
+ return schemaCache.get(pulsarSchema.getSchemaInfo().getSchema(), () -> {
+ if (pulsarSchema.getSchemaInfo().getType() == SchemaType.KEY_VALUE) {
+ KeyValueSchema kvSchema = (KeyValueSchema) pulsarSchema;
+ return SchemaBuilder.map(getKafkaConnectSchema(kvSchema.getKeySchema()),
+ getKafkaConnectSchema(kvSchema.getKeySchema()))
Review comment:
should this be `getValueSchema` ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org