From e702650902a8b8ce036f034ed6061c7bb62420c1 Mon Sep 17 00:00:00 2001
From: Jinho Kim <jhkim@apache.org>
Date: Mon, 27 Jul 2015 15:54:07 +0900
Subject: [PATCH] TAJO-1714: Boosting aggregation performance using
 GS-Collection

---
 tajo-core/pom.xml                             | 13 ++++++++++
 .../planner/physical/HashAggregateExec.java   |  6 +++--
 tajo-project/pom.xml                          | 25 +++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/tajo-core/pom.xml b/tajo-core/pom.xml
index 748950360a..2bf9209c40 100644
--- a/tajo-core/pom.xml
+++ b/tajo-core/pom.xml
@@ -474,6 +474,19 @@
       <groupId>com.jayway.jsonpath</groupId>
       <artifactId>json-path</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.goldmansachs</groupId>
+      <artifactId>gs-collections-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.goldmansachs</groupId>
+      <artifactId>gs-collections</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.goldmansachs</groupId>
+      <artifactId>gs-collections-testutils</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <profiles>
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java
index b657622dcd..f713ab870f 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java
@@ -18,6 +18,8 @@
 
 package org.apache.tajo.engine.planner.physical;
 
+import com.gs.collections.api.map.MutableMap;
+import com.gs.collections.impl.map.mutable.UnifiedMap;
 import org.apache.tajo.engine.planner.KeyProjector;
 import org.apache.tajo.plan.function.FunctionContext;
 import org.apache.tajo.plan.logical.GroupbyNode;
@@ -34,7 +36,7 @@
  */
 public class HashAggregateExec extends AggregationExec {
   private Tuple tuple = null;
-  private TupleMap<FunctionContext[]> hashTable;
+  private MutableMap<KeyTuple, FunctionContext[]> hashTable;
   private KeyProjector hashKeyProjector;
   private boolean computed = false;
   private Iterator<Entry<KeyTuple, FunctionContext []>> iterator = null;
@@ -42,7 +44,7 @@ public class HashAggregateExec extends AggregationExec {
   public HashAggregateExec(TaskAttemptContext ctx, GroupbyNode plan, PhysicalExec subOp) throws IOException {
     super(ctx, plan, subOp);
     hashKeyProjector = new KeyProjector(inSchema, plan.getGroupingColumns());
-    hashTable = new TupleMap<FunctionContext []>(10000);
+    hashTable = UnifiedMap.newMap();
     this.tuple = new VTuple(plan.getOutSchema().size());
   }
 
diff --git a/tajo-project/pom.xml b/tajo-project/pom.xml
index a85b61185c..de2729e683 100644
--- a/tajo-project/pom.xml
+++ b/tajo-project/pom.xml
@@ -40,6 +40,7 @@
     <hive.version>1.1.0</hive.version>
     <netty.version>4.0.29.Final</netty.version>
     <jersey.version>2.6</jersey.version>
+    <gs.collection>6.2.0</gs.collection>
     <tajo.root>${project.parent.relativePath}/..</tajo.root>
     <extra.source.path>src/main/hadoop-${hadoop.version}</extra.source.path>
   </properties>
@@ -1131,6 +1132,30 @@
         <artifactId>json-path</artifactId>
         <version>2.0.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.goldmansachs</groupId>
+        <artifactId>gs-collections-api</artifactId>
+        <version>${gs.collection}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.goldmansachs</groupId>
+        <artifactId>gs-collections</artifactId>
+        <version>${gs.collection}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.goldmansachs</groupId>
+        <artifactId>gs-collections-testutils</artifactId>
+        <version>${gs.collection}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>com.goldmansachs</groupId>
+        <artifactId>gs-collections-forkjoin</artifactId>
+        <version>${gs.collection}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <profiles>