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 LoopingByteArrayInputStream(byte[] buf) { private final ThreadLocal threadLocalByteArrayInputStream = new ThreadLocal() { @Override - protected synchronized ByteArrayInputStream initialValue() { + protected ByteArrayInputStream initialValue() { return null; } }; 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 @@ private void setDataInput(DataInput in) { private static ThreadLocal tbIn = new ThreadLocal() { @Override - protected synchronized Object initialValue() { + protected Object initialValue() { return new TypedBytesInput(); } }; 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 @@ private void setDataOutput(DataOutput out) { private static ThreadLocal tbOut = new ThreadLocal() { @Override - protected synchronized Object initialValue() { + protected Object initialValue() { return new TypedBytesOutput(); } }; 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 @@ private void setTypedBytesInput(TypedBytesInput in) { private static ThreadLocal tbIn = new ThreadLocal() { @Override - protected synchronized Object initialValue() { + protected Object initialValue() { return new TypedBytesRecordInput(); } }; 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 @@ private void setTypedBytesOutput(TypedBytesOutput out) { private static ThreadLocal tbOut = new ThreadLocal() { @Override - protected synchronized Object initialValue() { + protected Object initialValue() { return new TypedBytesRecordOutput(); } }; 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 @@ private void setTypedBytesInput(TypedBytesInput in) { private static ThreadLocal tbIn = new ThreadLocal() { @Override - protected synchronized Object initialValue() { + protected Object initialValue() { return new TypedBytesWritableInput(); } }; 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 @@ private void setTypedBytesOutput(TypedBytesOutput out) { private static ThreadLocal tbOut = new ThreadLocal() { @Override - protected synchronized Object initialValue() { + protected Object initialValue() { return new TypedBytesWritableOutput(); } }; 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 @@ private Deadline(long timeout) { private static final ThreadLocal DEADLINE_THREAD_LOCAL = new ThreadLocal() { @Override - protected synchronized Deadline initialValue() { + protected Deadline initialValue() { return null; } }; 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 cf23c13..0d483d3 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java @@ -296,14 +296,14 @@ public TTransport getTransport(TTransport trans) { private static final ThreadLocal threadLocalMS = new ThreadLocal() { @Override - protected synchronized RawStore initialValue() { + protected RawStore initialValue() { return null; } }; private final ThreadLocal threadLocalTxn = new ThreadLocal() { @Override - protected synchronized TxnHandler initialValue() { + protected TxnHandler initialValue() { return null; } }; @@ -321,7 +321,7 @@ public static void removeRawStore() { private final ThreadLocal threadLocalConf = new ThreadLocal() { @Override - protected synchronized Configuration initialValue() { + protected Configuration initialValue() { return null; } }; @@ -373,7 +373,7 @@ private final void logAuditEvent(String cmd) { private static int nextSerialNum = 0; private static ThreadLocal threadLocalId = new ThreadLocal() { @Override - protected synchronized Integer initialValue() { + protected Integer initialValue() { return new Integer(nextSerialNum++); } }; @@ -383,7 +383,7 @@ protected synchronized Integer initialValue() { // instance of TSocket. private static ThreadLocal threadLocalIpAddress = new ThreadLocal() { @Override - protected synchronized String initialValue() { + protected String initialValue() { return null; } }; 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 TaskTuple(Class workClass, Class> taskClass) { private static ThreadLocal tid = new ThreadLocal() { @Override - protected synchronized Integer initialValue() { + protected Integer initialValue() { return Integer.valueOf(0); } }; 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 f2ba3c5..74912c3 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 @@ -1072,7 +1072,7 @@ private static void serializeObjectByKryo(Kryo kryo, Object plan, OutputStream o // Also new Kryo() is expensive, so we want to do it just once. public static ThreadLocal runtimeSerializationKryo = new ThreadLocal() { @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()); @@ -1092,7 +1092,7 @@ protected static void removeField(Kryo kryo, Class type, String fieldName) { } private static ThreadLocal cloningQueryPlanKryo = new ThreadLocal() { @Override - protected synchronized Kryo initialValue() { + protected Kryo initialValue() { Kryo kryo = new Kryo(); kryo.setClassLoader(Thread.currentThread().getContextClassLoader()); kryo.register(CommonToken.class, new CommonTokenSerializer()); 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 @@ */ private static final ThreadLocal threadLocal = new ThreadLocal(){ @Override - protected synchronized IOContext initialValue() { return new IOContext(); } + protected IOContext initialValue() { return new IOContext(); } }; private static IOContext get() { 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 ec11bb3..b39f17c 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 @@ -142,7 +142,7 @@ private static ThreadLocal hiveDB = new ThreadLocal() { @Override - protected synchronized Hive initialValue() { + protected Hive initialValue() { return null; } 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 571bbbc..6a1dcbf 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 @@ -48,7 +48,7 @@ public OperationLog(String name, File file) throws FileNotFoundException{ private static final ThreadLocal THREAD_LOCAL_OPERATION_LOG = new ThreadLocal() { @Override - protected synchronized OperationLog initialValue() { + protected OperationLog initialValue() { return null; } }; 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 1bc2cc4..afb3b57 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 @@ private static final ThreadLocal threadLocalDateFormat = new ThreadLocal() { @Override - protected synchronized DateFormat initialValue() { + protected DateFormat initialValue() { return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); } }; 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 @@ private static ThreadLocal DATE_FORMAT = new ThreadLocal() { @Override - protected synchronized DateFormat initialValue() { + protected DateFormat initialValue() { return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); } }; 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 @@ private TSocket getUnderlyingSocketFromTransport(TTransport transport) { private static final ThreadLocal THREAD_LOCAL_IP_ADDRESS = new ThreadLocal() { @Override - protected synchronized String initialValue() { + protected String initialValue() { return null; } }; private static final ThreadLocal THREAD_LOCAL_USER_NAME = new ThreadLocal() { @Override - protected synchronized String initialValue() { + protected String initialValue() { return null; } }; 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 8ade297..5101b0a 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 @@ -307,7 +307,7 @@ public OperationManager getOperationManager() { private static ThreadLocal threadLocalIpAddress = new ThreadLocal() { @Override - protected synchronized String initialValue() { + protected String initialValue() { return null; } }; @@ -326,7 +326,7 @@ public static String getIpAddress() { private static ThreadLocal threadLocalUserName = new ThreadLocal(){ @Override - protected synchronized String initialValue() { + protected String initialValue() { return null; } }; @@ -345,7 +345,7 @@ public static String getUserName() { private static ThreadLocal threadLocalProxyUserName = new ThreadLocal(){ @Override - protected synchronized String initialValue() { + protected String initialValue() { return null; } }; 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 void cancelDelegationToken(String tokenStrForm) throws IOException { new ThreadLocal() { @Override - protected synchronized InetAddress initialValue() { + protected InetAddress initialValue() { return null; } }; @@ -529,7 +529,7 @@ public InetAddress getRemoteAddress() { new ThreadLocal() { @Override - protected synchronized AuthenticationMethod initialValue() { + protected AuthenticationMethod initialValue() { return AuthenticationMethod.TOKEN; } }; @@ -537,7 +537,7 @@ protected synchronized AuthenticationMethod initialValue() { private static ThreadLocal remoteUser = new ThreadLocal () { @Override - protected synchronized String initialValue() { + protected String initialValue() { return null; } };