You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by rs...@apache.org on 2013/03/25 08:22:52 UTC
git commit: TAJO-6: Rename tajo.engine.function.builtin.NewSumInt to
SumInt (rsumbaly)
Updated Branches:
refs/heads/master e91cc9ebe -> ab60e744e
TAJO-6: Rename tajo.engine.function.builtin.NewSumInt to SumInt (rsumbaly)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/ab60e744
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/ab60e744
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/ab60e744
Branch: refs/heads/master
Commit: ab60e744e4a8b1d3a6772f1221a389d3eafd968d
Parents: e91cc9e
Author: Roshan Sumbaly <rs...@apache.org>
Authored: Mon Mar 25 00:16:33 2013 -0700
Committer: Roshan Sumbaly <rs...@apache.org>
Committed: Mon Mar 25 00:16:33 2013 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 +-
.../tajo/engine/function/builtin/NewSumInt.java | 52 ---------------
.../java/tajo/engine/function/builtin/SumInt.java | 52 +++++++++++++++
.../src/main/java/tajo/master/TajoMaster.java | 2 +-
.../tajo/engine/planner/TestLogicalOptimizer.java | 4 +-
.../tajo/engine/planner/TestLogicalPlanner.java | 4 +-
.../java/tajo/engine/planner/TestPlannerUtil.java | 4 +-
7 files changed, 60 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ab60e744/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 75974d8..1064f8b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,4 +10,4 @@ Release 0.2.0 - unreleased
TAJO-1: RCFileWrapper always reads whole columns regardless of the target
schema. (jihoonson via hyunsik)
-
+ TAJO-6: Rename tajo.engine.function.builtin.NewSumInt to SumInt. (rsumbaly)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ab60e744/tajo-core/tajo-core-backend/src/main/java/tajo/engine/function/builtin/NewSumInt.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/tajo/engine/function/builtin/NewSumInt.java b/tajo-core/tajo-core-backend/src/main/java/tajo/engine/function/builtin/NewSumInt.java
deleted file mode 100644
index 7b9acad..0000000
--- a/tajo-core/tajo-core-backend/src/main/java/tajo/engine/function/builtin/NewSumInt.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package tajo.engine.function.builtin;
-
-import tajo.catalog.Column;
-import tajo.catalog.function.AggFunction;
-import tajo.catalog.function.FunctionContext;
-import tajo.catalog.proto.CatalogProtos;
-import tajo.catalog.proto.CatalogProtos.DataType;
-import tajo.datum.Datum;
-import tajo.datum.DatumFactory;
-import tajo.storage.Tuple;
-
-/**
- * @author Hyunsik Choi
- */
-public class NewSumInt extends AggFunction<Datum> {
-
- public NewSumInt() {
- super(new Column[] {
- new Column("val", CatalogProtos.DataType.INT)
- });
- }
-
- @Override
- public SumIntContext newContext() {
- return new SumIntContext();
- }
-
- @Override
- public void eval(FunctionContext ctx, Tuple params) {
- SumIntContext sumCtx = (SumIntContext) ctx;
- sumCtx.sum += params.get(0).asLong();
- }
-
- @Override
- public Datum getPartialResult(FunctionContext ctx) {
- return DatumFactory.createInt(((SumIntContext)ctx).sum);
- }
-
- @Override
- public DataType[] getPartialResultType() {
- return new DataType[] {DataType.INT};
- }
-
- @Override
- public Datum terminate(FunctionContext ctx) {
- return DatumFactory.createInt(((SumIntContext)ctx).sum);
- }
-
- private class SumIntContext implements FunctionContext {
- int sum;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ab60e744/tajo-core/tajo-core-backend/src/main/java/tajo/engine/function/builtin/SumInt.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/tajo/engine/function/builtin/SumInt.java b/tajo-core/tajo-core-backend/src/main/java/tajo/engine/function/builtin/SumInt.java
new file mode 100644
index 0000000..c22e4cd
--- /dev/null
+++ b/tajo-core/tajo-core-backend/src/main/java/tajo/engine/function/builtin/SumInt.java
@@ -0,0 +1,52 @@
+package tajo.engine.function.builtin;
+
+import tajo.catalog.Column;
+import tajo.catalog.function.AggFunction;
+import tajo.catalog.function.FunctionContext;
+import tajo.catalog.proto.CatalogProtos;
+import tajo.catalog.proto.CatalogProtos.DataType;
+import tajo.datum.Datum;
+import tajo.datum.DatumFactory;
+import tajo.storage.Tuple;
+
+/**
+ * @author Hyunsik Choi
+ */
+public class SumInt extends AggFunction<Datum> {
+
+ public SumInt() {
+ super(new Column[] {
+ new Column("val", CatalogProtos.DataType.INT)
+ });
+ }
+
+ @Override
+ public SumIntContext newContext() {
+ return new SumIntContext();
+ }
+
+ @Override
+ public void eval(FunctionContext ctx, Tuple params) {
+ SumIntContext sumCtx = (SumIntContext) ctx;
+ sumCtx.sum += params.get(0).asLong();
+ }
+
+ @Override
+ public Datum getPartialResult(FunctionContext ctx) {
+ return DatumFactory.createInt(((SumIntContext)ctx).sum);
+ }
+
+ @Override
+ public DataType[] getPartialResultType() {
+ return new DataType[] {DataType.INT};
+ }
+
+ @Override
+ public Datum terminate(FunctionContext ctx) {
+ return DatumFactory.createInt(((SumIntContext)ctx).sum);
+ }
+
+ private class SumIntContext implements FunctionContext {
+ int sum;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ab60e744/tajo-core/tajo-core-backend/src/main/java/tajo/master/TajoMaster.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/tajo/master/TajoMaster.java b/tajo-core/tajo-core-backend/src/main/java/tajo/master/TajoMaster.java
index 5c17de3..d1ca849 100644
--- a/tajo-core/tajo-core-backend/src/main/java/tajo/master/TajoMaster.java
+++ b/tajo-core/tajo-core-backend/src/main/java/tajo/master/TajoMaster.java
@@ -171,7 +171,7 @@ public class TajoMaster extends CompositeService {
List<FunctionDesc> sqlFuncs = new ArrayList<FunctionDesc>();
// Sum
- sqlFuncs.add(new FunctionDesc("sum", NewSumInt.class, FunctionType.AGGREGATION,
+ sqlFuncs.add(new FunctionDesc("sum", SumInt.class, FunctionType.AGGREGATION,
new DataType[] {DataType.INT},
new DataType[] {DataType.INT}));
sqlFuncs.add(new FunctionDesc("sum", SumLong.class, FunctionType.AGGREGATION,
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ab60e744/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestLogicalOptimizer.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestLogicalOptimizer.java b/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestLogicalOptimizer.java
index d36857b..8e105b2 100644
--- a/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestLogicalOptimizer.java
+++ b/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestLogicalOptimizer.java
@@ -9,7 +9,7 @@ import tajo.catalog.*;
import tajo.catalog.proto.CatalogProtos.DataType;
import tajo.catalog.proto.CatalogProtos.FunctionType;
import tajo.catalog.proto.CatalogProtos.StoreType;
-import tajo.engine.function.builtin.NewSumInt;
+import tajo.engine.function.builtin.SumInt;
import tajo.engine.parser.QueryAnalyzer;
import tajo.engine.planner.logical.*;
import tajo.master.TajoMaster;
@@ -61,7 +61,7 @@ public class TestLogicalOptimizer {
new Path("file:///"));
catalog.addTable(score);
- FunctionDesc funcDesc = new FunctionDesc("sumtest", NewSumInt.class, FunctionType.GENERAL,
+ FunctionDesc funcDesc = new FunctionDesc("sumtest", SumInt.class, FunctionType.GENERAL,
new DataType[] {DataType.INT},
new DataType[] {DataType.INT});
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ab60e744/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestLogicalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestLogicalPlanner.java b/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestLogicalPlanner.java
index 25a54b2..ac7b25a 100644
--- a/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestLogicalPlanner.java
+++ b/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestLogicalPlanner.java
@@ -35,7 +35,7 @@ import tajo.catalog.proto.CatalogProtos.FunctionType;
import tajo.catalog.proto.CatalogProtos.IndexMethod;
import tajo.catalog.proto.CatalogProtos.StoreType;
import tajo.engine.eval.EvalNode;
-import tajo.engine.function.builtin.NewSumInt;
+import tajo.engine.function.builtin.SumInt;
import tajo.engine.json.GsonCreator;
import tajo.engine.parser.QueryAnalyzer;
import tajo.engine.planner.logical.*;
@@ -96,7 +96,7 @@ public class TestLogicalPlanner {
new Path("file:///"));
catalog.addTable(score);
- FunctionDesc funcDesc = new FunctionDesc("sumtest", NewSumInt.class, FunctionType.AGGREGATION,
+ FunctionDesc funcDesc = new FunctionDesc("sumtest", SumInt.class, FunctionType.AGGREGATION,
new DataType [] {DataType.INT},
new DataType [] {DataType.INT});
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ab60e744/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestPlannerUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestPlannerUtil.java b/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestPlannerUtil.java
index a94af58..176b99f 100644
--- a/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestPlannerUtil.java
+++ b/tajo-core/tajo-core-backend/src/test/java/tajo/engine/planner/TestPlannerUtil.java
@@ -34,7 +34,7 @@ import tajo.engine.eval.BinaryEval;
import tajo.engine.eval.ConstEval;
import tajo.engine.eval.EvalNode;
import tajo.engine.eval.FieldEval;
-import tajo.engine.function.builtin.NewSumInt;
+import tajo.engine.function.builtin.SumInt;
import tajo.engine.parser.QueryAnalyzer;
import tajo.engine.planner.logical.*;
import tajo.storage.Tuple;
@@ -85,7 +85,7 @@ public class TestPlannerUtil {
new Path("file:///"));
catalog.addTable(score);
- FunctionDesc funcDesc = new FunctionDesc("sumtest", NewSumInt.class, FunctionType.AGGREGATION,
+ FunctionDesc funcDesc = new FunctionDesc("sumtest", SumInt.class, FunctionType.AGGREGATION,
new DataType [] {DataType.INT},
new DataType [] {DataType.INT});