You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by GitBox <gi...@apache.org> on 2022/06/05 15:14:53 UTC
[GitHub] [incubator-inlong] healchow commented on a diff in pull request #4515: [INLONG-4513][Manager] Bug fix & add iceberg and hbase client example
healchow commented on code in PR #4515:
URL: https://github.com/apache/incubator-inlong/pull/4515#discussion_r889701972
##########
inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2HBaseExample.java:
##########
@@ -0,0 +1,150 @@
+/*
+ * 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.inlong.manager.client;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.inlong.manager.client.api.ClientConfiguration;
+import org.apache.inlong.manager.client.api.InlongClient;
+import org.apache.inlong.manager.client.api.InlongGroup;
+import org.apache.inlong.manager.client.api.InlongGroupContext;
+import org.apache.inlong.manager.client.api.InlongStreamBuilder;
+import org.apache.inlong.manager.common.enums.FieldType;
+import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
+import org.apache.inlong.manager.common.pojo.sink.SinkField;
+import org.apache.inlong.manager.common.pojo.sink.hbase.HBaseColumnFamilyInfo;
+import org.apache.inlong.manager.common.pojo.sink.hbase.HBaseSink;
+import org.apache.inlong.manager.common.pojo.source.file.FileSource;
+import org.apache.inlong.manager.common.pojo.stream.StreamField;
+import org.apache.shiro.util.Assert;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Test class for file to hbase.
+ */
+@Slf4j
+public class File2HBaseExample extends BaseExample {
+
+ @Test
+ public void testCreateGroupForHBase() {
+ ClientConfiguration configuration = new ClientConfiguration();
+ configuration.setWriteTimeout(10);
+ configuration.setReadTimeout(10);
+ configuration.setConnectTimeout(10);
+ configuration.setTimeUnit(TimeUnit.SECONDS);
+ configuration.setAuthentication(super.getInlongAuth());
+ InlongClient inlongClient = InlongClient.create(super.getServiceUrl(), configuration);
+
+ InlongGroupInfo groupInfo = super.createGroupInfo();
+ try {
+ InlongGroup group = inlongClient.forGroup(groupInfo);
+ InlongStreamBuilder streamBuilder = group.createStream(createStreamInfo());
+ streamBuilder.fields(createStreamFields());
+ streamBuilder.source(createAgentFileSource());
+ streamBuilder.sink(createHBaseSink());
+ streamBuilder.initOrUpdate();
+ // start group
+ InlongGroupContext inlongGroupContext = group.init();
+ Assert.notNull(inlongGroupContext);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testStopGroup() {
+ ClientConfiguration configuration = new ClientConfiguration();
+ configuration.setWriteTimeout(10);
+ configuration.setReadTimeout(10);
+ configuration.setConnectTimeout(10);
+ configuration.setTimeUnit(TimeUnit.SECONDS);
+ configuration.setAuthentication(super.getInlongAuth());
+ InlongClient inlongClient = InlongClient.create(super.getServiceUrl(), configuration);
+ InlongGroupInfo groupInfo = createGroupInfo();
+ try {
+ InlongGroup group = inlongClient.forGroup(groupInfo);
+ InlongGroupContext groupContext = group.delete();
+ Assert.notNull(groupContext);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private FileSource createAgentFileSource() {
+ FileSource fileSource = new FileSource();
+ fileSource.setSourceName("{source.name}");
+ fileSource.setAgentIp("{agent.ip}");
+ fileSource.setPattern("/a/b/*.txt");
+ fileSource.setTimeOffset("-1h");
+ return fileSource;
+ }
+
+ private List<StreamField> createStreamFields() {
+ List<StreamField> streamFieldList = Lists.newArrayList();
+ streamFieldList.add(new StreamField(0, FieldType.STRING.toString(), "name", null, null));
+ streamFieldList.add(new StreamField(1, FieldType.INT.toString(), "age", null, null));
+ streamFieldList.add(new StreamField(2, FieldType.DECIMAL.toString(), "score", null, null));
+ return streamFieldList;
+ }
+
+ /**
+ * Create iceberg sink
+ */
+ public HBaseSink createHBaseSink() throws Exception {
+ HBaseSink sink = new HBaseSink();
+
+ sink.setSinkName("{sink.name}");
+ sink.setNamespace("{db.name}");
+ sink.setTableName("{table.name}");
+ sink.setZkQuorum("{ip:port}");
+ sink.setZkNodeParent("{zk.node.path}");
+ sink.setRowKey("{rowkey}");
+
+ final SinkField field1 = new SinkField(0, FieldType.INT.toString(), "age", FieldType.INT.toString(), "age");
+ final SinkField field2 = new SinkField(1, FieldType.STRING.toString(), "name", FieldType.STRING.toString(),
+ "name");
+ final SinkField field3 = new SinkField(2, FieldType.DECIMAL.toString(), "score", FieldType.DECIMAL.toString(),
+ "score");
+
+ // field ext param
+ final ObjectMapper mapper = new ObjectMapper();
Review Comment:
Suggest using a global instance of ObjectMapper, for example, extract this instance into the super class `BaseExample`.
##########
inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/iceberg/IcebergCatalogUtils.java:
##########
@@ -57,7 +58,7 @@ public static HiveCatalog getCatalog(String metastoreUri, String warehouse) {
HiveCatalog catalog = new HiveCatalog();
Map<String, String> properties = new HashMap<>();
properties.put(CATALOG_PROP_URI, metastoreUri);
- if (!warehouse.isEmpty()) {
+ if (!StringUtils.isEmpty(warehouse)) {
Review Comment:
Just use `StringUtils.isNotEmpty` or `StringUtils.isNotBlank`, please.
##########
inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2IcebergExample.java:
##########
@@ -0,0 +1,160 @@
+/*
+ * 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.inlong.manager.client;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.inlong.manager.client.api.ClientConfiguration;
+import org.apache.inlong.manager.client.api.InlongClient;
+import org.apache.inlong.manager.client.api.InlongGroup;
+import org.apache.inlong.manager.client.api.InlongGroupContext;
+import org.apache.inlong.manager.client.api.InlongStreamBuilder;
+import org.apache.inlong.manager.common.enums.FieldType;
+import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
+import org.apache.inlong.manager.common.pojo.sink.SinkField;
+import org.apache.inlong.manager.common.pojo.sink.iceberg.IcebergColumnInfo;
+import org.apache.inlong.manager.common.pojo.sink.iceberg.IcebergPartition;
+import org.apache.inlong.manager.common.pojo.sink.iceberg.IcebergSink;
+import org.apache.inlong.manager.common.pojo.source.file.FileSource;
+import org.apache.inlong.manager.common.pojo.stream.StreamField;
+import org.apache.shiro.util.Assert;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Test class for file to iceberg.
+ */
+@Slf4j
+public class File2IcebergExample extends BaseExample {
+
+ @Test
+ public void testCreateGroupForIceberg() {
+ ClientConfiguration configuration = new ClientConfiguration();
+ configuration.setWriteTimeout(10);
+ configuration.setReadTimeout(10);
+ configuration.setConnectTimeout(10);
+ configuration.setTimeUnit(TimeUnit.SECONDS);
+ configuration.setAuthentication(super.getInlongAuth());
+ InlongClient inlongClient = InlongClient.create(super.getServiceUrl(), configuration);
+
+ InlongGroupInfo groupInfo = super.createGroupInfo();
+ try {
+ InlongGroup group = inlongClient.forGroup(groupInfo);
+ InlongStreamBuilder streamBuilder = group.createStream(createStreamInfo());
+ streamBuilder.fields(createStreamFields());
+ streamBuilder.source(createAgentFileSource());
+ streamBuilder.sink(createIcebergSink());
+ streamBuilder.initOrUpdate();
+ // start group
+ InlongGroupContext inlongGroupContext = group.init();
+ Assert.notNull(inlongGroupContext);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testStopGroup() {
+ ClientConfiguration configuration = new ClientConfiguration();
+ configuration.setWriteTimeout(10);
+ configuration.setReadTimeout(10);
+ configuration.setConnectTimeout(10);
+ configuration.setTimeUnit(TimeUnit.SECONDS);
+ configuration.setAuthentication(super.getInlongAuth());
+ InlongClient inlongClient = InlongClient.create(super.getServiceUrl(), configuration);
+ InlongGroupInfo groupInfo = createGroupInfo();
+ try {
+ InlongGroup group = inlongClient.forGroup(groupInfo);
+ InlongGroupContext groupContext = group.delete();
+ Assert.notNull(groupContext);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private FileSource createAgentFileSource() {
+ FileSource fileSource = new FileSource();
+ fileSource.setSourceName("{source.name}");
+ fileSource.setAgentIp("{agent.ip}");
+ fileSource.setPattern("/a/b/*.txt");
+ fileSource.setTimeOffset("-1h");
+ return fileSource;
+ }
+
+ private List<StreamField> createStreamFields() {
+ List<StreamField> streamFieldList = Lists.newArrayList();
+ streamFieldList.add(new StreamField(0, FieldType.STRING.toString(), "name", null, null));
+ streamFieldList.add(new StreamField(1, FieldType.INT.toString(), "age", null, null));
+ streamFieldList.add(new StreamField(2, FieldType.DECIMAL.toString(), "score", null, null));
+ streamFieldList.add(new StreamField(3, FieldType.TIMESTAMP.toString(), "ts", null, null));
+ return streamFieldList;
+ }
+
+ /**
+ * Create iceberg sink
+ */
+ public IcebergSink createIcebergSink() throws Exception {
+ IcebergSink sink = new IcebergSink();
+
+ sink.setSinkName("{sink.name}");
+ sink.setDbName("{db.name}");
+ sink.setTableName("{table.name}");
+ sink.setCatalogUri("thrift://{ip:port}");
+ sink.setWarehouse("hdfs://{ip:port}/user/iceberg/warehouse/");
+
+ final SinkField field1 = new SinkField(0, FieldType.INT.toString(), "age", FieldType.INT.toString(), "age");
+ final SinkField field2 = new SinkField(1, FieldType.STRING.toString(), "name", FieldType.STRING.toString(),
+ "name");
+ final SinkField field3 = new SinkField(3, FieldType.DECIMAL.toString(), "score", FieldType.DECIMAL.toString(),
+ "score");
+ final SinkField field4 = new SinkField(3, FieldType.TIMESTAMP.toString(), "ts", FieldType.TIMESTAMP.toString(),
+ "ts");
+
+ // field ext param
+ // field1: bucket partition example
+ final ObjectMapper mapper = new ObjectMapper();
+ IcebergColumnInfo info1 = new IcebergColumnInfo();
+ info1.setRequired(true);
+ info1.setPartitionStrategy(IcebergPartition.BUCKET.toString());
+ info1.setBucketNum(10);
+ field1.setExtParams(mapper.writeValueAsString(info1));
+
+ // field3: decimal column example
+ IcebergColumnInfo info3 = new IcebergColumnInfo();
+ info3.setScale(5);
+ info3.setPrecision(10); //NOTE: scale must be less than or equal to precision
Review Comment:
Did this restriction checked in save or update APIs?
--
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.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org