-
Notifications
You must be signed in to change notification settings - Fork 571
fix(server): ensure graph clear API does not clear meta table for hbase #2911
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.
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
base: master
Are you sure you want to change the base?
Changes from all commits
fbb5e04
9c810fd
004684e
7676f54
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -114,6 +114,14 @@ protected List<String> tableNames() { | |||||||||||||||||
| .collect(Collectors.toList()); | ||||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
| protected List<String> truncatedTableNames() { | ||||||||||||||||||
| // Exclude meta table to preserve system metadata during graph clear | ||||||||||||||||||
| return this.tables.entrySet().stream() | ||||||||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. While unlikely, if
Suggested change
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The current code 'HugeType.META == e.getKey()' is already NPE-safe regardless of which operand is null, as the '==' operator never throws NullPointerException. |
||||||||||||||||||
| .filter(e -> !(HugeType.META == e.getKey())) | ||||||||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The filter condition Consider adding a comment explaining why META type should be preserved during truncation to improve code maintainability.
Suggested change
|
||||||||||||||||||
| .map(e -> e.getValue().table()) | ||||||||||||||||||
|
Comment on lines
+119
to
+121
|
||||||||||||||||||
| return this.tables.entrySet().stream() | |
| .filter(e -> !(HugeType.META == e.getKey())) | |
| .map(e -> e.getValue().table()) | |
| return this.tables.values().stream() | |
| .map(BackendTable::table) |
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,71 @@ | ||||||||||||||||||||||||||||||||||||||||||||
| /* | ||||||||||||||||||||||||||||||||||||||||||||
| * 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.hugegraph.unit.hbase; | ||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||
| import org.apache.commons.configuration2.Configuration; | ||||||||||||||||||||||||||||||||||||||||||||
| import org.apache.hugegraph.backend.store.hbase.HbaseSessions; | ||||||||||||||||||||||||||||||||||||||||||||
| import org.apache.hugegraph.backend.store.hbase.HbaseStoreProvider; | ||||||||||||||||||||||||||||||||||||||||||||
| import org.apache.hugegraph.config.HugeConfig; | ||||||||||||||||||||||||||||||||||||||||||||
| import org.apache.hugegraph.testutil.Utils; | ||||||||||||||||||||||||||||||||||||||||||||
| import org.apache.hugegraph.unit.BaseUnitTest; | ||||||||||||||||||||||||||||||||||||||||||||
| import org.junit.After; | ||||||||||||||||||||||||||||||||||||||||||||
| import org.junit.Before; | ||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧹 Naming: Space missing in class declaration Minor style issue:
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||
| import java.io.IOException; | ||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||
| public class BaseHbaseUnitTest extends BaseUnitTest { | ||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||
| private static final String GRAPH_NAME = "test_graph"; | ||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||
| protected HugeConfig config; | ||||||||||||||||||||||||||||||||||||||||||||
| protected HbaseStoreProvider provider; | ||||||||||||||||||||||||||||||||||||||||||||
| protected HbaseSessions sessions; | ||||||||||||||||||||||||||||||||||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
The method is named
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||
| @Before | ||||||||||||||||||||||||||||||||||||||||||||
| public void setup() throws IOException { | ||||||||||||||||||||||||||||||||||||||||||||
| Configuration conf = Utils.getConf(); | ||||||||||||||||||||||||||||||||||||||||||||
| this.config = new HugeConfig(conf); | ||||||||||||||||||||||||||||||||||||||||||||
| this.provider = new HbaseStoreProvider(); | ||||||||||||||||||||||||||||||||||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If any exception occurs after opening stores but before
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||
| this.provider.open(GRAPH_NAME); | ||||||||||||||||||||||||||||||||||||||||||||
| this.provider.loadSystemStore(config).open(config); | ||||||||||||||||||||||||||||||||||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For code consistency, add a space after commas in method calls.
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||
| this.provider.loadGraphStore(config).open(config); | ||||||||||||||||||||||||||||||||||||||||||||
| this.provider.loadSchemaStore(config).open(config); | ||||||||||||||||||||||||||||||||||||||||||||
| this.provider.init(); | ||||||||||||||||||||||||||||||||||||||||||||
imbajin marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||||||||||||||||||||||||||||||||||||
| this.sessions = | ||||||||||||||||||||||||||||||||||||||||||||
| new HbaseSessions(config, GRAPH_NAME, this.provider.loadGraphStore(config).store()); | ||||||||||||||||||||||||||||||||||||||||||||
| this.sessions.open(); | ||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||
| @After | ||||||||||||||||||||||||||||||||||||||||||||
| public void tearDown() { | ||||||||||||||||||||||||||||||||||||||||||||
| if (this.sessions != null) { | ||||||||||||||||||||||||||||||||||||||||||||
| try { | ||||||||||||||||||||||||||||||||||||||||||||
| this.sessions.close(); | ||||||||||||||||||||||||||||||||||||||||||||
| } catch (Exception e) { | ||||||||||||||||||||||||||||||||||||||||||||
| LOG.warn("Failed to close sessions ", e); | ||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||
| if (this.provider != null){ | ||||||||||||||||||||||||||||||||||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧹 Code style: inconsistent spacing Missing space after
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||
| if (this.provider != null){ | |
| if (this.provider != null) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧹 Code style: inconsistent spacing
Missing space after catch keyword.
| this.provider.close(); | |
| } catch (Exception e) { |
Copilot
AI
Dec 9, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing space after catch keyword. Should be } catch (Exception e) { for consistency with the code style used on line 59.
| }catch (Exception e){ | |
| } catch (Exception e) { |
Copilot
AI
Dec 9, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing space after catch keyword. Should be } catch (Exception e) { for consistency with the code style used on line 59.
| }catch (Exception e){ | |
| } catch (Exception e) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧹 Code style: inconsistent spacing
Missing space after closing brace and before catch. Should be } catch, not }catch.
| LOG.warn("Failed to close provider ",e); | |
| LOG.warn("Failed to close provider ", e); |
Copilot
AI
Dec 9, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing space after comma in log message. Should be "Failed to close provider ", e for consistency with line 60.
| LOG.warn("Failed to close provider ",e); | |
| LOG.warn("Failed to close provider ", e); |
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,82 @@ | ||||||
| /* | ||||||
| * 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.hugegraph.unit.hbase; | ||||||
|
|
||||||
| import org.apache.hadoop.hbase.client.Result; | ||||||
| import org.apache.hugegraph.backend.store.BackendEntry.BackendIterator; | ||||||
| import org.apache.hugegraph.backend.store.BackendStore; | ||||||
| import org.apache.hugegraph.testutil.Assert; | ||||||
| import org.apache.hugegraph.backend.store.hbase.HbaseSessions; | ||||||
| import org.apache.hugegraph.util.StringEncoding; | ||||||
| import org.junit.Test; | ||||||
|
|
||||||
| import java.nio.charset.StandardCharsets; | ||||||
|
|
||||||
| public class HbaseUnitTest extends BaseHbaseUnitTest { | ||||||
|
|
||||||
| @Test | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The test only verifies that meta version is preserved, but doesn't verify the actual truncation behavior. Consider adding assertions to verify:
Example enhancement: @Test
public void testHbaseMetaVersionAfterTruncate() {
BackendStore systemStore = this.provider.loadSystemStore(config);
BackendStore graphStore = this.provider.loadGraphStore(config);
// Record initial version
String beforeVersion = systemStore.storedVersion();
// Insert some test data to verify truncation
// ... add test data insertion code ...
// Perform truncation
this.provider.truncate();
// Verify version preserved
String afterVersion = systemStore.storedVersion();
Assert.assertEquals(beforeVersion, afterVersion);
// Verify data tables are empty
// ... add verification code ...
} |
||||||
| public void testHbaseMetaVersionAfterTruncate() { | ||||||
| BackendStore systemStore = this.provider.loadSystemStore(config); | ||||||
|
|
||||||
| // Record system version before truncation | ||||||
| String beforeVersion = systemStore.storedVersion(); | ||||||
|
|
||||||
imbajin marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| HbaseSessions.Session testsession = this.sessions.session(); | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The test inserts data with specific row keys ( Consider:
|
||||||
|
|
||||||
| // Insert test data | ||||||
| testsession.put("g_v", "f".getBytes(StandardCharsets.UTF_8), | ||||||
| "row_trunc_v".getBytes(StandardCharsets.UTF_8), StringEncoding.encode("q"), | ||||||
| StringEncoding.encode("v")); | ||||||
| testsession.put("g_oe", "f".getBytes(StandardCharsets.UTF_8), | ||||||
| "row_trunc_oe".getBytes(StandardCharsets.UTF_8), | ||||||
| StringEncoding.encode("q"), StringEncoding.encode("v")); | ||||||
| testsession.put("g_ie", "f".getBytes(StandardCharsets.UTF_8), | ||||||
| "row_trunc_ie".getBytes(StandardCharsets.UTF_8), | ||||||
| StringEncoding.encode("q"), StringEncoding.encode("v")); | ||||||
| testsession.commit(); | ||||||
|
|
||||||
| // Verify data insertion success | ||||||
| try ( | ||||||
| BackendIterator<Result> vIterator = testsession.get("g_v", "f".getBytes(StandardCharsets.UTF_8), "row_trunc_v".getBytes(StandardCharsets.UTF_8)); | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The session Consider wrapping the session usage in a try-with-resources block or explicitly closing it after use. |
||||||
| BackendIterator<Result> oeIterator = testsession.get("g_oe", "f".getBytes(StandardCharsets.UTF_8), "row_trunc_oe".getBytes(StandardCharsets.UTF_8)); | ||||||
| BackendIterator<Result> ieIterator = testsession.get("g_ie", "f".getBytes(StandardCharsets.UTF_8), "row_trunc_ie".getBytes(StandardCharsets.UTF_8)); | ||||||
| ) { | ||||||
| Assert.assertTrue("data should exist", vIterator.hasNext()); | ||||||
| Assert.assertTrue("data should exist", oeIterator.hasNext()); | ||||||
| Assert.assertTrue("data should exist", ieIterator.hasNext()); | ||||||
| } | ||||||
| // Execute truncate operation, clears all graph data but preserves system tables | ||||||
| this.provider.truncate(); | ||||||
|
|
||||||
| // Verify system version remains unchanged after truncation | ||||||
| String afterVersion = systemStore.storedVersion(); | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| Assert.assertNotNull("System metadata version should exist", afterVersion); | ||||||
| Assert.assertEquals("System metadata version should remain unchanged after truncation", beforeVersion, afterVersion); | ||||||
|
|
||||||
| // Verify data has been cleared | ||||||
| try ( | ||||||
| BackendIterator<Result> vIterator = testsession.get("g_v", "f".getBytes(StandardCharsets.UTF_8), "row_trunc_v".getBytes(StandardCharsets.UTF_8)); | ||||||
| BackendIterator<Result> oeIterator = testsession.get("g_oe", "f".getBytes(StandardCharsets.UTF_8), "row_trunc_oe".getBytes(StandardCharsets.UTF_8)); | ||||||
| BackendIterator<Result> ieIterator = testsession.get("g_ie", "f".getBytes(StandardCharsets.UTF_8), "row_trunc_ie".getBytes(StandardCharsets.UTF_8)); | ||||||
| ) { | ||||||
| Assert.assertFalse("data should not exist", vIterator.hasNext()); | ||||||
| Assert.assertFalse("data should not exist", oeIterator.hasNext()); | ||||||
| Assert.assertFalse("data should not exist", ieIterator.hasNext()); | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The method name
truncatedTableNames()is grammatically incorrect and misleading. It suggests tables that have already been truncated, when it actually returns tables that SHOULD be truncated.Alternative names:
getClearableTableNames(),getDataTableNames(), orgetTableNamesExcludingMeta()