Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
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
dataplatform
atlas
Commits
a40f3c2c
Commit
a40f3c2c
authored
Dec 15, 2017
by
Madhan Neethiraj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2312: Use ThreadLocal DateFormat objects to avoid simultaneous use from multiple threads
parent
f89fa441
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
28 additions
and
10 deletions
+28
-10
HiveHookIT.java
.../src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
+1
-1
AtlasStruct.java
...ain/java/org/apache/atlas/model/instance/AtlasStruct.java
+3
-1
AtlasBaseTypeDef.java
...java/org/apache/atlas/model/typedef/AtlasBaseTypeDef.java
+19
-1
AtlasBuiltInTypes.java
...rc/main/java/org/apache/atlas/type/AtlasBuiltInTypes.java
+1
-1
AtlasJson.java
intg/src/main/java/org/apache/atlas/utils/AtlasJson.java
+2
-4
Id.java
.../src/main/java/org/apache/atlas/v1/model/instance/Id.java
+1
-1
TestAtlasDateType.java
...rc/test/java/org/apache/atlas/type/TestAtlasDateType.java
+1
-1
No files found.
addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
View file @
a40f3c2c
...
...
@@ -180,7 +180,7 @@ public class HiveHookIT extends HiveITBase {
private
void
verifyTimestamps
(
Referenceable
ref
,
String
property
,
long
expectedTime
)
throws
ParseException
{
//Verify timestamps.
String
createTimeStr
=
(
String
)
ref
.
get
(
property
);
Date
createDate
=
AtlasBaseTypeDef
.
DATE_FORMATTER
.
parse
(
createTimeStr
);
Date
createDate
=
AtlasBaseTypeDef
.
getDateFormatter
()
.
parse
(
createTimeStr
);
Assert
.
assertNotNull
(
createTimeStr
);
if
(
expectedTime
>
0
)
{
...
...
intg/src/main/java/org/apache/atlas/model/instance/AtlasStruct.java
View file @
a40f3c2c
...
...
@@ -39,6 +39,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import
org.apache.atlas.model.PList
;
import
org.apache.atlas.model.SearchFilter.SortType
;
import
org.apache.atlas.model.typedef.AtlasBaseTypeDef
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.MapUtils
;
...
...
@@ -58,6 +59,7 @@ public class AtlasStruct implements Serializable {
private
static
final
long
serialVersionUID
=
1L
;
public
static
final
String
SERIALIZED_DATE_FORMAT_STR
=
"yyyyMMdd-HH:mm:ss.SSS-Z"
;
@Deprecated
public
static
final
DateFormat
DATE_FORMATTER
=
new
SimpleDateFormat
(
SERIALIZED_DATE_FORMAT_STR
);
private
String
typeName
;
...
...
@@ -266,7 +268,7 @@ public class AtlasStruct implements Serializable {
if
(
value
==
null
)
{
sb
.
append
(
value
);
}
else
{
sb
.
append
(
DATE_FORMATTER
.
format
(
value
));
sb
.
append
(
AtlasBaseTypeDef
.
getDateFormatter
()
.
format
(
value
));
}
return
sb
;
...
...
intg/src/main/java/org/apache/atlas/model/typedef/AtlasBaseTypeDef.java
View file @
a40f3c2c
...
...
@@ -123,13 +123,31 @@ public abstract class AtlasBaseTypeDef implements java.io.Serializable {
ATLAS_TYPE_OBJECT_ID
,
};
public
static
final
String
SERIALIZED_DATE_FORMAT_STR
=
"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
;
@Deprecated
public
static
final
DateFormat
DATE_FORMATTER
=
new
SimpleDateFormat
(
SERIALIZED_DATE_FORMAT_STR
);
static
{
DATE_FORMATTER
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"UTC"
));
}
public
static
DateFormat
getDateFormatter
()
{
return
THREAD_LOCAL_DATE_FORMAT
.
get
();
}
private
static
final
ThreadLocal
<
DateFormat
>
THREAD_LOCAL_DATE_FORMAT
=
new
ThreadLocal
<
DateFormat
>()
{
@Override
public
DateFormat
initialValue
()
{
DateFormat
ret
=
new
SimpleDateFormat
(
SERIALIZED_DATE_FORMAT_STR
);
ret
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"UTC"
));
return
ret
;
}
};
private
final
TypeCategory
category
;
private
String
guid
=
null
;
private
String
createdBy
=
null
;
...
...
@@ -390,7 +408,7 @@ public abstract class AtlasBaseTypeDef implements java.io.Serializable {
if
(
value
==
null
)
{
sb
.
append
(
value
);
}
else
{
sb
.
append
(
DATE_FORMATTER
.
format
(
value
));
sb
.
append
(
getDateFormatter
()
.
format
(
value
));
}
return
sb
;
...
...
intg/src/main/java/org/apache/atlas/type/AtlasBuiltInTypes.java
View file @
a40f3c2c
...
...
@@ -479,7 +479,7 @@ public class AtlasBuiltInTypes {
return
new
Date
(((
Number
)
obj
).
longValue
());
}
else
{
try
{
return
AtlasBaseTypeDef
.
DATE_FORMATTER
.
parse
(
obj
.
toString
());
return
AtlasBaseTypeDef
.
getDateFormatter
()
.
parse
(
obj
.
toString
());
}
catch
(
ParseException
excp
)
{
try
{
// try to read it as a number
long
longDate
=
Long
.
valueOf
(
obj
.
toString
());
...
...
intg/src/main/java/org/apache/atlas/utils/AtlasJson.java
View file @
a40f3c2c
...
...
@@ -39,8 +39,6 @@ import java.io.IOException;
import
java.text.ParseException
;
import
java.util.Collection
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
public
class
AtlasJson
{
...
...
@@ -187,7 +185,7 @@ public class AtlasJson {
@Override
public
void
serialize
(
Date
value
,
JsonGenerator
jgen
,
SerializerProvider
provider
)
throws
IOException
{
if
(
value
!=
null
)
{
jgen
.
writeString
(
AtlasBaseTypeDef
.
DATE_FORMATTER
.
format
(
value
));
jgen
.
writeString
(
AtlasBaseTypeDef
.
getDateFormatter
()
.
format
(
value
));
}
}
}
...
...
@@ -201,7 +199,7 @@ public class AtlasJson {
if
(
value
!=
null
)
{
try
{
ret
=
AtlasBaseTypeDef
.
DATE_FORMATTER
.
parse
(
value
);
ret
=
AtlasBaseTypeDef
.
getDateFormatter
()
.
parse
(
value
);
}
catch
(
ParseException
excp
)
{
}
}
...
...
intg/src/main/java/org/apache/atlas/v1/model/instance/Id.java
View file @
a40f3c2c
...
...
@@ -236,7 +236,7 @@ public class Id implements Serializable {
}
try
{
return
AtlasBaseTypeDef
.
DATE_FORMATTER
.
parse
(
val
.
toString
());
return
AtlasBaseTypeDef
.
getDateFormatter
()
.
parse
(
val
.
toString
());
}
catch
(
ParseException
excp
)
{
// ignore
}
...
...
intg/src/test/java/org/apache/atlas/type/TestAtlasDateType.java
View file @
a40f3c2c
...
...
@@ -46,7 +46,7 @@ public class TestAtlasDateType {
private
final
Object
[]
invalidValues
=
{
"12ab"
,
"abcd"
,
"-12ab"
,
};
private
final
Date
now
=
new
Date
();
private
final
String
strNow
=
AtlasBaseTypeDef
.
DATE_FORMATTER
.
format
(
now
);
private
final
String
strNow
=
AtlasBaseTypeDef
.
getDateFormatter
()
.
format
(
now
);
@Test
public
void
testDateTypeDefaultValue
()
{
...
...
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