Skip to content
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

Jump to bottom

Make random UUID a compliant type name in CorrelationIdentifier.uniqueID #1938

Merged
merged 5 commits into from Dec 8, 2022
Merged

Make random UUID a compliant type name in CorrelationIdentifier.uniqueID #1938

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b77000
Make random UUID a compliant type name in CorrelationIdentifier.uniqueID
arnaud-lacurie Dec 6, 2022
7d4c89a
Properly prefix correlation identifier names
arnaud-lacurie Dec 7, 2022
41e759d
Fix checkstyle
arnaud-lacurie Dec 7, 2022
cff9d08
Update fdb-record-layer-core/src/main/java/com/apple/foundationdb/rec…
arnaud-lacurie Dec 7, 2022
748fe6d
Update fdb-record-layer-core/src/main/java/com/apple/foundationdb/rec…
arnaud-lacurie Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...rc/main/java/com/apple/foundationdb/record/query/plan/cascades/CorrelationIdentifier.java
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@

import com.apple.foundationdb.annotation.API;
import com.apple.foundationdb.record.query.plan.cascades.debug.Debugger;
import com.apple.foundationdb.record.query.plan.cascades.typing.Type;
import com.google.common.collect.ImmutableSet;

import javax.annotation.Nonnull;
Expand Down Expand Up @@ -89,7 +90,7 @@ public static CorrelationIdentifier uniqueID(@Nonnull final Class<?> clazz, @Non
final CorrelationIdentifier id =
Debugger.getIndexOptional(clazz)
.map(i -> CorrelationIdentifier.of(prefix + i))
.orElseGet(() -> new CorrelationIdentifier(UUID.randomUUID().toString()));
.orElseGet(() -> new CorrelationIdentifier(Type.uniqueCompliantTypeName()));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this just want half of that method? This id needs to be protobuf-friendly but isn't a __type__, is it?

Debugger.updateIndex(clazz, i -> i + 1);
return id;
}
Expand Down