You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@drill.apache.org by ja...@apache.org on 2014/05/22 03:14:57 UTC
[20/24] git commit: Remove references to hive12 Guava.
Remove references to hive12 Guava.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/fbdca8f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/fbdca8f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/fbdca8f9
Branch: refs/heads/diagnostics2
Commit: fbdca8f90c82745218962bddec8c8d55d3ee5c4c
Parents: 79054a8
Author: Jacques Nadeau <ja...@apache.org>
Authored: Wed May 21 13:32:23 2014 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Wed May 21 13:32:23 2014 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/drill/exec/ops/FragmentStats.java | 2 +-
.../org/apache/drill/exec/planner/common/DrillWriterRelBase.java | 2 +-
.../java/org/apache/drill/exec/planner/logical/DrillJoinRel.java | 2 +-
.../apache/drill/exec/planner/physical/PhysicalPlanCreator.java | 2 +-
.../java/org/apache/drill/exec/planner/physical/WriterPrel.java | 2 +-
.../org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java | 2 +-
.../main/java/org/apache/drill/exec/record/MaterializedField.java | 2 +-
.../org/apache/drill/exec/store/easy/json/JSONRecordReader2.java | 2 +-
.../java/org/apache/drill/exec/vector/BaseDataValueVector.java | 2 +-
.../main/java/org/apache/drill/exec/vector/BaseValueVector.java | 2 +-
.../main/java/org/apache/drill/exec/vector/complex/MapVector.java | 2 +-
.../org/apache/drill/exec/vector/complex/RepeatedListVector.java | 2 +-
.../apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java | 2 +-
.../src/test/java/org/apache/drill/exec/TestOpSerialization.java | 2 +-
.../java-exec/src/test/java/org/apache/drill/exec/cache/ISpan.java | 2 +-
.../apache/drill/exec/vector/complex/writer/TestJsonReader.java | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentStats.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentStats.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentStats.java
index 24a02b5..d667794 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentStats.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentStats.java
@@ -23,7 +23,7 @@ import org.apache.drill.exec.proto.BitControl.FragmentStatus;
import org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile;
import com.codahale.metrics.MetricRegistry;
-import com.google.hive12.common.collect.Lists;
+import com.google.common.collect.Lists;
public class FragmentStats {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentStats.class);
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java
index 03431d6..7ea98a4 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java
@@ -29,7 +29,7 @@ import org.eigenbase.reltype.RelDataType;
import org.eigenbase.sql.type.SqlTypeName;
import com.google.common.collect.ImmutableList;
-import com.google.hive12.common.collect.Lists;
+import com.google.common.collect.Lists;
/** Base class for logical and physical Writer implemented in Drill. */
public abstract class DrillWriterRelBase extends SingleRel implements DrillRelNode {
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRel.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRel.java
index a5593e7..e687f5a 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRel.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRel.java
@@ -42,7 +42,7 @@ import org.eigenbase.rex.RexUtil;
import org.eigenbase.sql.fun.SqlStdOperatorTable;
import org.eigenbase.util.Pair;
-import com.google.hive12.common.collect.Lists;
+import com.google.common.collect.Lists;
/**
* Join implemented in Drill.
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java
index f4189e4..35841ab 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java
@@ -31,7 +31,7 @@ import org.apache.drill.exec.physical.base.PhysicalOperator;
import org.apache.drill.exec.planner.physical.explain.PrelSequencer.OpId;
import com.google.common.collect.Lists;
-import com.google.hive12.common.collect.Maps;
+import com.google.common.collect.Maps;
public class PhysicalPlanCreator {
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java
index 233b20b..70d0b1b 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java
@@ -33,7 +33,7 @@ import org.eigenbase.reltype.RelDataType;
import org.eigenbase.sql.type.SqlTypeName;
import com.google.common.collect.ImmutableList;
-import com.google.hive12.common.collect.Lists;
+import com.google.common.collect.Lists;
public class WriterPrel extends DrillWriterRelBase implements Prel {
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java
index b074ba0..26f5af2 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java
@@ -46,7 +46,7 @@ import org.eigenbase.sql.validate.SqlMonotonicity;
import org.eigenbase.sql.validate.SqlValidator;
import org.eigenbase.sql.validate.SqlValidatorScope;
-import com.google.hive12.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
public class DrillSqlAggOperator extends SqlAggFunction {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillSqlAggOperator.class);
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/record/MaterializedField.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/MaterializedField.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/MaterializedField.java
index 439552f..f4d00e6 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/MaterializedField.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/MaterializedField.java
@@ -27,7 +27,7 @@ import org.apache.drill.common.types.TypeProtos.MajorType;
import org.apache.drill.exec.expr.TypeHelper;
import org.apache.drill.exec.proto.UserBitShared.SerializedField;
-import com.google.hive12.common.collect.Lists;
+import com.google.common.collect.Lists;
public class MaterializedField{
private SchemaPath path;
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader2.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader2.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader2.java
index bb52a20..b4f3880 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader2.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader2.java
@@ -36,7 +36,7 @@ import org.apache.drill.exec.vector.complex.impl.VectorContainerWriter;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import com.google.hive12.common.collect.Lists;
+import com.google.common.collect.Lists;
public class JSONRecordReader2 implements RecordReader{
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(JSONRecordReader2.class);
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/vector/BaseDataValueVector.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/BaseDataValueVector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/BaseDataValueVector.java
index 9641e6a..e70f406 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/BaseDataValueVector.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/BaseDataValueVector.java
@@ -26,7 +26,7 @@ import org.apache.drill.exec.proto.UserBitShared.SerializedField;
import org.apache.drill.exec.record.DeadBuf;
import org.apache.drill.exec.record.MaterializedField;
-import com.google.hive12.common.collect.Iterators;
+import com.google.common.collect.Iterators;
public abstract class BaseDataValueVector extends BaseValueVector{
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java
index 7a61475..f968435 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java
@@ -27,7 +27,7 @@ import org.apache.drill.exec.memory.BufferAllocator;
import org.apache.drill.exec.proto.UserBitShared.SerializedField;
import org.apache.drill.exec.record.MaterializedField;
-import com.google.hive12.common.collect.Iterators;
+import com.google.common.collect.Iterators;
public abstract class BaseValueVector implements ValueVector{
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(BaseValueVector.class);
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java
index 9b2e119..9d71727 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java
@@ -46,7 +46,7 @@ import org.apache.drill.exec.vector.complex.writer.BaseWriter.MapWriter;
import com.carrotsearch.hppc.IntObjectOpenHashMap;
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
-import com.google.hive12.common.collect.Lists;
+import com.google.common.collect.Lists;
public class MapVector extends AbstractContainerVector {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(MapVector.class);
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/RepeatedListVector.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/RepeatedListVector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/RepeatedListVector.java
index 1f65761..ef8aef8 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/RepeatedListVector.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/RepeatedListVector.java
@@ -46,7 +46,7 @@ import org.apache.drill.exec.vector.complex.impl.RepeatedListReaderImpl;
import org.apache.drill.exec.vector.complex.reader.FieldReader;
import com.google.common.collect.Lists;
-import com.google.hive12.common.base.Preconditions;
+import com.google.common.base.Preconditions;
public class RepeatedListVector extends AbstractContainerVector implements RepeatedFixedWidthVector{
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java
index c6ea75b..0c7378a 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java
@@ -24,7 +24,7 @@ import org.apache.drill.exec.vector.complex.StateTool;
import org.apache.drill.exec.vector.complex.writer.BaseWriter;
import org.apache.drill.exec.vector.complex.writer.BaseWriter.ComplexWriter;
-import com.google.hive12.common.base.Preconditions;
+import com.google.common.base.Preconditions;
public class ComplexWriterImpl extends AbstractFieldWriter implements ComplexWriter{
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ComplexWriterImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java
index 906361a..29502be 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java
@@ -36,7 +36,7 @@ import org.apache.drill.exec.proto.CoordinationProtos;
import org.apache.drill.exec.store.mock.MockSubScanPOP;
import org.junit.Test;
-import com.google.hive12.common.collect.Lists;
+import com.google.common.collect.Lists;
public class TestOpSerialization {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestOpSerialization.class);
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/test/java/org/apache/drill/exec/cache/ISpan.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/cache/ISpan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/cache/ISpan.java
index 13322f1..9d067da 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/cache/ISpan.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/cache/ISpan.java
@@ -38,7 +38,7 @@ import org.infinispan.configuration.global.GlobalConfigurationBuilder;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.manager.EmbeddedCacheManager;
-import com.google.hive12.common.collect.Lists;
+import com.google.common.collect.Lists;
public class ISpan {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ISpan.class);
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/fbdca8f9/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java
index 7bc4a40..1f3b540 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java
@@ -37,7 +37,7 @@ import org.junit.Test;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.google.common.base.Charsets;
-import com.google.hive12.common.collect.Lists;
+import com.google.common.collect.Lists;
public class TestJsonReader {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestJsonReader.class);