Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
3786dbc8
Commit
3786dbc8
authored
Apr 05, 2019
by
dreis2211
Committed by
Andy Wilkinson
Apr 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Speed up element equality checks in ConfigurationPropertyName
See gh-16474
parent
ff1e5076
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
83 additions
and
8 deletions
+83
-8
ConfigurationPropertyName.java
.../context/properties/source/ConfigurationPropertyName.java
+83
-8
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
View file @
3786dbc8
...
...
@@ -237,12 +237,7 @@ public final class ConfigurationPropertyName
if
(
this
.
getNumberOfElements
()
>=
name
.
getNumberOfElements
())
{
return
false
;
}
for
(
int
i
=
this
.
elements
.
getSize
()
-
1
;
i
>=
0
;
i
--)
{
if
(!
elementEquals
(
this
.
elements
,
name
.
elements
,
i
))
{
return
false
;
}
}
return
true
;
return
elementsEqual
(
name
);
}
@Override
...
...
@@ -309,15 +304,34 @@ public final class ConfigurationPropertyName
&&
other
.
elements
.
canShortcutWithSource
(
ElementType
.
UNIFORM
))
{
return
toString
().
equals
(
other
.
toString
());
}
return
elementsEqual
(
other
);
}
private
boolean
elementsEqual
(
ConfigurationPropertyName
name
)
{
for
(
int
i
=
this
.
elements
.
getSize
()
-
1
;
i
>=
0
;
i
--)
{
if
(
!
elementEquals
(
this
.
elements
,
other
.
elements
,
i
))
{
if
(
elementDiffers
(
this
.
elements
,
name
.
elements
,
i
))
{
return
false
;
}
}
return
true
;
}
private
boolean
elementEquals
(
Elements
e1
,
Elements
e2
,
int
i
)
{
private
boolean
elementDiffers
(
Elements
e1
,
Elements
e2
,
int
i
)
{
ElementType
type1
=
e1
.
getType
(
i
);
ElementType
type2
=
e2
.
getType
(
i
);
if
(
type1
.
allowsFastEqualityCheck
()
&&
type2
.
allowsFastEqualityCheck
())
{
return
!
fastElementEquals
(
e1
,
e2
,
i
);
}
else
if
(
type1
.
allowsDashIgnoringEqualityCheck
()
&&
type2
.
allowsDashIgnoringEqualityCheck
())
{
return
!
dashIgnoringElementEquals
(
e1
,
e2
,
i
);
}
else
{
return
!
defaultElementEquals
(
e1
,
e2
,
i
);
}
}
private
boolean
defaultElementEquals
(
Elements
e1
,
Elements
e2
,
int
i
)
{
int
l1
=
e1
.
getLength
(
i
);
int
l2
=
e2
.
getLength
(
i
);
boolean
indexed1
=
e1
.
getType
(
i
).
isIndexed
();
...
...
@@ -355,6 +369,59 @@ public final class ConfigurationPropertyName
return
true
;
}
private
boolean
dashIgnoringElementEquals
(
Elements
e1
,
Elements
e2
,
int
i
)
{
int
l1
=
e1
.
getLength
(
i
);
int
l2
=
e2
.
getLength
(
i
);
int
i1
=
0
;
int
i2
=
0
;
while
(
i1
<
l1
)
{
if
(
i2
>=
l2
)
{
return
false
;
}
char
ch1
=
e1
.
charAt
(
i
,
i1
);
char
ch2
=
e2
.
charAt
(
i
,
i2
);
if
(
ch1
==
'-'
)
{
i1
++;
}
else
if
(
ch2
==
'-'
)
{
i2
++;
}
else
if
(
ch1
!=
ch2
)
{
return
false
;
}
else
{
i1
++;
i2
++;
}
}
boolean
indexed2
=
e2
.
getType
(
i
).
isIndexed
();
while
(
i2
<
l2
)
{
char
ch2
=
e2
.
charAt
(
i
,
i2
++);
if
(
indexed2
||
ch2
==
'-'
)
{
return
false
;
}
}
return
true
;
}
private
boolean
fastElementEquals
(
Elements
e1
,
Elements
e2
,
int
i
)
{
int
length1
=
e1
.
getLength
(
i
);
int
length2
=
e2
.
getLength
(
i
);
if
(
length1
==
length2
)
{
int
i1
=
0
;
while
(
length1
--
!=
0
)
{
char
ch1
=
e1
.
charAt
(
i
,
i1
);
char
ch2
=
e2
.
charAt
(
i
,
i1
);
if
(
ch1
!=
ch2
)
{
return
false
;
}
i1
++;
}
return
true
;
}
return
false
;
}
@Override
public
int
hashCode
()
{
return
0
;
...
...
@@ -913,6 +980,14 @@ public final class ConfigurationPropertyName
return
this
.
indexed
;
}
public
boolean
allowsFastEqualityCheck
()
{
return
this
==
UNIFORM
||
this
==
NUMERICALLY_INDEXED
;
}
public
boolean
allowsDashIgnoringEqualityCheck
()
{
return
allowsFastEqualityCheck
()
||
this
==
DASHED
;
}
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment