drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jacq...@apache.org
Subject [2/5] drill git commit: DRILL-3581: Upgrade HPPC to 0.7.1
Date Fri, 05 Feb 2016 15:00:55 GMT
DRILL-3581: Upgrade HPPC to 0.7.1


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/d27127c9
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/d27127c9
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/d27127c9

Branch: refs/heads/master
Commit: d27127c94d5c08306697a5627a1bac5f144abb22
Parents: af98e93
Author: Jacques Nadeau <jacques@apache.org>
Authored: Tue Feb 2 19:30:31 2016 -0800
Committer: Jacques Nadeau <jacques@apache.org>
Committed: Fri Feb 5 05:54:41 2016 -0800

----------------------------------------------------------------------
 exec/java-exec/pom.xml                          |  2 +-
 .../compile/bytecode/InstructionModifier.java   | 10 +++---
 .../exec/compile/bytecode/ValueHolderIden.java  |  6 ++--
 .../drill/exec/ops/BufferManagerImpl.java       | 11 +++---
 .../apache/drill/exec/ops/OperatorStats.java    | 20 +++++------
 .../drill/exec/ops/ViewExpansionContext.java    | 13 ++++----
 .../impl/flatten/FlattenRecordBatch.java        |  7 ++--
 .../impl/project/ProjectRecordBatch.java        |  7 ++--
 .../drill/exec/planner/physical/PrelUtil.java   | 35 +++++++++-----------
 .../exec/rpc/control/CustomHandlerRegistry.java |  4 +--
 .../exec/store/schedule/AffinityCreator.java    |  4 +--
 .../store/schedule/EndpointByteMapImpl.java     |  4 +--
 .../drill/exec/work/foreman/QueryManager.java   | 22 ++++++------
 exec/vector/pom.xml                             |  2 +-
 .../drill/exec/expr/fn/impl/DateUtility.java    |  4 +--
 15 files changed, 72 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/pom.xml
----------------------------------------------------------------------
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 6e3ffdd..11ca089 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -342,7 +342,7 @@
     <dependency>
       <groupId>com.carrotsearch</groupId>
       <artifactId>hppc</artifactId>
-      <version>0.4.2</version>
+      <version>0.7.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java
index d25b1ba..8677a39 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java
@@ -28,8 +28,8 @@ import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.analysis.BasicValue;
 import org.objectweb.asm.tree.analysis.Frame;
 
-import com.carrotsearch.hppc.IntIntOpenHashMap;
-import com.carrotsearch.hppc.IntObjectOpenHashMap;
+import com.carrotsearch.hppc.IntIntHashMap;
+import com.carrotsearch.hppc.IntObjectHashMap;
 import com.carrotsearch.hppc.cursors.IntIntCursor;
 import com.carrotsearch.hppc.cursors.IntObjectCursor;
 import com.google.common.base.Preconditions;
