You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/11/02 03:18:15 UTC

[iotdb] branch master updated: Rename iotdb-engine.properties to iotdb-datanode.properties in UTs (#7869)

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/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new b73f8d07a2 Rename iotdb-engine.properties to iotdb-datanode.properties in UTs (#7869)
b73f8d07a2 is described below

commit b73f8d07a21112ec515b21f99450d66f090ae1a6
Author: Haonan <hh...@outlook.com>
AuthorDate: Wed Nov 2 11:18:09 2022 +0800

    Rename iotdb-engine.properties to iotdb-datanode.properties in UTs (#7869)
---
 .../src/test/resources/iotdb-datanode.properties   | 23 +++++++++++++++++++++
 .../src/test/resources/iotdb-engine.properties     | 21 -------------------
 .../src/test/resources/iotdb-datanode.properties   | 24 ++++++++++++++++++++++
 .../src/test/resources/iotdb-engine.properties     | 21 -------------------
 .../src/test/resources/iotdb-datanode.properties   | 24 ++++++++++++++++++++++
 .../src/test/resources/iotdb-engine.properties     | 21 -------------------
 .../src/test/resources/iotdb-datanode.properties   | 23 +++++++++++++++++++++
 session/src/test/resources/iotdb-engine.properties | 20 ------------------
 .../src/test/resources/iotdb-datanode.properties   | 23 +++++++++++++++++++++
 .../src/test/resources/iotdb-engine.properties     | 21 -------------------
 10 files changed, 117 insertions(+), 104 deletions(-)

diff --git a/cross-tests/src/test/resources/iotdb-datanode.properties b/cross-tests/src/test/resources/iotdb-datanode.properties
new file mode 100644
index 0000000000..44f7270b33
--- /dev/null
+++ b/cross-tests/src/test/resources/iotdb-datanode.properties
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+
+
+base_dir=target/tmp
+dn_data_dirs=target/data
+dn_wal_dirs=target/wal
\ No newline at end of file
diff --git a/cross-tests/src/test/resources/iotdb-engine.properties b/cross-tests/src/test/resources/iotdb-engine.properties
deleted file mode 100644
index b213e4cad9..0000000000
--- a/cross-tests/src/test/resources/iotdb-engine.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#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.
-
-
-base_dir=target/tmp
-data_dirs=target/data
-wal_dir=target/wal
\ No newline at end of file
diff --git a/integration-test/src/test/resources/iotdb-datanode.properties b/integration-test/src/test/resources/iotdb-datanode.properties
new file mode 100644
index 0000000000..cc01ac1336
--- /dev/null
+++ b/integration-test/src/test/resources/iotdb-datanode.properties
@@ -0,0 +1,24 @@
+#
+# 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.
+#
+
+
+base_dir=target/tmp
+dn_data_dirs=target/data
+dn_wal_dirs=target/wal
+sync_dir=target/sync
\ No newline at end of file
diff --git a/integration-test/src/test/resources/iotdb-engine.properties b/integration-test/src/test/resources/iotdb-engine.properties
deleted file mode 100644
index ce9be14770..0000000000
--- a/integration-test/src/test/resources/iotdb-engine.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#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.
-
-base_dir=target/tmp
-data_dirs=target/data
-wal_dir=target/wal
-sync_dir=target/sync
\ No newline at end of file
diff --git a/integration/src/test/resources/iotdb-datanode.properties b/integration/src/test/resources/iotdb-datanode.properties
new file mode 100644
index 0000000000..cc01ac1336
--- /dev/null
+++ b/integration/src/test/resources/iotdb-datanode.properties
@@ -0,0 +1,24 @@
+#
+# 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.
+#
+
+
+base_dir=target/tmp
+dn_data_dirs=target/data
+dn_wal_dirs=target/wal
+sync_dir=target/sync
\ No newline at end of file
diff --git a/integration/src/test/resources/iotdb-engine.properties b/integration/src/test/resources/iotdb-engine.properties
deleted file mode 100644
index ce9be14770..0000000000
--- a/integration/src/test/resources/iotdb-engine.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#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.
-
-base_dir=target/tmp
-data_dirs=target/data
-wal_dir=target/wal
-sync_dir=target/sync
\ No newline at end of file
diff --git a/session/src/test/resources/iotdb-datanode.properties b/session/src/test/resources/iotdb-datanode.properties
new file mode 100644
index 0000000000..44f7270b33
--- /dev/null
+++ b/session/src/test/resources/iotdb-datanode.properties
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+
+
+base_dir=target/tmp
+dn_data_dirs=target/data
+dn_wal_dirs=target/wal
\ No newline at end of file
diff --git a/session/src/test/resources/iotdb-engine.properties b/session/src/test/resources/iotdb-engine.properties
deleted file mode 100644
index f93226c615..0000000000
--- a/session/src/test/resources/iotdb-engine.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#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.
-
-base_dir=target/tmp
-data_dirs=target/data
-wal_dir=target/wal
\ No newline at end of file
diff --git a/spark-iotdb-connector/src/test/resources/iotdb-datanode.properties b/spark-iotdb-connector/src/test/resources/iotdb-datanode.properties
new file mode 100644
index 0000000000..44f7270b33
--- /dev/null
+++ b/spark-iotdb-connector/src/test/resources/iotdb-datanode.properties
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+
+
+base_dir=target/tmp
+dn_data_dirs=target/data
+dn_wal_dirs=target/wal
\ No newline at end of file
diff --git a/spark-iotdb-connector/src/test/resources/iotdb-engine.properties b/spark-iotdb-connector/src/test/resources/iotdb-engine.properties
deleted file mode 100644
index 6141c481e0..0000000000
--- a/spark-iotdb-connector/src/test/resources/iotdb-engine.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#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.
-
-
-base_dir=target
-data_dirs=target/data
-wal_dir=target/wal
\ No newline at end of file