diff --git a/.github/actions/confWriter/action.yml b/.github/actions/confWriter/action.yml index 32c7cce516..dfa7ff1e1f 100644 --- a/.github/actions/confWriter/action.yml +++ b/.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" diff --git a/.github/actions/dbConfWriter/action.yml b/.github/actions/dbConfWriter/action.yml index a48ec85db5..7c863cbed8 100644 --- a/.github/actions/dbConfWriter/action.yml +++ b/.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 diff --git a/.github/actions/dbRunner/action.yml b/.github/actions/dbRunner/action.yml index 845b74ad6e..62bae11cc2 100644 --- a/.github/actions/dbRunner/action.yml +++ b/.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 diff --git a/.github/scripts/dataSources/startup/filestore.sh b/.github/scripts/dataSources/startup/filesystem.sh similarity index 94% rename from .github/scripts/dataSources/startup/filestore.sh rename to .github/scripts/dataSources/startup/filesystem.sh index 9bbe00b4bb..e1e8640491 100644 --- a/.github/scripts/dataSources/startup/filestore.sh +++ b/.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 diff --git a/.github/scripts/test/cli/test_outfile.sh b/.github/scripts/test/cli/test_outfile.sh index ea95ac2341..6cce23937b 100644 --- a/.github/scripts/test/cli/test_outfile.sh +++ b/.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 diff --git a/.github/scripts/test/cli/test_outfile_macos.sh b/.github/scripts/test/cli/test_outfile_macos.sh index ebe28b05ef..45448ec9e0 100644 --- a/.github/scripts/test/cli/test_outfile_macos.sh +++ b/.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 diff --git a/.github/scripts/test/cli/test_outfile_windows.sh b/.github/scripts/test/cli/test_outfile_windows.sh index fc87d57055..c7f949b4e7 100644 --- a/.github/scripts/test/cli/test_outfile_windows.sh +++ b/.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 diff --git a/.github/workflows/DB-CE.yml b/.github/workflows/DB-CE.yml index 45f8e7fabb..f2762e7950 100644 --- a/.github/workflows/DB-CE.yml +++ b/.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 diff --git a/.github/workflows/remote-test.yml b/.github/workflows/remote-test.yml index c76bd0cd9e..b171046e40 100644 --- a/.github/workflows/remote-test.yml +++ b/.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 diff --git a/.github/workflows/standalone-test-pushdown.yml b/.github/workflows/standalone-test-pushdown.yml index 0b39a9f2d4..f02bd6c55a 100644 --- a/.github/workflows/standalone-test-pushdown.yml +++ b/.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: diff --git a/.github/workflows/standalone-test.yml b/.github/workflows/standalone-test.yml index 3c18573053..c68492372f 100644 --- a/.github/workflows/standalone-test.yml +++ b/.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 diff --git a/.github/workflows/tpc-h.yml b/.github/workflows/tpc-h.yml index c2ceabd0de..854ba2c275 100644 --- a/.github/workflows/tpc-h.yml +++ b/.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: diff --git a/assembly/pom.xml b/assembly/pom.xml index f0a0b17853..e191224eac 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -44,7 +44,7 @@ cn.edu.tsinghua - filestore + filesystem cn.edu.tsinghua @@ -175,8 +175,8 @@ #storageEngineList=127.0.0.1#6667#iotdb - #storageEngineList=127.0.0.1#6667#filestore.* - storageEngineList=127.0.0.1#6667#filestore#dir=data#iginx_port=6888 + #storageEngineList=127.0.0.1#6667#filesystem.* + storageEngineList=127.0.0.1#6667#filesystem#dir=data#iginx_port=6888 UD[ATS]F,.*,.*,.*[.]py diff --git a/assembly/src/assembly/component/iginx-filestore-driver.xml b/assembly/src/assembly/component/iginx-filesystem-driver.xml similarity index 93% rename from assembly/src/assembly/component/iginx-filestore-driver.xml rename to assembly/src/assembly/component/iginx-filesystem-driver.xml index 7861b8f878..f75b8d4ff2 100644 --- a/assembly/src/assembly/component/iginx-filestore-driver.xml +++ b/assembly/src/assembly/component/iginx-filesystem-driver.xml @@ -23,13 +23,13 @@ true - cn.edu.tsinghua:filestore + cn.edu.tsinghua:filesystem false - ${project.build.directory}/filestore-${project.version} + ${project.build.directory}/filesystem-${project.version} / diff --git a/assembly/src/assembly/include.xml b/assembly/src/assembly/include.xml index 5f54f9800f..5aa0d8b005 100644 --- a/assembly/src/assembly/include.xml +++ b/assembly/src/assembly/include.xml @@ -28,7 +28,7 @@ src/assembly/component/iginx-core.xml src/assembly/component/iginx-iotdb12-driver.xml - src/assembly/component/iginx-filestore-driver.xml + src/assembly/component/iginx-filesystem-driver.xml src/assembly/component/include-zookeeper.xml diff --git a/assembly/src/assembly/server.xml b/assembly/src/assembly/server.xml index 24a46390ba..10b108b485 100644 --- a/assembly/src/assembly/server.xml +++ b/assembly/src/assembly/server.xml @@ -27,7 +27,7 @@ false src/assembly/component/iginx-core.xml - src/assembly/component/iginx-filestore-driver.xml + src/assembly/component/iginx-filesystem-driver.xml src/assembly/component/iginx-influxdb-driver.xml src/assembly/component/iginx-iotdb12-driver.xml src/assembly/component/iginx-mongodb-driver.xml diff --git a/conf/config.properties b/conf/config.properties index 0f4b87b39c..2317db27f1 100644 --- a/conf/config.properties +++ b/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 diff --git a/core/src/main/java/cn/edu/tsinghua/iginx/IginxWorker.java b/core/src/main/java/cn/edu/tsinghua/iginx/IginxWorker.java index dca2c79857..4785230a70 100644 --- a/core/src/main/java/cn/edu/tsinghua/iginx/IginxWorker.java +++ b/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 localMetas = new ArrayList<>(); List otherMetas = new ArrayList<>(); for (StorageEngineMeta meta : storageEngineMetas) { diff --git a/core/src/main/java/cn/edu/tsinghua/iginx/conf/Config.java b/core/src/main/java/cn/edu/tsinghua/iginx/conf/Config.java index b0e0581f16..2695490666 100644 --- a/core/src/main/java/cn/edu/tsinghua/iginx/conf/Config.java +++ b/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"; diff --git a/core/src/main/java/cn/edu/tsinghua/iginx/conf/ConfigDescriptor.java b/core/src/main/java/cn/edu/tsinghua/iginx/conf/ConfigDescriptor.java index 07ad4537eb..455e406197 100644 --- a/core/src/main/java/cn/edu/tsinghua/iginx/conf/ConfigDescriptor.java +++ b/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( diff --git a/core/src/main/java/cn/edu/tsinghua/iginx/conf/Constants.java b/core/src/main/java/cn/edu/tsinghua/iginx/conf/Constants.java index b7e5b23f6d..b1b033da3e 100644 --- a/core/src/main/java/cn/edu/tsinghua/iginx/conf/Constants.java +++ b/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"; diff --git a/core/src/main/java/cn/edu/tsinghua/iginx/metadata/utils/StorageEngineUtils.java b/core/src/main/java/cn/edu/tsinghua/iginx/metadata/utils/StorageEngineUtils.java index 2e168e8f97..e513f5fbf5 100644 --- a/core/src/main/java/cn/edu/tsinghua/iginx/metadata/utils/StorageEngineUtils.java +++ b/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) { diff --git a/core/src/test/java/cn/edu/tsinghua/iginx/metadata/entity/ExtraParamTest.java b/core/src/test/java/cn/edu/tsinghua/iginx/metadata/entity/ExtraParamTest.java index c898947d36..f4ea3e190d 100644 --- a/core/src/test/java/cn/edu/tsinghua/iginx/metadata/entity/ExtraParamTest.java +++ b/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)); } } diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/FileStorage.java b/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/FileStorage.java deleted file mode 100644 index 4b4cf28156..0000000000 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/FileStorage.java +++ /dev/null @@ -1,384 +0,0 @@ -/* - * IGinX - the polystore system with high performance - * Copyright (C) Tsinghua University - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package cn.edu.tsinghua.iginx.filestore; - -import static cn.edu.tsinghua.iginx.metadata.utils.StorageEngineUtils.isLocal; - -import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; -import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalTaskExecuteFailureException; -import cn.edu.tsinghua.iginx.engine.physical.exception.StorageInitializationException; -import cn.edu.tsinghua.iginx.engine.physical.storage.IStorage; -import cn.edu.tsinghua.iginx.engine.physical.storage.domain.Column; -import cn.edu.tsinghua.iginx.engine.physical.storage.domain.DataArea; -import cn.edu.tsinghua.iginx.engine.physical.task.TaskExecuteResult; -import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; -import cn.edu.tsinghua.iginx.engine.shared.data.read.Header; -import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; -import cn.edu.tsinghua.iginx.engine.shared.function.Function; -import cn.edu.tsinghua.iginx.engine.shared.function.FunctionCall; -import cn.edu.tsinghua.iginx.engine.shared.function.FunctionParams; -import cn.edu.tsinghua.iginx.engine.shared.function.FunctionType; -import cn.edu.tsinghua.iginx.engine.shared.operator.*; -import cn.edu.tsinghua.iginx.engine.shared.operator.filter.BoolFilter; -import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.engine.shared.operator.tag.TagFilter; -import cn.edu.tsinghua.iginx.filestore.common.AbstractConfig; -import cn.edu.tsinghua.iginx.filestore.common.Configs; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.common.Filters; -import cn.edu.tsinghua.iginx.filestore.service.FileStoreConfig; -import cn.edu.tsinghua.iginx.filestore.service.FileStoreService; -import cn.edu.tsinghua.iginx.filestore.service.storage.StorageConfig; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.FileStructure; -import cn.edu.tsinghua.iginx.filestore.struct.FileStructureManager; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.LegacyFilesystem; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.LegacyParquet; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTreeConfig; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; -import cn.edu.tsinghua.iginx.filestore.thrift.DataUnit; -import cn.edu.tsinghua.iginx.metadata.entity.ColumnsInterval; -import cn.edu.tsinghua.iginx.metadata.entity.KeyInterval; -import cn.edu.tsinghua.iginx.metadata.entity.StorageEngineMeta; -import cn.edu.tsinghua.iginx.thrift.AggregateType; -import cn.edu.tsinghua.iginx.thrift.StorageEngineType; -import cn.edu.tsinghua.iginx.utils.Pair; -import com.google.common.base.Strings; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigFactory; -import java.net.InetSocketAddress; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import javax.annotation.Nullable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class FileStorage implements IStorage { - - private static final Logger LOGGER = LoggerFactory.getLogger(FileStorage.class); - - private final FileStoreService service; - - private final FileStoreConfig fileStoreConfig; - - private final ExecutorService executor = Executors.newCachedThreadPool(); - - private final boolean isLegacyParquet; - - static { - Collection structures = FileStructureManager.getInstance().getAll(); - LOGGER.info("found file structures: {}", structures); - } - - public FileStorage(StorageEngineMeta meta) throws StorageInitializationException { - if (!meta.getStorageEngine().equals(StorageEngineType.filestore)) { - throw new StorageInitializationException("unexpected database: " + meta.getStorageEngine()); - } - - String dataStructPath = - String.join(".", FileStoreConfig.Fields.data, StorageConfig.Fields.struct); - isLegacyParquet = - LegacyParquet.NAME.equals( - meta.getExtraParams().getOrDefault(dataStructPath, LegacyParquet.NAME)); - - InetSocketAddress address = new InetSocketAddress(meta.getIp(), meta.getPort()); - this.fileStoreConfig = toFileStoreConfig(meta); - try { - this.service = new FileStoreService(address, fileStoreConfig); - } catch (FileStoreException e) { - throw new StorageInitializationException("file store initialization error", e); - } - } - - static FileStoreConfig toFileStoreConfig(StorageEngineMeta meta) - throws StorageInitializationException { - Config rawConfig = toConfig(meta); - LOGGER.debug("storage of {} config: {}", meta, rawConfig); - FileStoreConfig fileStoreConfig = FileStoreConfig.of(rawConfig); - LOGGER.debug("storage of {} will be initialized with {}", meta, fileStoreConfig); - List problems = fileStoreConfig.validate(); - if (!problems.isEmpty()) { - throw new StorageInitializationException("invalided config: " + problems); - } - return fileStoreConfig; - } - - static Config toConfig(StorageEngineMeta meta) throws StorageInitializationException { - HashMap reshaped = new HashMap<>(); - - for (Map.Entry param : meta.getExtraParams().entrySet()) { - String key = param.getKey(); - String value = param.getValue(); - if (key.contains(".")) { - reshaped.put(key, value); - } - } - - Configs.put( - reshaped, - meta.getExtraParams().get("dir"), - FileStoreConfig.Fields.data, - StorageConfig.Fields.root); - Configs.put( - reshaped, - meta.getExtraParams().get("dummy_dir"), - FileStoreConfig.Fields.dummy, - StorageConfig.Fields.root); - Configs.put( - reshaped, - meta.getExtraParams().get("embedded_prefix"), - FileStoreConfig.Fields.dummy, - StorageConfig.Fields.config, - FileTreeConfig.Fields.prefix); - Configs.putIfAbsent( - reshaped, LegacyParquet.NAME, FileStoreConfig.Fields.data, StorageConfig.Fields.struct); - Configs.putIfAbsent( - reshaped, LegacyFilesystem.NAME, FileStoreConfig.Fields.dummy, StorageConfig.Fields.struct); - - boolean local = isLocal(meta); - reshaped.put(FileStoreConfig.Fields.serve, String.valueOf(local)); - - Config config = ConfigFactory.parseMap(reshaped, "storage engine initialization parameters"); - - if (local) { - LOGGER.debug("storage of {} is local, ignore config for remote", meta); - config = config.withoutPath(FileStoreConfig.Fields.client); - - if (!meta.isHasData()) { - LOGGER.debug("storage of {} don't have data, ignore config for dummy", meta); - config = config.withoutPath(FileStoreConfig.Fields.dummy); - } - - if (meta.isReadOnly()) { - LOGGER.debug("storage of {} is read only, ignore config for iginx data", meta); - config = config.withoutPath(FileStoreConfig.Fields.data); - } - } else { - LOGGER.debug("storage of {} is remote, ignore config for local", meta); - config = config.withoutPath(FileStoreConfig.Fields.data); - config = config.withoutPath(FileStoreConfig.Fields.dummy); - } - - return config; - } - - @Override - public TaskExecuteResult executeProject(Project project, DataArea dataArea) { - return executeQuery(unitOf(dataArea), getDataTargetOf(project, dataArea), null); - } - - @Override - public TaskExecuteResult executeProjectDummy(Project project, DataArea dataArea) { - return executeQuery(unitOfDummy(), getDataTargetOf(project, dataArea), null); - } - - @Override - public boolean isSupportProjectWithSelect() { - return true; - } - - @Override - public TaskExecuteResult executeProjectWithSelect( - Project project, Select select, DataArea dataArea) { - return executeQuery(unitOf(dataArea), getDataTargetOf(select, project, dataArea), null); - } - - @Override - public TaskExecuteResult executeProjectDummyWithSelect( - Project project, Select select, DataArea dataArea) { - return executeQuery(unitOfDummy(), getDataTargetOf(select, project, dataArea), null); - } - - @Override - public boolean isSupportProjectWithSetTransform(SetTransform setTransform, DataArea dataArea) { - if (!isLegacyParquet) { - return false; - } - - // just push down in full column fragment - KeyInterval keyInterval = dataArea.getKeyInterval(); - if (keyInterval.getStartKey() > 0 || keyInterval.getEndKey() < Long.MAX_VALUE) { - return false; - } - - // just push down count(*) for now - List functionCalls = setTransform.getFunctionCallList(); - if (functionCalls.size() != 1) { - return false; - } - FunctionCall functionCall = functionCalls.get(0); - Function function = functionCall.getFunction(); - FunctionParams params = functionCall.getParams(); - if (function.getFunctionType() != FunctionType.System) { - return false; - } - if (!function.getIdentifier().equals("count")) { - return false; - } - if (params.getPaths().size() != 1) { - return false; - } - String path = params.getPaths().get(0); - return path.equals("*") || path.equals("*.*"); - } - - @Override - public TaskExecuteResult executeProjectWithSetTransform( - Project project, SetTransform setTransform, DataArea dataArea) { - if (!isSupportProjectWithSetTransform(setTransform, dataArea)) { - throw new IllegalArgumentException("unsupported set transform"); - } - - DataArea reshapedDataArea = - new DataArea(dataArea.getStorageUnit(), KeyInterval.getDefaultKeyInterval()); - - return executeQuery( - unitOf(dataArea), getDataTargetOf(project, reshapedDataArea), AggregateType.COUNT); - } - - @Override - public TaskExecuteResult executeDelete(Delete delete, DataArea dataArea) { - Filter filter; - if (delete.getKeyRanges() == null || delete.getKeyRanges().isEmpty()) { - filter = null; - } else { - filter = Filters.toFilter(delete.getKeyRanges()); - } - try { - service.delete( - unitOf(dataArea), new DataTarget(filter, delete.getPatterns(), delete.getTagFilter())); - return new TaskExecuteResult(); - } catch (PhysicalException e) { - return new TaskExecuteResult(e); - } - } - - @Override - public TaskExecuteResult executeInsert(Insert insert, DataArea dataArea) { - try { - service.insert(unitOf(dataArea), insert.getData()); - return new TaskExecuteResult(); - } catch (PhysicalException e) { - return new TaskExecuteResult(e); - } - } - - @Override - public List getColumns(Set patterns, TagFilter tagFilter) - throws PhysicalException { - List columns = Collections.synchronizedList(new ArrayList<>()); - List columnsWrapper = Collections.synchronizedList(columns); - - Map units = service.getUnits(null); - - List patternList = new ArrayList<>(patterns); - if (patternList.isEmpty()) { - patternList = null; - } - - DataTarget dataTarget = new DataTarget(new BoolFilter(false), patternList, tagFilter); - - List> futures = new ArrayList<>(); - for (DataUnit unit : units.keySet()) { - CompletableFuture future = - CompletableFuture.supplyAsync( - () -> { - List localColumns = new ArrayList<>(); - try (RowStream stream = service.query(unit, dataTarget, null)) { - Header header = stream.getHeader(); - for (Field field : header.getFields()) { - localColumns.add( - new Column( - field.getName(), field.getType(), field.getTags(), unit.isDummy())); - } - } catch (PhysicalException e) { - throw new CompletionException(e); - } - return localColumns; - }, - executor) - .thenAccept(columnsWrapper::addAll); - futures.add(future); - } - - try { - CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join(); - } catch (CompletionException e) { - throw new FileStoreException(e); - } - - return columns; - } - - @Override - public Pair getBoundaryOfStorage(String prefix) - throws PhysicalException { - Map units = service.getUnits(Strings.emptyToNull(prefix)); - DataBoundary boundary = units.get(unitOfDummy()); - if (Objects.equals(boundary, new DataBoundary())) { - throw new PhysicalTaskExecuteFailureException("no data"); - } - ColumnsInterval columnsInterval = - new ColumnsInterval(boundary.getStartColumn(), boundary.getEndColumn()); - KeyInterval keyInterval = new KeyInterval(boundary.getStartKey(), boundary.getEndKey()); - return new Pair<>(columnsInterval, keyInterval); - } - - @Override - public void release() throws PhysicalException { - service.close(); - executor.shutdown(); - } - - private static DataUnit unitOf(DataArea dataArea) { - DataUnit dataUnit = new DataUnit(); - dataUnit.setDummy(false); - dataUnit.setName(dataArea.getStorageUnit()); - return dataUnit; - } - - private static DataUnit unitOfDummy() { - DataUnit dataUnit = new DataUnit(); - dataUnit.setDummy(true); - return dataUnit; - } - - private static DataTarget getDataTargetOf(Project project, DataArea dataArea) { - Filter filter = Filters.toFilter(dataArea.getKeyInterval()); - return new DataTarget(filter, project.getPatterns(), project.getTagFilter()); - } - - private static DataTarget getDataTargetOf(Select select, Project project, DataArea dataArea) { - Filter rangeFilter = Filters.toFilter(dataArea.getKeyInterval()); - Filter filter = Filters.nullableAnd(rangeFilter, select.getFilter()); - return new DataTarget(filter, project.getPatterns(), project.getTagFilter()); - } - - public TaskExecuteResult executeQuery( - DataUnit unit, DataTarget target, @Nullable AggregateType aggregateType) { - try { - RowStream stream = service.query(unit, target, aggregateType); - return new TaskExecuteResult(stream); - } catch (PhysicalException e) { - return new TaskExecuteResult(e); - } - } -} diff --git a/dataSource/filestore/pom.xml b/dataSource/filesystem/pom.xml similarity index 99% rename from dataSource/filestore/pom.xml rename to dataSource/filesystem/pom.xml index d10455f818..74901f7bf9 100644 --- a/dataSource/filestore/pom.xml +++ b/dataSource/filesystem/pom.xml @@ -28,8 +28,8 @@ ${revision} - filestore - IGinX FileStore + filesystem + IGinX FileSystem diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/FileStoreStorage.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/FileSystemStorage.java similarity index 83% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/FileStoreStorage.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/FileSystemStorage.java index 0daccd4099..873b093e16 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/FileStoreStorage.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/FileSystemStorage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore; +package cn.edu.tsinghua.iginx.filesystem; import static cn.edu.tsinghua.iginx.metadata.utils.StorageEngineUtils.isLocal; @@ -37,20 +37,20 @@ import cn.edu.tsinghua.iginx.engine.shared.operator.filter.BoolFilter; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; import cn.edu.tsinghua.iginx.engine.shared.operator.tag.TagFilter; -import cn.edu.tsinghua.iginx.filestore.common.AbstractConfig; -import cn.edu.tsinghua.iginx.filestore.common.Configs; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.common.Filters; -import cn.edu.tsinghua.iginx.filestore.service.FileStoreConfig; -import cn.edu.tsinghua.iginx.filestore.service.FileStoreService; -import cn.edu.tsinghua.iginx.filestore.service.storage.StorageConfig; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.FileStructure; -import cn.edu.tsinghua.iginx.filestore.struct.FileStructureManager; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.LegacyParquet; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTreeConfig; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; -import cn.edu.tsinghua.iginx.filestore.thrift.DataUnit; +import cn.edu.tsinghua.iginx.filesystem.common.AbstractConfig; +import cn.edu.tsinghua.iginx.filesystem.common.Configs; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; +import cn.edu.tsinghua.iginx.filesystem.common.Filters; +import cn.edu.tsinghua.iginx.filesystem.service.FileSystemConfig; +import cn.edu.tsinghua.iginx.filesystem.service.FileSystemService; +import cn.edu.tsinghua.iginx.filesystem.service.storage.StorageConfig; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.FileStructure; +import cn.edu.tsinghua.iginx.filesystem.struct.FileStructureManager; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.LegacyParquet; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.FileTreeConfig; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataUnit; import cn.edu.tsinghua.iginx.metadata.entity.ColumnsInterval; import cn.edu.tsinghua.iginx.metadata.entity.KeyInterval; import cn.edu.tsinghua.iginx.metadata.entity.StorageEngineMeta; @@ -70,13 +70,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class FileStoreStorage implements IStorage { +public class FileSystemStorage implements IStorage { - private static final Logger LOGGER = LoggerFactory.getLogger(FileStoreStorage.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FileSystemStorage.class); - private final FileStoreService service; + private final FileSystemService service; - private final FileStoreConfig fileStoreConfig; + private final FileSystemConfig fileSystemConfig; private final ExecutorService executor = Executors.newCachedThreadPool(); @@ -87,37 +87,37 @@ public class FileStoreStorage implements IStorage { LOGGER.info("found file structures: {}", structures); } - public FileStoreStorage(StorageEngineMeta meta) throws StorageInitializationException { - if (!meta.getStorageEngine().equals(StorageEngineType.filestore)) { + public FileSystemStorage(StorageEngineMeta meta) throws StorageInitializationException { + if (!meta.getStorageEngine().equals(StorageEngineType.filesystem)) { throw new StorageInitializationException("unexpected database: " + meta.getStorageEngine()); } String dataStructPath = - String.join(".", FileStoreConfig.Fields.data, StorageConfig.Fields.struct); + String.join(".", FileSystemConfig.Fields.data, StorageConfig.Fields.struct); isLegacyParquet = LegacyParquet.NAME.equals( meta.getExtraParams().getOrDefault(dataStructPath, LegacyParquet.NAME)); InetSocketAddress address = new InetSocketAddress(meta.getIp(), meta.getPort()); - this.fileStoreConfig = toFileStoreConfig(meta); + this.fileSystemConfig = toFileSystemConfig(meta); try { - this.service = new FileStoreService(address, fileStoreConfig); - } catch (FileStoreException e) { + this.service = new FileSystemService(address, fileSystemConfig); + } catch (FileSystemException e) { throw new StorageInitializationException("file store initialization error", e); } } - static FileStoreConfig toFileStoreConfig(StorageEngineMeta meta) + static FileSystemConfig toFileSystemConfig(StorageEngineMeta meta) throws StorageInitializationException { Config rawConfig = toConfig(meta); LOGGER.debug("storage of {} config: {}", meta, rawConfig); - FileStoreConfig fileStoreConfig = FileStoreConfig.of(rawConfig); - LOGGER.debug("storage of {} will be initialized with {}", meta, fileStoreConfig); - List problems = fileStoreConfig.validate(); + FileSystemConfig fileSystemConfig = FileSystemConfig.of(rawConfig); + LOGGER.debug("storage of {} will be initialized with {}", meta, fileSystemConfig); + List problems = fileSystemConfig.validate(); if (!problems.isEmpty()) { throw new StorageInitializationException("invalided config: " + problems); } - return fileStoreConfig; + return fileSystemConfig; } static Config toConfig(StorageEngineMeta meta) throws StorageInitializationException { @@ -131,43 +131,43 @@ static Config toConfig(StorageEngineMeta meta) throws StorageInitializationExcep } } - Configs.put(reshaped, String.valueOf(isLocal(meta)), FileStoreConfig.Fields.serve); + Configs.put(reshaped, String.valueOf(isLocal(meta)), FileSystemConfig.Fields.serve); Configs.put( reshaped, meta.getExtraParams().get("dir"), - FileStoreConfig.Fields.data, + FileSystemConfig.Fields.data, StorageConfig.Fields.root); Configs.put( reshaped, meta.getExtraParams().get("dummy_dir"), - FileStoreConfig.Fields.dummy, + FileSystemConfig.Fields.dummy, StorageConfig.Fields.root); Configs.put( reshaped, meta.getExtraParams().get("embedded_prefix"), - FileStoreConfig.Fields.dummy, + FileSystemConfig.Fields.dummy, StorageConfig.Fields.config, FileTreeConfig.Fields.prefix); Configs.putIfAbsent( reshaped, - FileStoreConfig.DEFAULT_DATA_STRUCT, - FileStoreConfig.Fields.data, + FileSystemConfig.DEFAULT_DATA_STRUCT, + FileSystemConfig.Fields.data, StorageConfig.Fields.struct); Configs.putIfAbsent( reshaped, - FileStoreConfig.DEFAULT_DUMMY_STRUCT, - FileStoreConfig.Fields.dummy, + FileSystemConfig.DEFAULT_DUMMY_STRUCT, + FileSystemConfig.Fields.dummy, StorageConfig.Fields.struct); Config config = ConfigFactory.parseMap(reshaped, "storage engine initialization parameters"); if (!meta.isHasData()) { LOGGER.debug("storage of {} don't have data, ignore config for dummy", meta); - config = config.withoutPath(FileStoreConfig.Fields.dummy); + config = config.withoutPath(FileSystemConfig.Fields.dummy); } if (meta.isReadOnly()) { LOGGER.debug("storage of {} is read only, ignore config for iginx data", meta); - config = config.withoutPath(FileStoreConfig.Fields.data); + config = config.withoutPath(FileSystemConfig.Fields.data); } return config; @@ -315,7 +315,7 @@ public List getColumns(Set patterns, TagFilter tagFilter) try { CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join(); } catch (CompletionException e) { - throw new FileStoreException(e); + throw new FileSystemException(e); } return columns; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/AbstractConfig.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/AbstractConfig.java similarity index 98% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/AbstractConfig.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/AbstractConfig.java index 3193fa913a..b29050db93 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/AbstractConfig.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/AbstractConfig.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import com.google.common.collect.Range; import com.typesafe.config.Config; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Closeables.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Closeables.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Closeables.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Closeables.java index 4887c02314..4ca4435bbd 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Closeables.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Closeables.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import java.io.Closeable; import java.io.IOException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Configs.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Configs.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Configs.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Configs.java index 3fb7421a4f..e20e46100f 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Configs.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Configs.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import java.util.Map; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/DataUnits.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/DataUnits.java similarity index 90% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/DataUnits.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/DataUnits.java index 0db6781ba1..2690a9a4de 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/DataUnits.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/DataUnits.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; -import cn.edu.tsinghua.iginx.filestore.thrift.DataUnit; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataUnit; import javax.annotation.Nullable; public class DataUnits { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Fields.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Fields.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Fields.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Fields.java index c736efadad..7a31140102 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Fields.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Fields.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import cn.edu.tsinghua.iginx.engine.physical.storage.domain.Column; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/FileStoreException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/FileSystemException.java similarity index 77% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/FileStoreException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/FileSystemException.java index 1338ee4657..fc88c43952 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/FileStoreException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/FileSystemException.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; -public class FileStoreException extends PhysicalException { +public class FileSystemException extends PhysicalException { - public FileStoreException(String message) { + public FileSystemException(String message) { super(message); } - public FileStoreException(String message, Throwable cause) { + public FileSystemException(String message, Throwable cause) { super(message, cause); } - public FileStoreException(Throwable cause) { + public FileSystemException(Throwable cause) { super(cause); } } diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/FileStoreRowStream.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/FileSystemRowStream.java similarity index 73% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/FileStoreRowStream.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/FileSystemRowStream.java index 24f7405f91..672994801a 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/FileStoreRowStream.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/FileSystemRowStream.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import cn.edu.tsinghua.iginx.engine.shared.data.read.Header; import cn.edu.tsinghua.iginx.engine.shared.data.read.Row; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; -public abstract class FileStoreRowStream implements RowStream { +public abstract class FileSystemRowStream implements RowStream { @Override - public abstract Header getHeader() throws FileStoreException; + public abstract Header getHeader() throws FileSystemException; @Override - public abstract void close() throws FileStoreException; + public abstract void close() throws FileSystemException; @Override - public abstract boolean hasNext() throws FileStoreException; + public abstract boolean hasNext() throws FileSystemException; @Override - public abstract Row next() throws FileStoreException; + public abstract Row next() throws FileSystemException; } diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Filters.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Filters.java similarity index 99% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Filters.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Filters.java index 7b6c7c666e..f51f60febf 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Filters.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Filters.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import cn.edu.tsinghua.iginx.engine.logical.utils.LogicalFilterUtils; import cn.edu.tsinghua.iginx.engine.shared.KeyRange; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/IginxPaths.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/IginxPaths.java similarity index 98% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/IginxPaths.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/IginxPaths.java index 7d87e4cf5c..869d24ef21 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/IginxPaths.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/IginxPaths.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import com.google.common.collect.Iterables; import java.nio.file.FileSystem; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Patterns.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Patterns.java similarity index 98% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Patterns.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Patterns.java index d893adf27c..3ad70ac78c 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Patterns.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Patterns.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import cn.edu.tsinghua.iginx.utils.StringUtils; import com.google.common.base.Strings; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Ranges.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Ranges.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Ranges.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Ranges.java index 974901a76f..302bd8424c 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Ranges.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Ranges.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import cn.edu.tsinghua.iginx.engine.shared.KeyRange; import com.google.common.collect.BoundType; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/RowStreams.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/RowStreams.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/RowStreams.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/RowStreams.java index ec8b6b9cdd..034fe6eae6 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/RowStreams.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/RowStreams.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.physical.memory.execute.stream.EmptyRowStream; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Strings.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Strings.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Strings.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Strings.java index e65eb7ff57..f4b966603a 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/common/Strings.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/common/Strings.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import java.util.regex.Pattern; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/AbstractFileFormat.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/AbstractFileFormat.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/AbstractFileFormat.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/AbstractFileFormat.java index 419fef68b5..2bf5f45099 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/AbstractFileFormat.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/AbstractFileFormat.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format; +package cn.edu.tsinghua.iginx.filesystem.format; import com.google.common.collect.Lists; import java.util.*; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/FileFormat.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/FileFormat.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/FileFormat.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/FileFormat.java index 531631e0e9..f01c8c4efc 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/FileFormat.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/FileFormat.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format; +package cn.edu.tsinghua.iginx.filesystem.format; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/FileFormatManager.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/FileFormatManager.java similarity index 98% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/FileFormatManager.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/FileFormatManager.java index 94a4ad8fb0..bd1c9d29b2 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/FileFormatManager.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/FileFormatManager.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format; +package cn.edu.tsinghua.iginx.filesystem.format; import java.util.Collection; import java.util.Collections; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/FilterUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/FilterUtils.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/FilterUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/FilterUtils.java index d6c5438ed6..c20f6d2618 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/FilterUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/FilterUtils.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.parquet; +package cn.edu.tsinghua.iginx.filesystem.format.parquet; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.AndFilter; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.KeyFilter; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.OrFilter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Constants; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Constants; import cn.edu.tsinghua.iginx.utils.Pair; import java.util.Objects; import shaded.iginx.org.apache.parquet.filter2.predicate.FilterApi; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IGroupConverter.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IGroupConverter.java similarity index 99% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IGroupConverter.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IGroupConverter.java index b8beaa4690..95fc14de86 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IGroupConverter.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IGroupConverter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.parquet; +package cn.edu.tsinghua.iginx.filesystem.format.parquet; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IParquetReader.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IParquetReader.java similarity index 98% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IParquetReader.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IParquetReader.java index ca3d5b5349..fb8cf2f2d7 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IParquetReader.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IParquetReader.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.parquet; +package cn.edu.tsinghua.iginx.filesystem.format.parquet; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Constants; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Constants; import cn.edu.tsinghua.iginx.thrift.DataType; import cn.edu.tsinghua.iginx.utils.Pair; import com.google.common.collect.Range; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IParquetWriter.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IParquetWriter.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IParquetWriter.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IParquetWriter.java index d4d5237bf1..f2a47e42f6 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IParquetWriter.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IParquetWriter.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.parquet; +package cn.edu.tsinghua.iginx.filesystem.format.parquet; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Constants; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Constants; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import java.io.Closeable; import java.io.IOException; import java.nio.file.Path; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IRecord.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IRecord.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IRecord.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IRecord.java index 3c145b42c9..3ef2d87563 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IRecord.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IRecord.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.parquet; +package cn.edu.tsinghua.iginx.filesystem.format.parquet; import java.util.*; import shaded.iginx.org.apache.parquet.io.api.Binary; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IRecordDematerializer.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IRecordDematerializer.java similarity index 98% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IRecordDematerializer.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IRecordDematerializer.java index eeff41b5a8..1ec4a4db60 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IRecordDematerializer.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IRecordDematerializer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.parquet; +package cn.edu.tsinghua.iginx.filesystem.format.parquet; import java.util.Collections; import java.util.Map; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IRecordMaterializer.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IRecordMaterializer.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IRecordMaterializer.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IRecordMaterializer.java index 00adb5c3b6..09b705d85d 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/IRecordMaterializer.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/IRecordMaterializer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.parquet; +package cn.edu.tsinghua.iginx.filesystem.format.parquet; import shaded.iginx.org.apache.parquet.io.api.GroupConverter; import shaded.iginx.org.apache.parquet.io.api.RecordMaterializer; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ParquetFormat.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ParquetFormat.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ParquetFormat.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ParquetFormat.java index c5a026524d..5934242a70 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ParquetFormat.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ParquetFormat.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.parquet; +package cn.edu.tsinghua.iginx.filesystem.format.parquet; -import cn.edu.tsinghua.iginx.filestore.format.FileFormat; +import cn.edu.tsinghua.iginx.filesystem.format.FileFormat; import com.google.auto.service.AutoService; import com.typesafe.config.Config; import java.io.IOException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ParquetFormatReader.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ParquetFormatReader.java similarity index 91% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ParquetFormatReader.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ParquetFormatReader.java index 109e0700a6..5db250797b 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ParquetFormatReader.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ParquetFormatReader.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.parquet; +package cn.edu.tsinghua.iginx.filesystem.format.parquet; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.common.IginxPaths; -import cn.edu.tsinghua.iginx.filestore.common.Patterns; -import cn.edu.tsinghua.iginx.filestore.common.RowStreams; -import cn.edu.tsinghua.iginx.filestore.format.FileFormat; +import cn.edu.tsinghua.iginx.filesystem.common.IginxPaths; +import cn.edu.tsinghua.iginx.filesystem.common.Patterns; +import cn.edu.tsinghua.iginx.filesystem.common.RowStreams; +import cn.edu.tsinghua.iginx.filesystem.format.FileFormat; import cn.edu.tsinghua.iginx.thrift.DataType; import java.io.IOException; import java.util.*; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ParquetFormatRowStream.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ParquetFormatRowStream.java similarity index 80% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ParquetFormatRowStream.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ParquetFormatRowStream.java index da48352952..9a0747eda9 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ParquetFormatRowStream.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ParquetFormatRowStream.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.parquet; +package cn.edu.tsinghua.iginx.filesystem.format.parquet; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; import cn.edu.tsinghua.iginx.engine.shared.data.read.Header; import cn.edu.tsinghua.iginx.engine.shared.data.read.Row; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreRowStream; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemRowStream; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -29,7 +29,7 @@ import javax.annotation.WillCloseWhenClosed; import shaded.iginx.org.apache.parquet.schema.MessageType; -public class ParquetFormatRowStream extends FileStoreRowStream { +public class ParquetFormatRowStream extends FileSystemRowStream { private final IParquetReader reader; private final Header header; @@ -64,34 +64,34 @@ private Row fetchNext() throws IOException { } @Override - public Header getHeader() throws FileStoreException { + public Header getHeader() throws FileSystemException { return header; } @Override - public void close() throws FileStoreException { + public void close() throws FileSystemException { try { reader.close(); } catch (IOException e) { - throw new FileStoreException(e); + throw new FileSystemException(e); } } @Override - public boolean hasNext() throws FileStoreException { + public boolean hasNext() throws FileSystemException { return nextRow != null; } @Override - public Row next() throws FileStoreException { + public Row next() throws FileSystemException { if (nextRow == null) { - throw new FileStoreException("No more rows"); + throw new FileSystemException("No more rows"); } Row row = nextRow; try { nextRow = fetchNext(); } catch (IOException e) { - throw new FileStoreException(e); + throw new FileSystemException(e); } return row; } diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ProjectUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ProjectUtils.java similarity index 91% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ProjectUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ProjectUtils.java index 7a1e992c50..c7b8d3074e 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ProjectUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ProjectUtils.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.parquet; +package cn.edu.tsinghua.iginx.filesystem.format.parquet; -import static cn.edu.tsinghua.iginx.filestore.format.parquet.IRecordDematerializer.OBJECT_MODEL_NAME_VALUE; -import static cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.dummy.Storer.getParquetType; +import static cn.edu.tsinghua.iginx.filesystem.format.parquet.IRecordDematerializer.OBJECT_MODEL_NAME_VALUE; +import static cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.dummy.Storer.getParquetType; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; import cn.edu.tsinghua.iginx.engine.shared.data.read.Header; import cn.edu.tsinghua.iginx.engine.shared.data.read.Row; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Constants; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Constants; import cn.edu.tsinghua.iginx.thrift.DataType; import java.util.*; import javax.annotation.Nullable; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/raw/RawFormat.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/raw/RawFormat.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/raw/RawFormat.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/raw/RawFormat.java index 292258ae22..5fccc4764e 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/raw/RawFormat.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/raw/RawFormat.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.raw; +package cn.edu.tsinghua.iginx.filesystem.format.raw; -import cn.edu.tsinghua.iginx.filestore.format.FileFormat; +import cn.edu.tsinghua.iginx.filesystem.format.FileFormat; import com.google.auto.service.AutoService; import com.typesafe.config.Config; import java.io.IOException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/raw/RawFormatRowStream.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/raw/RawFormatRowStream.java similarity index 85% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/raw/RawFormatRowStream.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/raw/RawFormatRowStream.java index 8f2643dd7b..513cda0220 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/raw/RawFormatRowStream.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/raw/RawFormatRowStream.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.raw; +package cn.edu.tsinghua.iginx.filesystem.format.raw; import cn.edu.tsinghua.iginx.engine.shared.data.read.Header; import cn.edu.tsinghua.iginx.engine.shared.data.read.Row; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreRowStream; -import cn.edu.tsinghua.iginx.filestore.common.Ranges; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemRowStream; +import cn.edu.tsinghua.iginx.filesystem.common.Ranges; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; import java.io.IOException; @@ -35,7 +35,7 @@ import java.util.Queue; import javax.annotation.Nullable; -public class RawFormatRowStream extends FileStoreRowStream { +public class RawFormatRowStream extends FileSystemRowStream { private final Header header; private final FileChannel channel; @@ -63,26 +63,26 @@ public RawFormatRowStream(Header header, Path path, long pageSize, RangeSet. */ -package cn.edu.tsinghua.iginx.filestore.format.raw; +package cn.edu.tsinghua.iginx.filesystem.format.raw; import cn.edu.tsinghua.iginx.engine.physical.memory.execute.stream.EmptyRowStream; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; import cn.edu.tsinghua.iginx.engine.shared.data.read.Header; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.common.Filters; -import cn.edu.tsinghua.iginx.filestore.common.Patterns; -import cn.edu.tsinghua.iginx.filestore.common.RowStreams; -import cn.edu.tsinghua.iginx.filestore.format.FileFormat; +import cn.edu.tsinghua.iginx.filesystem.common.Filters; +import cn.edu.tsinghua.iginx.filesystem.common.Patterns; +import cn.edu.tsinghua.iginx.filesystem.common.RowStreams; +import cn.edu.tsinghua.iginx.filesystem.format.FileFormat; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.collect.RangeSet; import java.io.IOException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/raw/RawReaderConfig.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/raw/RawReaderConfig.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/raw/RawReaderConfig.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/raw/RawReaderConfig.java index 1b156d82dd..6d3110e1b4 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/format/raw/RawReaderConfig.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/format/raw/RawReaderConfig.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.raw; +package cn.edu.tsinghua.iginx.filesystem.format.raw; -import cn.edu.tsinghua.iginx.filestore.common.AbstractConfig; +import cn.edu.tsinghua.iginx.filesystem.common.AbstractConfig; import com.typesafe.config.Config; import com.typesafe.config.ConfigMemorySize; import com.typesafe.config.Optional; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/FileStoreConfig.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/FileSystemConfig.java similarity index 79% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/FileStoreConfig.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/FileSystemConfig.java index 70828b9338..3bb66175b9 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/FileStoreConfig.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/FileSystemConfig.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service; +package cn.edu.tsinghua.iginx.filesystem.service; -import cn.edu.tsinghua.iginx.filestore.common.AbstractConfig; -import cn.edu.tsinghua.iginx.filestore.service.rpc.client.ClientConfig; -import cn.edu.tsinghua.iginx.filestore.service.storage.StorageConfig; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.LegacyFilesystem; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.LegacyParquet; +import cn.edu.tsinghua.iginx.filesystem.common.AbstractConfig; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.client.ClientConfig; +import cn.edu.tsinghua.iginx.filesystem.service.storage.StorageConfig; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.LegacyFilesystem; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.LegacyParquet; import com.typesafe.config.Config; import com.typesafe.config.Optional; import java.util.ArrayList; @@ -35,9 +35,9 @@ @Data @EqualsAndHashCode(callSuper = true) @FieldNameConstants -public class FileStoreConfig extends AbstractConfig { +public class FileSystemConfig extends AbstractConfig { - private static final Logger LOGGER = LoggerFactory.getLogger(FileStoreConfig.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FileSystemConfig.class); public static final String DEFAULT_DATA_STRUCT = LegacyParquet.NAME; public static final String DEFAULT_DUMMY_STRUCT = LegacyFilesystem.NAME; @@ -71,8 +71,8 @@ public List validate() { return problems; } - public static FileStoreConfig of(Config config) { - FileStoreConfig result = of(config, FileStoreConfig.class); + public static FileSystemConfig of(Config config) { + FileSystemConfig result = of(config, FileSystemConfig.class); if (result.isServe()) { LOGGER.debug("storage of {} is local, ignore config for remote", config); diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/FileStoreService.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/FileSystemService.java similarity index 74% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/FileStoreService.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/FileSystemService.java index dea8fe8bd9..41a4bec9a1 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/FileStoreService.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/FileSystemService.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service; +package cn.edu.tsinghua.iginx.filesystem.service; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.service.rpc.client.RemoteService; -import cn.edu.tsinghua.iginx.filestore.service.rpc.server.Server; -import cn.edu.tsinghua.iginx.filestore.service.storage.StorageService; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; -import cn.edu.tsinghua.iginx.filestore.thrift.DataUnit; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.client.RemoteService; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.server.Server; +import cn.edu.tsinghua.iginx.filesystem.service.storage.StorageService; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataUnit; import cn.edu.tsinghua.iginx.thrift.AggregateType; import java.net.InetSocketAddress; import java.util.Map; @@ -34,15 +34,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class FileStoreService implements Service { +public class FileSystemService implements Service { - private static final Logger LOGGER = LoggerFactory.getLogger(FileStoreService.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FileSystemService.class); private final Service service; private final Server server; - public FileStoreService(InetSocketAddress address, FileStoreConfig config) - throws FileStoreException { + public FileSystemService(InetSocketAddress address, FileSystemConfig config) + throws FileSystemException { if (config.isServe()) { this.service = new StorageService(config.getData(), config.getDummy()); Server temp = null; @@ -61,28 +61,28 @@ public FileStoreService(InetSocketAddress address, FileStoreConfig config) } @Override - public Map getUnits(@Nullable String prefix) throws FileStoreException { + public Map getUnits(@Nullable String prefix) throws FileSystemException { return service.getUnits(prefix); } @Override public RowStream query(DataUnit unit, DataTarget target, @Nullable AggregateType aggregate) - throws FileStoreException { + throws FileSystemException { return service.query(unit, target, aggregate); } @Override - public void delete(DataUnit unit, DataTarget target) throws FileStoreException { + public void delete(DataUnit unit, DataTarget target) throws FileSystemException { service.delete(unit, target); } @Override - public void insert(DataUnit unit, DataView dataView) throws FileStoreException { + public void insert(DataUnit unit, DataView dataView) throws FileSystemException { service.insert(unit, dataView); } @Override - public void close() throws FileStoreException { + public void close() throws FileSystemException { if (server != null) { server.close(); } diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/Service.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/Service.java similarity index 69% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/Service.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/Service.java index c67bc7b90b..5d90f2139d 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/Service.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/Service.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service; +package cn.edu.tsinghua.iginx.filesystem.service; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; -import cn.edu.tsinghua.iginx.filestore.thrift.DataUnit; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataUnit; import cn.edu.tsinghua.iginx.thrift.AggregateType; import java.util.Map; import javax.annotation.Nullable; @@ -35,9 +35,9 @@ public interface Service extends AutoCloseable { * * @param prefix filter path by prefix, null only if match all paths * @return the column boundary of data in the given iginx path prefix - * @throws FileStoreException if any exception occurs during the process + * @throws FileSystemException if any exception occurs during the process */ - Map getUnits(@Nullable String prefix) throws FileStoreException; + Map getUnits(@Nullable String prefix) throws FileSystemException; /** * Query data @@ -46,29 +46,29 @@ public interface Service extends AutoCloseable { * @param target the data target to query * @param aggregate the aggregate type of the query, null only if no aggregate * @return the result of the query - * @throws FileStoreException if any exception occurs during the process + * @throws FileSystemException if any exception occurs during the process */ RowStream query(DataUnit unit, DataTarget target, @Nullable AggregateType aggregate) - throws FileStoreException; + throws FileSystemException; /** * Delete data * * @param unit the storage unit to delete * @param target the data target to delete - * @throws FileStoreException if any exception occurs during the process + * @throws FileSystemException if any exception occurs during the process */ - void delete(DataUnit unit, DataTarget target) throws FileStoreException; + void delete(DataUnit unit, DataTarget target) throws FileSystemException; /** * Insert data * * @param unit the storage unit to insert * @param dataView the data to insert - * @throws FileStoreException if any exception occurs during the process + * @throws FileSystemException if any exception occurs during the process */ - void insert(DataUnit unit, DataView dataView) throws FileStoreException; + void insert(DataUnit unit, DataView dataView) throws FileSystemException; @Override - void close() throws FileStoreException; + void close() throws FileSystemException; } diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/ClientConfig.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/ClientConfig.java similarity index 88% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/ClientConfig.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/ClientConfig.java index 66c4885364..834ad5c85d 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/ClientConfig.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/ClientConfig.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.client; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.client; -import cn.edu.tsinghua.iginx.filestore.common.AbstractConfig; -import cn.edu.tsinghua.iginx.filestore.service.rpc.client.pool.TTransportPoolConfig; +import cn.edu.tsinghua.iginx.filesystem.common.AbstractConfig; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.client.pool.TTransportPoolConfig; import com.typesafe.config.Optional; import java.time.Duration; import java.util.Collections; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/ClientObjectMappingUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/ClientObjectMappingUtils.java similarity index 98% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/ClientObjectMappingUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/ClientObjectMappingUtils.java index a568d0ca56..ac79450d5a 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/ClientObjectMappingUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/ClientObjectMappingUtils.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.client; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.client; import cn.edu.tsinghua.iginx.engine.physical.memory.execute.Table; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; @@ -27,8 +27,8 @@ import cn.edu.tsinghua.iginx.engine.shared.data.write.RawDataType; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.*; import cn.edu.tsinghua.iginx.engine.shared.operator.tag.*; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.thrift.*; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.thrift.*; import cn.edu.tsinghua.iginx.thrift.*; import cn.edu.tsinghua.iginx.thrift.TagFilterType; import cn.edu.tsinghua.iginx.utils.Bitmap; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/RemoteFileStoreException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/RemoteFileSystemException.java similarity index 74% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/RemoteFileStoreException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/RemoteFileSystemException.java index 2beb729ad3..ce790bbdb1 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/RemoteFileStoreException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/RemoteFileSystemException.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.client; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.client; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; -public class RemoteFileStoreException extends FileStoreException { - public RemoteFileStoreException(String message, Throwable e) { +public class RemoteFileSystemException extends FileSystemException { + public RemoteFileSystemException(String message, Throwable e) { super(message, e); } } diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/RemoteService.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/RemoteService.java similarity index 79% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/RemoteService.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/RemoteService.java index ff34157ee9..195c45bd23 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/RemoteService.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/RemoteService.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.client; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.client; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.service.Service; -import cn.edu.tsinghua.iginx.filestore.service.rpc.client.pool.PooledTTransport; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.thrift.*; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; +import cn.edu.tsinghua.iginx.filesystem.service.Service; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.client.pool.PooledTTransport; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.thrift.*; import cn.edu.tsinghua.iginx.thrift.AggregateType; import java.net.InetSocketAddress; import java.util.Map; @@ -45,16 +45,16 @@ public RemoteService(InetSocketAddress address, ClientConfig config) { this.pool = new TSocketPool(address, config); } - private FileStoreRpc.Client wrapClient(TTransport transport) { - return new FileStoreRpc.Client(new TBinaryProtocol(transport)); + private FileSystemRpc.Client wrapClient(TTransport transport) { + return new FileSystemRpc.Client(new TBinaryProtocol(transport)); } - private void handleRpcException(String action, RpcException e) throws RemoteFileStoreException { + private void handleRpcException(String action, RpcException e) throws RemoteFileSystemException { String msg = String.format("failed to %s remotely: %s(%s)", action, e.getStatus(), e.getMessage()); switch (e.getStatus()) { - case FileStoreException: - throw new RemoteFileStoreException(msg, e); + case FileSystemException: + throw new RemoteFileSystemException(msg, e); case OK: case UnknownException: default: @@ -63,10 +63,10 @@ private void handleRpcException(String action, RpcException e) throws RemoteFile } @Override - public Map getUnits(@Nullable String prefix) throws FileStoreException { + public Map getUnits(@Nullable String prefix) throws FileSystemException { RawPrefix rawPrefix = ClientObjectMappingUtils.constructRawPrefix(prefix); try (PooledTTransport transport = pool.borrowObject()) { - FileStoreRpc.Client client = wrapClient(transport); + FileSystemRpc.Client client = wrapClient(transport); try { return client.getUnits(rawPrefix); } catch (Exception e) { @@ -79,17 +79,17 @@ public Map getUnits(@Nullable String prefix) throws File handleRpcException("get units", e); throw new IllegalStateException("unreachable", e); } catch (Exception e) { - throw new RemoteFileStoreException("failed to get storage units", e); + throw new RemoteFileSystemException("failed to get storage units", e); } } @Override public RowStream query(DataUnit unit, DataTarget target, @Nullable AggregateType aggregate) - throws FileStoreException { + throws FileSystemException { RawDataTarget rawTarget = ClientObjectMappingUtils.constructRawDataTarget(target); RawAggregate rawAggregate = ClientObjectMappingUtils.constructRawAggregate(aggregate); try (PooledTTransport transport = pool.borrowObject()) { - FileStoreRpc.Client client = wrapClient(transport); + FileSystemRpc.Client client = wrapClient(transport); try { RawDataSet dataSet = client.query(unit, rawTarget, rawAggregate); return ClientObjectMappingUtils.constructRowStream(dataSet); @@ -108,10 +108,10 @@ public RowStream query(DataUnit unit, DataTarget target, @Nullable AggregateType } @Override - public void delete(DataUnit dataUnit, DataTarget target) throws FileStoreException { + public void delete(DataUnit dataUnit, DataTarget target) throws FileSystemException { RawDataTarget rawTarget = ClientObjectMappingUtils.constructRawDataTarget(target); try (PooledTTransport transport = pool.borrowObject()) { - FileStoreRpc.Client client = wrapClient(transport); + FileSystemRpc.Client client = wrapClient(transport); try { client.delete(dataUnit, rawTarget); } catch (Exception e) { @@ -124,15 +124,15 @@ public void delete(DataUnit dataUnit, DataTarget target) throws FileStoreExcepti handleRpcException("delete", e); throw new IllegalStateException("unreachable", e); } catch (Exception e) { - throw new RemoteFileStoreException("failed to delete", e); + throw new RemoteFileSystemException("failed to delete", e); } } @Override - public void insert(DataUnit unit, DataView dataView) throws FileStoreException { + public void insert(DataUnit unit, DataView dataView) throws FileSystemException { RawInserted rawInserted = ClientObjectMappingUtils.constructRawInserted(dataView); try (PooledTTransport transport = pool.borrowObject()) { - FileStoreRpc.Client client = wrapClient(transport); + FileSystemRpc.Client client = wrapClient(transport); try { client.insert(unit, rawInserted); } catch (Exception e) { @@ -145,7 +145,7 @@ public void insert(DataUnit unit, DataView dataView) throws FileStoreException { handleRpcException("insert", e); throw new IllegalStateException("unreachable", e); } catch (Exception e) { - throw new RemoteFileStoreException("failed to insert", e); + throw new RemoteFileSystemException("failed to insert", e); } } diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/TSocketPool.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/TSocketPool.java similarity index 78% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/TSocketPool.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/TSocketPool.java index ab0f77632b..dbab675c2b 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/TSocketPool.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/TSocketPool.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.client; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.client; -import cn.edu.tsinghua.iginx.filestore.service.rpc.client.pool.PooledTTransport; -import cn.edu.tsinghua.iginx.filestore.service.rpc.client.pool.TTransportPool; -import cn.edu.tsinghua.iginx.filestore.service.rpc.client.pool.TTransportPoolConfig; -import cn.edu.tsinghua.iginx.filestore.service.rpc.client.transport.TSocketFactory; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.client.pool.PooledTTransport; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.client.pool.TTransportPool; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.client.pool.TTransportPoolConfig; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.client.transport.TSocketFactory; import java.net.InetSocketAddress; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/pool/ForwardTTransport.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/pool/ForwardTTransport.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/pool/ForwardTTransport.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/pool/ForwardTTransport.java index d1c7cfdc79..3df2674a9c 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/pool/ForwardTTransport.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/pool/ForwardTTransport.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.client.pool; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.client.pool; import java.nio.ByteBuffer; import java.util.Objects; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/pool/PooledTTransport.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/pool/PooledTTransport.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/pool/PooledTTransport.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/pool/PooledTTransport.java index ee0a094c8d..523b0ae0be 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/pool/PooledTTransport.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/pool/PooledTTransport.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.client.pool; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.client.pool; import org.apache.commons.pool2.ObjectPool; import org.apache.thrift.transport.TTransport; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/pool/TTransportPool.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/pool/TTransportPool.java similarity index 94% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/pool/TTransportPool.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/pool/TTransportPool.java index 22a6678127..1da122a5c8 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/pool/TTransportPool.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/pool/TTransportPool.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.client.pool; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.client.pool; -import cn.edu.tsinghua.iginx.filestore.service.rpc.client.transport.TTransportFactory; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.client.transport.TTransportFactory; import java.util.Objects; import lombok.Setter; import org.apache.commons.pool2.PooledObject; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/pool/TTransportPoolConfig.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/pool/TTransportPoolConfig.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/pool/TTransportPoolConfig.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/pool/TTransportPoolConfig.java index 9352942a0e..695e793beb 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/pool/TTransportPoolConfig.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/pool/TTransportPoolConfig.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.client.pool; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.client.pool; -import cn.edu.tsinghua.iginx.filestore.common.AbstractConfig; +import cn.edu.tsinghua.iginx.filesystem.common.AbstractConfig; import com.typesafe.config.Optional; import java.time.Duration; import java.util.ArrayList; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/transport/TSocketFactory.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/transport/TSocketFactory.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/transport/TSocketFactory.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/transport/TSocketFactory.java index 98a048e450..4b74eb13cd 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/transport/TSocketFactory.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/transport/TSocketFactory.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.client.transport; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.client.transport; -import cn.edu.tsinghua.iginx.filestore.service.rpc.client.ClientConfig; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.client.ClientConfig; import java.net.InetSocketAddress; import java.util.Objects; import org.apache.thrift.TConfiguration; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/transport/TTransportFactory.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/transport/TTransportFactory.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/transport/TTransportFactory.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/transport/TTransportFactory.java index ac2d92ed54..c80c7d652c 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/client/transport/TTransportFactory.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/client/transport/TTransportFactory.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.client.transport; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.client.transport; import org.apache.thrift.transport.TTransport; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/server/Server.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/server/Server.java similarity index 87% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/server/Server.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/server/Server.java index 3c90a8ce71..25c77311a0 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/server/Server.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/server/Server.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.server; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.server; import cn.edu.tsinghua.iginx.conf.Config; import cn.edu.tsinghua.iginx.conf.ConfigDescriptor; -import cn.edu.tsinghua.iginx.filestore.service.Service; -import cn.edu.tsinghua.iginx.filestore.thrift.FileStoreRpc; +import cn.edu.tsinghua.iginx.filesystem.service.Service; +import cn.edu.tsinghua.iginx.filesystem.thrift.FileSystemRpc; import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.net.InetSocketAddress; import java.util.concurrent.*; @@ -43,7 +43,7 @@ public Server(InetSocketAddress address, Service service) throws TTransportException, InterruptedException { LOGGER.info("starting thrift server at {}", address); TProcessor processor = - new FileStoreRpc.Processor(new ServerWorker(service)); + new FileSystemRpc.Processor(new ServerWorker(service)); Config config = ConfigDescriptor.getInstance().getConfig(); ExecutorService executorService = new ThreadPoolExecutor( @@ -53,7 +53,7 @@ public Server(InetSocketAddress address, Service service) TimeUnit.SECONDS, new SynchronousQueue<>(), new ThreadFactoryBuilder() - .setNameFormat("FileStoreServer(" + address + ")-%d") + .setNameFormat("FileSystemServer(" + address + ")-%d") .build()); TThreadPoolServer.Args args = new TThreadPoolServer.Args(new TServerSocket(address)) @@ -61,7 +61,7 @@ public Server(InetSocketAddress address, Service service) .executorService(executorService) .protocolFactory(new TBinaryProtocol.Factory()); this.server = new TThreadPoolServer(args); - new Thread(server::serve, "FileStoreServer(" + server + ")").start(); + new Thread(server::serve, "FileSystemServer(" + address + ")").start(); // wait for server to be ready // 因为这里有两个线程，如果由于某些原因在 server::serve 执行前就 close 了， // 那么 server 会不断 accept 失败而死循环 diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/server/ServerObjectMappingUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/server/ServerObjectMappingUtils.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/server/ServerObjectMappingUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/server/ServerObjectMappingUtils.java index 088075bbce..5bf2a38573 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/server/ServerObjectMappingUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/server/ServerObjectMappingUtils.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.server; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.server; import static cn.edu.tsinghua.iginx.engine.shared.operator.filter.Op.*; @@ -28,9 +28,9 @@ import cn.edu.tsinghua.iginx.engine.shared.data.write.*; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.*; import cn.edu.tsinghua.iginx.engine.shared.operator.tag.*; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.thrift.*; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.thrift.*; import cn.edu.tsinghua.iginx.thrift.*; import cn.edu.tsinghua.iginx.utils.Bitmap; import cn.edu.tsinghua.iginx.utils.ByteUtils; @@ -238,14 +238,14 @@ public static AggregateType resolveRawAggregate(RawAggregate aggregate) { return aggregate.getType(); } - public static RawDataSet constructRawDataSet(RowStream rowStream) throws FileStoreException { + public static RawDataSet constructRawDataSet(RowStream rowStream) throws FileSystemException { try { RawHeader rawHeader = constructRawHeader(rowStream.getHeader()); List rawRows = constructRawRows(rowStream, rawHeader); return new RawDataSet(rawHeader, rawRows); } catch (PhysicalException e) { - throw new FileStoreException(e); + throw new FileSystemException(e); } } diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/server/ServerWorker.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/server/ServerWorker.java similarity index 78% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/server/ServerWorker.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/server/ServerWorker.java index 707887e078..bb60081d9d 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/rpc/server/ServerWorker.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/rpc/server/ServerWorker.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.rpc.server; +package cn.edu.tsinghua.iginx.filesystem.service.rpc.server; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.service.Service; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.thrift.*; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; +import cn.edu.tsinghua.iginx.filesystem.service.Service; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.thrift.*; import cn.edu.tsinghua.iginx.thrift.AggregateType; import java.util.HashMap; import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ServerWorker implements FileStoreRpc.Iface { +public class ServerWorker implements FileSystemRpc.Iface { private static final Logger LOGGER = LoggerFactory.getLogger(ServerWorker.class); @@ -51,9 +51,9 @@ public Map getUnits(RawPrefix prefix) throws RpcExceptio result.put(dataUnit, dataBoundary); } return result; - } catch (FileStoreException e) { + } catch (FileSystemException e) { LOGGER.error("failed to getUnits({})", prefix, e); - throw new RpcException(Status.FileStoreException, e.getMessage()); + throw new RpcException(Status.FileSystemException, e.getMessage()); } } @@ -65,9 +65,9 @@ public RawDataSet query(DataUnit unit, RawDataTarget target, RawAggregate aggreg try { RowStream rowStream = service.query(unit, dataTarget, aggregateType); return ServerObjectMappingUtils.constructRawDataSet(rowStream); - } catch (FileStoreException e) { + } catch (FileSystemException e) { LOGGER.error("failed to query({}, {}, {})", unit, target, aggregate, e); - throw new RpcException(Status.FileStoreException, e.getMessage()); + throw new RpcException(Status.FileSystemException, e.getMessage()); } } @@ -76,9 +76,9 @@ public void delete(DataUnit unit, RawDataTarget target) throws RpcException { DataTarget dataTarget = ServerObjectMappingUtils.resolveRawDataTarget(target); try { service.delete(unit, dataTarget); - } catch (FileStoreException e) { + } catch (FileSystemException e) { LOGGER.error("failed to delete({}, {})", unit, target, e); - throw new RpcException(Status.FileStoreException, e.getMessage()); + throw new RpcException(Status.FileSystemException, e.getMessage()); } } @@ -87,9 +87,9 @@ public void insert(DataUnit unit, RawInserted data) throws RpcException { DataView dataView = ServerObjectMappingUtils.resolveRawInserted(data); try { service.insert(unit, dataView); - } catch (FileStoreException e) { + } catch (FileSystemException e) { LOGGER.error("failed to insert({}, {})", unit, data, e); - throw new RpcException(Status.FileStoreException, e.getMessage()); + throw new RpcException(Status.FileSystemException, e.getMessage()); } } } diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/storage/StorageConfig.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/storage/StorageConfig.java similarity index 89% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/storage/StorageConfig.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/storage/StorageConfig.java index e5db774f54..fe9fba8a03 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/storage/StorageConfig.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/storage/StorageConfig.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.storage; +package cn.edu.tsinghua.iginx.filesystem.service.storage; -import cn.edu.tsinghua.iginx.filestore.common.AbstractConfig; -import cn.edu.tsinghua.iginx.filestore.struct.FileStructure; -import cn.edu.tsinghua.iginx.filestore.struct.FileStructureManager; +import cn.edu.tsinghua.iginx.filesystem.common.AbstractConfig; +import cn.edu.tsinghua.iginx.filesystem.struct.FileStructure; +import cn.edu.tsinghua.iginx.filesystem.struct.FileStructureManager; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import com.typesafe.config.Optional; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/storage/StorageService.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/storage/StorageService.java similarity index 87% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/storage/StorageService.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/storage/StorageService.java index fea85d50fe..02c413316f 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/service/storage/StorageService.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/service/storage/StorageService.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.storage; +package cn.edu.tsinghua.iginx.filesystem.service.storage; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; -import cn.edu.tsinghua.iginx.filestore.common.DataUnits; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.service.Service; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.FileManager; -import cn.edu.tsinghua.iginx.filestore.struct.FileStructure; -import cn.edu.tsinghua.iginx.filestore.struct.FileStructureManager; -import cn.edu.tsinghua.iginx.filestore.struct.units.UnitsMerger; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; -import cn.edu.tsinghua.iginx.filestore.thrift.DataUnit; +import cn.edu.tsinghua.iginx.filesystem.common.DataUnits; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; +import cn.edu.tsinghua.iginx.filesystem.service.Service; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.FileManager; +import cn.edu.tsinghua.iginx.filesystem.struct.FileStructure; +import cn.edu.tsinghua.iginx.filesystem.struct.FileStructureManager; +import cn.edu.tsinghua.iginx.filesystem.struct.units.UnitsMerger; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataUnit; import cn.edu.tsinghua.iginx.thrift.AggregateType; import java.io.Closeable; import java.io.IOException; @@ -61,7 +61,7 @@ public class StorageService implements Service { private volatile boolean closed = false; public StorageService(@Nullable StorageConfig dataConfig, @Nullable StorageConfig dummyConfig) - throws FileStoreException { + throws FileSystemException { this.dataConfig = dataConfig; this.dummyConfig = dummyConfig; @@ -81,27 +81,27 @@ public StorageService(@Nullable StorageConfig dataConfig, @Nullable StorageConfi initManager(); } catch (IOException e) { close(); - throw new FileStoreException("failed to initialize storage service", e); + throw new FileSystemException("failed to initialize storage service", e); } } @Nullable private static FileStructure getFileStructure(@Nullable StorageConfig config) - throws FileStoreException { + throws FileSystemException { if (config == null) { return null; } FileStructure structure = FileStructureManager.getInstance().getByName(config.getStruct()); if (structure == null) { String message = String.format("unknown file structure %s", config.getStruct()); - throw new FileStoreException(message); + throw new FileSystemException(message); } return structure; } @Nullable private static Closeable getShared(@Nullable StorageConfig config, FileStructure structure) - throws FileStoreException { + throws FileSystemException { if (config == null) { return null; } @@ -109,7 +109,7 @@ private static Closeable getShared(@Nullable StorageConfig config, FileStructure return structure.newShared(config.getConfig()); } catch (IOException e) { String message = String.format("failed to create shared for %s", config.getStruct()); - throw new FileStoreException(message, e); + throw new FileSystemException(message, e); } } @@ -214,7 +214,7 @@ private static Path getPathOf(Path root, String unitName) { } @Override - public Map getUnits(@Nullable String prefix) throws FileStoreException { + public Map getUnits(@Nullable String prefix) throws FileSystemException { Map boundariesForEachUnit = new HashMap<>(); for (DataUnit unit : managers.keySet()) { if (unit.isDummy() && unit.getName() != null) { @@ -233,7 +233,7 @@ public Map getUnits(@Nullable String prefix) throws File // TODO: use lock and cache in better way private DataBoundary getBoundary(DataUnit unit, @Nullable String prefix) - throws FileStoreException { + throws FileSystemException { if (unit.isDummy()) { try { if (dummyBoundary == null || !Objects.equals(prefix, lastPrefix)) @@ -246,7 +246,7 @@ private DataBoundary getBoundary(DataUnit unit, @Nullable String prefix) } catch (IOException e) { String message = String.format("failed to get boundary for unit %s with prefix %s", unit, prefix); - throw new FileStoreException(message, e); + throw new FileSystemException(message, e); } } else { return DATA_BOUNDARY; @@ -255,7 +255,7 @@ private DataBoundary getBoundary(DataUnit unit, @Nullable String prefix) @Override public RowStream query(DataUnit unit, DataTarget target, @Nullable AggregateType aggregate) - throws FileStoreException { + throws FileSystemException { try { FileManager manager = getOrCreateManager(unit); return manager.query(target, aggregate); @@ -269,13 +269,13 @@ public RowStream query(DataUnit unit, DataTarget target, @Nullable AggregateType } else { msg = "Failed to query data"; } - throw new FileStoreException(msg, e); + throw new FileSystemException(msg, e); } } // TODO: close and remove manager after clear all data @Override - public void delete(DataUnit unit, DataTarget target) throws FileStoreException { + public void delete(DataUnit unit, DataTarget target) throws FileSystemException { if (unit.isDummy()) { throw new IllegalStateException("cannot delete data from dummy unit"); } @@ -289,12 +289,12 @@ public void delete(DataUnit unit, DataTarget target) throws FileStoreException { } else { msg = "failed to delete data"; } - throw new FileStoreException(msg, e); + throw new FileSystemException(msg, e); } } @Override - public void insert(DataUnit unit, DataView dataView) throws FileStoreException { + public void insert(DataUnit unit, DataView dataView) throws FileSystemException { if (unit.isDummy()) { throw new IllegalStateException("cannot insert data into dummy unit"); } @@ -308,18 +308,18 @@ public void insert(DataUnit unit, DataView dataView) throws FileStoreException { } else { msg = "failed to insert data"; } - throw new FileStoreException(msg, e); + throw new FileSystemException(msg, e); } } // TODO: use rwlock to make sure close is exclusive with other operations @Override - public synchronized void close() throws FileStoreException { + public synchronized void close() throws FileSystemException { if (closed) { return; } closed = true; - FileStoreException exception = new FileStoreException("Failed to close storage service"); + FileSystemException exception = new FileSystemException("Failed to close storage service"); for (FileManager manager : managers.values()) { try { manager.close(); diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/DataTarget.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/DataTarget.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/DataTarget.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/DataTarget.java index 5f4c5dc6f8..3aad6e65d0 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/DataTarget.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/DataTarget.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct; +package cn.edu.tsinghua.iginx.filesystem.struct; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; import cn.edu.tsinghua.iginx.engine.shared.operator.tag.TagFilter; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/FileManager.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/FileManager.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/FileManager.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/FileManager.java index 879b0b13e6..dd0a1f5c56 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/FileManager.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/FileManager.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct; +package cn.edu.tsinghua.iginx.filesystem.struct; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; import cn.edu.tsinghua.iginx.thrift.AggregateType; import java.io.Closeable; import java.io.IOException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/FileStructure.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/FileStructure.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/FileStructure.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/FileStructure.java index e312c2ae53..2508c3b481 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/FileStructure.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/FileStructure.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct; +package cn.edu.tsinghua.iginx.filesystem.struct; import com.typesafe.config.Config; import java.io.Closeable; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/FileStructureManager.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/FileStructureManager.java similarity index 98% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/FileStructureManager.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/FileStructureManager.java index bac5c41345..05812991be 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/FileStructureManager.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/FileStructureManager.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct; +package cn.edu.tsinghua.iginx.filesystem.struct; import java.util.Collection; import java.util.Collections; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/exception/FileStructureException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/exception/FileStructureException.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/exception/FileStructureException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/exception/FileStructureException.java index 81d9694ee3..46ef3159f5 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/exception/FileStructureException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/exception/FileStructureException.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.exception; import java.io.IOException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/exception/NoSuchUnitException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/exception/NoSuchUnitException.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/exception/NoSuchUnitException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/exception/NoSuchUnitException.java index 2ab7a66edb..9d9e1ecd22 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/exception/NoSuchUnitException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/exception/NoSuchUnitException.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.exception; public class NoSuchUnitException extends FileStructureException { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/LegacyFilesystem.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/LegacyFilesystem.java similarity index 89% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/LegacyFilesystem.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/LegacyFilesystem.java index b17d8c3183..d08cb3acfe 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/LegacyFilesystem.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/LegacyFilesystem.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem; import cn.edu.tsinghua.iginx.auth.FilePermissionManager; import cn.edu.tsinghua.iginx.auth.entity.FileAccessType; import cn.edu.tsinghua.iginx.auth.utils.FilePermissionRuleNameFilters; -import cn.edu.tsinghua.iginx.filestore.struct.FileManager; -import cn.edu.tsinghua.iginx.filestore.struct.FileStructure; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.exec.LocalExecutor; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.shared.Constant; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTreeConfig; +import cn.edu.tsinghua.iginx.filesystem.struct.FileManager; +import cn.edu.tsinghua.iginx.filesystem.struct.FileStructure; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.exec.LocalExecutor; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.shared.Constant; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.FileTreeConfig; import com.google.auto.service.AutoService; import com.typesafe.config.Config; import java.io.Closeable; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/LegacyFilesystemWrapper.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/LegacyFilesystemWrapper.java similarity index 89% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/LegacyFilesystemWrapper.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/LegacyFilesystemWrapper.java index 3940fb6e46..1868596569 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/LegacyFilesystemWrapper.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/LegacyFilesystemWrapper.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.physical.memory.execute.Table; @@ -27,13 +27,13 @@ import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.*; import cn.edu.tsinghua.iginx.engine.shared.operator.tag.TagFilter; -import cn.edu.tsinghua.iginx.filestore.common.Fields; -import cn.edu.tsinghua.iginx.filestore.common.Filters; -import cn.edu.tsinghua.iginx.filestore.common.Patterns; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.FileManager; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.exec.LocalExecutor; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.common.Fields; +import cn.edu.tsinghua.iginx.filesystem.common.Filters; +import cn.edu.tsinghua.iginx.filesystem.common.Patterns; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.FileManager; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.exec.LocalExecutor; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; import cn.edu.tsinghua.iginx.metadata.entity.ColumnsInterval; import cn.edu.tsinghua.iginx.metadata.entity.KeyInterval; import cn.edu.tsinghua.iginx.thrift.AggregateType; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exception/FileSystemTaskExecuteFailureException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exception/FileSystemTaskExecuteFailureException.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exception/FileSystemTaskExecuteFailureException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exception/FileSystemTaskExecuteFailureException.java index e70f357e35..325378052f 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exception/FileSystemTaskExecuteFailureException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exception/FileSystemTaskExecuteFailureException.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.exception; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalTaskExecuteFailureException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exception/FilesystemException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exception/FilesystemException.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exception/FilesystemException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exception/FilesystemException.java index 1a08eedd92..73fae00f27 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exception/FilesystemException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exception/FilesystemException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.exception; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exec/Executor.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exec/Executor.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exec/Executor.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exec/Executor.java index 01280204f7..697672246e 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exec/Executor.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exec/Executor.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.exec; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.exec; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.physical.storage.domain.Column; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exec/FileSystemManager.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exec/FileSystemManager.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exec/FileSystemManager.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exec/FileSystemManager.java index 16eddb42d9..f8c4c83b68 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exec/FileSystemManager.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exec/FileSystemManager.java @@ -16,22 +16,22 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.exec; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.exec; import static cn.edu.tsinghua.iginx.engine.logical.utils.PathUtils.MAX_CHAR; -import static cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.shared.Constant.*; +import static cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.shared.Constant.*; import cn.edu.tsinghua.iginx.auth.entity.FileAccessType; import cn.edu.tsinghua.iginx.engine.physical.storage.utils.TagKVUtils; import cn.edu.tsinghua.iginx.engine.shared.KeyRange; import cn.edu.tsinghua.iginx.engine.shared.operator.tag.TagFilter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.file.DefaultFileOperator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.file.IFileOperator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.file.entity.FileMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.query.entity.FileSystemResultTable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.query.entity.Record; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.tools.FilePathUtils; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.tools.MemoryPool; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.file.DefaultFileOperator; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.file.IFileOperator; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.file.entity.FileMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.query.entity.FileSystemResultTable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.query.entity.Record; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.tools.FilePathUtils; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.tools.MemoryPool; import cn.edu.tsinghua.iginx.thrift.DataType; import cn.edu.tsinghua.iginx.utils.Pair; import cn.edu.tsinghua.iginx.utils.StringUtils; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exec/LocalExecutor.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exec/LocalExecutor.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exec/LocalExecutor.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exec/LocalExecutor.java index 6d8a7a6b36..fce816251b 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/exec/LocalExecutor.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/exec/LocalExecutor.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.exec; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.exec; import static cn.edu.tsinghua.iginx.engine.logical.utils.LogicalFilterUtils.getKeyRangesFromFilter; -import static cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.shared.Constant.SEPARATOR; -import static cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.shared.Constant.WILDCARD; +import static cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.shared.Constant.SEPARATOR; +import static cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.shared.Constant.WILDCARD; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.physical.memory.execute.stream.EmptyRowStream; @@ -35,15 +35,15 @@ import cn.edu.tsinghua.iginx.engine.shared.data.write.RowDataView; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; import cn.edu.tsinghua.iginx.engine.shared.operator.tag.TagFilter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.exception.FileSystemTaskExecuteFailureException; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.exception.FilesystemException; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.file.entity.FileMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.query.entity.FileSystemHistoryQueryRowStream; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.query.entity.FileSystemQueryRowStream; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.query.entity.FileSystemResultTable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.query.entity.Record; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.shared.Constant; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.tools.FilePathUtils; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.exception.FileSystemTaskExecuteFailureException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.exception.FilesystemException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.file.entity.FileMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.query.entity.FileSystemHistoryQueryRowStream; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.query.entity.FileSystemQueryRowStream; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.query.entity.FileSystemResultTable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.query.entity.Record; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.shared.Constant; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.tools.FilePathUtils; import cn.edu.tsinghua.iginx.metadata.entity.ColumnsInterval; import cn.edu.tsinghua.iginx.metadata.entity.KeyInterval; import cn.edu.tsinghua.iginx.thrift.DataType; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/file/DefaultFileOperator.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/file/DefaultFileOperator.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/file/DefaultFileOperator.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/file/DefaultFileOperator.java index 40e96dfecd..85e3019cbb 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/file/DefaultFileOperator.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/file/DefaultFileOperator.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.file; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.file; -import static cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.shared.Constant.*; -import static cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.shared.Constant.MAGIC_NUMBER; +import static cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.shared.Constant.*; +import static cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.shared.Constant.MAGIC_NUMBER; import static cn.edu.tsinghua.iginx.utils.DataTypeUtils.transformObjectToStringByDataType; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.file.entity.FileMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.query.entity.Record; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.tools.LimitedSizeMap; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.file.entity.FileMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.query.entity.Record; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.tools.LimitedSizeMap; import cn.edu.tsinghua.iginx.thrift.DataType; import cn.edu.tsinghua.iginx.utils.DataTypeUtils; import cn.edu.tsinghua.iginx.utils.JsonUtils; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/file/IFileOperator.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/file/IFileOperator.java similarity index 86% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/file/IFileOperator.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/file/IFileOperator.java index d94a9598eb..8ac9f29752 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/file/IFileOperator.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/file/IFileOperator.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.file; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.file; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.file.entity.FileMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.query.entity.Record; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.file.entity.FileMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.query.entity.Record; import cn.edu.tsinghua.iginx.thrift.DataType; import java.io.File; import java.io.IOException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/file/entity/FileMeta.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/file/entity/FileMeta.java similarity index 89% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/file/entity/FileMeta.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/file/entity/FileMeta.java index cc285d551d..151f812c7c 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/file/entity/FileMeta.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/file/entity/FileMeta.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.file.entity; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.file.entity; -import static cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.shared.Constant.MAGIC_NUMBER; +import static cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.shared.Constant.MAGIC_NUMBER; import cn.edu.tsinghua.iginx.thrift.DataType; import java.util.HashMap; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/query/entity/FileSystemHistoryQueryRowStream.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/query/entity/FileSystemHistoryQueryRowStream.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/query/entity/FileSystemHistoryQueryRowStream.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/query/entity/FileSystemHistoryQueryRowStream.java index b02bb09c95..0e436744cf 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/query/entity/FileSystemHistoryQueryRowStream.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/query/entity/FileSystemHistoryQueryRowStream.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.query.entity; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.query.entity; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.physical.memory.execute.utils.FilterUtils; @@ -25,9 +25,9 @@ import cn.edu.tsinghua.iginx.engine.shared.data.read.Row; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.exception.FilesystemException; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.tools.FilePathUtils; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.tools.MemoryPool; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.exception.FilesystemException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.tools.FilePathUtils; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.tools.MemoryPool; import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/query/entity/FileSystemQueryRowStream.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/query/entity/FileSystemQueryRowStream.java similarity index 94% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/query/entity/FileSystemQueryRowStream.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/query/entity/FileSystemQueryRowStream.java index be3a6b843c..aaaf3c3846 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/query/entity/FileSystemQueryRowStream.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/query/entity/FileSystemQueryRowStream.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.query.entity; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.query.entity; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.physical.memory.execute.utils.FilterUtils; @@ -25,8 +25,8 @@ import cn.edu.tsinghua.iginx.engine.shared.data.read.Row; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.exception.FilesystemException; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.tools.FilePathUtils; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.exception.FilesystemException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.tools.FilePathUtils; import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/query/entity/FileSystemResultTable.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/query/entity/FileSystemResultTable.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/query/entity/FileSystemResultTable.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/query/entity/FileSystemResultTable.java index f602a886d9..1c814412d5 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/query/entity/FileSystemResultTable.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/query/entity/FileSystemResultTable.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.query.entity; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.query.entity; import cn.edu.tsinghua.iginx.thrift.DataType; import java.io.File; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/query/entity/Record.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/query/entity/Record.java similarity index 94% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/query/entity/Record.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/query/entity/Record.java index 2d8a0904d9..b994f05679 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/query/entity/Record.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/query/entity/Record.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.query.entity; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.query.entity; import cn.edu.tsinghua.iginx.engine.shared.data.Value; import cn.edu.tsinghua.iginx.thrift.DataType; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/shared/Constant.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/shared/Constant.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/shared/Constant.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/shared/Constant.java index ac09460bca..9117c27832 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/shared/Constant.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/shared/Constant.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.shared; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.shared; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/shared/FileType.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/shared/FileType.java similarity index 91% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/shared/FileType.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/shared/FileType.java index d2283a7bfa..f99507efeb 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/shared/FileType.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/shared/FileType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.shared; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.shared; public enum FileType { IGINX_FILE, diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/tools/FilePathUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/tools/FilePathUtils.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/tools/FilePathUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/tools/FilePathUtils.java index 5ed66fb5e8..d199fb4a48 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/tools/FilePathUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/tools/FilePathUtils.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.tools; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.tools; -import static cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.shared.Constant.*; +import static cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.shared.Constant.*; import cn.edu.tsinghua.iginx.auth.FilePermissionManager; import cn.edu.tsinghua.iginx.auth.entity.FileAccessType; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/tools/LimitedSizeMap.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/tools/LimitedSizeMap.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/tools/LimitedSizeMap.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/tools/LimitedSizeMap.java index 8fda95b2bf..4a7c71b669 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/tools/LimitedSizeMap.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/tools/LimitedSizeMap.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.tools; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.tools; import java.util.LinkedHashMap; import java.util.Map; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/tools/MemoryPool.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/tools/MemoryPool.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/tools/MemoryPool.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/tools/MemoryPool.java index e423edb51b..a13f1e1d3f 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/filesystem/tools/MemoryPool.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/filesystem/tools/MemoryPool.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.filesystem.tools; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.filesystem.tools; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/LegacyParquet.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/LegacyParquet.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/LegacyParquet.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/LegacyParquet.java index 31cdd559eb..9c03b6932c 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/LegacyParquet.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/LegacyParquet.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet; -import cn.edu.tsinghua.iginx.filestore.struct.FileManager; -import cn.edu.tsinghua.iginx.filestore.struct.FileStructure; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data.DataManager; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Shared; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.StorageProperties; +import cn.edu.tsinghua.iginx.filesystem.struct.FileManager; +import cn.edu.tsinghua.iginx.filesystem.struct.FileStructure; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data.DataManager; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Shared; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.StorageProperties; import com.google.auto.service.AutoService; import com.typesafe.config.Config; import java.io.Closeable; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/LegacyParquetWrapper.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/LegacyParquetWrapper.java similarity index 91% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/LegacyParquetWrapper.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/LegacyParquetWrapper.java index 09c5a03ccb..8c0880c123 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/LegacyParquetWrapper.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/LegacyParquetWrapper.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.physical.memory.execute.Table; @@ -26,16 +26,16 @@ import cn.edu.tsinghua.iginx.engine.shared.operator.filter.BoolFilter; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; import cn.edu.tsinghua.iginx.engine.shared.operator.tag.TagFilter; -import cn.edu.tsinghua.iginx.filestore.common.Fields; -import cn.edu.tsinghua.iginx.filestore.common.Filters; -import cn.edu.tsinghua.iginx.filestore.common.Patterns; -import cn.edu.tsinghua.iginx.filestore.common.Ranges; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.FileManager; -import cn.edu.tsinghua.iginx.filestore.struct.exception.NoSuchUnitException; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data.DataManager; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.common.Fields; +import cn.edu.tsinghua.iginx.filesystem.common.Filters; +import cn.edu.tsinghua.iginx.filesystem.common.Patterns; +import cn.edu.tsinghua.iginx.filesystem.common.Ranges; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.FileManager; +import cn.edu.tsinghua.iginx.filesystem.struct.exception.NoSuchUnitException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data.DataManager; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; import cn.edu.tsinghua.iginx.metadata.entity.ColumnsInterval; import cn.edu.tsinghua.iginx.metadata.entity.KeyInterval; import cn.edu.tsinghua.iginx.thrift.AggregateType; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/Database.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/Database.java similarity index 84% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/Database.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/Database.java index bb2cece271..20ab6c8897 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/Database.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/Database.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.collect.RangeSet; import java.io.IOException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/OneTierDB.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/OneTierDB.java similarity index 80% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/OneTierDB.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/OneTierDB.java index c00d394778..532f898628 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/OneTierDB.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/OneTierDB.java @@ -16,28 +16,28 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.Database; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.ReadWriter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.DataBuffer; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.MemTableQueue; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.compact.Flusher; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table.TableStorage; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.WriteBatches; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.BatchPlaneScanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.utils.TagKVUtils; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.NoexceptAutoCloseable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.NoexceptAutoCloseables; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Shared; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowFields; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageRuntimeException; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.TypeConflictedException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.Database; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.ReadWriter; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.DataBuffer; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.MemTableQueue; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.compact.Flusher; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table.TableStorage; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.WriteBatches; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.BatchPlaneScanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.utils.TagKVUtils; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.NoexceptAutoCloseable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.NoexceptAutoCloseables; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Shared; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowFields; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageRuntimeException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.TypeConflictedException; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/api/ReadWriter.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/api/ReadWriter.java similarity index 85% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/api/ReadWriter.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/api/ReadWriter.java index 97a8aeb9f1..2a0a76bac7 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/api/ReadWriter.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/api/ReadWriter.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; import com.google.common.collect.RangeSet; import java.io.IOException; import java.util.Set; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/api/TableMeta.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/api/TableMeta.java similarity index 94% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/api/TableMeta.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/api/TableMeta.java index dbd8c5cf8c..8bf4b804b1 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/api/TableMeta.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/api/TableMeta.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.collect.Range; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/ActiveMemTable.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/ActiveMemTable.java similarity index 89% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/ActiveMemTable.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/ActiveMemTable.java index 0188d2fce9..82af6250a8 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/ActiveMemTable.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/ActiveMemTable.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer; - -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.conflict.ConflictResolver; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table.MemoryTable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Awaitable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.NoexceptAutoCloseable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Shared; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowFields; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer; + +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.conflict.ConflictResolver; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table.MemoryTable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Awaitable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.NoexceptAutoCloseable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Shared; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowFields; import com.google.common.collect.RangeSet; import java.io.IOException; import java.util.*; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/ArchivedMemTable.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/ArchivedMemTable.java similarity index 88% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/ArchivedMemTable.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/ArchivedMemTable.java index e78d868561..6e21321247 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/ArchivedMemTable.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/ArchivedMemTable.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table.MemoryTable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.NoexceptAutoCloseable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table.MemoryTable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.NoexceptAutoCloseable; import com.google.common.collect.RangeSet; import java.util.ArrayList; import java.util.Collection; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/DataBuffer.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/DataBuffer.java similarity index 91% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/DataBuffer.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/DataBuffer.java index 306a3e032b..88119d0ffc 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/DataBuffer.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/DataBuffer.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.ColumnUnionRowScanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.IteratorScanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.ColumnUnionRowScanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.IteratorScanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import com.google.common.collect.BoundType; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/MemColumn.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/MemColumn.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/MemColumn.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/MemColumn.java index fb73f4ea6d..94157a454f 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/MemColumn.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/MemColumn.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.IndexedChunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.iterator.DedupIterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.iterator.StableMergeIterator; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.IndexedChunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.iterator.DedupIterator; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.iterator.StableMergeIterator; import com.google.common.collect.*; import java.util.ArrayList; import java.util.Iterator; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/MemTable.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/MemTable.java similarity index 91% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/MemTable.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/MemTable.java index 8cd07bc9bd..b9f1cd5479 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/MemTable.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/MemTable.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.IndexedChunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table.MemoryTable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.IndexedChunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table.MemoryTable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; import com.google.common.collect.RangeSet; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/MemTableQueue.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/MemTableQueue.java similarity index 89% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/MemTableQueue.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/MemTableQueue.java index 32ad969c07..ffe33d7506 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/MemTableQueue.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/MemTableQueue.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer; - -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table.MemoryTable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.AreaFilterScanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Awaitable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.NoexceptAutoCloseable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Shared; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowFields; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer; + +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table.MemoryTable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.AreaFilterScanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Awaitable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.NoexceptAutoCloseable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Shared; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowFields; import com.google.common.collect.RangeSet; import java.io.IOException; import java.util.*; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/Chunk.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/Chunk.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/Chunk.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/Chunk.java index ff0f909d1f..81574fb6f9 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/Chunk.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/Chunk.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.NoexceptAutoCloseable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowVectors; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.NoexceptAutoCloseable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowVectors; import java.util.AbstractMap; import java.util.Iterator; import java.util.Map; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/IndexedChunk.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/IndexedChunk.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/IndexedChunk.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/IndexedChunk.java index 54f562ab3f..5e038186da 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/IndexedChunk.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/IndexedChunk.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowVectors; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowVectors; import com.google.common.collect.RangeSet; import java.util.Map; import javax.annotation.Nullable; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/IndexedChunkType.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/IndexedChunkType.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/IndexedChunkType.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/IndexedChunkType.java index 0d8d462149..94b0c9d355 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/IndexedChunkType.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/IndexedChunkType.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk; public enum IndexedChunkType { SKIP_LIST(SkipListChunk::new), diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/NoIndexChunk.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/NoIndexChunk.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/NoIndexChunk.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/NoIndexChunk.java index 0c2264bdf3..6bfc73a0aa 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/NoIndexChunk.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/NoIndexChunk.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowVectors; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowVectors; import com.google.common.collect.RangeSet; import com.google.common.collect.TreeRangeSet; import java.util.Map; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/SkipListChunk.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/SkipListChunk.java similarity index 94% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/SkipListChunk.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/SkipListChunk.java index 37549e4236..2efcd1b334 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/chunk/SkipListChunk.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/chunk/SkipListChunk.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowVectors; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowVectors; import com.google.common.collect.BoundType; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/ConflictResolver.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/ConflictResolver.java similarity index 76% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/ConflictResolver.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/ConflictResolver.java index a98935ab89..6db4b17e23 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/ConflictResolver.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/ConflictResolver.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.conflict; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.conflict; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.MemTable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.MemTable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; public interface ConflictResolver { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/ConflictResolverType.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/ConflictResolverType.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/ConflictResolverType.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/ConflictResolverType.java index feacb3a21d..c9aca59573 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/ConflictResolverType.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/ConflictResolverType.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.conflict; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.conflict; import java.util.Objects; import java.util.function.Supplier; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/NoneResolver.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/NoneResolver.java similarity index 79% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/NoneResolver.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/NoneResolver.java index 5718ffd50a..74c77b789c 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/NoneResolver.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/NoneResolver.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.conflict; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.conflict; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.MemTable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.MemTable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; public class NoneResolver implements ConflictResolver { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/RecursiveTryLockResolver.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/RecursiveTryLockResolver.java similarity index 83% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/RecursiveTryLockResolver.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/RecursiveTryLockResolver.java index ef6b212b4a..6983e27b6d 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/RecursiveTryLockResolver.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/RecursiveTryLockResolver.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.conflict; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.conflict; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.MemTable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.MemTable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/ThreadPoolResolver.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/ThreadPoolResolver.java similarity index 89% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/ThreadPoolResolver.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/ThreadPoolResolver.java index 241adcf994..cef9e006fa 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/ThreadPoolResolver.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/ThreadPoolResolver.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.conflict; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.conflict; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.MemTable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.MemTable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/TryLockResolver.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/TryLockResolver.java similarity index 90% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/TryLockResolver.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/TryLockResolver.java index 13c4412f60..939ee4a6ab 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/buffer/conflict/TryLockResolver.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/buffer/conflict/TryLockResolver.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.conflict; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.conflict; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.MemTable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.MemTable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/compact/Flusher.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/compact/Flusher.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/compact/Flusher.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/compact/Flusher.java index d0eafd7a8a..3d434b1621 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/compact/Flusher.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/compact/Flusher.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.compact; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.compact; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.MemTableQueue; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table.MemoryTable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table.TableStorage; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.NoexceptAutoCloseable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Shared; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.MemTableQueue; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table.MemoryTable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table.TableStorage; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.NoexceptAutoCloseable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Shared; import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.util.ArrayList; import java.util.List; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/DeletedTable.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/DeletedTable.java similarity index 78% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/DeletedTable.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/DeletedTable.java index 0b0f82f84b..bc8d485ff7 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/DeletedTable.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/DeletedTable.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.TableMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.AreaFilterScanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.TableMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.AreaFilterScanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; import com.google.common.collect.RangeSet; import java.io.IOException; import java.util.Set; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/DeletedTableMeta.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/DeletedTableMeta.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/DeletedTableMeta.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/DeletedTableMeta.java index b4947e0df8..14966a91ac 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/DeletedTableMeta.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/DeletedTableMeta.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.TableMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.TableMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/FileTable.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/FileTable.java similarity index 86% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/FileTable.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/FileTable.java index e532c3ddf1..5791ed83ff 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/FileTable.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/FileTable.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.ReadWriter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.TableMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.ReadWriter; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.TableMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; import com.google.common.collect.RangeSet; import java.io.IOException; import java.util.Set; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/MemoryTable.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/MemoryTable.java similarity index 88% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/MemoryTable.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/MemoryTable.java index fc8878d240..5bdf127bf9 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/MemoryTable.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/MemoryTable.java @@ -16,17 +16,17 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.TableMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.MemColumn; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.*; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.utils.TagKVUtils; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.NoexceptAutoCloseable; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.SingleCache; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowFields; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.TableMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.MemColumn; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.*; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.utils.TagKVUtils; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.NoexceptAutoCloseable; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.SingleCache; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowFields; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/Table.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/Table.java similarity index 79% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/Table.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/Table.java index fc1ded1f10..1857a06083 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/Table.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/Table.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.TableMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.LazyRowScanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.TableMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.LazyRowScanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import com.google.common.collect.RangeSet; import java.io.IOException; import java.util.Set; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/TableIndex.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/TableIndex.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/TableIndex.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/TableIndex.java index 324a149cc5..06a2851984 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/TableIndex.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/TableIndex.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.TableMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.NotIntegrityException; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageRuntimeException; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.TypeConflictedException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.TableMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.NotIntegrityException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageRuntimeException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.TypeConflictedException; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.Range; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/TableStorage.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/TableStorage.java similarity index 89% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/TableStorage.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/TableStorage.java index 4832462796..46397440c5 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/lsm/table/TableStorage.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/lsm/table/TableStorage.java @@ -16,21 +16,21 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.ReadWriter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.TableMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.DataBuffer; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.ConcatScanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.EmtpyHeadRowScanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.RowUnionScanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Shared; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowFields; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.TypeConflictedException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.ReadWriter; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.TableMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.DataBuffer; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.ConcatScanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.EmtpyHeadRowScanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.RowUnionScanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Shared; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowFields; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.TypeConflictedException; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.collect.*; import java.io.IOException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/AreaSet.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/AreaSet.java similarity index 98% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/AreaSet.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/AreaSet.java index 9837a68bdf..f577e2bd22 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/AreaSet.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/AreaSet.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/SequenceGenerator.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/SequenceGenerator.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/SequenceGenerator.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/SequenceGenerator.java index e74294e2e9..b254f14662 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/SequenceGenerator.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/SequenceGenerator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util; import java.util.concurrent.atomic.AtomicLong; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/WriteBatches.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/WriteBatches.java similarity index 88% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/WriteBatches.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/WriteBatches.java index 52745ca155..a8870f7e15 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/WriteBatches.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/WriteBatches.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util; import cn.edu.tsinghua.iginx.engine.physical.storage.domain.ColumnKey; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.utils.TagKVUtils; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowFields; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowTypes; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowVectors; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.Chunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.utils.TagKVUtils; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowFields; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowTypes; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowVectors; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import cn.edu.tsinghua.iginx.thrift.DataType; import java.util.HashMap; import java.util.Map; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/AreaFilterScanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/AreaFilterScanner.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/AreaFilterScanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/AreaFilterScanner.java index d0f56d279d..e5669d7613 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/AreaFilterScanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/AreaFilterScanner.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import com.google.common.collect.RangeSet; public class AreaFilterScanner, F, V> implements Scanner> { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/BatchPlaneScanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/BatchPlaneScanner.java similarity index 94% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/BatchPlaneScanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/BatchPlaneScanner.java index 4f8ad828a1..850f7b6cdb 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/BatchPlaneScanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/BatchPlaneScanner.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import java.util.NoSuchElementException; public class BatchPlaneScanner implements Scanner>> { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/ColumnUnionRowScanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/ColumnUnionRowScanner.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/ColumnUnionRowScanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/ColumnUnionRowScanner.java index 15499561f3..336d53bde5 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/ColumnUnionRowScanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/ColumnUnionRowScanner.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import java.util.Comparator; import java.util.Map; import java.util.NoSuchElementException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/ConcatScanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/ConcatScanner.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/ConcatScanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/ConcatScanner.java index c6207fb4f8..69d631e345 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/ConcatScanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/ConcatScanner.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/DelegateScanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/DelegateScanner.java similarity index 87% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/DelegateScanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/DelegateScanner.java index 0c395e1524..38691a9629 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/DelegateScanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/DelegateScanner.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; public class DelegateScanner implements Scanner { private final Scanner scanner; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/EmptyScanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/EmptyScanner.java similarity index 88% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/EmptyScanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/EmptyScanner.java index cf3b6d6bb8..a04dac4380 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/EmptyScanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/EmptyScanner.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import java.util.NoSuchElementException; public class EmptyScanner implements Scanner { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/EmtpyHeadRowScanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/EmtpyHeadRowScanner.java similarity index 88% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/EmtpyHeadRowScanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/EmtpyHeadRowScanner.java index 36ac346054..f31dc39764 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/EmtpyHeadRowScanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/EmtpyHeadRowScanner.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; public class EmtpyHeadRowScanner, F, V> implements Scanner> { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/IteratorScanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/IteratorScanner.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/IteratorScanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/IteratorScanner.java index 369329ccf8..37ef782da4 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/IteratorScanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/IteratorScanner.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; import java.util.Iterator; import java.util.Map; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/LazyRowScanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/LazyRowScanner.java similarity index 89% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/LazyRowScanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/LazyRowScanner.java index 6553f10f03..a244460214 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/LazyRowScanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/LazyRowScanner.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; public class LazyRowScanner, F, V> implements Scanner> { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/ListenCloseScanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/ListenCloseScanner.java similarity index 86% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/ListenCloseScanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/ListenCloseScanner.java index b7f88b2111..f2a6dcf949 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/ListenCloseScanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/ListenCloseScanner.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; public class ListenCloseScanner extends DelegateScanner { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/RowConcatScanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/RowConcatScanner.java similarity index 90% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/RowConcatScanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/RowConcatScanner.java index cb26fcc8f2..eedd4f6223 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/RowConcatScanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/RowConcatScanner.java @@ -15,6 +15,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; public class RowConcatScanner {} diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/RowScannerFactory.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/RowScannerFactory.java similarity index 83% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/RowScannerFactory.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/RowScannerFactory.java index 119914f6c6..c6fb3092eb 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/RowScannerFactory.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/RowScannerFactory.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; public interface RowScannerFactory, F, V> { Scanner> create() throws StorageException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/RowUnionScanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/RowUnionScanner.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/RowUnionScanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/RowUnionScanner.java index b45171749e..18537ee5e6 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/RowUnionScanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/RowUnionScanner.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import java.util.*; public class RowUnionScanner, F, V> implements Scanner> { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/Scanner.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/Scanner.java similarity index 84% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/Scanner.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/Scanner.java index ca24f81df4..73c53ccb1f 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/Scanner.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/Scanner.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; public interface Scanner extends AutoCloseable { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/SizeUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/SizeUtils.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/SizeUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/SizeUtils.java index b548a3d5f3..6a10898eb3 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/util/iterator/SizeUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/util/iterator/SizeUtils.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator; import java.util.HashMap; import java.util.Map; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/Manager.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/Manager.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/Manager.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/Manager.java index c4ff32c44b..e67fb1b11e 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/Manager.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/Manager.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.physical.storage.domain.Column; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/AggregatedRowStream.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/AggregatedRowStream.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/AggregatedRowStream.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/AggregatedRowStream.java index b224f023bb..3dff897ece 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/AggregatedRowStream.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/AggregatedRowStream.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/DataManager.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/DataManager.java similarity index 86% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/DataManager.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/DataManager.java index 75e3f757d7..8233a11066 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/DataManager.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/DataManager.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.physical.storage.domain.Column; @@ -27,17 +27,17 @@ import cn.edu.tsinghua.iginx.engine.shared.function.FunctionCall; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; import cn.edu.tsinghua.iginx.engine.shared.operator.tag.TagFilter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.Database; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.OneTierDB; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.ReadWriter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.Manager; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.utils.TagKVUtils; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Constants; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Shared; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow.ArrowFields; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.Database; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.OneTierDB; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.ReadWriter; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.Manager; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.utils.TagKVUtils; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Constants; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Shared; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow.ArrowFields; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.collect.RangeSet; import java.io.IOException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/DataViewWrapper.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/DataViewWrapper.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/DataViewWrapper.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/DataViewWrapper.java index 9613e5768c..571127745f 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/DataViewWrapper.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/DataViewWrapper.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; import cn.edu.tsinghua.iginx.engine.physical.storage.domain.ColumnKey; import cn.edu.tsinghua.iginx.engine.shared.data.write.BitmapView; import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.utils.TagKVUtils; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.utils.TagKVUtils; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; import cn.edu.tsinghua.iginx.thrift.DataType; import java.util.*; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/FilterRangeUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/FilterRangeUtils.java similarity index 98% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/FilterRangeUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/FilterRangeUtils.java index 94424fd0a6..78ad3c7070 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/FilterRangeUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/FilterRangeUtils.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.*; import com.google.common.collect.*; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/LongFormat.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/LongFormat.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/LongFormat.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/LongFormat.java index cfc80243bf..4ad5dcab6f 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/LongFormat.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/LongFormat.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; public class LongFormat implements ObjectFormat { @Override diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/ObjectFormat.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/ObjectFormat.java similarity index 91% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/ObjectFormat.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/ObjectFormat.java index c3f4c1ca07..b5a8c6775f 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/ObjectFormat.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/ObjectFormat.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; public interface ObjectFormat { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/ParquetReadWriter.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/ParquetReadWriter.java similarity index 90% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/ParquetReadWriter.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/ParquetReadWriter.java index 21566e62e3..bf7f0325d5 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/ParquetReadWriter.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/ParquetReadWriter.java @@ -16,26 +16,26 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.AndFilter; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.format.parquet.IParquetReader; -import cn.edu.tsinghua.iginx.filestore.format.parquet.IParquetWriter; -import cn.edu.tsinghua.iginx.filestore.format.parquet.IRecord; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.ReadWriter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.api.TableMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.table.DeletedTableMeta; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.AreaFilterScanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.IteratorScanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.dummy.Storer; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.CachePool; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Constants; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Shared; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageException; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageRuntimeException; +import cn.edu.tsinghua.iginx.filesystem.format.parquet.IParquetReader; +import cn.edu.tsinghua.iginx.filesystem.format.parquet.IParquetWriter; +import cn.edu.tsinghua.iginx.filesystem.format.parquet.IRecord; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.ReadWriter; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.api.TableMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.table.DeletedTableMeta; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.AreaFilterScanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.IteratorScanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.dummy.Storer; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.CachePool; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Constants; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Shared; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageRuntimeException; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/ProjectUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/ProjectUtils.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/ProjectUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/ProjectUtils.java index 9926fc121a..2c611116bb 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/ProjectUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/ProjectUtils.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; import cn.edu.tsinghua.iginx.engine.physical.storage.utils.TagKVUtils; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.*; import cn.edu.tsinghua.iginx.engine.shared.operator.tag.TagFilter; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.UnsupportedFilterException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.UnsupportedFilterException; import cn.edu.tsinghua.iginx.thrift.DataType; import cn.edu.tsinghua.iginx.utils.StringUtils; import java.util.*; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/ScannerRowStream.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/ScannerRowStream.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/ScannerRowStream.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/ScannerRowStream.java index 68fdbfe8a1..ce43a2c23b 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/ScannerRowStream.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/ScannerRowStream.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.physical.exception.RowFetchException; @@ -24,7 +24,7 @@ import cn.edu.tsinghua.iginx.engine.shared.data.read.Header; import cn.edu.tsinghua.iginx.engine.shared.data.read.Row; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.iterator.Scanner; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.iterator.Scanner; import cn.edu.tsinghua.iginx.thrift.DataType; import java.util.ArrayList; import java.util.HashMap; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/SerializeUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/SerializeUtils.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/SerializeUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/SerializeUtils.java index 36f3adde74..512c563c99 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/SerializeUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/SerializeUtils.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Constants; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Constants; import com.google.common.collect.*; import java.io.StringReader; import java.util.Collections; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/SizeUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/SizeUtils.java similarity index 90% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/SizeUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/SizeUtils.java index c4c5a83356..ed7b96b4a7 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/SizeUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/SizeUtils.java @@ -16,6 +16,6 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; public class SizeUtils {} diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/StringFormat.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/StringFormat.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/StringFormat.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/StringFormat.java index 099b50cf40..1a62d1c058 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/StringFormat.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/StringFormat.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; public class StringFormat implements ObjectFormat { @Override diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/TombstoneStorage.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/TombstoneStorage.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/TombstoneStorage.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/TombstoneStorage.java index 422d215f30..065dd4fbd2 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/TombstoneStorage.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/TombstoneStorage.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.CachePool; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Constants; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Shared; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception.StorageRuntimeException; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.CachePool; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Constants; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Shared; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception.StorageRuntimeException; import java.io.*; import java.nio.file.*; import java.util.Set; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Column.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Column.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Column.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Column.java index c8ba8faa07..9baf3c4d28 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Column.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Column.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.dummy; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.dummy; import cn.edu.tsinghua.iginx.thrift.DataType; import java.util.HashMap; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Field.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Field.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Field.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Field.java index 53717c3b05..9488ed634d 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Field.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Field.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.dummy; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.dummy; import cn.edu.tsinghua.iginx.thrift.DataType; import java.util.Objects; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Loader.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Loader.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Loader.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Loader.java index 80a48f80b9..2c3365ec34 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Loader.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Loader.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.dummy; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.dummy; -import cn.edu.tsinghua.iginx.filestore.format.parquet.IParquetReader; -import cn.edu.tsinghua.iginx.filestore.format.parquet.IRecord; +import cn.edu.tsinghua.iginx.filesystem.format.parquet.IParquetReader; +import cn.edu.tsinghua.iginx.filesystem.format.parquet.IRecord; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.collect.Range; import java.io.IOException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/NewQueryRowStream.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/NewQueryRowStream.java similarity index 94% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/NewQueryRowStream.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/NewQueryRowStream.java index 99a8fcec3c..1f52254369 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/NewQueryRowStream.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/NewQueryRowStream.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.dummy; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.dummy; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.physical.storage.domain.ColumnKey; @@ -47,7 +47,7 @@ public NewQueryRowStream(List columns) { List fields = new ArrayList<>(); for (Column column : columns) { ColumnKey key = - cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.utils.TagKVUtils + cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.utils.TagKVUtils .splitFullName(column.getPathName()); Field field; field = new Field(key.getPath(), column.getType(), key.getTags()); diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Storer.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Storer.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Storer.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Storer.java index a077ef8e1f..6605f70843 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Storer.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Storer.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.dummy; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.dummy; -import cn.edu.tsinghua.iginx.filestore.format.parquet.IParquetWriter; -import cn.edu.tsinghua.iginx.filestore.format.parquet.IRecord; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Constants; +import cn.edu.tsinghua.iginx.filesystem.format.parquet.IParquetWriter; +import cn.edu.tsinghua.iginx.filesystem.format.parquet.IRecord; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Constants; import cn.edu.tsinghua.iginx.thrift.DataType; import java.io.IOException; import java.nio.file.Path; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Table.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Table.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Table.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Table.java index 5b0053832b..edb6ef67d6 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/dummy/Table.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/dummy/Table.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.dummy; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.dummy; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Constants; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Constants; import cn.edu.tsinghua.iginx.thrift.DataType; import java.io.IOException; import java.util.*; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/utils/RangeUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/utils/RangeUtils.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/utils/RangeUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/utils/RangeUtils.java index 76406260d6..27a7e53e9c 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/utils/RangeUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/utils/RangeUtils.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.utils; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.utils; import cn.edu.tsinghua.iginx.metadata.entity.KeyInterval; import com.google.common.collect.BoundType; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/utils/TagKVUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/utils/TagKVUtils.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/utils/TagKVUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/utils/TagKVUtils.java index f4de8a30c4..63597396a8 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/utils/TagKVUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/utils/TagKVUtils.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.utils; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.utils; import cn.edu.tsinghua.iginx.engine.physical.storage.domain.ColumnKey; import cn.edu.tsinghua.iginx.engine.physical.storage.utils.ColumnKeyTranslator; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/Awaitable.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/Awaitable.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/Awaitable.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/Awaitable.java index 60629fffb7..95a8964048 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/Awaitable.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/Awaitable.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util; public interface Awaitable { void await() throws InterruptedException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/CachePool.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/CachePool.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/CachePool.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/CachePool.java index 21611fab0a..f11224736a 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/CachePool.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/CachePool.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/CloseableHolders.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/CloseableHolders.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/CloseableHolders.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/CloseableHolders.java index f42006feb8..cc8066db10 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/CloseableHolders.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/CloseableHolders.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util; import java.util.NoSuchElementException; import org.apache.arrow.util.Preconditions; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/Constants.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/Constants.java similarity index 96% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/Constants.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/Constants.java index db5d6cb6d4..1992746877 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/Constants.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/Constants.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util; public final class Constants { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/NoexceptAutoCloseable.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/NoexceptAutoCloseable.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/NoexceptAutoCloseable.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/NoexceptAutoCloseable.java index 35f8133422..2a2e9a31d4 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/NoexceptAutoCloseable.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/NoexceptAutoCloseable.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util; public interface NoexceptAutoCloseable extends AutoCloseable { @Override diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/NoexceptAutoCloseables.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/NoexceptAutoCloseables.java similarity index 94% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/NoexceptAutoCloseables.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/NoexceptAutoCloseables.java index 732c3acd90..8b782e6e65 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/NoexceptAutoCloseables.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/NoexceptAutoCloseables.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util; import org.apache.arrow.util.AutoCloseables; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/ParseUtils.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/ParseUtils.java similarity index 98% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/ParseUtils.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/ParseUtils.java index 2b541ee3f7..0950f577aa 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/ParseUtils.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/ParseUtils.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util; import java.time.Duration; import java.util.Map; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/Shared.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/Shared.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/Shared.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/Shared.java index 5c4af3b774..dee7b33bfa 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/Shared.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/Shared.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util; import java.io.Closeable; import java.io.IOException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/SingleCache.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/SingleCache.java similarity index 94% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/SingleCache.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/SingleCache.java index cc5602aff9..ddcb181fad 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/SingleCache.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/SingleCache.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/StorageProperties.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/StorageProperties.java similarity index 98% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/StorageProperties.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/StorageProperties.java index a6fe1b2664..a72eca8bac 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/StorageProperties.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/StorageProperties.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.IndexedChunk; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.chunk.IndexedChunkType; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.lsm.buffer.conflict.ConflictResolverType; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.IndexedChunk; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.chunk.IndexedChunkType; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.lsm.buffer.conflict.ConflictResolverType; import java.time.Duration; import java.util.Map; import java.util.Optional; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/arrow/ArrowFieldTypes.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/arrow/ArrowFieldTypes.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/arrow/ArrowFieldTypes.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/arrow/ArrowFieldTypes.java index 9c35c07c09..854a2e5467 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/arrow/ArrowFieldTypes.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/arrow/ArrowFieldTypes.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow; import cn.edu.tsinghua.iginx.thrift.DataType; import java.util.Map; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/arrow/ArrowFields.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/arrow/ArrowFields.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/arrow/ArrowFields.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/arrow/ArrowFields.java index 869bdd3618..140f7445ce 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/arrow/ArrowFields.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/arrow/ArrowFields.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow; import cn.edu.tsinghua.iginx.engine.physical.storage.domain.ColumnKey; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.utils.TagKVUtils; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Constants; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.utils.TagKVUtils; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Constants; import cn.edu.tsinghua.iginx.thrift.DataType; import java.util.Collections; import java.util.List; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/arrow/ArrowTypes.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/arrow/ArrowTypes.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/arrow/ArrowTypes.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/arrow/ArrowTypes.java index 8e8e4010fd..2df18b1013 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/arrow/ArrowTypes.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/arrow/ArrowTypes.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow; import cn.edu.tsinghua.iginx.thrift.DataType; import java.util.Objects; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/arrow/ArrowVectors.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/arrow/ArrowVectors.java similarity index 99% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/arrow/ArrowVectors.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/arrow/ArrowVectors.java index ac3724e3f5..4d5eb18431 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/arrow/ArrowVectors.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/arrow/ArrowVectors.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.arrow; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.arrow; import cn.edu.tsinghua.iginx.engine.physical.storage.domain.ColumnKey; import cn.edu.tsinghua.iginx.thrift.DataType; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/InvalidFieldNameException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/InvalidFieldNameException.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/InvalidFieldNameException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/InvalidFieldNameException.java index 0d70624eb7..c721e6800d 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/InvalidFieldNameException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/InvalidFieldNameException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception; public class InvalidFieldNameException extends SchemaException { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/IsClosedException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/IsClosedException.java similarity index 91% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/IsClosedException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/IsClosedException.java index 34ef692f83..895c1af3d5 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/IsClosedException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/IsClosedException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception; public class IsClosedException extends RuntimeException { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/NotIntegrityException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/NotIntegrityException.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/NotIntegrityException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/NotIntegrityException.java index e9f59c82dc..f260cc6a79 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/NotIntegrityException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/NotIntegrityException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception; public class NotIntegrityException extends StorageRuntimeException { public NotIntegrityException(String message) { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/SchemaException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/SchemaException.java similarity index 91% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/SchemaException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/SchemaException.java index 6122f9e7e8..7d923e2471 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/SchemaException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/SchemaException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception; public class SchemaException extends StorageException { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/StorageClosedException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/StorageClosedException.java similarity index 91% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/StorageClosedException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/StorageClosedException.java index 8500b9e8ab..1aefdcb62b 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/StorageClosedException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/StorageClosedException.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception; public class StorageClosedException extends StorageException { public StorageClosedException(String message) { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/StorageException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/StorageException.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/StorageException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/StorageException.java index d5b56cdd28..1ea29b730b 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/StorageException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/StorageException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/StorageRuntimeException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/StorageRuntimeException.java similarity index 93% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/StorageRuntimeException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/StorageRuntimeException.java index 8497001864..f11edcfd31 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/StorageRuntimeException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/StorageRuntimeException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalRuntimeException; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/TimeoutException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/TimeoutException.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/TimeoutException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/TimeoutException.java index cfa391f144..37c94c4f9f 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/TimeoutException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/TimeoutException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception; public class TimeoutException extends StorageException { public TimeoutException(String message) { diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/TypeConflictedException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/TypeConflictedException.java similarity index 94% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/TypeConflictedException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/TypeConflictedException.java index 3c3f8e4760..c5ce786081 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/TypeConflictedException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/TypeConflictedException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception; public class TypeConflictedException extends SchemaException { private final String field; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/UnsupportedFilterException.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/UnsupportedFilterException.java similarity index 94% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/UnsupportedFilterException.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/UnsupportedFilterException.java index 8b04b16e6e..6b378a8703 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/exception/UnsupportedFilterException.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/exception/UnsupportedFilterException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.exception; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.exception; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/iterator/DedupIterator.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/iterator/DedupIterator.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/iterator/DedupIterator.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/iterator/DedupIterator.java index 4b6e649999..3422534e8b 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/iterator/DedupIterator.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/iterator/DedupIterator.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.iterator; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/iterator/StableMergeIterator.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/iterator/StableMergeIterator.java similarity index 97% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/iterator/StableMergeIterator.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/iterator/StableMergeIterator.java index 0fb33dbda2..0ebf0cdc6a 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/util/iterator/StableMergeIterator.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/util/iterator/StableMergeIterator.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.iterator; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.iterator; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/FileTree.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/FileTree.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/FileTree.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/FileTree.java index 9e4a84b002..8dbc2bad30 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/FileTree.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/FileTree.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree; +package cn.edu.tsinghua.iginx.filesystem.struct.tree; -import cn.edu.tsinghua.iginx.filestore.struct.FileManager; -import cn.edu.tsinghua.iginx.filestore.struct.FileStructure; +import cn.edu.tsinghua.iginx.filesystem.struct.FileManager; +import cn.edu.tsinghua.iginx.filesystem.struct.FileStructure; import com.google.auto.service.AutoService; import com.typesafe.config.Config; import java.io.Closeable; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/FileTreeConfig.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/FileTreeConfig.java similarity index 95% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/FileTreeConfig.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/FileTreeConfig.java index dfd415457c..f28bc92ad6 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/FileTreeConfig.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/FileTreeConfig.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree; +package cn.edu.tsinghua.iginx.filesystem.struct.tree; -import cn.edu.tsinghua.iginx.filestore.common.AbstractConfig; +import cn.edu.tsinghua.iginx.filesystem.common.AbstractConfig; import com.typesafe.config.*; import com.typesafe.config.Optional; import java.util.*; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/FileTreeManager.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/FileTreeManager.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/FileTreeManager.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/FileTreeManager.java index 4b896518ab..5be9dc9845 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/FileTreeManager.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/FileTreeManager.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree; +package cn.edu.tsinghua.iginx.filesystem.struct.tree; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; -import cn.edu.tsinghua.iginx.filestore.common.IginxPaths; -import cn.edu.tsinghua.iginx.filestore.common.RowStreams; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.FileManager; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Querier; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.ftj.UnionFormatTree; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.common.IginxPaths; +import cn.edu.tsinghua.iginx.filesystem.common.RowStreams; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.FileManager; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Querier; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.ftj.UnionFormatTree; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; import cn.edu.tsinghua.iginx.metadata.entity.KeyInterval; import cn.edu.tsinghua.iginx.thrift.AggregateType; import cn.edu.tsinghua.iginx.utils.StringUtils; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/AbstractQuerier.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/AbstractQuerier.java similarity index 91% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/AbstractQuerier.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/AbstractQuerier.java index 4c5beb3979..89abcfd4b6 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/AbstractQuerier.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/AbstractQuerier.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree.query; +package cn.edu.tsinghua.iginx.filesystem.struct.tree.query; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; import java.nio.file.Path; import lombok.Getter; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/Querier.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/Querier.java similarity index 87% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/Querier.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/Querier.java index 52f130e8c7..56b2199f5e 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/Querier.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/Querier.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree.query; +package cn.edu.tsinghua.iginx.filesystem.struct.tree.query; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTreeConfig; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.FileTreeConfig; import java.io.Closeable; import java.io.IOException; import java.nio.file.Path; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/Queriers.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/Queriers.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/Queriers.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/Queriers.java index 3e5be1d46a..756328ea39 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/Queriers.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/Queriers.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree.query; +package cn.edu.tsinghua.iginx.filesystem.struct.tree.query; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.common.Closeables; -import cn.edu.tsinghua.iginx.filestore.common.Filters; -import cn.edu.tsinghua.iginx.filestore.common.RowStreams; -import cn.edu.tsinghua.iginx.filestore.common.Strings; +import cn.edu.tsinghua.iginx.filesystem.common.Closeables; +import cn.edu.tsinghua.iginx.filesystem.common.Filters; +import cn.edu.tsinghua.iginx.filesystem.common.RowStreams; +import cn.edu.tsinghua.iginx.filesystem.common.Strings; import com.google.common.collect.Iterables; import java.io.IOException; import java.util.Collections; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/FormatQuerier.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/FormatQuerier.java similarity index 86% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/FormatQuerier.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/FormatQuerier.java index fd01fb6b80..64729c4dfc 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/FormatQuerier.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/FormatQuerier.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree.query.ftj; +package cn.edu.tsinghua.iginx.filesystem.struct.tree.query.ftj; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; import cn.edu.tsinghua.iginx.engine.shared.data.read.Header; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.BoolFilter; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.common.Filters; -import cn.edu.tsinghua.iginx.filestore.common.Patterns; -import cn.edu.tsinghua.iginx.filestore.common.RowStreams; -import cn.edu.tsinghua.iginx.filestore.common.Strings; -import cn.edu.tsinghua.iginx.filestore.format.FileFormat; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.AbstractQuerier; +import cn.edu.tsinghua.iginx.filesystem.common.Filters; +import cn.edu.tsinghua.iginx.filesystem.common.Patterns; +import cn.edu.tsinghua.iginx.filesystem.common.RowStreams; +import cn.edu.tsinghua.iginx.filesystem.common.Strings; +import cn.edu.tsinghua.iginx.filesystem.format.FileFormat; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.AbstractQuerier; import cn.edu.tsinghua.iginx.thrift.DataType; import java.io.IOException; import java.nio.file.Path; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/FormatQuerierBuilder.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/FormatQuerierBuilder.java similarity index 82% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/FormatQuerierBuilder.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/FormatQuerierBuilder.java index 9613752701..029288a880 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/FormatQuerierBuilder.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/FormatQuerierBuilder.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree.query.ftj; +package cn.edu.tsinghua.iginx.filesystem.struct.tree.query.ftj; -import cn.edu.tsinghua.iginx.filestore.format.FileFormat; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Querier; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Querier.Builder; +import cn.edu.tsinghua.iginx.filesystem.format.FileFormat; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Querier; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Querier.Builder; import com.typesafe.config.Config; import java.io.IOException; import java.nio.file.Path; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/FormatQuerierBuilderFactory.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/FormatQuerierBuilderFactory.java similarity index 80% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/FormatQuerierBuilderFactory.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/FormatQuerierBuilderFactory.java index a43c31ccf8..40002e19da 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/FormatQuerierBuilderFactory.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/FormatQuerierBuilderFactory.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree.query.ftj; +package cn.edu.tsinghua.iginx.filesystem.struct.tree.query.ftj; -import cn.edu.tsinghua.iginx.filestore.format.FileFormat; -import cn.edu.tsinghua.iginx.filestore.format.FileFormatManager; -import cn.edu.tsinghua.iginx.filestore.format.raw.RawFormat; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTreeConfig; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Querier.Builder; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Querier.Builder.Factory; +import cn.edu.tsinghua.iginx.filesystem.format.FileFormat; +import cn.edu.tsinghua.iginx.filesystem.format.FileFormatManager; +import cn.edu.tsinghua.iginx.filesystem.format.raw.RawFormat; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.FileTreeConfig; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Querier.Builder; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Querier.Builder.Factory; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import java.nio.file.Path; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/UnionDirectoryQuerier.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/UnionDirectoryQuerier.java similarity index 82% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/UnionDirectoryQuerier.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/UnionDirectoryQuerier.java index 6af7e0d884..ffd8a3792e 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/UnionDirectoryQuerier.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/UnionDirectoryQuerier.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree.query.ftj; +package cn.edu.tsinghua.iginx.filesystem.struct.tree.query.ftj; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; -import cn.edu.tsinghua.iginx.filestore.common.Closeables; -import cn.edu.tsinghua.iginx.filestore.common.Strings; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.AbstractQuerier; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Querier; +import cn.edu.tsinghua.iginx.filesystem.common.Closeables; +import cn.edu.tsinghua.iginx.filesystem.common.Strings; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.AbstractQuerier; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Querier; import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/UnionDirectoryQuerierBuilder.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/UnionDirectoryQuerierBuilder.java similarity index 88% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/UnionDirectoryQuerierBuilder.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/UnionDirectoryQuerierBuilder.java index 4820e96d4c..b37aa5d715 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/UnionDirectoryQuerierBuilder.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/UnionDirectoryQuerierBuilder.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree.query.ftj; +package cn.edu.tsinghua.iginx.filesystem.struct.tree.query.ftj; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.common.Closeables; -import cn.edu.tsinghua.iginx.filestore.common.Filters; -import cn.edu.tsinghua.iginx.filestore.common.IginxPaths; -import cn.edu.tsinghua.iginx.filestore.common.Patterns; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTreeConfig; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Querier; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Querier.Builder; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Queriers; +import cn.edu.tsinghua.iginx.filesystem.common.Closeables; +import cn.edu.tsinghua.iginx.filesystem.common.Filters; +import cn.edu.tsinghua.iginx.filesystem.common.IginxPaths; +import cn.edu.tsinghua.iginx.filesystem.common.Patterns; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.FileTreeConfig; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Querier; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Querier.Builder; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Queriers; import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.Files; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/UnionDirectoryQuerierBuilderFactory.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/UnionDirectoryQuerierBuilderFactory.java similarity index 84% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/UnionDirectoryQuerierBuilderFactory.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/UnionDirectoryQuerierBuilderFactory.java index 98ec03c88d..e44c260184 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/UnionDirectoryQuerierBuilderFactory.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/UnionDirectoryQuerierBuilderFactory.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree.query.ftj; +package cn.edu.tsinghua.iginx.filesystem.struct.tree.query.ftj; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTreeConfig; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Querier.Builder; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Querier.Builder.Factory; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.FileTreeConfig; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Querier.Builder; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Querier.Builder.Factory; import java.nio.file.Path; import java.util.Objects; import javax.annotation.Nullable; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/UnionFormatTree.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/UnionFormatTree.java similarity index 84% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/UnionFormatTree.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/UnionFormatTree.java index 5f76bf38c1..a05d44b85a 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/tree/query/ftj/UnionFormatTree.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/query/ftj/UnionFormatTree.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree.query.ftj; +package cn.edu.tsinghua.iginx.filesystem.struct.tree.query.ftj; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTreeConfig; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Querier.Builder; -import cn.edu.tsinghua.iginx.filestore.struct.tree.query.Querier.Builder.Factory; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.FileTreeConfig; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Querier.Builder; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.query.Querier.Builder.Factory; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/units/UnitsMerger.java b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/units/UnitsMerger.java similarity index 92% rename from dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/units/UnitsMerger.java rename to dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/units/UnitsMerger.java index f832ceb239..cfe6a06d63 100644 --- a/dataSource/filestore/src/main/java/cn/edu/tsinghua/iginx/filestore/struct/units/UnitsMerger.java +++ b/dataSource/filesystem/src/main/java/cn/edu/tsinghua/iginx/filesystem/struct/units/UnitsMerger.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.units; +package cn.edu.tsinghua.iginx.filesystem.struct.units; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.shared.data.read.MergeFieldRowStreamWrapper; import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.FileManager; -import cn.edu.tsinghua.iginx.filestore.struct.exception.NoSuchUnitException; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; -import cn.edu.tsinghua.iginx.filestore.thrift.DataUnit; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.FileManager; +import cn.edu.tsinghua.iginx.filesystem.struct.exception.NoSuchUnitException; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataUnit; import cn.edu.tsinghua.iginx.thrift.AggregateType; import java.io.IOException; import java.util.ArrayList; diff --git a/dataSource/filestore/src/main/thrift/core.thrift b/dataSource/filesystem/src/main/thrift/core.thrift similarity index 100% rename from dataSource/filestore/src/main/thrift/core.thrift rename to dataSource/filesystem/src/main/thrift/core.thrift diff --git a/dataSource/filestore/src/main/thrift/filestore.thrift b/dataSource/filesystem/src/main/thrift/filesystem.thrift similarity index 95% rename from dataSource/filestore/src/main/thrift/filestore.thrift rename to dataSource/filesystem/src/main/thrift/filesystem.thrift index 8ea5201d9f..b84a09457e 100644 --- a/dataSource/filestore/src/main/thrift/filestore.thrift +++ b/dataSource/filesystem/src/main/thrift/filesystem.thrift @@ -18,11 +18,11 @@ include "rpc.thrift" include "core.thrift" -namespace java cn.edu.tsinghua.iginx.filestore.thrift +namespace java cn.edu.tsinghua.iginx.filesystem.thrift enum Status { OK, - FileStoreException, + FileSystemException, UnknownException, } @@ -72,7 +72,7 @@ struct RawInserted { 7: required string rawDataType } -service FileStoreRpc { +service FileSystemRpc { map getUnits (1: RawPrefix prefix) throws (1: RpcException e); RawDataSet query(1: DataUnit unit, 2: RawDataTarget target, 3: RawAggregate aggregate) throws (1: RpcException e); diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/common/FiltersTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/common/FiltersTest.java similarity index 97% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/common/FiltersTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/common/FiltersTest.java index 434ca38096..e019691285 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/common/FiltersTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/common/FiltersTest.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.common; +package cn.edu.tsinghua.iginx.filesystem.common; import cn.edu.tsinghua.iginx.engine.shared.data.Value; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.*; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ParquetTestUtils.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ParquetTestUtils.java similarity index 93% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ParquetTestUtils.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ParquetTestUtils.java index a7bfd6f848..a9e7eed023 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/format/parquet/ParquetTestUtils.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/format/parquet/ParquetTestUtils.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.format.parquet; +package cn.edu.tsinghua.iginx.filesystem.format.parquet; import cn.edu.tsinghua.iginx.engine.physical.memory.execute.Table; import cn.edu.tsinghua.iginx.engine.shared.data.read.Row; -import cn.edu.tsinghua.iginx.filestore.test.DataValidator; +import cn.edu.tsinghua.iginx.filesystem.test.DataValidator; import com.google.common.io.MoreFiles; import java.io.IOException; import java.nio.file.Path; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/server/ServerTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/server/ServerTest.java similarity index 93% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/server/ServerTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/server/ServerTest.java index 956de73641..2eacfc9073 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/server/ServerTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/server/ServerTest.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.server; +package cn.edu.tsinghua.iginx.filesystem.server; -import cn.edu.tsinghua.iginx.filestore.service.rpc.server.Server; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.server.Server; import java.net.InetSocketAddress; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/AbstractServiceTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/AbstractServiceTest.java similarity index 91% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/AbstractServiceTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/AbstractServiceTest.java index 6ffb2ffeda..e4b56f127c 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/AbstractServiceTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/AbstractServiceTest.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service; +package cn.edu.tsinghua.iginx.filesystem.service; import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.test.DataViewGenerator; -import cn.edu.tsinghua.iginx.filestore.thrift.DataUnit; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.test.DataViewGenerator; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataUnit; import cn.edu.tsinghua.iginx.thrift.DataType; import java.util.ArrayList; import java.util.List; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/remote/AbstractRemoteServiceTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/remote/AbstractRemoteServiceTest.java similarity index 80% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/remote/AbstractRemoteServiceTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/remote/AbstractRemoteServiceTest.java index 42435ff03d..1cbbcc6b50 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/remote/AbstractRemoteServiceTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/remote/AbstractRemoteServiceTest.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.remote; +package cn.edu.tsinghua.iginx.filesystem.service.remote; -import cn.edu.tsinghua.iginx.filestore.service.Service; -import cn.edu.tsinghua.iginx.filestore.service.rpc.client.ClientConfig; -import cn.edu.tsinghua.iginx.filestore.service.rpc.client.RemoteService; -import cn.edu.tsinghua.iginx.filestore.service.rpc.server.Server; -import cn.edu.tsinghua.iginx.filestore.service.storage.AbstractStorageServiceTest; +import cn.edu.tsinghua.iginx.filesystem.service.Service; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.client.ClientConfig; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.client.RemoteService; +import cn.edu.tsinghua.iginx.filesystem.service.rpc.server.Server; +import cn.edu.tsinghua.iginx.filesystem.service.storage.AbstractStorageServiceTest; import com.typesafe.config.Config; import java.net.InetSocketAddress; import java.util.Random; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/remote/LegacyParquetRemoteServiceTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/remote/LegacyParquetRemoteServiceTest.java similarity index 87% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/remote/LegacyParquetRemoteServiceTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/remote/LegacyParquetRemoteServiceTest.java index 1f08c94367..c2cc28a480 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/remote/LegacyParquetRemoteServiceTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/remote/LegacyParquetRemoteServiceTest.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.remote; +package cn.edu.tsinghua.iginx.filesystem.service.remote; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.LegacyParquet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.LegacyParquet; import com.typesafe.config.ConfigFactory; public class LegacyParquetRemoteServiceTest extends AbstractRemoteServiceTest { diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/AbstractDummyTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/AbstractDummyTest.java similarity index 88% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/AbstractDummyTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/AbstractDummyTest.java index 647241e593..659117c3b5 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/AbstractDummyTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/AbstractDummyTest.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.storage; +package cn.edu.tsinghua.iginx.filesystem.service.storage; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -25,12 +25,12 @@ import cn.edu.tsinghua.iginx.engine.shared.data.read.RowStream; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.BoolFilter; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Filter; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.service.Service; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.test.DataValidator; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; -import cn.edu.tsinghua.iginx.filestore.thrift.DataUnit; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; +import cn.edu.tsinghua.iginx.filesystem.service.Service; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.test.DataValidator; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataUnit; import cn.edu.tsinghua.iginx.metadata.entity.ColumnsInterval; import com.google.common.io.MoreFiles; import com.google.common.io.RecursiveDeleteOption; @@ -61,7 +61,7 @@ protected AbstractDummyTest(String type, Config config, String rootFileName) { protected Service service; - protected DataBoundary getBoundary(@Nullable String prefix) throws FileStoreException { + protected DataBoundary getBoundary(@Nullable String prefix) throws FileSystemException { Map units = service.getUnits(prefix); LOGGER.info("units: {}", units); assertEquals(units.keySet(), Collections.singleton(unit)); @@ -118,12 +118,12 @@ public void setUp() throws IOException { MoreFiles.createParentDirectories(root); } - protected void reset() throws IOException, FileStoreException { + protected void reset() throws IOException, FileSystemException { service = new StorageService(null, config); } @AfterEach - public void tearDown() throws IOException, FileStoreException { + public void tearDown() throws IOException, FileSystemException { if (service != null) { service.close(); } diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/AbstractHistoryDataTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/AbstractHistoryDataTest.java similarity index 93% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/AbstractHistoryDataTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/AbstractHistoryDataTest.java index fbcb3bcaac..a635de4c2a 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/AbstractHistoryDataTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/AbstractHistoryDataTest.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.storage; +package cn.edu.tsinghua.iginx.filesystem.service.storage; -import static cn.edu.tsinghua.iginx.filestore.common.DataUnits.of; +import static cn.edu.tsinghua.iginx.filesystem.common.DataUnits.of; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; @@ -25,12 +25,12 @@ import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.BoolFilter; import cn.edu.tsinghua.iginx.engine.shared.operator.tag.BaseTagFilter; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.struct.DataTarget; -import cn.edu.tsinghua.iginx.filestore.struct.FileStructureManager; -import cn.edu.tsinghua.iginx.filestore.test.DataViewGenerator; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; -import cn.edu.tsinghua.iginx.filestore.thrift.DataUnit; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; +import cn.edu.tsinghua.iginx.filesystem.struct.DataTarget; +import cn.edu.tsinghua.iginx.filesystem.struct.FileStructureManager; +import cn.edu.tsinghua.iginx.filesystem.test.DataViewGenerator; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataUnit; import cn.edu.tsinghua.iginx.metadata.entity.KeyInterval; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.io.MoreFiles; @@ -74,16 +74,16 @@ public void afterEach() throws IOException { MoreFiles.deleteRecursively(root, RecursiveDeleteOption.ALLOW_INSECURE); } - protected StorageService newHistoryService() throws FileStoreException { + protected StorageService newHistoryService() throws FileSystemException { return new StorageService(historyConfig, null); } - protected StorageService newDummyService() throws FileStoreException { + protected StorageService newDummyService() throws FileSystemException { return new StorageService(null, dummyConfig); } @Test - public void testNoData() throws FileStoreException { + public void testNoData() throws FileSystemException { try (StorageService service = newDummyService()) { Map units = service.getUnits(null); Map expected = diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/AbstractStorageServiceTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/AbstractStorageServiceTest.java similarity index 87% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/AbstractStorageServiceTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/AbstractStorageServiceTest.java index ea0e499f35..70a7a60f6e 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/AbstractStorageServiceTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/AbstractStorageServiceTest.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.storage; +package cn.edu.tsinghua.iginx.filesystem.service.storage; -import cn.edu.tsinghua.iginx.filestore.service.AbstractServiceTest; -import cn.edu.tsinghua.iginx.filestore.service.Service; -import cn.edu.tsinghua.iginx.filestore.thrift.DataUnit; +import cn.edu.tsinghua.iginx.filesystem.service.AbstractServiceTest; +import cn.edu.tsinghua.iginx.filesystem.service.Service; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataUnit; import com.typesafe.config.Config; import java.nio.file.Paths; import java.util.UUID; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/FileTreeDummyTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/FileTreeDummyTest.java similarity index 96% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/FileTreeDummyTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/FileTreeDummyTest.java index 2f04130cd2..19f8b9ba30 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/FileTreeDummyTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/FileTreeDummyTest.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.storage; +package cn.edu.tsinghua.iginx.filesystem.service.storage; import static org.junit.jupiter.api.Assertions.*; @@ -28,13 +28,13 @@ import cn.edu.tsinghua.iginx.engine.shared.operator.filter.KeyFilter; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Op; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.ValueFilter; -import cn.edu.tsinghua.iginx.filestore.common.Configs; -import cn.edu.tsinghua.iginx.filestore.format.raw.RawFormat; -import cn.edu.tsinghua.iginx.filestore.format.raw.RawReaderConfig; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTree; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTreeConfig; -import cn.edu.tsinghua.iginx.filestore.test.RowsBuilder; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.common.Configs; +import cn.edu.tsinghua.iginx.filesystem.format.raw.RawFormat; +import cn.edu.tsinghua.iginx.filesystem.format.raw.RawReaderConfig; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.FileTree; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.FileTreeConfig; +import cn.edu.tsinghua.iginx.filesystem.test.RowsBuilder; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.io.MoreFiles; import com.typesafe.config.Config; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/FileTreeParquetDummyTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/FileTreeParquetDummyTest.java similarity index 93% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/FileTreeParquetDummyTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/FileTreeParquetDummyTest.java index a289ceadd2..91a4d17fef 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/FileTreeParquetDummyTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/FileTreeParquetDummyTest.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.storage; +package cn.edu.tsinghua.iginx.filesystem.service.storage; import static cn.edu.tsinghua.iginx.thrift.DataType.*; import static org.junit.Assert.assertEquals; @@ -30,12 +30,12 @@ import cn.edu.tsinghua.iginx.engine.shared.operator.filter.KeyFilter; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Op; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.ValueFilter; -import cn.edu.tsinghua.iginx.filestore.common.Configs; -import cn.edu.tsinghua.iginx.filestore.format.parquet.ParquetTestUtils; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTree; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTreeConfig; -import cn.edu.tsinghua.iginx.filestore.test.TableBuilder; -import cn.edu.tsinghua.iginx.filestore.thrift.DataBoundary; +import cn.edu.tsinghua.iginx.filesystem.common.Configs; +import cn.edu.tsinghua.iginx.filesystem.format.parquet.ParquetTestUtils; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.FileTree; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.FileTreeConfig; +import cn.edu.tsinghua.iginx.filesystem.test.TableBuilder; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataBoundary; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import java.io.IOException; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/LegacyParquetHistoryDataTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/LegacyParquetHistoryDataTest.java similarity index 88% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/LegacyParquetHistoryDataTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/LegacyParquetHistoryDataTest.java index 850e533b36..9a60d2fa3b 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/LegacyParquetHistoryDataTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/LegacyParquetHistoryDataTest.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.storage; +package cn.edu.tsinghua.iginx.filesystem.service.storage; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.LegacyParquet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.LegacyParquet; import com.typesafe.config.ConfigFactory; public class LegacyParquetHistoryDataTest extends AbstractHistoryDataTest { diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/LegacyParquetStorageServiceTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/LegacyParquetStorageServiceTest.java similarity index 87% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/LegacyParquetStorageServiceTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/LegacyParquetStorageServiceTest.java index e028a7ea9e..d7d0229517 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/service/storage/LegacyParquetStorageServiceTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/service/storage/LegacyParquetStorageServiceTest.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.service.storage; +package cn.edu.tsinghua.iginx.filesystem.service.storage; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.LegacyParquet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.LegacyParquet; import com.typesafe.config.ConfigFactory; public class LegacyParquetStorageServiceTest extends AbstractStorageServiceTest { diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/common/utils/SerializeUtilsTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/common/utils/SerializeUtilsTest.java similarity index 87% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/common/utils/SerializeUtilsTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/common/utils/SerializeUtilsTest.java index d0a318124c..f1669ea7e3 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/db/common/utils/SerializeUtilsTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/db/common/utils/SerializeUtilsTest.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.common.utils; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.common.utils; import static org.junit.Assert.*; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.db.util.AreaSet; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data.LongFormat; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data.SerializeUtils; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data.StringFormat; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.db.util.AreaSet; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data.LongFormat; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data.SerializeUtils; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data.StringFormat; import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/io/ParquetFormatIOTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/io/ParquetFormatIOTest.java similarity index 95% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/io/ParquetFormatIOTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/io/ParquetFormatIOTest.java index 75127d3ee8..aac208a8f5 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/io/ParquetFormatIOTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/io/ParquetFormatIOTest.java @@ -16,20 +16,20 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.io; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.io; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.KeyFilter; import cn.edu.tsinghua.iginx.engine.shared.operator.filter.Op; -import cn.edu.tsinghua.iginx.filestore.format.parquet.IParquetReader; -import cn.edu.tsinghua.iginx.filestore.format.parquet.IParquetWriter; -import cn.edu.tsinghua.iginx.filestore.format.parquet.IRecord; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.dummy.Loader; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.dummy.Storer; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.dummy.Table; -import cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.util.Constants; +import cn.edu.tsinghua.iginx.filesystem.format.parquet.IParquetReader; +import cn.edu.tsinghua.iginx.filesystem.format.parquet.IParquetWriter; +import cn.edu.tsinghua.iginx.filesystem.format.parquet.IRecord; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.dummy.Loader; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.dummy.Storer; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.dummy.Table; +import cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.util.Constants; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.primitives.Bytes; import com.google.common.primitives.Longs; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/FilterRangeUtilsTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/FilterRangeUtilsTest.java similarity index 96% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/FilterRangeUtilsTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/FilterRangeUtilsTest.java index c451abf98d..5b63afa9b0 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/struct/legacy/parquet/manager/data/FilterRangeUtilsTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/struct/legacy/parquet/manager/data/FilterRangeUtilsTest.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.legacy.parquet.manager.data; +package cn.edu.tsinghua.iginx.filesystem.struct.legacy.parquet.manager.data; import static org.junit.Assert.*; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/struct/tree/FileTreeConfigTest.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/FileTreeConfigTest.java similarity index 93% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/struct/tree/FileTreeConfigTest.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/FileTreeConfigTest.java index d5eeb1203b..3a2d283527 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/struct/tree/FileTreeConfigTest.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/struct/tree/FileTreeConfigTest.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.struct.tree; +package cn.edu.tsinghua.iginx.filesystem.struct.tree; import static org.junit.jupiter.api.Assertions.*; -import cn.edu.tsinghua.iginx.filestore.common.AbstractConfig; -import cn.edu.tsinghua.iginx.filestore.format.raw.RawFormat; -import cn.edu.tsinghua.iginx.filestore.format.raw.RawReaderConfig; +import cn.edu.tsinghua.iginx.filesystem.common.AbstractConfig; +import cn.edu.tsinghua.iginx.filesystem.format.raw.RawFormat; +import cn.edu.tsinghua.iginx.filesystem.format.raw.RawReaderConfig; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import java.util.Collections; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/test/DataValidator.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/test/DataValidator.java similarity index 98% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/test/DataValidator.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/test/DataValidator.java index d754912cdd..83c3b7a827 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/test/DataValidator.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/test/DataValidator.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.test; +package cn.edu.tsinghua.iginx.filesystem.test; import cn.edu.tsinghua.iginx.engine.physical.exception.PhysicalException; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/test/DataViewGenerator.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/test/DataViewGenerator.java similarity index 98% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/test/DataViewGenerator.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/test/DataViewGenerator.java index 233c4d4af0..24c338fc1b 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/test/DataViewGenerator.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/test/DataViewGenerator.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.test; +package cn.edu.tsinghua.iginx.filesystem.test; import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; import cn.edu.tsinghua.iginx.engine.shared.data.write.RawData; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/test/RowsBuilder.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/test/RowsBuilder.java similarity index 98% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/test/RowsBuilder.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/test/RowsBuilder.java index c5a86e3db2..472e604d1c 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/test/RowsBuilder.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/test/RowsBuilder.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.test; +package cn.edu.tsinghua.iginx.filesystem.test; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; import cn.edu.tsinghua.iginx.engine.shared.data.read.Header; diff --git a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/test/TableBuilder.java b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/test/TableBuilder.java similarity index 98% rename from dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/test/TableBuilder.java rename to dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/test/TableBuilder.java index 79a087a30a..5723ec7949 100644 --- a/dataSource/filestore/src/test/java/cn/edu/tsinghua/iginx/filestore/test/TableBuilder.java +++ b/dataSource/filesystem/src/test/java/cn/edu/tsinghua/iginx/filesystem/test/TableBuilder.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.filestore.test; +package cn.edu.tsinghua.iginx.filesystem.test; import cn.edu.tsinghua.iginx.engine.physical.memory.execute.Table; import cn.edu.tsinghua.iginx.engine.shared.data.read.Field; diff --git a/dataSource/filestore/src/test/resources/log4j2-test.properties b/dataSource/filesystem/src/test/resources/log4j2-test.properties similarity index 100% rename from dataSource/filestore/src/test/resources/log4j2-test.properties rename to dataSource/filesystem/src/test/resources/log4j2-test.properties diff --git a/dataSource/pom.xml b/dataSource/pom.xml index 7eea78028f..a33542a1c4 100644 --- a/dataSource/pom.xml +++ b/dataSource/pom.xml @@ -32,7 +32,7 @@ IGinX Driver - filestore + filesystem influxdb iotdb12 mongodb diff --git a/docker/oneShot-filestore/Dockerfile b/docker/oneShot-filestore/Dockerfile index e72f9b2748..e077c1f311 100644 --- a/docker/oneShot-filestore/Dockerfile +++ b/docker/oneShot-filestore/Dockerfile @@ -19,7 +19,7 @@ FROM maven:3-amazoncorretto-8 AS builder COPY . /root/IGinX WORKDIR /root/IGinX -RUN --mount=type=cache,target=/root/.m2 mvn clean package -pl core,dataSources/filestore -am -Dmaven.test.skip=true -Drevision=dev +RUN --mount=type=cache,target=/root/.m2 mvn clean package -pl core,dataSources/filesystem -am -Dmaven.test.skip=true -Drevision=dev FROM amazoncorretto:8 COPY --from=builder /root/IGinX/core/target/iginx-core-dev /root/IGinX diff --git a/pom.xml b/pom.xml index 49f7dcfc89..8432c069c6 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ cn.edu.tsinghua - filestore + filesystem ${project.version} diff --git a/session_py/file_example.py b/session_py/file_example.py index 8f0279bbe8..b7d6c9ae07 100644 --- a/session_py/file_example.py +++ b/session_py/file_example.py @@ -285,7 +285,7 @@ def load_largecsv_and_export(session: Session, csv_path, out_file_path="csv_outf def add_storage_engine(session: Session, ip: str = "127.0.0.1", port: int = 6668, - type: int = StorageEngineType.filestore, + type: int = StorageEngineType.filesystem, extra_params=None, dummy_path=None): if extra_params is None: extra_params = { diff --git a/session_py/iginx/iginx_pyclient/thrift/rpc/ttypes.py b/session_py/iginx/iginx_pyclient/thrift/rpc/ttypes.py index 0ada1ae714..90a3639d80 100644 --- a/session_py/iginx/iginx_pyclient/thrift/rpc/ttypes.py +++ b/session_py/iginx/iginx_pyclient/thrift/rpc/ttypes.py @@ -65,7 +65,7 @@ class StorageEngineType(object): unknown = 0 iotdb12 = 1 influxdb = 2 - filestore = 3 + filesystem = 3 relational = 4 mongodb = 5 redis = 6 @@ -74,7 +74,7 @@ class StorageEngineType(object): 0: "unknown", 1: "iotdb12", 2: "influxdb", - 3: "filestore", + 3: "filesystem", 4: "relational", 5: "mongodb", 6: "redis", @@ -84,7 +84,7 @@ class StorageEngineType(object): "unknown": 0, "iotdb12": 1, "influxdb": 2, - "filestore": 3, + "filesystem": 3, "relational": 4, "mongodb": 5, "redis": 6, diff --git a/shared/src/main/java/cn/edu/tsinghua/iginx/exception/package-info.java b/shared/src/main/java/cn/edu/tsinghua/iginx/exception/package-info.java index 000b542eaa..892dd705eb 100644 --- a/shared/src/main/java/cn/edu/tsinghua/iginx/exception/package-info.java +++ b/shared/src/main/java/cn/edu/tsinghua/iginx/exception/package-info.java @@ -105,16 +105,16 @@ * * * - *

FileStore模块 + *

filesystem模块 * - *

FileStoreException是FileStore模块下所有自定义异常的基类。 + *

filesystemException是filesystem模块下所有自定义异常的基类。 * *

* * 
  * PhysicalException
- * └─FileStoreException
- *   └─RemoteFileStoreException
+ * └─filesystemException
+ *   └─RemotefilesystemException
  *
* *
diff --git a/test/pom.xml b/test/pom.xml index fe466e137a..74ee150fa9 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -42,11 +42,11 @@ cn.edu.tsinghua - filestore + filesystem cn.edu.tsinghua - filestore + filesystem ${project.version} tests test diff --git a/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/BaseCapacityExpansionIT.java b/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/BaseCapacityExpansionIT.java index b0dc74fe14..41ce7ffcd7 100644 --- a/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/BaseCapacityExpansionIT.java +++ b/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/BaseCapacityExpansionIT.java @@ -25,7 +25,7 @@ import cn.edu.tsinghua.iginx.exception.SessionException; import cn.edu.tsinghua.iginx.integration.controller.Controller; -import cn.edu.tsinghua.iginx.integration.expansion.filestore.FileStoreCapacityExpansionIT; +import cn.edu.tsinghua.iginx.integration.expansion.filesystem.FileSystemCapacityExpansionIT; import cn.edu.tsinghua.iginx.integration.expansion.influxdb.InfluxDBCapacityExpansionIT; import cn.edu.tsinghua.iginx.integration.expansion.utils.SQLTestTools; import cn.edu.tsinghua.iginx.integration.tool.ConfLoader; @@ -60,7 +60,7 @@ public abstract class BaseCapacityExpansionIT { protected Map updatedParams = new HashMap<>(); - private final boolean IS_EMBEDDED = this instanceof FileStoreCapacityExpansionIT; + private final boolean IS_EMBEDDED = this instanceof FileSystemCapacityExpansionIT; private final String EXP_SCHEMA_PREFIX = null; @@ -872,10 +872,10 @@ protected void startStorageEngineWithIginx(int port, boolean hasData, boolean is iginxPath = ".github/scripts/iginx/iginx_windows.sh"; } - if (this instanceof FileStoreCapacityExpansionIT) { - scriptPath = ".github/scripts/dataSources/startup/filestore.sh"; + if (this instanceof FileSystemCapacityExpansionIT) { + scriptPath = ".github/scripts/dataSources/startup/filesystem.sh"; } else { - throw new IllegalStateException("Only support filestore"); + throw new IllegalStateException("Only support filesystem"); } int iginxPort = PORT_TO_IGINXPORT.get(port); diff --git a/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/constant/Constant.java b/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/constant/Constant.java index e0fb2b0865..701b9859d8 100644 --- a/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/constant/Constant.java +++ b/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/constant/Constant.java @@ -130,7 +130,7 @@ public class Constant { // key list public static List INIT_KEYS_LIST = Arrays.asList(1L, (long) Integer.MAX_VALUE); - // for filestore & influxdb + // for filesystem & influxdb public static Map PORT_TO_ROOT = new HashMap() { { diff --git a/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/filestore/FileStoreCapacityExpansionIT.java b/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/filesystem/FileSystemCapacityExpansionIT.java similarity index 93% rename from test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/filestore/FileStoreCapacityExpansionIT.java rename to test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/filesystem/FileSystemCapacityExpansionIT.java index e6f478c921..507f7ca401 100644 --- a/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/filestore/FileStoreCapacityExpansionIT.java +++ b/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/filesystem/FileSystemCapacityExpansionIT.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.integration.expansion.filestore; +package cn.edu.tsinghua.iginx.integration.expansion.filesystem; -import static cn.edu.tsinghua.iginx.thrift.StorageEngineType.filestore; +import static cn.edu.tsinghua.iginx.thrift.StorageEngineType.filesystem; import static org.junit.Assert.fail; import cn.edu.tsinghua.iginx.exception.SessionException; -import cn.edu.tsinghua.iginx.filestore.format.raw.RawFormat; -import cn.edu.tsinghua.iginx.filestore.service.FileStoreConfig; -import cn.edu.tsinghua.iginx.filestore.struct.tree.FileTree; +import cn.edu.tsinghua.iginx.filesystem.format.raw.RawFormat; +import cn.edu.tsinghua.iginx.filesystem.service.FileSystemConfig; +import cn.edu.tsinghua.iginx.filesystem.struct.tree.FileTree; import cn.edu.tsinghua.iginx.integration.expansion.BaseCapacityExpansionIT; import cn.edu.tsinghua.iginx.integration.expansion.utils.SQLTestTools; import cn.edu.tsinghua.iginx.integration.tool.TempDummyDataSource; @@ -36,17 +36,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class FileStoreCapacityExpansionIT extends BaseCapacityExpansionIT { +public class FileSystemCapacityExpansionIT extends BaseCapacityExpansionIT { - private static final Logger LOGGER = LoggerFactory.getLogger(FileStoreCapacityExpansionIT.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FileSystemCapacityExpansionIT.class); - public FileStoreCapacityExpansionIT() { - super(filestore, getAddStorageParams(), new FileStoreHistoryDataGenerator()); + public FileSystemCapacityExpansionIT() { + super(filesystem, getAddStorageParams(), new FileSystemHistoryDataGenerator()); } private static String getAddStorageParams() { Map params = new LinkedHashMap<>(); - params.put("dummy.struct", FileStoreConfig.DEFAULT_DATA_STRUCT); + params.put("dummy.struct", FileSystemConfig.DEFAULT_DATA_STRUCT); return getAddStorageParams(params); } @@ -62,7 +62,7 @@ public static String getAddStorageParams(Map params) { @Override protected void testInvalidDummyParams( int port, boolean hasData, boolean isReadOnly, String dataPrefix, String schemaPrefix) { - LOGGER.info("filestore skips test for wrong dummy engine params."); + LOGGER.info("filesystem skips test for wrong dummy engine params."); } @Override @@ -77,9 +77,9 @@ public void testShowColumns() { // show dummy columns try (TempDummyDataSource ignoredFileTree = - new TempDummyDataSource(session, 16667, filestore, getLegacyFileSystemDummyParams()); + new TempDummyDataSource(session, 16667, filesystem, getLegacyFileSystemDummyParams()); TempDummyDataSource ignoredLegacyFileSystem = - new TempDummyDataSource(session, 16668, filestore, getFileTreeDummyParams())) { + new TempDummyDataSource(session, 16668, filesystem, getFileTreeDummyParams())) { testShowDummyColumns(); } catch (SessionException e) { LOGGER.error("add or remove read only storage engine failed ", e); @@ -100,7 +100,7 @@ protected void testQuerySpecialHistoryData() { private void testQueryLegacyFileSystem() { try (TempDummyDataSource ignored = - new TempDummyDataSource(session, filestore, getLegacyFileSystemDummyParams())) { + new TempDummyDataSource(session, filesystem, getLegacyFileSystemDummyParams())) { testQueryRawChunks(); } catch (SessionException e) { LOGGER.error("add or remove read only storage engine failed ", e); @@ -110,7 +110,7 @@ private void testQueryLegacyFileSystem() { private void testQueryFileTree() { try (TempDummyDataSource ignored = - new TempDummyDataSource(session, filestore, getFileTreeDummyParams())) { + new TempDummyDataSource(session, filesystem, getFileTreeDummyParams())) { testQueryRawChunks(); testQueryParquets(); } catch (SessionException e) { diff --git a/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/filestore/FileStoreHistoryDataGenerator.java b/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/filesystem/FileSystemHistoryDataGenerator.java similarity index 88% rename from test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/filestore/FileStoreHistoryDataGenerator.java rename to test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/filesystem/FileSystemHistoryDataGenerator.java index a6e59eaf7a..4701d8312d 100644 --- a/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/filestore/FileStoreHistoryDataGenerator.java +++ b/test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/filesystem/FileSystemHistoryDataGenerator.java @@ -16,18 +16,18 @@ * along with this program. If not, see . */ -package cn.edu.tsinghua.iginx.integration.expansion.filestore; +package cn.edu.tsinghua.iginx.integration.expansion.filesystem; import static cn.edu.tsinghua.iginx.integration.expansion.constant.Constant.IGINX_DATA_PATH_PREFIX_NAME; import static cn.edu.tsinghua.iginx.integration.expansion.constant.Constant.PORT_TO_ROOT; import cn.edu.tsinghua.iginx.engine.shared.data.write.DataView; -import cn.edu.tsinghua.iginx.filestore.common.FileStoreException; -import cn.edu.tsinghua.iginx.filestore.service.FileStoreConfig; -import cn.edu.tsinghua.iginx.filestore.service.storage.StorageConfig; -import cn.edu.tsinghua.iginx.filestore.service.storage.StorageService; -import cn.edu.tsinghua.iginx.filestore.test.DataViewGenerator; -import cn.edu.tsinghua.iginx.filestore.thrift.DataUnit; +import cn.edu.tsinghua.iginx.filesystem.common.FileSystemException; +import cn.edu.tsinghua.iginx.filesystem.service.FileSystemConfig; +import cn.edu.tsinghua.iginx.filesystem.service.storage.StorageConfig; +import cn.edu.tsinghua.iginx.filesystem.service.storage.StorageService; +import cn.edu.tsinghua.iginx.filesystem.test.DataViewGenerator; +import cn.edu.tsinghua.iginx.filesystem.thrift.DataUnit; import cn.edu.tsinghua.iginx.integration.expansion.BaseHistoryDataGenerator; import cn.edu.tsinghua.iginx.thrift.DataType; import com.google.common.io.MoreFiles; @@ -46,11 +46,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class FileStoreHistoryDataGenerator extends BaseHistoryDataGenerator { +public class FileSystemHistoryDataGenerator extends BaseHistoryDataGenerator { - private static final Logger LOGGER = LoggerFactory.getLogger(FileStoreHistoryDataGenerator.class); + private static final Logger LOGGER = + LoggerFactory.getLogger(FileSystemHistoryDataGenerator.class); - public FileStoreHistoryDataGenerator() {} + public FileSystemHistoryDataGenerator() {} @Override public void writeHistoryData( @@ -79,7 +80,7 @@ public void writeHistoryData( StorageConfig config = new StorageConfig(); config.setRoot(PORT_TO_ROOT.get(port)); - config.setStruct(FileStoreConfig.DEFAULT_DATA_STRUCT); + config.setStruct(FileSystemConfig.DEFAULT_DATA_STRUCT); LOGGER.debug("config root {}", Paths.get(config.getRoot()).toFile().getAbsolutePath()); @@ -92,7 +93,7 @@ public void writeHistoryData( try (StorageService storageService = new StorageService(config, null)) { storageService.insert(dataUnit, dataView); - } catch (FileStoreException e) { + } catch (FileSystemException e) { LOGGER.error("create storage service failure", e); } @@ -184,7 +185,7 @@ private static void copyFileFromResource(String resourcePath, Path targetPath) { return; } try (InputStream is = - FileStoreHistoryDataGenerator.class.getClassLoader().getResourceAsStream(resourcePath)) { + FileSystemHistoryDataGenerator.class.getClassLoader().getResourceAsStream(resourcePath)) { if (is == null) { LOGGER.error("resource {} not found", resourcePath); return; diff --git a/test/src/test/java/cn/edu/tsinghua/iginx/integration/func/session/PySessionIT.java b/test/src/test/java/cn/edu/tsinghua/iginx/integration/func/session/PySessionIT.java index ec96c94600..2fc2d1965e 100644 --- a/test/src/test/java/cn/edu/tsinghua/iginx/integration/func/session/PySessionIT.java +++ b/test/src/test/java/cn/edu/tsinghua/iginx/integration/func/session/PySessionIT.java @@ -329,16 +329,16 @@ public void testAddStorageEngine() { } assertEquals(result.size(), 12); // TODO: 这里 6670 和 6671 看起来是重复的，因为之前这里有两个不同的对接层 FileSystem 和 Parquet - // 但是现在这两者合二为一成为 FileStore，所以这里的测试用例可能需要精简 + // 但是现在这两者合二为一成为 filesystem，所以这里的测试用例可能需要精简 // 详见：https://github.com/IGinX-THU/IGinX/pull/424 - assertTrue(result.get(1).contains("ip='127.0.0.1', port=6670, type='filestore'")); - assertFalse(result.get(1).contains("ip='127.0.0.1', port=6671, type='filestore'")); - assertFalse(result.get(4).contains("ip='127.0.0.1', port=6670, type='filestore'")); - assertFalse(result.get(4).contains("ip='127.0.0.1', port=6671, type='filestore'")); - assertTrue(result.get(7).contains("ip='127.0.0.1', port=6670, type='filestore'")); - assertTrue(result.get(7).contains("ip='127.0.0.1', port=6671, type='filestore'")); - assertFalse(result.get(10).contains("ip='127.0.0.1', port=6670, type='filestore'")); - assertFalse(result.get(10).contains("ip='127.0.0.1', port=6671, type='filestore'")); + assertTrue(result.get(1).contains("ip='127.0.0.1', port=6670, type='filesystem'")); + assertFalse(result.get(1).contains("ip='127.0.0.1', port=6671, type='filesystem'")); + assertFalse(result.get(4).contains("ip='127.0.0.1', port=6670, type='filesystem'")); + assertFalse(result.get(4).contains("ip='127.0.0.1', port=6671, type='filesystem'")); + assertTrue(result.get(7).contains("ip='127.0.0.1', port=6670, type='filesystem'")); + assertTrue(result.get(7).contains("ip='127.0.0.1', port=6671, type='filesystem'")); + assertFalse(result.get(10).contains("ip='127.0.0.1', port=6670, type='filesystem'")); + assertFalse(result.get(10).contains("ip='127.0.0.1', port=6671, type='filesystem'")); } @Test diff --git a/test/src/test/java/cn/edu/tsinghua/iginx/integration/func/udf/TransformIT.java b/test/src/test/java/cn/edu/tsinghua/iginx/integration/func/udf/TransformIT.java index 236643eef2..a57110adfe 100644 --- a/test/src/test/java/cn/edu/tsinghua/iginx/integration/func/udf/TransformIT.java +++ b/test/src/test/java/cn/edu/tsinghua/iginx/integration/func/udf/TransformIT.java @@ -699,7 +699,7 @@ public void commitPythonExportBinaryToIginxTest() { params.put("dummy_dir", "test/src/test/resources/downloads/pics"); params.put("is_read_only", "true"); params.put("has_data", "true"); - session.addStorageEngine("127.0.0.1", 6660, StorageEngineType.filestore, params); + session.addStorageEngine("127.0.0.1", 6660, StorageEngineType.filesystem, params); String yamlFileName = OUTPUT_DIR_PREFIX + File.separator + "TransformBinaryExportToIginx.yaml"; diff --git a/test/src/test/resources/pySessionIT/tests.py b/test/src/test/resources/pySessionIT/tests.py index 6e9435fdf9..2ce425b050 100644 --- a/test/src/test/resources/pySessionIT/tests.py +++ b/test/src/test/resources/pySessionIT/tests.py @@ -58,7 +58,7 @@ def addStorageEngine(self): self.session.add_storage_engine( "127.0.0.1", 6670, - StorageEngineType.filestore, + StorageEngineType.filesystem, { "dummy_dir": f"{os.getcwd()}/pq/dummy", "iginx_port": "6888", @@ -78,7 +78,7 @@ def addStorageEngine(self): pq_engine = StorageEngine( "127.0.0.1", 6670, - StorageEngineType.filestore, + StorageEngineType.filesystem, { "dummy_dir": f"{os.getcwd()}/pq/dummy", "iginx_port": "6888", @@ -89,7 +89,7 @@ def addStorageEngine(self): fs_engine = StorageEngine( "127.0.0.1", 6671, - StorageEngineType.filestore, + StorageEngineType.filesystem, { "dummy_dir": f"{os.getcwd()}/fs/dummy", "iginx_port": "6888", diff --git a/test/src/test/resources/testConfig.properties b/test/src/test/resources/testConfig.properties index 986ce83395..af56b51d18 100644 --- a/test/src/test/resources/testConfig.properties +++ b/test/src/test/resources/testConfig.properties @@ -1,6 +1,6 @@ # the storage engine that you want to test #storageEngineList=iotdb12 -storageEngineList=IoTDB12,InfluxDB,FileStore,Relational,MongoDB,Redis +storageEngineList=IoTDB12,InfluxDB,FileSystem,Relational,MongoDB,Redis relationalStorageEngineList=PostgreSQL,MySQL # the test for every engine @@ -18,7 +18,7 @@ mongodb-test-list=UserPermissionIT,DataSourceIT,SQLSessionIT,SQLSessionPoolIT,SQ # isSupportSpecialCharacterPath: 是否支持路径上带特殊字符 IoTDB12-config=isSupportDiffTypeHistoryData=true,isSupportKey=true,isAbleToClearData=true,isAbleToDelete=true,isAbleToShowColumns=true,isSupportChinesePath=true,isSupportNumericalPath=true,isSupportSpecialCharacterPath=false InfluxDB-config=isSupportDiffTypeHistoryData=true,isSupportKey=true,isAbleToClearData=true,isAbleToDelete=false,isAbleToShowColumns=true,isSupportChinesePath=true,isSupportNumericalPath=true,isSupportSpecialCharacterPath=true -FileStore-config=isSupportDiffTypeHistoryData=true,isSupportKey=true,isAbleToClearData=true,isAbleToDelete=true,isAbleToShowColumns=true,isSupportChinesePath=true,isSupportNumericalPath=true,isSupportSpecialCharacterPath=true +FileSystem-config=isSupportDiffTypeHistoryData=true,isSupportKey=true,isAbleToClearData=true,isAbleToDelete=true,isAbleToShowColumns=true,isSupportChinesePath=true,isSupportNumericalPath=true,isSupportSpecialCharacterPath=true PostgreSQL-config=isSupportDiffTypeHistoryData=true,isSupportKey=false,isAbleToClearData=true,isAbleToDelete=true,isAbleToShowColumns=true,isSupportChinesePath=true,isSupportNumericalPath=true,isSupportSpecialCharacterPath=true MongoDB-config=isSupportDiffTypeHistoryData=true,isSupportKey=false,isAbleToClearData=true,isAbleToDelete=true,isAbleToShowColumns=true,isSupportChinesePath=true,isSupportNumericalPath=true,isSupportSpecialCharacterPath=true Redis-config=isSupportDiffTypeHistoryData=false,isSupportKey=false,isAbleToClearData=true,isAbleToDelete=true,isAbleToShowColumns=true,isSupportChinesePath=true,isSupportNumericalPath=true,isSupportSpecialCharacterPath=true @@ -27,7 +27,7 @@ MySQL-config=isSupportDiffTypeHistoryData=true,isSupportKey=false,isAbleToClearD # DataSources Test Config IoTDB12_mock=127.0.0.1#6667#IoTDB12#username=root#password=root#sessionPoolSize=20#has_data=false#is_read_only=false InfluxDB_mock=127.0.0.1#8086#InfluxDB#url=http://localhost:8086/#token=testToken#organization=testOrg#has_data=false -FileStore_mock=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 +FileSystem_mock=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 PostgreSQL_mock=127.0.0.1#5432#relational#engine=postgresql#username=postgres#password=postgres#has_data=false MongoDB_mock=127.0.0.1#27017#MongoDB#has_data=false Redis_mock=127.0.0.1#6379#Redis#has_data=false#is_read_only=false#timeout=5000 @@ -37,7 +37,7 @@ MySQL_mock=127.0.0.1#3306#relational#engine=mysql#has_data=false#username=root#m # class name for each DB IoTDB12_class=cn.edu.tsinghua.iginx.iotdb.IoTDBStorage InfluxDB_class=cn.edu.tsinghua.iginx.influxdb.InfluxDBStorage -FileStore_class=cn.edu.tsinghua.iginx.filestore.FileStoreStorage +FileSystem_class=cn.edu.tsinghua.iginx.filesystem.FileSystemStorage PostgreSQL_class=cn.edu.tsinghua.iginx.relational.RelationalStorage MongoDB_class=cn.edu.tsinghua.iginx.mongodb.MongoDBStorage Redis_class=cn.edu.tsinghua.iginx.redis.RedisStorage @@ -46,7 +46,7 @@ MySQL_class=cn.edu.tsinghua.iginx.relational.RelationalStorage # class name for history data generator IoTDB12_data_gen_class=cn.edu.tsinghua.iginx.integration.expansion.iotdb.IoTDB12HistoryDataGenerator InfluxDB_data_gen_class=cn.edu.tsinghua.iginx.integration.expansion.influxdb.InfluxDBHistoryDataGenerator -FileStore_data_gen_class=cn.edu.tsinghua.iginx.integration.expansion.filestore.FileStoreHistoryDataGenerator +FileSystem_data_gen_class=cn.edu.tsinghua.iginx.integration.expansion.filesystem.FileSystemHistoryDataGenerator PostgreSQL_data_gen_class=cn.edu.tsinghua.iginx.integration.expansion.postgresql.PostgreSQLHistoryDataGenerator MongoDB_data_gen_class=cn.edu.tsinghua.iginx.integration.expansion.mongodb.MongoDBHistoryDataGenerator Redis_data_gen_class=cn.edu.tsinghua.iginx.integration.expansion.redis.RedisHistoryDataGenerator @@ -55,7 +55,7 @@ MySQL_data_gen_class=cn.edu.tsinghua.iginx.integration.expansion.mysql.MySQLHist # DB-CE port mapping, oriPort,expPort,readOnlyPort IoTDB12_port=6667,6668,6669 InfluxDB_port=8086,8087,8088 -FileStore_port=6667,6668,6669 +FileSystem_port=6667,6668,6669 PostgreSQL_port=5432,5433,5434 MongoDB_port=27017,27018,27019 Redis_port=6379,6380,6381 diff --git a/thrift/src/main/thrift/rpc.thrift b/thrift/src/main/thrift/rpc.thrift index ebade58e36..447dca0c93 100644 --- a/thrift/src/main/thrift/rpc.thrift +++ b/thrift/src/main/thrift/rpc.thrift @@ -31,7 +31,7 @@ enum StorageEngineType { unknown, iotdb12, influxdb, - filestore, + filesystem, relational, mongodb, redis