-
Notifications
You must be signed in to change notification settings - Fork 607
fix(server): keep schema ~create_time userdata as Date after reload #3026
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
Open
dpol1
wants to merge
2
commits into
apache:master
Choose a base branch
from
dpol1:fix/3013-create-time-userdata-roundtrip
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
175 changes: 175 additions & 0 deletions
175
...server/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/SchemaElementTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| /* | ||
| * 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.core; | ||
|
|
||
| import java.util.Date; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import org.apache.hugegraph.backend.id.IdGenerator; | ||
| import org.apache.hugegraph.schema.PropertyKey; | ||
| import org.apache.hugegraph.schema.SchemaElement; | ||
| import org.apache.hugegraph.schema.Userdata; | ||
| import org.apache.hugegraph.schema.VertexLabel; | ||
| import org.apache.hugegraph.testutil.Assert; | ||
| import org.apache.hugegraph.unit.FakeObjects; | ||
| import org.apache.hugegraph.util.DateUtil; | ||
| import org.junit.Test; | ||
|
|
||
| public class SchemaElementTest { | ||
|
|
||
| private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; | ||
|
|
||
| private static SchemaElement newSchema() { | ||
| return new PropertyKey(null, IdGenerator.of(1L), "test"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSingleSetterNormalizesCreateTimeStringToDate() { | ||
| SchemaElement schema = newSchema(); | ||
| String formatted = "2026-05-14 10:11:12.345"; | ||
|
|
||
| schema.userdata(Userdata.CREATE_TIME, formatted); | ||
|
|
||
| Object value = schema.userdata().get(Userdata.CREATE_TIME); | ||
| Assert.assertTrue("CREATE_TIME should be a Date, was " + | ||
| (value == null ? "null" : value.getClass()), | ||
| value instanceof Date); | ||
| Assert.assertEquals(DateUtil.parse(formatted, DATE_FORMAT), value); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSingleSetterKeepsCreateTimeDateUnchanged() { | ||
| SchemaElement schema = newSchema(); | ||
| Date now = DateUtil.now(); | ||
|
|
||
| schema.userdata(Userdata.CREATE_TIME, now); | ||
|
|
||
| Assert.assertSame(now, schema.userdata().get(Userdata.CREATE_TIME)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSingleSetterRejectsInvalidCreateTimeString() { | ||
| SchemaElement schema = newSchema(); | ||
|
|
||
| Assert.assertThrows(IllegalArgumentException.class, () -> { | ||
| schema.userdata(Userdata.CREATE_TIME, "not-a-date"); | ||
| }, e -> { | ||
| Assert.assertContains(Userdata.CREATE_TIME, e.getMessage()); | ||
| Assert.assertContains("not-a-date", e.getMessage()); | ||
| Assert.assertNotNull(e.getCause()); | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSingleSetterRejectsNullCreateTime() { | ||
| SchemaElement schema = newSchema(); | ||
|
|
||
| Assert.assertThrows(IllegalArgumentException.class, () -> { | ||
| schema.userdata(Userdata.CREATE_TIME, null); | ||
| }, e -> { | ||
| Assert.assertContains("userdata value", e.getMessage()); | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSingleSetterLeavesOtherStringKeysUntouched() { | ||
| SchemaElement schema = newSchema(); | ||
|
dpol1 marked this conversation as resolved.
|
||
|
|
||
| schema.userdata("note", "2026-05-14 10:11:12.345"); | ||
|
|
||
| Object value = schema.userdata().get("note"); | ||
| Assert.assertTrue(value instanceof String); | ||
| Assert.assertEquals("2026-05-14 10:11:12.345", value); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUserdataConstructorNormalizesCreateTimeString() { | ||
| String formatted = "2026-05-14 10:11:12.345"; | ||
| Map<String, Object> map = new HashMap<>(); | ||
| map.put(Userdata.CREATE_TIME, formatted); | ||
|
|
||
| Userdata userdata = new Userdata(map); | ||
|
|
||
| Object createTime = userdata.get(Userdata.CREATE_TIME); | ||
| Assert.assertTrue(createTime instanceof Date); | ||
| Assert.assertEquals(DateUtil.parse(formatted, DATE_FORMAT), | ||
| createTime); | ||
| } | ||
|
|
||
| @Test | ||
| public void testBulkSetterNormalizesCreateTimeAndKeepsOtherEntries() { | ||
| SchemaElement schema = newSchema(); | ||
| Userdata bulk = new Userdata(); | ||
| String formatted = "2026-05-14 10:11:12.345"; | ||
| bulk.put(Userdata.CREATE_TIME, formatted); | ||
| bulk.put("note", "hello"); | ||
| bulk.put("count", 42); | ||
|
|
||
| schema.userdata(bulk); | ||
|
|
||
| Object createTime = schema.userdata().get(Userdata.CREATE_TIME); | ||
| Assert.assertTrue(createTime instanceof Date); | ||
| Assert.assertEquals(DateUtil.parse(formatted, DATE_FORMAT), createTime); | ||
| Assert.assertEquals("hello", schema.userdata().get("note")); | ||
| Assert.assertEquals(42, schema.userdata().get("count")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testBulkSetterKeepsCreateTimeDateUnchanged() { | ||
| SchemaElement schema = newSchema(); | ||
| Userdata bulk = new Userdata(); | ||
| Date now = DateUtil.now(); | ||
| bulk.put(Userdata.CREATE_TIME, now); | ||
|
|
||
| schema.userdata(bulk); | ||
|
|
||
| Assert.assertSame(now, schema.userdata().get(Userdata.CREATE_TIME)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testVertexLabelFromMapNormalizesCreateTimeString() { | ||
| String formatted = "2026-05-14 10:11:12.345"; | ||
| Map<String, Object> userdata = new HashMap<>(); | ||
| userdata.put(Userdata.CREATE_TIME, formatted); | ||
|
|
||
| Map<String, Object> map = new HashMap<>(); | ||
| map.put(VertexLabel.P.ID, 1); | ||
| map.put(VertexLabel.P.NAME, "person"); | ||
| map.put(VertexLabel.P.USERDATA, userdata); | ||
|
|
||
| VertexLabel vertexLabel = VertexLabel.fromMap(map, | ||
| new FakeObjects().graph()); | ||
|
|
||
| Object createTime = vertexLabel.userdata().get(Userdata.CREATE_TIME); | ||
| Assert.assertTrue(createTime instanceof Date); | ||
| Assert.assertEquals(DateUtil.parse(formatted, DATE_FORMAT), | ||
| createTime); | ||
| } | ||
|
|
||
| @Test | ||
| public void testBulkSetterRejectsNullUserdata() { | ||
| SchemaElement schema = newSchema(); | ||
|
|
||
| Assert.assertThrows(IllegalArgumentException.class, () -> { | ||
| schema.userdata(null); | ||
| }, e -> { | ||
| Assert.assertContains("userdata", e.getMessage()); | ||
| }); | ||
| } | ||
|
dpol1 marked this conversation as resolved.
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
...hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/TextSerializerTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * 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.serializer; | ||
|
|
||
| import java.util.Date; | ||
|
|
||
| import org.apache.hugegraph.backend.id.IdGenerator; | ||
| import org.apache.hugegraph.backend.serializer.TextSerializer; | ||
| import org.apache.hugegraph.backend.store.BackendEntry; | ||
| import org.apache.hugegraph.config.HugeConfig; | ||
| import org.apache.hugegraph.schema.PropertyKey; | ||
| import org.apache.hugegraph.schema.Userdata; | ||
| import org.apache.hugegraph.testutil.Assert; | ||
| import org.apache.hugegraph.unit.BaseUnitTest; | ||
| import org.apache.hugegraph.unit.FakeObjects; | ||
| import org.apache.hugegraph.util.DateUtil; | ||
| import org.junit.Test; | ||
|
|
||
| public class TextSerializerTest extends BaseUnitTest { | ||
|
|
||
| private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; | ||
|
|
||
| @Test | ||
| public void testPropertyKeyUserdataCreateTimeRoundTripsAsDate() { | ||
| HugeConfig config = FakeObjects.newConfig(); | ||
| TextSerializer ser = new TextSerializer(config); | ||
|
|
||
| FakeObjects objects = new FakeObjects(); | ||
| PropertyKey original = objects.newPropertyKey(IdGenerator.of(1L), | ||
| "name"); | ||
| Date created = DateUtil.parse("2026-05-14 10:11:12.345", DATE_FORMAT); | ||
| original.userdata(Userdata.CREATE_TIME, created); | ||
|
|
||
| BackendEntry entry = ser.writePropertyKey(original); | ||
| PropertyKey reloaded = ser.readPropertyKey(objects.graph(), entry); | ||
|
|
||
| Object value = reloaded.userdata().get(Userdata.CREATE_TIME); | ||
| Assert.assertTrue("CREATE_TIME should be a Date after round-trip, " + | ||
| "was " + (value == null ? "null" : value.getClass()), | ||
| value instanceof Date); | ||
| Assert.assertEquals(created, value); | ||
|
dpol1 marked this conversation as resolved.
|
||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.