Skip to content

Support delete object file #16945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HTHou wants to merge 10 commits into
base: master
Choose a base branch
from
+611 −4
Open

Support delete object file #16945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ee39ee1
deving
HTHou Dec 15, 2025
e2383e1
dev
HTHou Dec 16, 2025
fdbbd52
remove empty object dir
HTHou Dec 16, 2025
6bbf453
optimize drop table
HTHou Dec 18, 2025
b5a5549
add some IT
HTHou Dec 22, 2025
3824f30
Merge branch 'master' of github.com:apache/iotdb into object_delet
HTHou Dec 23, 2025
d10c274
Fix error
HTHou Dec 23, 2025
4cbf3e0
Merge branch 'master' of github.com:apache/iotdb into object_delet
HTHou Dec 29, 2025
fef95aa
Add IT
HTHou Dec 29, 2025
18c5519
fix check object dir error
HTHou Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
363 changes: 363 additions & 0 deletions ...ration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBObjectDeleteIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,363 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.apache.iotdb.relational.it.session;

import org.apache.iotdb.isession.ITableSession;
import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.TableClusterIT;
import org.apache.iotdb.itbase.category.TableLocalStandaloneIT;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;

import com.google.common.io.BaseEncoding;
import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.utils.Binary;
import org.apache.tsfile.write.record.Tablet;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;

import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import static org.junit.Assert.assertNull;

