-
Notifications
You must be signed in to change notification settings - Fork 624
fix(server): keep schema ~create_time 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
Changes from 1 commit
62680de
11adabf
bc48eec
dccc0f0
8110bc4
1977a44
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 |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /* | ||
| * 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 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.testutil.Assert; | ||
| 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"; | ||
|
dpol1 marked this conversation as resolved.
Outdated
|
||
|
|
||
| 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()); | ||
| }); | ||
| } | ||
|
|
||
| @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 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 testBulkSetterRejectsNullUserdata() { | ||
| SchemaElement schema = newSchema(); | ||
|
|
||
| Assert.assertThrows(IllegalArgumentException.class, () -> { | ||
| schema.userdata(null); | ||
| }, e -> { | ||
| Assert.assertContains("userdata", e.getMessage()); | ||
| }); | ||
| } | ||
|
dpol1 marked this conversation as resolved.
|
||
| } | ||
| 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.
|
||
| } | ||
|
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.
Only
Member
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. Holding off, with reasoning:
There's no existing unit-test harness for the SQL serializers — adding one Better closure for the shared logic: a direct
dpol1 marked this conversation as resolved.
|
||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.