[incubator-iotdb] 06/06: fix compile error caused by rebase and add a new test to help maintain the TSFileConfigUtil.

[qi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit b24cdde30f48f94d1f31c4abc1e73e00c2ceef18
Author: 仲炜 <zw...@alibaba-inc.com>
AuthorDate: Wed Apr 8 14:39:25 2020 +0800

    fix compile error caused by rebase and add a new test to help maintain the TSFileConfigUtil.
---
 .../iotdb/flink/tsfile/TsFileInputFormat.java      |  4 +-
 .../iotdb/flink/tsfile/util/TSFileConfigUtil.java  |  2 +-
 .../util/TSFileConfigUtilCompletenessTest.java     | 84 ++++++++++++++++++++++
 3 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileInputFormat.java b/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileInputFormat.java
index 1ecb4bb..7b94040 100644
--- a/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileInputFormat.java
+++ b/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileInputFormat.java
@@ -36,7 +36,7 @@ import org.apache.iotdb.tsfile.read.TsFileSequenceReader;
 import org.apache.iotdb.tsfile.read.common.RowRecord;
 import org.apache.iotdb.tsfile.read.expression.QueryExpression;
 import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
-import org.apache.iotdb.tsfile.read.reader.DefaultTsFileInput;
+import org.apache.iotdb.tsfile.read.reader.LocalTsFileInput;
 import org.apache.iotdb.tsfile.read.reader.TsFileInput;
 
 import javax.annotation.Nullable;
@@ -102,7 +102,7 @@ public class TsFileInputFormat<T> extends FileInputFormat<T> implements ResultTy
 					hadoopConf);
 			} else {
 				// Local File System
-				in = new DefaultTsFileInput(Paths.get(currentSplit.getPath().toUri()));
+				in = new LocalTsFileInput(Paths.get(currentSplit.getPath().toUri()));
 			}
 		} catch (URISyntaxException e) {
 			throw new FlinkRuntimeException(e);
diff --git a/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/util/TSFileConfigUtil.java b/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/util/TSFileConfigUtil.java
index 43b6237..41596ea 100644
--- a/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/util/TSFileConfigUtil.java
+++ b/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/util/TSFileConfigUtil.java
@@ -58,7 +58,7 @@ public class TSFileConfigUtil {
 		globalConfig.setSdtMaxError(config.getSdtMaxError());
 		globalConfig.setTimeEncoder(config.getTimeEncoder());
 		globalConfig.setTimeSeriesDataType(config.getTimeSeriesDataType());
-		globalConfig.setTSFileStorageFs(config.getTSFileStorageFs().toString());
+		globalConfig.setTSFileStorageFs(config.getTSFileStorageFs());
 		globalConfig.setUseKerberos(config.isUseKerberos());
 		globalConfig.setValueEncoder(config.getValueEncoder());
 	}
diff --git a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TSFileConfigUtilCompletenessTest.java b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TSFileConfigUtilCompletenessTest.java
new file mode 100644
index 0000000..2af10b6
--- /dev/null
+++ b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TSFileConfigUtilCompletenessTest.java
@@ -0,0 +1,84 @@
+/*
+ * 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.iotdb.flink.util;
+
+import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * This test is used to help maintain the {@link org.apache.iotdb.flink.tsfile.util.TSFileConfigUtil}.
+ */
+public class TSFileConfigUtilCompletenessTest {
+
+	@Test
+	public void testTSFileConfigUtilCompleteness() {
+		String[] addedSetters = {
+			"setBatchSize",
+			"setBloomFilterErrorRate",
+			"setCompressor",
+			"setCoreSitePath",
+			"setDeltaBlockSize",
+			"setDfsClientFailoverProxyProvider",
+			"setDfsHaAutomaticFailoverEnabled",
+			"setDfsHaNamenodes",
+			"setDfsNameServices",
+			"setDftSatisfyRate",
+			"setEndian",
+			"setFloatPrecision",
+			"setFreqType",
+			"setGroupSizeInByte",
+			"setHdfsIp",
+			"setHdfsPort",
+			"setHdfsSitePath",
+			"setKerberosKeytabFilePath",
+			"setKerberosPrincipal",
+			"setMaxNumberOfPointsInPage",
+			"setMaxStringLength",
+			"setPageCheckSizeThreshold",
+			"setPageSizeInByte",
+			"setPlaMaxError",
+			"setRleBitWidth",
+			"setSdtMaxError",
+			"setTimeEncoder",
+			"setTimeSeriesDataType",
+			"setTSFileStorageFs",
+			"setUseKerberos",
+			"setValueEncoder"
+		};
+		Set<String> newSetters = Arrays.stream(TSFileConfig.class.getMethods())
+			.map(Method::getName)
+			.filter(s -> s.startsWith("set"))
+			.filter(s -> !Arrays.asList(addedSetters).contains(s))
+			.collect(Collectors.toSet());
+		assertTrue(
+			String.format(
+				"New setters in TSFileConfig are detected, please add them to " +
+				"org.apache.iotdb.flink.tsfile.util.TSFileConfigUtil. The setters need to be added: %s",
+				newSetters),
+			newSetters.isEmpty());
+	}
+}