You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by xu...@apache.org on 2015/06/26 05:42:02 UTC
[09/53] [abbrv] hive git commit: HIVE-10173 : ThreadLocal
synchronized initialvalue() is irrelevant in JDK7 (Ferdinand Xu via Ashutosh
Chauhan)
HIVE-10173 : ThreadLocal synchronized initialvalue() is irrelevant in JDK7 (Ferdinand Xu via Ashutosh Chauhan)
Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/74a61e05
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/74a61e05
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/74a61e05
Branch: refs/heads/beeline-cli
Commit: 74a61e059c71843c52f4e6b7d2284e83ec329d84
Parents: 55c6d41
Author: Ferdinand Xu <ch...@intel.com>
Authored: Tue Mar 31 23:58:00 2015 -0700
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Tue Jun 23 19:21:04 2015 -0700
----------------------------------------------------------------------
.../hadoop/hive/conf/LoopingByteArrayInputStream.java | 2 +-
.../hive/contrib/util/typedbytes/TypedBytesInput.java | 2 +-
.../hive/contrib/util/typedbytes/TypedBytesOutput.java | 2 +-
.../contrib/util/typedbytes/TypedBytesRecordInput.java | 2 +-
.../contrib/util/typedbytes/TypedBytesRecordOutput.java | 2 +-
.../contrib/util/typedbytes/TypedBytesWritableInput.java | 2 +-
.../contrib/util/typedbytes/TypedBytesWritableOutput.java | 2 +-
.../java/org/apache/hadoop/hive/metastore/Deadline.java | 2 +-
.../org/apache/hadoop/hive/metastore/HiveMetaStore.java | 10 +++++-----
.../java/org/apache/hadoop/hive/ql/exec/TaskFactory.java | 2 +-
ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java | 4 ++--
ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java | 2 +-
ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java | 2 +-
.../org/apache/hadoop/hive/ql/session/OperationLog.java | 2 +-
.../apache/hadoop/hive/serde2/io/TimestampWritable.java | 2 +-
.../hadoop/hive/serde2/io/TestTimestampWritable.java | 2 +-
.../apache/hive/service/auth/TSetIpAddressProcessor.java | 4 ++--
.../apache/hive/service/cli/session/SessionManager.java | 6 +++---
.../apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java | 6 +++---
19 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/common/src/java/org/apache/hadoop/hive/conf/LoopingByteArrayInputStream.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/LoopingByteArrayInputStream.java b/common/src/java/org/apache/hadoop/hive/conf/LoopingByteArrayInputStream.java
index d35c9da..5009925 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/LoopingByteArrayInputStream.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/LoopingByteArrayInputStream.java
@@ -47,7 +47,7 @@ public class LoopingByteArrayInputStream extends InputStream {
private final ThreadLocal<ByteArrayInputStream> threadLocalByteArrayInputStream =
new ThreadLocal<ByteArrayInputStream>() {
@Override
- protected synchronized ByteArrayInputStream initialValue() {
+ protected ByteArrayInputStream initialValue() {
return null;
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesInput.java
----------------------------------------------------------------------
diff --git a/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesInput.java b/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesInput.java
index 052b093..ec918d9 100644
--- a/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesInput.java
+++ b/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesInput.java
@@ -43,7 +43,7 @@ public class TypedBytesInput {
private static ThreadLocal tbIn = new ThreadLocal() {
@Override
- protected synchronized Object initialValue() {
+ protected Object initialValue() {
return new TypedBytesInput();
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesOutput.java
----------------------------------------------------------------------
diff --git a/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesOutput.java b/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesOutput.java
index 1ffa8ef..2e5198b 100644
--- a/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesOutput.java
+++ b/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesOutput.java
@@ -44,7 +44,7 @@ public class TypedBytesOutput {
private static ThreadLocal tbOut = new ThreadLocal() {
@Override
- protected synchronized Object initialValue() {
+ protected Object initialValue() {
return new TypedBytesOutput();
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordInput.java
----------------------------------------------------------------------
diff --git a/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordInput.java b/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordInput.java
index d7949eb..5f049a0 100644
--- a/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordInput.java
+++ b/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordInput.java
@@ -37,7 +37,7 @@ public class TypedBytesRecordInput {
private static ThreadLocal tbIn = new ThreadLocal() {
@Override
- protected synchronized Object initialValue() {
+ protected Object initialValue() {
return new TypedBytesRecordInput();
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordOutput.java
----------------------------------------------------------------------
diff --git a/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordOutput.java b/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordOutput.java
index 7ac1690..a7022f5 100644
--- a/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordOutput.java
+++ b/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordOutput.java
@@ -39,7 +39,7 @@ public class TypedBytesRecordOutput {
private static ThreadLocal tbOut = new ThreadLocal() {
@Override
- protected synchronized Object initialValue() {
+ protected Object initialValue() {
return new TypedBytesRecordOutput();
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableInput.java
----------------------------------------------------------------------
diff --git a/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableInput.java b/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableInput.java
index 3e1b041..7204c76 100644
--- a/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableInput.java
+++ b/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableInput.java
@@ -66,7 +66,7 @@ public class TypedBytesWritableInput implements Configurable {
private static ThreadLocal tbIn = new ThreadLocal() {
@Override
- protected synchronized Object initialValue() {
+ protected Object initialValue() {
return new TypedBytesWritableInput();
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableOutput.java
----------------------------------------------------------------------
diff --git a/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableOutput.java b/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableOutput.java
index 09ef8c1..70b0d64 100644
--- a/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableOutput.java
+++ b/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableOutput.java
@@ -63,7 +63,7 @@ public class TypedBytesWritableOutput {
private static ThreadLocal tbOut = new ThreadLocal() {
@Override
- protected synchronized Object initialValue() {
+ protected Object initialValue() {
return new TypedBytesWritableOutput();
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/metastore/src/java/org/apache/hadoop/hive/metastore/Deadline.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/Deadline.java b/metastore/src/java/org/apache/hadoop/hive/metastore/Deadline.java
index b56e0df..82a537a 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/Deadline.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/Deadline.java
@@ -54,7 +54,7 @@ public class Deadline {
private static final ThreadLocal<Deadline> DEADLINE_THREAD_LOCAL = new
ThreadLocal<Deadline>() {
@Override
- protected synchronized Deadline initialValue() {
+ protected Deadline initialValue() {
return null;
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
index ae9c119..0bcd053 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
@@ -294,14 +294,14 @@ public class HiveMetaStore extends ThriftHiveMetastore {
private static final ThreadLocal<RawStore> threadLocalMS =
new ThreadLocal<RawStore>() {
@Override
- protected synchronized RawStore initialValue() {
+ protected RawStore initialValue() {
return null;
}
};
private static final ThreadLocal<TxnHandler> threadLocalTxn = new ThreadLocal<TxnHandler>() {
@Override
- protected synchronized TxnHandler initialValue() {
+ protected TxnHandler initialValue() {
return null;
}
};
@@ -319,7 +319,7 @@ public class HiveMetaStore extends ThriftHiveMetastore {
private static final ThreadLocal<Configuration> threadLocalConf =
new ThreadLocal<Configuration>() {
@Override
- protected synchronized Configuration initialValue() {
+ protected Configuration initialValue() {
return null;
}
};
@@ -371,7 +371,7 @@ public class HiveMetaStore extends ThriftHiveMetastore {
private static int nextSerialNum = 0;
private static ThreadLocal<Integer> threadLocalId = new ThreadLocal<Integer>() {
@Override
- protected synchronized Integer initialValue() {
+ protected Integer initialValue() {
return new Integer(nextSerialNum++);
}
};
@@ -381,7 +381,7 @@ public class HiveMetaStore extends ThriftHiveMetastore {
// instance of TSocket.
private static ThreadLocal<String> threadLocalIpAddress = new ThreadLocal<String>() {
@Override
- protected synchronized String initialValue() {
+ protected String initialValue() {
return null;
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java
index 5db45ec..14fd61a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java
@@ -111,7 +111,7 @@ public final class TaskFactory {
private static ThreadLocal<Integer> tid = new ThreadLocal<Integer>() {
@Override
- protected synchronized Integer initialValue() {
+ protected Integer initialValue() {
return Integer.valueOf(0);
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
index 14aaceb..afecb1e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
@@ -1087,7 +1087,7 @@ public final class Utilities {
// Also new Kryo() is expensive, so we want to do it just once.
public static ThreadLocal<Kryo> runtimeSerializationKryo = new ThreadLocal<Kryo>() {
@Override
- protected synchronized Kryo initialValue() {
+ protected Kryo initialValue() {
Kryo kryo = new Kryo();
kryo.setClassLoader(Thread.currentThread().getContextClassLoader());
kryo.register(java.sql.Date.class, new SqlDateSerializer());
@@ -1130,7 +1130,7 @@ public final class Utilities {
private static ThreadLocal<Kryo> cloningQueryPlanKryo = new ThreadLocal<Kryo>() {
@Override
- protected synchronized Kryo initialValue() {
+ protected Kryo initialValue() {
Kryo kryo = new Kryo();
kryo.setClassLoader(Thread.currentThread().getContextClassLoader());
kryo.register(CommonToken.class, new CommonTokenSerializer());
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java b/ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java
index 04c9644..ebad0a6 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java
@@ -41,7 +41,7 @@ public class IOContext {
*/
private static final ThreadLocal<IOContext> threadLocal = new ThreadLocal<IOContext>(){
@Override
- protected synchronized IOContext initialValue() { return new IOContext(); }
+ protected IOContext initialValue() { return new IOContext(); }
};
private static IOContext get() {
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
index 1428c0d..a6193ba 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
@@ -148,7 +148,7 @@ public class Hive {
private static ThreadLocal<Hive> hiveDB = new ThreadLocal<Hive>() {
@Override
- protected synchronized Hive initialValue() {
+ protected Hive initialValue() {
return null;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/ql/src/java/org/apache/hadoop/hive/ql/session/OperationLog.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/session/OperationLog.java b/ql/src/java/org/apache/hadoop/hive/ql/session/OperationLog.java
index 5b6df2b..b642e27 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/session/OperationLog.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/session/OperationLog.java
@@ -77,7 +77,7 @@ public class OperationLog {
private static final ThreadLocal<OperationLog> THREAD_LOCAL_OPERATION_LOG = new
ThreadLocal<OperationLog>() {
@Override
- protected synchronized OperationLog initialValue() {
+ protected OperationLog initialValue() {
return null;
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampWritable.java
----------------------------------------------------------------------
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampWritable.java b/serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampWritable.java
index a2a6c79..533b76f 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampWritable.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampWritable.java
@@ -70,7 +70,7 @@ public class TimestampWritable implements WritableComparable<TimestampWritable>
private static final ThreadLocal<DateFormat> threadLocalDateFormat =
new ThreadLocal<DateFormat>() {
@Override
- protected synchronized DateFormat initialValue() {
+ protected DateFormat initialValue() {
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/serde/src/test/org/apache/hadoop/hive/serde2/io/TestTimestampWritable.java
----------------------------------------------------------------------
diff --git a/serde/src/test/org/apache/hadoop/hive/serde2/io/TestTimestampWritable.java b/serde/src/test/org/apache/hadoop/hive/serde2/io/TestTimestampWritable.java
index 5fee019..6c763bc 100644
--- a/serde/src/test/org/apache/hadoop/hive/serde2/io/TestTimestampWritable.java
+++ b/serde/src/test/org/apache/hadoop/hive/serde2/io/TestTimestampWritable.java
@@ -50,7 +50,7 @@ public class TestTimestampWritable {
private static ThreadLocal<DateFormat> DATE_FORMAT =
new ThreadLocal<DateFormat>() {
@Override
- protected synchronized DateFormat initialValue() {
+ protected DateFormat initialValue() {
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/service/src/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
----------------------------------------------------------------------
diff --git a/service/src/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java b/service/src/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
index 645e3e2..8d7eb21 100644
--- a/service/src/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
+++ b/service/src/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
@@ -95,14 +95,14 @@ public class TSetIpAddressProcessor<I extends Iface> extends TCLIService.Process
private static final ThreadLocal<String> THREAD_LOCAL_IP_ADDRESS = new ThreadLocal<String>() {
@Override
- protected synchronized String initialValue() {
+ protected String initialValue() {
return null;
}
};
private static final ThreadLocal<String> THREAD_LOCAL_USER_NAME = new ThreadLocal<String>() {
@Override
- protected synchronized String initialValue() {
+ protected String initialValue() {
return null;
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/service/src/java/org/apache/hive/service/cli/session/SessionManager.java
----------------------------------------------------------------------
diff --git a/service/src/java/org/apache/hive/service/cli/session/SessionManager.java b/service/src/java/org/apache/hive/service/cli/session/SessionManager.java
index 36a30b1..c46bbce 100644
--- a/service/src/java/org/apache/hive/service/cli/session/SessionManager.java
+++ b/service/src/java/org/apache/hive/service/cli/session/SessionManager.java
@@ -326,7 +326,7 @@ public class SessionManager extends CompositeService {
private static ThreadLocal<String> threadLocalIpAddress = new ThreadLocal<String>() {
@Override
- protected synchronized String initialValue() {
+ protected String initialValue() {
return null;
}
};
@@ -345,7 +345,7 @@ public class SessionManager extends CompositeService {
private static ThreadLocal<String> threadLocalUserName = new ThreadLocal<String>(){
@Override
- protected synchronized String initialValue() {
+ protected String initialValue() {
return null;
}
};
@@ -364,7 +364,7 @@ public class SessionManager extends CompositeService {
private static ThreadLocal<String> threadLocalProxyUserName = new ThreadLocal<String>(){
@Override
- protected synchronized String initialValue() {
+ protected String initialValue() {
return null;
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/74a61e05/shims/common/src/main/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java
----------------------------------------------------------------------
diff --git a/shims/common/src/main/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java b/shims/common/src/main/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java
index d004e40..9d49ad5 100644
--- a/shims/common/src/main/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java
+++ b/shims/common/src/main/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java
@@ -515,7 +515,7 @@ public class HadoopThriftAuthBridge {
new ThreadLocal<InetAddress>() {
@Override
- protected synchronized InetAddress initialValue() {
+ protected InetAddress initialValue() {
return null;
}
};
@@ -529,7 +529,7 @@ public class HadoopThriftAuthBridge {
new ThreadLocal<AuthenticationMethod>() {
@Override
- protected synchronized AuthenticationMethod initialValue() {
+ protected AuthenticationMethod initialValue() {
return AuthenticationMethod.TOKEN;
}
};
@@ -537,7 +537,7 @@ public class HadoopThriftAuthBridge {
private static ThreadLocal<String> remoteUser = new ThreadLocal<String> () {
@Override
- protected synchronized String initialValue() {
+ protected String initialValue() {
return null;
}
};