@@ -38,9 +38,9 @@ public class InstructionModifier extends MethodVisitor {
   private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(InstructionModifier.class);
 
   /* Map from old (reference) local variable index to new local variable information. */
-  private final IntObjectOpenHashMap<ValueHolderIden.ValueHolderSub> oldToNew = new
IntObjectOpenHashMap<>();
+  private final IntObjectHashMap<ValueHolderIden.ValueHolderSub> oldToNew = new IntObjectHashMap<>();
 
-  private final IntIntOpenHashMap oldLocalToFirst = new IntIntOpenHashMap();
+  private final IntIntHashMap oldLocalToFirst = new IntIntHashMap();
 
   private final DirectSorter adder;
   private int lastLineNumber = 0; // the last line number seen
@@ -313,7 +313,7 @@ public class InstructionModifier extends MethodVisitor {
 
       // if local var is not set, then check map to see if existing holders are mapped to
local var.
       if (oldLocalToFirst.containsKey(var)) {
-        final ValueHolderSub sub = oldToNew.get(oldLocalToFirst.lget());
+        final ValueHolderSub sub = oldToNew.get(oldLocalToFirst.get(var));
         if (sub.iden() == from.iden()) {
           // if they are, then transfer to that.
           from.transfer(this, sub.first());

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java
index 8b28629..cc2eda1 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
-import com.carrotsearch.hppc.ObjectIntOpenHashMap;
+import com.carrotsearch.hppc.ObjectIntHashMap;
 import com.carrotsearch.hppc.cursors.ObjectIntCursor;
 import com.google.common.collect.Lists;
 
@@ -32,7 +32,7 @@ class ValueHolderIden {
 //  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ValueHolderIden.class);
 
   // the index of a field is the number in which it appears within the holder
-  private final ObjectIntOpenHashMap<String> fieldMap; // field name -> index
+  private final ObjectIntHashMap<String> fieldMap; // field name -> index
   private final Type[] types; // the type of each field in the holder, by index
   private final String[] names; // the name of each field in the holder, by index
   private final int[] offsets; // the offset of each field in the holder, by index
@@ -54,7 +54,7 @@ class ValueHolderIden {
     this.types = new Type[fldList.size()];
     this.names = new String[fldList.size()];
     this.offsets = new int[fldList.size()];
-    fieldMap = new ObjectIntOpenHashMap<String>(fldList.size(), 1.0f);
+    fieldMap = new ObjectIntHashMap<String>(fldList.size());
     int i = 0; // index of the next holder member variable
     int offset = 0; // offset of the next holder member variable
     for (Field f : fldList) {

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/src/main/java/org/apache/drill/exec/ops/BufferManagerImpl.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/BufferManagerImpl.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/BufferManagerImpl.java
index b8c6796..e82f3f4 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/BufferManagerImpl.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/BufferManagerImpl.java
@@ -21,10 +21,10 @@ import io.netty.buffer.DrillBuf;
 
 import org.apache.drill.exec.memory.BufferAllocator;
 
-import com.carrotsearch.hppc.LongObjectOpenHashMap;
+import com.carrotsearch.hppc.LongObjectHashMap;
 
 public class BufferManagerImpl implements BufferManager {
-  private LongObjectOpenHashMap<DrillBuf> managedBuffers = new LongObjectOpenHashMap<>();
+  private LongObjectHashMap<DrillBuf> managedBuffers = new LongObjectHashMap<>();
   private final BufferAllocator allocator;
 
   public BufferManagerImpl(BufferAllocator allocator) {
@@ -33,10 +33,11 @@ public class BufferManagerImpl implements BufferManager {
 
   @Override
   public void close() {
-    final Object[] mbuffers = ((LongObjectOpenHashMap<Object>) (Object) managedBuffers).values;
+    final Object[] mbuffers = ((LongObjectHashMap<Object>) (Object) managedBuffers).values;
     for (int i = 0; i < mbuffers.length; i++) {
-      if (managedBuffers.allocated[i]) {
-        ((DrillBuf) mbuffers[i]).release(1);
+      final DrillBuf buf = (DrillBuf) mbuffers[i];
+      if (buf != null) {
+        buf.release();
       }
     }
     managedBuffers.clear();

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorStats.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorStats.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorStats.java
index 3f671e0..e79eab3 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorStats.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorStats.java
@@ -24,8 +24,8 @@ import org.apache.drill.exec.proto.UserBitShared.MetricValue;
 import org.apache.drill.exec.proto.UserBitShared.OperatorProfile;
 import org.apache.drill.exec.proto.UserBitShared.StreamProfile;
 
-import com.carrotsearch.hppc.IntDoubleOpenHashMap;
-import com.carrotsearch.hppc.IntLongOpenHashMap;
+import com.carrotsearch.hppc.IntDoubleHashMap;
+import com.carrotsearch.hppc.IntLongHashMap;
 import com.carrotsearch.hppc.cursors.IntDoubleCursor;
 import com.carrotsearch.hppc.cursors.IntLongCursor;
 
@@ -36,8 +36,8 @@ public class OperatorStats {
   protected final int operatorType;
   private final BufferAllocator allocator;
 
-  private IntLongOpenHashMap longMetrics = new IntLongOpenHashMap();
-  private IntDoubleOpenHashMap doubleMetrics = new IntDoubleOpenHashMap();
+  private IntLongHashMap longMetrics = new IntLongHashMap();
+  private IntDoubleHashMap doubleMetrics = new IntDoubleHashMap();
 
   public long[] recordsReceivedByInput;
   public long[] batchesReceivedByInput;
@@ -107,7 +107,7 @@ public class OperatorStats {
    * @return OperatorStats - for convenience so one can merge multiple stats in one go
    */
   public OperatorStats mergeMetrics(OperatorStats from) {
-    final IntLongOpenHashMap fromMetrics = from.longMetrics;
+    final IntLongHashMap fromMetrics = from.longMetrics;
 
     final Iterator<IntLongCursor> iter = fromMetrics.iterator();
     while (iter.hasNext()) {
@@ -115,7 +115,7 @@ public class OperatorStats {
       longMetrics.putOrAdd(next.key, next.value, next.value);
     }
 
-    final IntDoubleOpenHashMap fromDMetrics = from.doubleMetrics;
+    final IntDoubleHashMap fromDMetrics = from.doubleMetrics;
     final Iterator<IntDoubleCursor> iterD = fromDMetrics.iterator();
 
     while (iterD.hasNext()) {
@@ -217,16 +217,16 @@ public class OperatorStats {
   }
 
   public void addLongMetrics(OperatorProfile.Builder builder) {
-    for(int i =0; i < longMetrics.allocated.length; i++){
-      if(longMetrics.allocated[i]){
+    for (int i = 0; i < longMetrics.keys.length; i++) {
+      if (longMetrics.keys[i] != 0) {
         builder.addMetric(MetricValue.newBuilder().setMetricId(longMetrics.keys[i]).setLongValue(longMetrics.values[i]));
       }
     }
   }
 
   public void addDoubleMetrics(OperatorProfile.Builder builder) {
-    for(int i =0; i < doubleMetrics.allocated.length; i++){
-      if(doubleMetrics.allocated[i]){
+    for (int i = 0; i < longMetrics.keys.length; i++) {
+      if (doubleMetrics.keys[i] != 0) {
         builder.addMetric(MetricValue.newBuilder().setMetricId(doubleMetrics.keys[i]).setDoubleValue(doubleMetrics.values[i]));
       }
     }

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java
index 53dbfd2..e5d565c 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java
@@ -17,14 +17,15 @@
  */
 package org.apache.drill.exec.ops;
 
-import com.carrotsearch.hppc.ObjectIntOpenHashMap;
-import com.google.common.base.Preconditions;
-import org.apache.calcite.schema.SchemaPlus;
-import org.apache.drill.common.exceptions.UserException;
+import static org.apache.drill.exec.ExecConstants.IMPERSONATION_MAX_CHAINED_USER_HOPS;
+
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.plan.RelOptTable.ToRelContext;
+import org.apache.calcite.schema.SchemaPlus;
+import org.apache.drill.common.exceptions.UserException;
 
-import static org.apache.drill.exec.ExecConstants.IMPERSONATION_MAX_CHAINED_USER_HOPS;
+import com.carrotsearch.hppc.ObjectIntHashMap;
+import com.google.common.base.Preconditions;
 
 /**
  * Contains context information about view expansion(s) in a query. Part of {@link org.apache.drill.exec.ops
@@ -72,7 +73,7 @@ public class ViewExpansionContext {
   private final QueryContext queryContext;
   private final int maxChainedUserHops;
   private final String queryUser;
-  private final ObjectIntOpenHashMap<String> userTokens = new ObjectIntOpenHashMap<>();
+  private final ObjectIntHashMap<String> userTokens = new ObjectIntHashMap<>();
 
   public ViewExpansionContext(QueryContext queryContext) {
     this.queryContext = queryContext;

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java
index dcaa244..f1d6dfc 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java
@@ -20,8 +20,6 @@ package org.apache.drill.exec.physical.impl.flatten;
 import java.io.IOException;
 import java.util.List;
 
-import com.carrotsearch.hppc.IntOpenHashSet;
-
 import org.apache.drill.common.exceptions.UserException;
 import org.apache.drill.common.expression.ErrorCollector;
 import org.apache.drill.common.expression.ErrorCollectorImpl;
@@ -49,11 +47,12 @@ import org.apache.drill.exec.record.TransferPair;
 import org.apache.drill.exec.record.TypedFieldId;
 import org.apache.drill.exec.record.VectorContainer;
 import org.apache.drill.exec.record.VectorWrapper;
-import org.apache.drill.exec.vector.complex.RepeatedValueVector;
 import org.apache.drill.exec.vector.ValueVector;
 import org.apache.drill.exec.vector.complex.RepeatedMapVector;
+import org.apache.drill.exec.vector.complex.RepeatedValueVector;
 import org.apache.drill.exec.vector.complex.writer.BaseWriter.ComplexWriter;
 
+import com.carrotsearch.hppc.IntHashSet;
 import com.google.common.collect.Lists;
 import com.sun.codemodel.JExpr;
 
@@ -285,7 +284,7 @@ public class FlattenRecordBatch extends AbstractSingleRecordBatch<FlattenPOP>
{
     final List<TransferPair> transfers = Lists.newArrayList();
 
     final ClassGenerator<Flattener> cg = CodeGenerator.getRoot(Flattener.TEMPLATE_DEFINITION,
context.getFunctionRegistry());
-    final IntOpenHashSet transferFieldIds = new IntOpenHashSet();
+    final IntHashSet transferFieldIds = new IntHashSet();
 
     final NamedExpression flattenExpr = new NamedExpression(popConfig.getColumn(), new FieldReference(popConfig.getColumn()));
     final ValueVectorReadExpression vectorRead = (ValueVectorReadExpression)ExpressionTreeMaterializer.materialize(flattenExpr.getExpr(),
incoming, collector, context.getFunctionRegistry(), true);

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectRecordBatch.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectRecordBatch.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectRecordBatch.java
index 1ca5d1d..56bfa79 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectRecordBatch.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectRecordBatch.java
@@ -26,7 +26,6 @@ import org.apache.drill.common.expression.ConvertExpression;
 import org.apache.drill.common.expression.ErrorCollector;
 import org.apache.drill.common.expression.ErrorCollectorImpl;
 import org.apache.drill.common.expression.ExpressionPosition;
-import org.apache.drill.common.expression.ExpressionStringBuilder;
 import org.apache.drill.common.expression.FieldReference;
 import org.apache.drill.common.expression.FunctionCall;
 import org.apache.drill.common.expression.FunctionCallFactory;
@@ -38,7 +37,6 @@ import org.apache.drill.common.expression.fn.CastFunctions;
 import org.apache.drill.common.logical.data.NamedExpression;
 import org.apache.drill.common.types.TypeProtos.MinorType;
 import org.apache.drill.common.types.Types;
-import org.apache.drill.exec.ExecConstants;
 import org.apache.drill.exec.exception.ClassTransformationException;
 import org.apache.drill.exec.exception.OutOfMemoryException;
 import org.apache.drill.exec.exception.SchemaChangeException;
@@ -47,7 +45,6 @@ import org.apache.drill.exec.expr.ClassGenerator.HoldingContainer;
 import org.apache.drill.exec.expr.CodeGenerator;
 import org.apache.drill.exec.expr.DrillFuncHolderExpr;
 import org.apache.drill.exec.expr.ExpressionTreeMaterializer;
-import org.apache.drill.exec.expr.HashVisitor;
 import org.apache.drill.exec.expr.TypeHelper;
 import org.apache.drill.exec.expr.ValueVectorReadExpression;
 import org.apache.drill.exec.expr.ValueVectorWriteExpression;
@@ -68,7 +65,7 @@ import org.apache.drill.exec.vector.FixedWidthVector;
 import org.apache.drill.exec.vector.ValueVector;
 import org.apache.drill.exec.vector.complex.writer.BaseWriter.ComplexWriter;
 
-import com.carrotsearch.hppc.IntOpenHashSet;
+import com.carrotsearch.hppc.IntHashSet;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -299,7 +296,7 @@ public class ProjectRecordBatch extends AbstractSingleRecordBatch<Project>
{
 
     final ClassGenerator<Projector> cg = CodeGenerator.getRoot(Projector.TEMPLATE_DEFINITION,
context.getFunctionRegistry());
 
-    final IntOpenHashSet transferFieldIds = new IntOpenHashSet();
+    final IntHashSet transferFieldIds = new IntHashSet();
 
     final boolean isAnyWildcard = isAnyWildcard(exprs);
 

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelUtil.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelUtil.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelUtil.java
index ae70a50..6605020 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelUtil.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelUtil.java
@@ -17,31 +17,18 @@
  */
 package org.apache.drill.exec.planner.physical;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.drill.common.expression.ExpressionPosition;
-import org.apache.drill.common.expression.FieldReference;
-import org.apache.drill.common.expression.FunctionCall;
-import org.apache.drill.common.expression.LogicalExpression;
-import org.apache.drill.common.expression.PathSegment;
-import org.apache.drill.common.expression.PathSegment.ArraySegment;
-import org.apache.drill.common.expression.PathSegment.NameSegment;
-import org.apache.drill.common.expression.SchemaPath;
-import org.apache.drill.common.logical.data.Order.Ordering;
-import org.apache.drill.exec.planner.physical.DrillDistributionTrait.DistributionField;
-import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode;
-
+import org.apache.calcite.plan.RelOptCluster;
 import org.apache.calcite.plan.RelOptPlanner;
+import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelCollation;
 import org.apache.calcite.rel.RelFieldCollation;
 import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.plan.RelOptCluster;
-import org.apache.calcite.plan.RelOptRuleCall;
-import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.type.RelDataType;
 import org.apache.calcite.rel.type.RelDataTypeFactory;
 import org.apache.calcite.rel.type.RelDataTypeField;
@@ -52,8 +39,16 @@ import org.apache.calcite.rex.RexLocalRef;
 import org.apache.calcite.rex.RexNode;
 import org.apache.calcite.rex.RexShuttle;
 import org.apache.calcite.rex.RexVisitorImpl;
+import org.apache.drill.common.expression.ExpressionPosition;
+import org.apache.drill.common.expression.FieldReference;
+import org.apache.drill.common.expression.PathSegment;
+import org.apache.drill.common.expression.PathSegment.ArraySegment;
+import org.apache.drill.common.expression.PathSegment.NameSegment;
+import org.apache.drill.common.expression.SchemaPath;
+import org.apache.drill.common.logical.data.Order.Ordering;
+import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode;
 
-import com.carrotsearch.hppc.IntIntOpenHashMap;
+import com.carrotsearch.hppc.IntIntHashMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -198,7 +193,7 @@ public class PrelUtil {
 
       this.fieldNames = Lists.newArrayListWithCapacity(desiredFields.size());
       this.types = Lists.newArrayListWithCapacity(desiredFields.size());
-      IntIntOpenHashMap oldToNewIds = new IntIntOpenHashMap();
+      IntIntHashMap oldToNewIds = new IntIntHashMap();
 
       int i =0;
       for (DesiredField f : desiredFields) {
@@ -352,9 +347,9 @@ public class PrelUtil {
 
   public static class InputRewriter extends RexShuttle {
 
-    final IntIntOpenHashMap map;
+    final IntIntHashMap map;
 
-    public InputRewriter(IntIntOpenHashMap map) {
+    public InputRewriter(IntIntHashMap map) {
       super();
       this.map = map;
     }

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java
index c328cd8..7fc09fb 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java
@@ -33,7 +33,7 @@ import org.apache.drill.exec.rpc.UserRpcException;
 import org.apache.drill.exec.rpc.control.Controller.CustomMessageHandler;
 import org.apache.drill.exec.rpc.control.Controller.CustomResponse;
 
-import com.carrotsearch.hppc.IntObjectOpenHashMap;
+import com.carrotsearch.hppc.IntObjectHashMap;
 import com.google.common.base.Preconditions;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
@@ -46,7 +46,7 @@ public class CustomHandlerRegistry {
   private final ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
   private final AutoCloseableLock read = new AutoCloseableLock(readWriteLock.readLock());
   private final AutoCloseableLock write = new AutoCloseableLock(readWriteLock.writeLock());
-  private final IntObjectOpenHashMap<ParsingHandler<?>> handlers = new IntObjectOpenHashMap<>();
+  private final IntObjectHashMap<ParsingHandler<?>> handlers = new IntObjectHashMap<>();
   private volatile DrillbitEndpoint endpoint;
 
   public CustomHandlerRegistry() {

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java
index 22d4ef5..cf3daec 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.drill.exec.physical.EndpointAffinity;
 import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
 
-import com.carrotsearch.hppc.ObjectFloatOpenHashMap;
+import com.carrotsearch.hppc.ObjectFloatHashMap;
 import com.carrotsearch.hppc.cursors.ObjectFloatCursor;
 import com.carrotsearch.hppc.cursors.ObjectLongCursor;
 import com.google.common.base.Stopwatch;
@@ -40,7 +40,7 @@ public class AffinityCreator {
       totalBytes += entry.getTotalBytes();
     }
 
-    ObjectFloatOpenHashMap<DrillbitEndpoint> affinities = new ObjectFloatOpenHashMap<DrillbitEndpoint>();
+    ObjectFloatHashMap<DrillbitEndpoint> affinities = new ObjectFloatHashMap<DrillbitEndpoint>();
     for (CompleteWork entry : work) {
       for (ObjectLongCursor<DrillbitEndpoint> cursor : entry.getByteMap()) {
         long bytes = cursor.value;

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMapImpl.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMapImpl.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMapImpl.java
index 567175d..8a9f0a1 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMapImpl.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMapImpl.java
@@ -21,13 +21,13 @@ import java.util.Iterator;
 
 import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
 
-import com.carrotsearch.hppc.ObjectLongOpenHashMap;
+import com.carrotsearch.hppc.ObjectLongHashMap;
 import com.carrotsearch.hppc.cursors.ObjectLongCursor;
 
 public class EndpointByteMapImpl implements EndpointByteMap{
   static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(EndpointByteMapImpl.class);
 
-  private final ObjectLongOpenHashMap<DrillbitEndpoint> map = new ObjectLongOpenHashMap<>();
+  private final ObjectLongHashMap<DrillbitEndpoint> map = new ObjectLongHashMap<>();
 
   private long maxBytes;
 

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java
index b07c86b..060cffc 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java
@@ -51,7 +51,7 @@ import org.apache.drill.exec.store.sys.PStoreProvider;
 import org.apache.drill.exec.work.EndpointListener;
 import org.apache.drill.exec.work.foreman.Foreman.StateListener;
 
-import com.carrotsearch.hppc.IntObjectOpenHashMap;
+import com.carrotsearch.hppc.IntObjectHashMap;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -86,8 +86,8 @@ public class QueryManager {
    * Doesn't need to be thread safe as fragmentDataMap is generated in a single thread and
then
    * accessed by multiple threads for reads only.
    */
-  private final IntObjectOpenHashMap<IntObjectOpenHashMap<FragmentData>> fragmentDataMap
=
-      new IntObjectOpenHashMap<>();
+  private final IntObjectHashMap<IntObjectHashMap<FragmentData>> fragmentDataMap
=
+      new IntObjectHashMap<>();
   private final List<FragmentData> fragmentDataSet = Lists.newArrayList();
 
   private final PStore<QueryProfile> profilePStore;
@@ -163,9 +163,9 @@ public class QueryManager {
     final int majorFragmentId = fragmentHandle.getMajorFragmentId();
     final int minorFragmentId = fragmentHandle.getMinorFragmentId();
 
-    IntObjectOpenHashMap<FragmentData> minorMap = fragmentDataMap.get(majorFragmentId);
+    IntObjectHashMap<FragmentData> minorMap = fragmentDataMap.get(majorFragmentId);
     if (minorMap == null) {
-      minorMap = new IntObjectOpenHashMap<>();
+      minorMap = new IntObjectHashMap<>();
       fragmentDataMap.put(majorFragmentId, minorMap);
     }
     minorMap.put(minorFragmentId, fragmentData);
@@ -351,15 +351,15 @@ public class QueryManager {
       profileBuilder.setPlan(planText);
     }
 
-    for (int i = 0; i < fragmentDataMap.allocated.length; i++) {
-      if (fragmentDataMap.allocated[i]) {
+    for (int i = 0; i < fragmentDataMap.keys.length; i++) {
+      if (fragmentDataMap.keys[i] != 0) {
         final int majorFragmentId = fragmentDataMap.keys[i];
-        final IntObjectOpenHashMap<FragmentData> minorMap =
-            (IntObjectOpenHashMap<FragmentData>) ((Object[]) fragmentDataMap.values)[i];
+        final IntObjectHashMap<FragmentData> minorMap =
+            (IntObjectHashMap<FragmentData>) ((Object[]) fragmentDataMap.values)[i];
         final MajorFragmentProfile.Builder fb = MajorFragmentProfile.newBuilder()
             .setMajorFragmentId(majorFragmentId);
-        for (int v = 0; v < minorMap.allocated.length; v++) {
-          if (minorMap.allocated[v]) {
+        for (int v = 0; v < minorMap.keys.length; v++) {
+          if (minorMap.keys[v] != 0) {
             final FragmentData data = (FragmentData) ((Object[]) minorMap.values)[v];
             fb.addMinorFragmentProfile(data.getProfile());
           }

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/vector/pom.xml
----------------------------------------------------------------------
diff --git a/exec/vector/pom.xml b/exec/vector/pom.xml
index 3be9cc1..2d62631 100644
--- a/exec/vector/pom.xml
+++ b/exec/vector/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.carrotsearch</groupId>
       <artifactId>hppc</artifactId>
-      <version>0.4.2</version>
+      <version>0.7.1</version>
     </dependency>
 
 

http://git-wip-us.apache.org/repos/asf/drill/blob/d27127c9/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/DateUtility.java
----------------------------------------------------------------------
diff --git a/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/DateUtility.java
b/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/DateUtility.java
index 98a0b61..992ae03 100644
--- a/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/DateUtility.java
+++ b/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/DateUtility.java
@@ -24,7 +24,7 @@ import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.DateTimeFormatterBuilder;
 import org.joda.time.format.DateTimeParser;
 
-import com.carrotsearch.hppc.ObjectIntOpenHashMap;
+import com.carrotsearch.hppc.ObjectIntHashMap;
 
 // Utility class for Date, DateTime, TimeStamp, Interval data types
 public class DateUtility {
@@ -35,7 +35,7 @@ public class DateUtility {
      * reconstruct the timestamp, we use this index to index through the array timezoneList
      * and get the corresponding timezone and pass it to joda-time
      */
-    public static ObjectIntOpenHashMap<String> timezoneMap = new ObjectIntOpenHashMap<String>();
+  public static ObjectIntHashMap<String> timezoneMap = new ObjectIntHashMap<String>();
 
     public static String[] timezoneList =  {"Africa/Abidjan",
                                             "Africa/Accra",


Mime
View raw message