@RunWith(IoTDBTestRunner.class)
@Category({TableLocalStandaloneIT.class, TableClusterIT.class})
public class IoTDBObjectDeleteIT {

@BeforeClass
public static void classSetUp() throws Exception {
EnvFactory.getEnv().initClusterEnvironment();
}

@Before
public void setUp() throws Exception {
try (ITableSession session = EnvFactory.getEnv().getTableSessionConnection()) {
session.executeNonQueryStatement("CREATE DATABASE IF NOT EXISTS db1");
}
}

@After
public void tearDown() throws Exception {
try (ITableSession session = EnvFactory.getEnv().getTableSessionConnection()) {
session.executeNonQueryStatement("DROP DATABASE IF EXISTS db1");
}
}

@AfterClass
public static void classTearDown() {
EnvFactory.getEnv().cleanClusterEnvironment();
}

@Test
public void dropObjectTableTest()
throws IoTDBConnectionException, StatementExecutionException, IOException {
String testObject =
System.getProperty("user.dir")
+ File.separator
+ "target"
+ File.separator
+ "test-classes"
+ File.separator
+ "object-example.pt";

try (ITableSession session = EnvFactory.getEnv().getTableSessionConnection()) {
session.executeNonQueryStatement("USE \"db1\"");
// insert table data by tablet
List<String> columnNameList =
Arrays.asList("region_id", "plant_id", "device_id", "temperature", "file");
List<TSDataType> dataTypeList =
Arrays.asList(
TSDataType.STRING,
TSDataType.STRING,
TSDataType.STRING,
TSDataType.FLOAT,
TSDataType.OBJECT);
List<ColumnCategory> columnTypeList =
new ArrayList<>(
Arrays.asList(
ColumnCategory.TAG,
ColumnCategory.TAG,
ColumnCategory.TAG,
ColumnCategory.FIELD,
ColumnCategory.FIELD));
Tablet tablet = new Tablet("object_table", columnNameList, dataTypeList, columnTypeList, 1);
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(rowIndex, 1);
tablet.addValue(rowIndex, 0, "1");
tablet.addValue(rowIndex, 1, "5");
tablet.addValue(rowIndex, 2, "3");
tablet.addValue(rowIndex, 3, 37.6F);
tablet.addValue(rowIndex, 4, true, 0, Files.readAllBytes(Paths.get(testObject)));
session.insert(tablet);
tablet.reset();

try (SessionDataSet dataSet =
session.executeQueryStatement(
"select READ_OBJECT(file) from object_table where time = 1")) {
SessionDataSet.DataIterator iterator = dataSet.iterator();
while (iterator.next()) {
Binary binary = iterator.getBlob(1);
Assert.assertArrayEquals(Files.readAllBytes(Paths.get(testObject)), binary.getValues());
}
session.executeNonQueryStatement("DROP TABLE IF EXISTS object_table");
}
}

// test object file path
boolean success = false;
for (DataNodeWrapper dataNodeWrapper : EnvFactory.getEnv().getDataNodeWrapperList()) {
String objectDirStr = dataNodeWrapper.getDataNodeObjectDir();
File objectDir = new File(objectDirStr);
if (objectDir.exists() && objectDir.isDirectory()) {
File[] regionDirs = objectDir.listFiles();
if (regionDirs != null) {
for (File regionDir : regionDirs) {
if (regionDir.isDirectory()) {
File objectFile =
new File(
regionDir,
convertPathString("object_table")
+ File.separator
+ convertPathString("1")
+ File.separator
+ convertPathString("5")
+ File.separator
+ convertPathString("3")
+ File.separator
+ convertPathString("file")
+ File.separator
+ "1.bin");
if (objectFile.exists() && objectFile.isFile()) {
success = true;
}
}
}
}
}
}
Assert.assertFalse(success);
}

@Test
public void dropObjectColumnTest()
throws IoTDBConnectionException, StatementExecutionException, IOException {
String testObject =
System.getProperty("user.dir")
+ File.separator
+ "target"
+ File.separator
+ "test-classes"
+ File.separator
+ "object-example.pt";

try (ITableSession session = EnvFactory.getEnv().getTableSessionConnection()) {
session.executeNonQueryStatement("USE \"db1\"");
// insert table data by tablet
List<String> columnNameList =
Arrays.asList("region_id", "plant_id", "device_id", "temperature", "file");
List<TSDataType> dataTypeList =
Arrays.asList(
TSDataType.STRING,
TSDataType.STRING,
TSDataType.STRING,
TSDataType.FLOAT,
TSDataType.OBJECT);
List<ColumnCategory> columnTypeList =
new ArrayList<>(
Arrays.asList(
ColumnCategory.TAG,
ColumnCategory.TAG,
ColumnCategory.TAG,
ColumnCategory.FIELD,
ColumnCategory.FIELD));
Tablet tablet = new Tablet("object_table", columnNameList, dataTypeList, columnTypeList, 1);
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(rowIndex, 1);
tablet.addValue(rowIndex, 0, "1");
tablet.addValue(rowIndex, 1, "5");
tablet.addValue(rowIndex, 2, "3");
tablet.addValue(rowIndex, 3, 37.6F);
tablet.addValue(rowIndex, 4, true, 0, Files.readAllBytes(Paths.get(testObject)));
session.insert(tablet);
tablet.reset();

try (SessionDataSet dataSet =
session.executeQueryStatement(
"select READ_OBJECT(file) from object_table where time = 1")) {
SessionDataSet.DataIterator iterator = dataSet.iterator();
while (iterator.next()) {
Binary binary = iterator.getBlob(1);
Assert.assertArrayEquals(Files.readAllBytes(Paths.get(testObject)), binary.getValues());
}
session.executeNonQueryStatement("ALTER TABLE object_table drop column file");
}
}

// test object file path
boolean success = false;
for (DataNodeWrapper dataNodeWrapper : EnvFactory.getEnv().getDataNodeWrapperList()) {
String objectDirStr = dataNodeWrapper.getDataNodeObjectDir();
File objectDir = new File(objectDirStr);
if (objectDir.exists() && objectDir.isDirectory()) {
File[] regionDirs = objectDir.listFiles();
if (regionDirs != null) {
for (File regionDir : regionDirs) {
if (regionDir.isDirectory()) {
File objectFile =
new File(
regionDir,
convertPathString("object_table")
+ File.separator
+ convertPathString("1")
+ File.separator
+ convertPathString("5")
+ File.separator
+ convertPathString("3")
+ File.separator
+ convertPathString("file")
+ File.separator
+ "1.bin");
if (objectFile.exists() && objectFile.isFile()) {
success = true;
}
}
}
}
}
}
Assert.assertFalse(success);
}

@Test
public void deleteObjectSegmentsTest()
throws IoTDBConnectionException, StatementExecutionException, IOException {
String testObject =
System.getProperty("user.dir")
+ File.separator
+ "target"
+ File.separator
+ "test-classes"
+ File.separator
+ "object-example.pt";
byte[] objectBytes = Files.readAllBytes(Paths.get(testObject));
List<byte[]> objectSegments = new ArrayList<>();
for (int i = 0; i < objectBytes.length; i += 512) {
objectSegments.add(Arrays.copyOfRange(objectBytes, i, Math.min(i + 512, objectBytes.length)));
}

try (ITableSession session = EnvFactory.getEnv().getTableSessionConnection()) {
session.executeNonQueryStatement("USE \"db1\"");
// insert table data by tablet
List<String> columnNameList =
Arrays.asList("region_id", "plant_id", "device_id", "temperature", "file");
List<TSDataType> dataTypeList =
Arrays.asList(
TSDataType.STRING,
TSDataType.STRING,
TSDataType.STRING,
TSDataType.FLOAT,
TSDataType.OBJECT);
List<ColumnCategory> columnTypeList =
new ArrayList<>(
Arrays.asList(
ColumnCategory.TAG,
ColumnCategory.TAG,
ColumnCategory.TAG,
ColumnCategory.FIELD,
ColumnCategory.FIELD));
Tablet tablet = new Tablet("object_table", columnNameList, dataTypeList, columnTypeList, 1);
for (int i = 0; i < objectSegments.size() - 1; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(rowIndex, 1);
tablet.addValue(rowIndex, 0, "1");
tablet.addValue(rowIndex, 1, "5");
tablet.addValue(rowIndex, 2, "3");
tablet.addValue(rowIndex, 3, 37.6F);
tablet.addValue(rowIndex, 4, false, i * 512L, objectSegments.get(i));
session.insert(tablet);
tablet.reset();
}
session.executeNonQueryStatement("DELETE FROM object_table where time = 1");

try (SessionDataSet dataSet =
session.executeQueryStatement("select file from object_table where time = 1")) {
SessionDataSet.DataIterator iterator = dataSet.iterator();
while (iterator.next()) {
assertNull(iterator.getString(1));
}
}
}

// test object file path
boolean success = false;
for (DataNodeWrapper dataNodeWrapper : EnvFactory.getEnv().getDataNodeWrapperList()) {
String objectDirStr = dataNodeWrapper.getDataNodeObjectDir();
File objectDir = new File(objectDirStr);
if (objectDir.exists() && objectDir.isDirectory()) {
File[] regionDirs = objectDir.listFiles();
if (regionDirs != null) {
for (File regionDir : regionDirs) {
if (regionDir.isDirectory()) {
File objectTmpFile =
new File(
regionDir,
convertPathString("object_table")
+ File.separator
+ convertPathString("1")
+ File.separator
+ convertPathString("5")
+ File.separator
+ convertPathString("3")
+ File.separator
+ convertPathString("file")
+ File.separator
+ "1.bin.tmp");
if (objectTmpFile.exists() && objectTmpFile.isFile()) {
success = true;
}
}
}
}
}
}
Assert.assertFalse(success);
}

protected String convertPathString(String path) {
return BaseEncoding.base32().omitPadding().encode(path.getBytes(StandardCharsets.UTF_8));
}
}
Loading
Loading