refactor(dataSource): rename FileStore to FileSystem

.github/actions/confWriter/action.yml

@@ -33,14 +33,14 @@ inputs:
 runs:
     using: "composite" # Mandatory parameter
     steps:
-        - if: inputs.DB-name=='FileStore'
-          name: save config for FileStore
+        - if: inputs.DB-name=='FileSystem'
+          name: save config for FileSystem
           shell: bash
           run: |
               cp -f "${{ inputs.Root-Dir-Path }}/conf/config.properties" "${{ inputs.Root-Dir-Path }}/core/target/iginx-core-${VERSION}/conf/config.properties"
 
-        - if: inputs.DB-name=='FileStore'
-          name: save config for FileStore
+        - if: inputs.DB-name=='FileSystem'
+          name: save config for FileSystem
           shell: bash
           run: |
               cp -f "${{ inputs.Root-Dir-Path }}/conf/config.properties" "${{ inputs.Root-Dir-Path }}/core/target/iginx-core-${VERSION}/conf/config.properties"

.github/actions/dbConfWriter/action.yml

@@ -47,13 +47,13 @@ runs:
               paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
               statements: s/#storageEngineList=127.0.0.1#8086/storageEngineList=127.0.0.1#8086/g
 
-        - if: inputs.DB-name == 'FileStore'
+        - if: inputs.DB-name == 'FileSystem'
           name: Modify IGinX Config
           uses: ./.github/actions/edit
           with:
               paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
               statements: |
-                  s/^#storageEngineList=127.0.0.1#6667#filestore/storageEngineList=127.0.0.1#6667#filestore/g
+                  s/^#storageEngineList=127.0.0.1#6667#filesystem/storageEngineList=127.0.0.1#6667#filesystem/g
                   s#dir=data#dir=${PWD}/test/iginx_mn#g
                   s/data.config.write.buffer.size=104857600/data.config.write.buffer.size=1048576/g
                   s/write.buffer.size=104857600/write.buffer.size=1048576/g

.github/actions/dbRunner/action.yml

@@ -169,19 +169,19 @@ runs:
               paths: conf/config.properties
               statements: s|^#storageEngineList=127.0.0.1#3306#relational#engine=mysql#username=root#password=mysql#has_data=false#meta_properties_path=your-meta-properties-path|storageEngineList=127.0.0.1#3306#relational#engine=mysql#username=root#has_data=false#meta_properties_path=${{ steps.mysql-properties.outputs.path }}|g
 
-        - if: inputs.DB-name=='FileStore'
+        - if: inputs.DB-name=='FileSystem'
           name: Run DB
           shell: bash
           run: |
               cp -f "${GITHUB_WORKSPACE}/conf/config.properties" "${GITHUB_WORKSPACE}/conf/config.properties.bak"
 
-        - if: inputs.DB-name == 'FileStore'
+        - if: inputs.DB-name == 'FileSystem'
           name: Modify IGinX Config
           uses: ./.github/actions/edit
           with:
               paths: conf/config.properties
               statements: |
-                  s/^#storageEngineList=127.0.0.1#6667#filestore/storageEngineList=127.0.0.1#6667#filestore/g
+                  s/^#storageEngineList=127.0.0.1#6667#filesystem/storageEngineList=127.0.0.1#6667#filesystem/g
                   s#dir=data#dir=${{ steps.project.outputs.workspace }}/test/iginx_mn#g
                   s#dummy_dir=dummy#dummy_dir=${{ steps.project.outputs.workspace }}/test/mn#g
                   s/data.config.write.buffer.size=104857600/data.config.write.buffer.size=1048576/g

.github/scripts/dataSources/startup/filestore.sh → .github/scripts/dataSources/startup/filesystem.sh

@@ -24,7 +24,7 @@ cp -f conf/config.properties.bak $7
 
 sed -i"" -e "s/^storageEngineList=127.0.0.1#6667#iotdb12/#storageEngineList=127.0.0.1#6667#iotdb12/" $7
 
