You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2015/07/01 19:03:03 UTC
[1/2] hive git commit: HIVE-10794: Remove the dependence from
ErrorMsg to HiveUtils (Owen O'Malley via Prasanth Jayachandran)
Repository: hive
Updated Branches:
refs/heads/master 052643cb8 -> 20034d3ef
HIVE-10794: Remove the dependence from ErrorMsg to HiveUtils (Owen O'Malley via Prasanth Jayachandran)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f755652f
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f755652f
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f755652f
Branch: refs/heads/master
Commit: f755652ff053c57373a4c072d4c93cf9b7169e01
Parents: 052643c
Author: Prasanth Jayachandran <j....@gmail.com>
Authored: Wed Jul 1 10:00:08 2015 -0700
Committer: Prasanth Jayachandran <j....@gmail.com>
Committed: Wed Jul 1 10:00:08 2015 -0700
----------------------------------------------------------------------
ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java | 6 ++++--
.../java/org/apache/hadoop/hive/ql/metadata/HiveUtils.java | 8 --------
2 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/f755652f/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java b/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
index 20509ce..f012b72 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
@@ -665,6 +665,8 @@ public enum ErrorMsg {
return sb.toString();
}
+ static final String LINE_SEP = System.getProperty("line.separator");
+
public static void renderOrigin(StringBuilder sb, ASTNodeOrigin origin) {
while (origin != null) {
sb.append(" in definition of ");
@@ -672,9 +674,9 @@ public enum ErrorMsg {
sb.append(" ");
sb.append(origin.getObjectName());
sb.append(" [");
- sb.append(HiveUtils.LINE_SEP);
+ sb.append(LINE_SEP);
sb.append(origin.getObjectDefinition());
- sb.append(HiveUtils.LINE_SEP);
+ sb.append(LINE_SEP);
sb.append("] used as ");
sb.append(origin.getUsageAlias());
sb.append(" at ");
http://git-wip-us.apache.org/repos/asf/hive/blob/f755652f/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveUtils.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveUtils.java
index c4633f6..719728d 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveUtils.java
@@ -45,14 +45,6 @@ import org.apache.hadoop.util.ReflectionUtils;
*/
public final class HiveUtils {
- public static final char QUOTE = '"';
- public static final char COLON = ':';
- public static final String LBRACKET = "[";
- public static final String RBRACKET = "]";
- public static final String LBRACE = "{";
- public static final String RBRACE = "}";
- public static final String LINE_SEP = System.getProperty("line.separator");
-
public static String escapeString(String str) {
int length = str.length();
StringBuilder escape = new StringBuilder(length + 16);
[2/2] hive git commit: HIVE-10796: Remove dependencies on
NumericHistogram and NumDistinctValueEstimator from JavaDataModel (Owen
O'Malley via Prasanth Jayachandran)
Posted by pr...@apache.org.
HIVE-10796: Remove dependencies on NumericHistogram and NumDistinctValueEstimator from JavaDataModel (Owen O'Malley via Prasanth Jayachandran)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/20034d3e
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/20034d3e
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/20034d3e
Branch: refs/heads/master
Commit: 20034d3ef223c249aa72ffa315238af6c7157afd
Parents: f755652
Author: Prasanth Jayachandran <j....@gmail.com>
Authored: Wed Jul 1 10:02:49 2015 -0700
Committer: Prasanth Jayachandran <j....@gmail.com>
Committed: Wed Jul 1 10:02:49 2015 -0700
----------------------------------------------------------------------
.../ql/udf/generic/GenericUDAFComputeStats.java | 4 +--
.../generic/GenericUDAFHistogramNumeric.java | 2 +-
.../generic/GenericUDAFPercentileApprox.java | 2 +-
.../udf/generic/NumDistinctValueEstimator.java | 18 ++++++++++++
.../hive/ql/udf/generic/NumericHistogram.java | 14 +++++++++
.../hadoop/hive/ql/util/JavaDataModel.java | 30 --------------------
6 files changed, 36 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/20034d3e/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFComputeStats.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFComputeStats.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFComputeStats.java
index 274330b..8482e18 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFComputeStats.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFComputeStats.java
@@ -435,7 +435,7 @@ public class GenericUDAFComputeStats extends AbstractGenericUDAFResolver {
public int estimate() {
JavaDataModel model = JavaDataModel.get();
return model.lengthFor(columnType) + model.primitive1() + model.primitive2() +
- model.lengthFor(numDV);
+ numDV.lengthFor(model);
}
protected void initNDVEstimator(int numBitVectors) {
@@ -833,7 +833,7 @@ public class GenericUDAFComputeStats extends AbstractGenericUDAFResolver {
public int estimate() {
JavaDataModel model = JavaDataModel.get();
return model.primitive1() * 2 + model.primitive2() * 4 +
- model.lengthFor(columnType) + model.lengthFor(numDV);
+ model.lengthFor(columnType) + numDV.lengthFor(model);
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/20034d3e/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFHistogramNumeric.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFHistogramNumeric.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFHistogramNumeric.java
index 008d937..434956f 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFHistogramNumeric.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFHistogramNumeric.java
@@ -238,7 +238,7 @@ public class GenericUDAFHistogramNumeric extends AbstractGenericUDAFResolver {
NumericHistogram histogram; // the histogram object
@Override
public int estimate() {
- return JavaDataModel.get().lengthFor(histogram);
+ return histogram.lengthFor(JavaDataModel.get());
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/20034d3e/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFPercentileApprox.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFPercentileApprox.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFPercentileApprox.java
index e53b893..89d95f8 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFPercentileApprox.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFPercentileApprox.java
@@ -358,7 +358,7 @@ public class GenericUDAFPercentileApprox extends AbstractGenericUDAFResolver {
@Override
public int estimate() {
JavaDataModel model = JavaDataModel.get();
- return model.lengthFor(histogram) +
+ return histogram.lengthFor(model) +
model.array() + JavaDataModel.PRIMITIVES2 * quantiles.length;
}
};
http://git-wip-us.apache.org/repos/asf/hive/blob/20034d3e/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NumDistinctValueEstimator.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NumDistinctValueEstimator.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NumDistinctValueEstimator.java
index 8212bea..7cc5734 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NumDistinctValueEstimator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NumDistinctValueEstimator.java
@@ -23,6 +23,7 @@ import javolution.util.FastBitSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.common.type.HiveDecimal;
+import org.apache.hadoop.hive.ql.util.JavaDataModel;
import org.apache.hadoop.io.Text;
public class NumDistinctValueEstimator {
@@ -356,4 +357,21 @@ public class NumDistinctValueEstimator {
numDistinctValues = Math.pow(2.0, avgLeastSigZero);
return ((long)(numDistinctValues));
}
+
+ public int lengthFor(JavaDataModel model) {
+ int length = model.object();
+ length += model.primitive1() * 2; // two int
+ length += model.primitive2(); // one double
+ length += model.lengthForRandom() * 2; // two Random
+
+ int numVector = getnumBitVectors();
+ if (numVector > 0) {
+ length += model.array() * 3; // three array
+ length += model.primitive1() * numVector * 2; // two int array
+ length += (model.object() + model.array() + model.primitive1() +
+ model.primitive2()) * numVector; // bitset array
+ }
+ return length;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/hive/blob/20034d3e/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NumericHistogram.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NumericHistogram.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NumericHistogram.java
index 0577a4f..4182234 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NumericHistogram.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NumericHistogram.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Collections;
import java.util.Random;
+import org.apache.hadoop.hive.ql.util.JavaDataModel;
import org.apache.hadoop.hive.serde2.io.DoubleWritable;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
@@ -311,4 +312,17 @@ public class NumericHistogram {
public int getNumBins() {
return bins == null ? 0 : bins.size();
}
+
+ public int lengthFor(JavaDataModel model) {
+ int length = model.object();
+ length += model.primitive1() * 2; // two int
+ int numBins = getNumBins();
+ if (numBins > 0) {
+ length += model.arrayList(); // List<Coord>
+ // Coord holds two doubles
+ length += numBins * (model.object() + model.primitive2() * 2);
+ }
+ length += model.lengthForRandom(); // Random
+ return length;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/20034d3e/ql/src/java/org/apache/hadoop/hive/ql/util/JavaDataModel.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/util/JavaDataModel.java b/ql/src/java/org/apache/hadoop/hive/ql/util/JavaDataModel.java
index 3352a08..a0cd188 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/util/JavaDataModel.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/util/JavaDataModel.java
@@ -18,9 +18,6 @@
package org.apache.hadoop.hive.ql.util;
-import org.apache.hadoop.hive.ql.udf.generic.NumDistinctValueEstimator;
-import org.apache.hadoop.hive.ql.udf.generic.NumericHistogram;
-
/**
* Estimation of memory footprint of object
*/
@@ -160,33 +157,6 @@ public enum JavaDataModel {
return lengthForStringOfLength(string.length());
}
- public int lengthFor(NumericHistogram histogram) {
- int length = object();
- length += primitive1() * 2; // two int
- int numBins = histogram.getNumBins();
- if (numBins > 0) {
- length += arrayList(); // List<Coord>
- length += numBins * (object() + primitive2() * 2); // Coord holds two doubles
- }
- length += lengthForRandom(); // Random
- return length;
- }
-
- public int lengthFor(NumDistinctValueEstimator estimator) {
- int length = object();
- length += primitive1() * 2; // two int
- length += primitive2(); // one double
- length += lengthForRandom() * 2; // two Random
-
- int numVector = estimator.getnumBitVectors();
- if (numVector > 0) {
- length += array() * 3; // three array
- length += primitive1() * numVector * 2; // two int array
- length += (object() + array() + primitive1() + primitive2()) * numVector; // bitset array
- }
- return length;
- }
-
public int lengthForRandom() {
// boolean + double + AtomicLong
return object() + primitive1() + primitive2() + object() + primitive2();