hive git commit: HIVE-13972 : Resolve class dependency issue introduced by HIVE-13354 (Wei Zheng, reviewed by Eugene Koifman)
Repository: hive
Updated Branches:
refs/heads/branch-1 52c7c04b0 -> df3746565
HIVE-13972 : Resolve class dependency issue introduced by HIVE-13354 (Wei
Zheng, reviewed by Eugene Koifman)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/df374656
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/df374656
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/df374656
Branch: refs/heads/branch-1
Commit: df37465651858fd3502b01044b237d074a5125c4
Parents: 52c7c04
Author: Wei Zheng
Authored: Wed Jun 8 13:52:45 2016 -0700
Committer: Wei Zheng
Committed: Wed Jun 8 13:52:45 2016 -0700
--
.../hadoop/hive/common/StringableMap.java | 80
.../hadoop/hive/metastore/txn/TxnHandler.java | 2 +-
.../hadoop/hive/metastore/txn/TxnUtils.java | 54 -
.../hive/ql/txn/compactor/CompactorMR.java | 2 +-
.../hive/ql/txn/compactor/TestWorker.java | 2 +-
5 files changed, 83 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hive/blob/df374656/common/src/java/org/apache/hadoop/hive/common/StringableMap.java
--
diff --git a/common/src/java/org/apache/hadoop/hive/common/StringableMap.java
b/common/src/java/org/apache/hadoop/hive/common/StringableMap.java
new file mode 100644
index 000..8a93c0f
--- /dev/null
+++ b/common/src/java/org/apache/hadoop/hive/common/StringableMap.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive.common;
+
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * A utility class that can convert a HashMap of Properties into a colon
separated string,
+ * and can take the same format of string and convert it to a HashMap of
Properties.
+ */
+public class StringableMap extends HashMap {
+
+ public StringableMap(String s) {
+String[] parts = s.split(":", 2);
+// read that many chars
+int numElements = Integer.parseInt(parts[0]);
+s = parts[1];
+for (int i = 0; i < numElements; i++) {
+ parts = s.split(":", 2);
+ int len = Integer.parseInt(parts[0]);
+ String key = null;
+ if (len > 0) key = parts[1].substring(0, len);
+ parts = parts[1].substring(len).split(":", 2);
+ len = Integer.parseInt(parts[0]);
+ String value = null;
+ if (len > 0) value = parts[1].substring(0, len);
+ s = parts[1].substring(len);
+ put(key, value);
+}
+ }
+
+ public StringableMap(Map m) {
+super(m);
+ }
+
+ @Override
+ public String toString() {
+StringBuilder buf = new StringBuilder();
+buf.append(size());
+buf.append(':');
+if (size() > 0) {
+ for (Map.Entry entry : entrySet()) {
+int length = (entry.getKey() == null) ? 0 : entry.getKey().length();
+buf.append(entry.getKey() == null ? 0 : length);
+buf.append(':');
+if (length > 0) buf.append(entry.getKey());
+length = (entry.getValue() == null) ? 0 : entry.getValue().length();
+buf.append(length);
+buf.append(':');
+if (length > 0) buf.append(entry.getValue());
+ }
+}
+return buf.toString();
+ }
+
+ public Properties toProperties() {
+Properties props = new Properties();
+props.putAll(this);
+return props;
+ }
+}
http://git-wip-us.apache.org/repos/asf/hive/blob/df374656/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
--
diff --git
a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
index 129abef..0902121 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
@@ -34,13 +34,13 @@ import org.apache.commons.dbcp.PoolingDataSource;
import org.apache.commons.pool.ObjectPool;
import org
hive git commit: HIVE-13972 : Resolve class dependency issue introduced by HIVE-13354 (Wei Zheng, reviewed by Eugene Koifman)
Repository: hive
Updated Branches:
refs/heads/branch-2.1 1bc13cb36 -> 185d9c572
HIVE-13972 : Resolve class dependency issue introduced by HIVE-13354 (Wei
Zheng, reviewed by Eugene Koifman)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/185d9c57
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/185d9c57
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/185d9c57
Branch: refs/heads/branch-2.1
Commit: 185d9c57269cc6b673aa3950a8909b7157cd0197
Parents: 1bc13cb
Author: Wei Zheng
Authored: Wed Jun 8 13:26:14 2016 -0700
Committer: Wei Zheng
Committed: Wed Jun 8 13:26:14 2016 -0700
--
.../hadoop/hive/common/StringableMap.java | 80
.../hadoop/hive/metastore/txn/TxnHandler.java | 2 +-
.../hadoop/hive/metastore/txn/TxnUtils.java | 54 -
.../hive/ql/txn/compactor/CompactorMR.java | 2 +-
.../hive/ql/txn/compactor/TestWorker.java | 2 +-
5 files changed, 83 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hive/blob/185d9c57/common/src/java/org/apache/hadoop/hive/common/StringableMap.java
--
diff --git a/common/src/java/org/apache/hadoop/hive/common/StringableMap.java
b/common/src/java/org/apache/hadoop/hive/common/StringableMap.java
new file mode 100644
index 000..8a93c0f
--- /dev/null
+++ b/common/src/java/org/apache/hadoop/hive/common/StringableMap.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive.common;
+
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * A utility class that can convert a HashMap of Properties into a colon
separated string,
+ * and can take the same format of string and convert it to a HashMap of
Properties.
+ */
+public class StringableMap extends HashMap {
+
+ public StringableMap(String s) {
+String[] parts = s.split(":", 2);
+// read that many chars
+int numElements = Integer.parseInt(parts[0]);
+s = parts[1];
+for (int i = 0; i < numElements; i++) {
+ parts = s.split(":", 2);
+ int len = Integer.parseInt(parts[0]);
+ String key = null;
+ if (len > 0) key = parts[1].substring(0, len);
+ parts = parts[1].substring(len).split(":", 2);
+ len = Integer.parseInt(parts[0]);
+ String value = null;
+ if (len > 0) value = parts[1].substring(0, len);
+ s = parts[1].substring(len);
+ put(key, value);
+}
+ }
+
+ public StringableMap(Map m) {
+super(m);
+ }
+
+ @Override
+ public String toString() {
+StringBuilder buf = new StringBuilder();
+buf.append(size());
+buf.append(':');
+if (size() > 0) {
+ for (Map.Entry entry : entrySet()) {
+int length = (entry.getKey() == null) ? 0 : entry.getKey().length();
+buf.append(entry.getKey() == null ? 0 : length);
+buf.append(':');
+if (length > 0) buf.append(entry.getKey());
+length = (entry.getValue() == null) ? 0 : entry.getValue().length();
+buf.append(length);
+buf.append(':');
+if (length > 0) buf.append(entry.getValue());
+ }
+}
+return buf.toString();
+ }
+
+ public Properties toProperties() {
+Properties props = new Properties();
+props.putAll(this);
+return props;
+ }
+}
http://git-wip-us.apache.org/repos/asf/hive/blob/185d9c57/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
--
diff --git
a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
index dd7054b..7a89a0c 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
@@ -37,9 +37,9 @@ import org.apache.commons.dbcp.PoolingDataSource;
import org.apache.commons.pool.ObjectPool;
import o
hive git commit: HIVE-13972 : Resolve class dependency issue introduced by HIVE-13354 (Wei Zheng, reviewed by Eugene Koifman)
Repository: hive
Updated Branches:
refs/heads/master f4707b1f1 -> edc5974a1
HIVE-13972 : Resolve class dependency issue introduced by HIVE-13354 (Wei
Zheng, reviewed by Eugene Koifman)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/edc5974a
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/edc5974a
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/edc5974a
Branch: refs/heads/master
Commit: edc5974a1e87dc140850c6be09c4979c2ccae881
Parents: f4707b1
Author: Wei Zheng
Authored: Wed Jun 8 13:25:20 2016 -0700
Committer: Wei Zheng
Committed: Wed Jun 8 13:25:20 2016 -0700
--
.../hadoop/hive/common/StringableMap.java | 80
.../hadoop/hive/metastore/txn/TxnHandler.java | 2 +-
.../hadoop/hive/metastore/txn/TxnUtils.java | 54 -
.../hive/ql/txn/compactor/CompactorMR.java | 2 +-
.../hive/ql/txn/compactor/TestWorker.java | 2 +-
5 files changed, 83 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hive/blob/edc5974a/common/src/java/org/apache/hadoop/hive/common/StringableMap.java
--
diff --git a/common/src/java/org/apache/hadoop/hive/common/StringableMap.java
b/common/src/java/org/apache/hadoop/hive/common/StringableMap.java
new file mode 100644
index 000..8a93c0f
--- /dev/null
+++ b/common/src/java/org/apache/hadoop/hive/common/StringableMap.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive.common;
+
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * A utility class that can convert a HashMap of Properties into a colon
separated string,
+ * and can take the same format of string and convert it to a HashMap of
Properties.
+ */
+public class StringableMap extends HashMap {
+
+ public StringableMap(String s) {
+String[] parts = s.split(":", 2);
+// read that many chars
+int numElements = Integer.parseInt(parts[0]);
+s = parts[1];
+for (int i = 0; i < numElements; i++) {
+ parts = s.split(":", 2);
+ int len = Integer.parseInt(parts[0]);
+ String key = null;
+ if (len > 0) key = parts[1].substring(0, len);
+ parts = parts[1].substring(len).split(":", 2);
+ len = Integer.parseInt(parts[0]);
+ String value = null;
+ if (len > 0) value = parts[1].substring(0, len);
+ s = parts[1].substring(len);
+ put(key, value);
+}
+ }
+
+ public StringableMap(Map m) {
+super(m);
+ }
+
+ @Override
+ public String toString() {
+StringBuilder buf = new StringBuilder();
+buf.append(size());
+buf.append(':');
+if (size() > 0) {
+ for (Map.Entry entry : entrySet()) {
+int length = (entry.getKey() == null) ? 0 : entry.getKey().length();
+buf.append(entry.getKey() == null ? 0 : length);
+buf.append(':');
+if (length > 0) buf.append(entry.getKey());
+length = (entry.getValue() == null) ? 0 : entry.getValue().length();
+buf.append(length);
+buf.append(':');
+if (length > 0) buf.append(entry.getValue());
+ }
+}
+return buf.toString();
+ }
+
+ public Properties toProperties() {
+Properties props = new Properties();
+props.putAll(this);
+return props;
+ }
+}
http://git-wip-us.apache.org/repos/asf/hive/blob/edc5974a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
--
diff --git
a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
index dd7054b..7a89a0c 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
@@ -37,9 +37,9 @@ import org.apache.commons.dbcp.PoolingDataSource;
import org.apache.commons.pool.ObjectPool;
import org.apach