-sed -i"" -e "s/^#storageEngineList=127.0.0.1#6667#filestore/storageEngineList=127.0.0.1#$1#filestore/g" $7
+sed -i"" -e "s/^#storageEngineList=127.0.0.1#6667#filesystem/storageEngineList=127.0.0.1#$1#filesystem/g" $7
 
 sed -i"" -e "s/#iginx_port=6888#/#iginx_port=$2#/g" $7
 

.github/scripts/test/cli/test_outfile.sh

@@ -53,13 +53,13 @@ for file in test/src/test/resources/fileReadAndWrite/byteDummy/*; do
     mv "$file" "${file}.ext"
 done
 
-bash -c "echo 'ADD STORAGEENGINE ("'"127.0.0.1"'", 6670, "'"filestore"'", "'"dummy_dir:test/src/test/resources/fileReadAndWrite/byteDummy,iginx_port:6888,has_data:true,is_read_only:true"'");show columns byteDummy.*;' | ${SCRIPT_COMMAND}"
+bash -c "echo 'ADD STORAGEENGINE ("'"127.0.0.1"'", 6670, "'"filesystem"'", "'"dummy_dir:test/src/test/resources/fileReadAndWrite/byteDummy,iginx_port:6888,has_data:true,is_read_only:true"'");show columns byteDummy.*;' | ${SCRIPT_COMMAND}"
 
 bash -c "echo 'select * from byteDummy into outfile "'"test/src/test/resources/fileReadAndWrite/byteStreamExport"'" as stream;' | ${SCRIPT_COMMAND}"
 
 db_name=$1
 
-if [[ "$db_name" != "FileStore" ]]; then
+if [[ "$db_name" != "FileSystem" ]]; then
   exit 0
 fi
 

.github/scripts/test/cli/test_outfile_macos.sh

@@ -53,13 +53,13 @@ for file in test/src/test/resources/fileReadAndWrite/byteDummy/*; do
     mv "$file" "${file}.ext"
 done
 
-bash -c "echo 'ADD STORAGEENGINE ("'"127.0.0.1"'", 6670, "'"filestore"'", "'"dummy_dir:test/src/test/resources/fileReadAndWrite/byteDummy,iginx_port:6888,has_data:true,is_read_only:true"'");show columns byteDummy.*;' | ${SCRIPT_COMMAND}"
+bash -c "echo 'ADD STORAGEENGINE ("'"127.0.0.1"'", 6670, "'"filesystem"'", "'"dummy_dir:test/src/test/resources/fileReadAndWrite/byteDummy,iginx_port:6888,has_data:true,is_read_only:true"'");show columns byteDummy.*;' | ${SCRIPT_COMMAND}"
 
 bash -c "echo 'select * from byteDummy into outfile "'"test/src/test/resources/fileReadAndWrite/byteStreamExport"'" as stream;' | ${SCRIPT_COMMAND}"
 
 db_name=$1
 
-if [[ "$db_name" != "FileStore" ]]; then
+if [[ "$db_name" != "FileSystem" ]]; then
   exit 0
 fi
 

.github/scripts/test/cli/test_outfile_windows.sh

@@ -57,13 +57,13 @@ for file in test/src/test/resources/fileReadAndWrite/byteDummy/*; do
     mv "$file" "${file}.ext"
 done
 
-bash -c "client/target/iginx-client-$2/sbin/start_cli.bat -e 'ADD STORAGEENGINE ("'"127.0.0.1"'", 6670, "'"filestore"'", "'"dummy_dir:test/src/test/resources/fileReadAndWrite/byteDummy,iginx_port:6888,has_data:true,is_read_only:true"'");show columns byteDummy.*;'"
+bash -c "client/target/iginx-client-$2/sbin/start_cli.bat -e 'ADD STORAGEENGINE ("'"127.0.0.1"'", 6670, "'"filesystem"'", "'"dummy_dir:test/src/test/resources/fileReadAndWrite/byteDummy,iginx_port:6888,has_data:true,is_read_only:true"'");show columns byteDummy.*;'"
 
 bash -c "client/target/iginx-client-$2/sbin/start_cli.bat -e 'select * from byteDummy into outfile "'"test/src/test/resources/fileReadAndWrite/byteStreamExport"'" as stream;'"
 
 db_name=$1
 
-if [[ "$db_name" != "FileStore" ]]; then
+if [[ "$db_name" != "FileSystem" ]]; then
   exit 0
 fi
 

.github/workflows/DB-CE.yml

@@ -27,7 +27,7 @@ on:
                 description: "The database to run the test on"
                 type: string
                 required: false
-                default: '["IoTDB12", "InfluxDB", "FileStore", "PostgreSQL", "Redis", "MongoDB", "MySQL"]'
+                default: '["IoTDB12", "InfluxDB", "FileSystem", "PostgreSQL", "Redis", "MongoDB", "MySQL"]'
 
 env:
     FUNCTEST: NewSessionIT,SQLCompareIT,TagIT,RestIT,TransformIT,UDFIT,RestAnnotationIT,SQLSessionIT,SQLSessionPoolIT,SessionV2IT,SessionIT,SessionPoolIT,CompactionIT,TimePrecisionIT,PySessionIT

.github/workflows/remote-test.yml

@@ -26,7 +26,7 @@ on:
                 description: "The database to run the test on"
                 type: string
                 required: false
-                default: '["IoTDB12", "FileStore"]'
+                default: '["IoTDB12", "FileSystem"]'
 
 env:
     FUNCTEST: RemoteUDFIT

.github/workflows/standalone-test-pushdown.yml

@@ -27,7 +27,7 @@ on:
                 description: "The database to run the test on"
                 type: string
                 required: false
-                default: '["IoTDB12", "InfluxDB", "FileStore", "PostgreSQL", "Redis", "MongoDB", "MySQL"]'
+                default: '["IoTDB12", "InfluxDB", "FileSystem", "PostgreSQL", "Redis", "MongoDB", "MySQL"]'
 
 jobs:
     Union-DB-Test-Push_Down:

.github/workflows/standalone-test.yml

@@ -27,7 +27,7 @@ on:
                 description: "The database to run the test on"
                 type: string
                 required: false
-                default: '["IoTDB12", "InfluxDB", "FileStore", "PostgreSQL", "Redis", "MongoDB", "MySQL"]'
+                default: '["IoTDB12", "InfluxDB", "FileSystem", "PostgreSQL", "Redis", "MongoDB", "MySQL"]'
 
 jobs:
     Union-DB-Test:
@@ -106,12 +106,12 @@ jobs:
                   shell: client-before
 
             # TODO: extract it to a separate job to test
-            # large image export only tested in FileStore
+            # large image export only tested in FileSystem
             - name: Test Client Export File
               if: always()
               shell: bash
               run: |
-                  if [[ "${{ matrix.DB-name }}" == "FileStore" ]]; then
+                  if [[ "${{ matrix.DB-name }}" == "FileSystem" ]]; then
                       mvn test -q -Dtest=ExportFileIT -DfailIfNoTests=false -P-format
                   else
                       mvn test -q -Dtest=ExportFileIT#checkExportByteStream -DfailIfNoTests=false -P-format

.github/workflows/tpc-h.yml

@@ -27,7 +27,7 @@ on:
                 description: "The database to run the test on"
                 type: string
                 required: false
-                default: '["IoTDB12", "InfluxDB", "FileStore", "PostgreSQL", "Redis", "MongoDB", "MySQL"]'
+                default: '["IoTDB12", "InfluxDB", "FileSystem", "PostgreSQL", "Redis", "MongoDB", "MySQL"]'
 
 jobs:
     TPC-H-Test:

assembly/pom.xml

@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>cn.edu.tsinghua</groupId>
-            <artifactId>filestore</artifactId>
+            <artifactId>filesystem</artifactId>
         </dependency>
         <dependency>
             <groupId>cn.edu.tsinghua</groupId>
@@ -175,8 +175,8 @@
                                     <value>#storageEngineList=127.0.0.1#6667#iotdb</value>
                                 </replacement>
                                 <replacement>
-                                    <token>#storageEngineList=127.0.0.1#6667#filestore.*</token>
-                                    <value>storageEngineList=127.0.0.1#6667#filestore#dir=data#iginx_port=6888</value>
+                                    <token>#storageEngineList=127.0.0.1#6667#filesystem.*</token>
+                                    <value>storageEngineList=127.0.0.1#6667#filesystem#dir=data#iginx_port=6888</value>
                                 </replacement>
                                 <replacement>
                                     <token>UD[ATS]F,.*,.*,.*[.]py</token>

assembly/src/assembly/component/iginx-filestore-driver.xml → assembly/src/assembly/component/iginx-filesystem-driver.xml

@@ -23,13 +23,13 @@
         <moduleSet>
             <useAllReactorProjects>true</useAllReactorProjects>
             <includes>
-                <include>cn.edu.tsinghua:filestore</include>
+                <include>cn.edu.tsinghua:filesystem</include>
             </includes>
             <sources>
                 <includeModuleDirectory>false</includeModuleDirectory>
                 <fileSets>
                     <fileSet>
-                        <directory>${project.build.directory}/filestore-${project.version}</directory>
+                        <directory>${project.build.directory}/filesystem-${project.version}</directory>
                         <outputDirectory>/</outputDirectory>
                     </fileSet>
                 </fileSets>

assembly/src/assembly/include.xml

@@ -28,7 +28,7 @@
     <componentDescriptors>
         <componentDescriptor>src/assembly/component/iginx-core.xml</componentDescriptor>
         <componentDescriptor>src/assembly/component/iginx-iotdb12-driver.xml</componentDescriptor>
-        <componentDescriptor>src/assembly/component/iginx-filestore-driver.xml</componentDescriptor>
+        <componentDescriptor>src/assembly/component/iginx-filesystem-driver.xml</componentDescriptor>
         <componentDescriptor>src/assembly/component/include-zookeeper.xml</componentDescriptor>
     </componentDescriptors>
     <fileSets>

assembly/src/assembly/server.xml

@@ -27,7 +27,7 @@
     <includeBaseDirectory>false</includeBaseDirectory>
     <componentDescriptors>
         <componentDescriptor>src/assembly/component/iginx-core.xml</componentDescriptor>
-        <componentDescriptor>src/assembly/component/iginx-filestore-driver.xml</componentDescriptor>
+        <componentDescriptor>src/assembly/component/iginx-filesystem-driver.xml</componentDescriptor>
         <componentDescriptor>src/assembly/component/iginx-influxdb-driver.xml</componentDescriptor>
         <componentDescriptor>src/assembly/component/iginx-iotdb12-driver.xml</componentDescriptor>
         <componentDescriptor>src/assembly/component/iginx-mongodb-driver.xml</componentDescriptor>

conf/config.properties

@@ -34,7 +34,7 @@ password=root
 # 数据库列表，使用','分隔不同实例
 storageEngineList=127.0.0.1#6667#iotdb12#username=root#password=root#sessionPoolSize=20#has_data=false#is_read_only=false
 #storageEngineList=127.0.0.1#8086#influxdb#url=http://localhost:8086/#token=your-token#organization=your-organization#has_data=false
-#storageEngineList=127.0.0.1#6667#filestore#iginx_port=6888#has_data=false#is_read_only=false#dir=data#data.config.write.buffer.size=104857600#data.config.write.buffer.timeout=0#dummy_dir=dummy#dummy.struct=LegacyFilesystem#dummy.config.chunk_size_in_bytes=1048576#dummy.config.memory_pool_size=100#client.connectPool.maxTotal=100
+#storageEngineList=127.0.0.1#6667#filesystem#iginx_port=6888#has_data=false#is_read_only=false#dir=data#data.config.write.buffer.size=104857600#data.config.write.buffer.timeout=0#dummy_dir=dummy#dummy.struct=LegacyFilesystem#dummy.config.chunk_size_in_bytes=1048576#dummy.config.memory_pool_size=100#client.connectPool.maxTotal=100
 #storageEngineList=127.0.0.1#5432#relational#engine=postgresql#username=postgres#password=postgres#has_data=false
 #storageEngineList=127.0.0.1#3306#relational#engine=mysql#username=root#password=mysql#has_data=false#meta_properties_path=your-meta-properties-path
 #storageEngineList=127.0.0.1#27017#mongodb#uri="mongodb://127.0.0.1:27017/?maxPoolSize=200&maxIdleTimeMS=60000&waitQueueTimeoutMS=50000"#has_data=false#schema.sample.size=1000#dummy.sample.size=0
@@ -51,7 +51,7 @@ defaultUDFDir=udf_funcs
 replicaNum=0
 
 # 底层数据库类名
-databaseClassNames=iotdb12=cn.edu.tsinghua.iginx.iotdb.IoTDBStorage,influxdb=cn.edu.tsinghua.iginx.influxdb.InfluxDBStorage,filestore=cn.edu.tsinghua.iginx.filestore.FileStoreStorage,relational=cn.edu.tsinghua.iginx.relational.RelationalStorage,mongodb=cn.edu.tsinghua.iginx.mongodb.MongoDBStorage,redis=cn.edu.tsinghua.iginx.redis.RedisStorage
+databaseClassNames=iotdb12=cn.edu.tsinghua.iginx.iotdb.IoTDBStorage,influxdb=cn.edu.tsinghua.iginx.influxdb.InfluxDBStorage,filesystem=cn.edu.tsinghua.iginx.filesystem.FileSystemStorage,relational=cn.edu.tsinghua.iginx.relational.RelationalStorage,mongodb=cn.edu.tsinghua.iginx.mongodb.MongoDBStorage,redis=cn.edu.tsinghua.iginx.redis.RedisStorage
 
 # 内存任务执行线程池
 memoryTaskThreadPoolSize=200

core/src/main/java/cn/edu/tsinghua/iginx/IginxWorker.java

@@ -81,7 +81,7 @@ public class IginxWorker implements IService.Iface {
   private static final Config config = ConfigDescriptor.getInstance().getConfig();
 
   private IginxWorker() {
-    // if there are new local filestore in conf, add them to cluster.
+    // if there are new local filesystem in conf, add them to cluster.
     if (!addLocalStorageEngineMetas()) {
       LOGGER.error("there are no valid storage engines!");
       System.exit(-1);
@@ -459,8 +459,8 @@ private void addStorageEngineMetas(
       }
     }
 
-    // init local filestore before adding to meta
-    // exclude remote filestore
+    // init local filesystem before adding to meta
+    // exclude remote filesystem
     List<StorageEngineMeta> localMetas = new ArrayList<>();
     List<StorageEngineMeta> otherMetas = new ArrayList<>();
     for (StorageEngineMeta meta : storageEngineMetas) {

core/src/main/java/cn/edu/tsinghua/iginx/conf/Config.java

@@ -52,7 +52,7 @@ public class Config {
   private TimePrecision timePrecision = TimePrecision.NS;
 
   private String databaseClassNames =
-      "iotdb12=cn.edu.tsinghua.iginx.iotdb.IoTDBStorage,influxdb=cn.edu.tsinghua.iginx.influxdb.InfluxDBStorage,relational=cn.edu.tsinghua.iginx.relational.RelationalStorage,mongodb=cn.edu.tsinghua.iginx.mongodb.MongoDBStorage,redis=cn.edu.tsinghua.iginx.redis.RedisStorage,filestore=cn.edu.tsinghua.iginx.filestore.FileStorage";
+      "iotdb12=cn.edu.tsinghua.iginx.iotdb.IoTDBStorage,influxdb=cn.edu.tsinghua.iginx.influxdb.InfluxDBStorage,relational=cn.edu.tsinghua.iginx.relational.RelationalStorage,mongodb=cn.edu.tsinghua.iginx.mongodb.MongoDBStorage,redis=cn.edu.tsinghua.iginx.redis.RedisStorage,filesystem=cn.edu.tsinghua.iginx.filesystem.FileSystemStorage";
 
   private String policyClassName = "cn.edu.tsinghua.iginx.policy.naive.NaivePolicy";
 

core/src/main/java/cn/edu/tsinghua/iginx/conf/ConfigDescriptor.java

@@ -85,7 +85,7 @@ private void loadPropsFromFile() {
       config.setDatabaseClassNames(
           properties.getProperty(
               "databaseClassNames",
-              "iotdb12=cn.edu.tsinghua.iginx.iotdb.IoTDBStorage,influxdb=cn.edu.tsinghua.iginx.influxdb.InfluxDBStorage,relational=cn.edu.tsinghua.iginx.relational.RelationalStorage,mongodb=cn.edu.tsinghua.iginx.mongodb.MongoDBStorage,redis=cn.edu.tsinghua.iginx.redis.RedisStorage,filestore=cn.edu.tsinghua.iginx.filestore.FileStorage"));
+              "iotdb12=cn.edu.tsinghua.iginx.iotdb.IoTDBStorage,influxdb=cn.edu.tsinghua.iginx.influxdb.InfluxDBStorage,relational=cn.edu.tsinghua.iginx.relational.RelationalStorage,mongodb=cn.edu.tsinghua.iginx.mongodb.MongoDBStorage,redis=cn.edu.tsinghua.iginx.redis.RedisStorage,filesystem=cn.edu.tsinghua.iginx.filesystem.FileSystemStorage"));
 
       config.setPolicyClassName(
           properties.getProperty(

core/src/main/java/cn/edu/tsinghua/iginx/conf/Constants.java

@@ -58,7 +58,7 @@ public class Constants {
 
   public static final String DATA_PREFIX = "data_prefix";
 
-  // especially for embedded storage engines: filestore
+  // especially for embedded storage engines: filesystem
   public static final String EMBEDDED_PREFIX = "embedded_prefix";
 
   public static final String SCHEMA_PREFIX = "schema_prefix";

core/src/main/java/cn/edu/tsinghua/iginx/metadata/utils/StorageEngineUtils.java

@@ -33,7 +33,7 @@
 public class StorageEngineUtils {
 
   public static boolean isEmbeddedStorageEngine(StorageEngineType type) {
-    return type.equals(StorageEngineType.filestore);
+    return type.equals(StorageEngineType.filesystem);
   }
 
   private static boolean isDirValid(String dir) {

core/src/test/java/cn/edu/tsinghua/iginx/metadata/entity/ExtraParamTest.java

@@ -95,9 +95,9 @@ private void runParamTest(
       extraParam.put(DUMMY_DIR, dummyDir);
     }
     if (valid) {
-      assertTrue(checkEmbeddedStorageExtraParams(StorageEngineType.filestore, extraParam));
+      assertTrue(checkEmbeddedStorageExtraParams(StorageEngineType.filesystem, extraParam));
     } else {
-      assertFalse(checkEmbeddedStorageExtraParams(StorageEngineType.filestore, extraParam));
+      assertFalse(checkEmbeddedStorageExtraParams(StorageEngineType.filesystem, extraParam));
     }
   }