You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2013/07/03 08:32:42 UTC
git commit: TAJO-77: Rename TabletProto as FragmentProto in
CatalogProtos.proto. (jihoon)
Updated Branches:
refs/heads/master bc6359b83 -> 400de6a70
TAJO-77: Rename TabletProto as FragmentProto in CatalogProtos.proto. (jihoon)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/400de6a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/400de6a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/400de6a7
Branch: refs/heads/master
Commit: 400de6a70077349149b0f236d27dc7b9813d213b
Parents: bc6359b
Author: Jihoon Son <ji...@apache.org>
Authored: Wed Jul 3 15:31:41 2013 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Wed Jul 3 15:31:41 2013 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../src/main/proto/CatalogProtos.proto | 4 +--
.../src/main/proto/CatalogProtos.proto | 4 +--
.../src/main/proto/CatalogProtos.proto | 4 +--
.../src/main/proto/MasterWorkerProtos.proto | 2 +-
.../java/org/apache/tajo/storage/Fragment.java | 34 ++++++++++----------
.../src/main/proto/CatalogProtos.proto | 4 +--
7 files changed, 28 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/400de6a7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dc44657..a745a34 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@ Release 0.2.0 - unreleased
IMPROVEMENTS
+ TAJO-77: Rename TabletProto as FragmentProto in CatalogProtos.proto. (jihoon)
+
TAJO-22: The package prefix should be org.apache.tajo. (DaeMyung Kang via hyunsik)
TAJO-75: Separate SQL.g into SQLParser.g and SQLLexer.g. (hyunsik)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/400de6a7/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtos.proto
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtos.proto b/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtos.proto
index 60cbbcd..6164553 100644
--- a/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtos.proto
+++ b/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtos.proto
@@ -80,7 +80,7 @@ message KeyValueSetProto {
repeated KeyValueProto keyval = 1;
}
-message TabletProto {
+message FragmentProto {
required string id = 1;
required string path = 2;
required int64 startOffset = 3;
@@ -208,4 +208,4 @@ message SortSpecProto {
required int32 sortColumnId = 1;
optional bool ascending = 2 [default = true];
optional bool nullFirst = 3 [default = false];
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/400de6a7/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
index ee7e277..c171c2b 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
+++ b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
@@ -80,7 +80,7 @@ message KeyValueSetProto {
repeated KeyValueProto keyval = 1;
}
-message TabletProto {
+message FragmentProto {
required string id = 1;
required string path = 2;
required int64 startOffset = 3;
@@ -208,4 +208,4 @@ message SortSpecProto {
required int32 sortColumnId = 1;
optional bool ascending = 2 [default = true];
optional bool nullFirst = 3 [default = false];
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/400de6a7/tajo-core/tajo-core-backend/src/main/proto/CatalogProtos.proto
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/proto/CatalogProtos.proto b/tajo-core/tajo-core-backend/src/main/proto/CatalogProtos.proto
index ee7e277..c171c2b 100644
--- a/tajo-core/tajo-core-backend/src/main/proto/CatalogProtos.proto
+++ b/tajo-core/tajo-core-backend/src/main/proto/CatalogProtos.proto
@@ -80,7 +80,7 @@ message KeyValueSetProto {
repeated KeyValueProto keyval = 1;
}
-message TabletProto {
+message FragmentProto {
required string id = 1;
required string path = 2;
required int64 startOffset = 3;
@@ -208,4 +208,4 @@ message SortSpecProto {
required int32 sortColumnId = 1;
optional bool ascending = 2 [default = true];
optional bool nullFirst = 3 [default = false];
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/400de6a7/tajo-core/tajo-core-backend/src/main/proto/MasterWorkerProtos.proto
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/proto/MasterWorkerProtos.proto b/tajo-core/tajo-core-backend/src/main/proto/MasterWorkerProtos.proto
index 9fea5be..ffffdcc 100644
--- a/tajo-core/tajo-core-backend/src/main/proto/MasterWorkerProtos.proto
+++ b/tajo-core/tajo-core-backend/src/main/proto/MasterWorkerProtos.proto
@@ -49,7 +49,7 @@ message TaskFatalErrorReport {
message QueryUnitRequestProto {
required QueryUnitAttemptIdProto id = 1;
- repeated TabletProto fragments = 2;
+ repeated FragmentProto fragments = 2;
required string outputTable = 3;
required bool clusteredOutput = 4;
required string serializedData = 5;
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/400de6a7/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/Fragment.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/Fragment.java b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/Fragment.java
index df10354..c1605b6 100644
--- a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/Fragment.java
+++ b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/Fragment.java
@@ -23,16 +23,16 @@ import com.google.gson.Gson;
import com.google.gson.annotations.Expose;
import org.apache.hadoop.fs.Path;
import org.apache.tajo.catalog.*;
+import org.apache.tajo.catalog.proto.CatalogProtos.FragmentProto;
+import org.apache.tajo.catalog.proto.CatalogProtos.FragmentProtoOrBuilder;
import org.apache.tajo.catalog.proto.CatalogProtos.SchemaProto;
-import org.apache.tajo.catalog.proto.CatalogProtos.TabletProto;
-import org.apache.tajo.catalog.proto.CatalogProtos.TabletProtoOrBuilder;
import org.apache.tajo.storage.json.GsonCreator;
import org.apache.tajo.util.TUtil;
public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
- protected TabletProto proto = TabletProto.getDefaultInstance();
- protected TabletProto.Builder builder = null;
+ protected FragmentProto proto = FragmentProto.getDefaultInstance();
+ protected FragmentProto.Builder builder = null;
protected boolean viaProto = false;
@Expose
@@ -52,7 +52,7 @@ public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
private String [] dataLocations;
public Fragment() {
- builder = TabletProto.newBuilder();
+ builder = FragmentProto.newBuilder();
}
public Fragment(String fragmentId, Path path, TableMeta meta, long start,
@@ -66,7 +66,7 @@ public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
this.dataLocations = dataLocations;
}
- public Fragment(TabletProto proto) {
+ public Fragment(FragmentProto proto) {
this();
TableMeta newMeta = new TableMetaImpl(proto.getMeta());
this.set(proto.getId(), new Path(proto.getPath()), newMeta,
@@ -94,7 +94,7 @@ public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
}
public String getId() {
- TabletProtoOrBuilder p = viaProto ? proto : builder;
+ FragmentProtoOrBuilder p = viaProto ? proto : builder;
if (this.fragmentId != null) {
return this.fragmentId;
@@ -116,7 +116,7 @@ public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
@Override
public Path getPath() {
- TabletProtoOrBuilder p = viaProto ? proto : builder;
+ FragmentProtoOrBuilder p = viaProto ? proto : builder;
if (this.path != null) {
return this.path;
@@ -139,7 +139,7 @@ public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
}
public TableMeta getMeta() {
- TabletProtoOrBuilder p = viaProto ? proto : builder;
+ FragmentProtoOrBuilder p = viaProto ? proto : builder;
if (this.meta != null) {
return this.meta;
@@ -158,7 +158,7 @@ public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
}
public Long getStartOffset() {
- TabletProtoOrBuilder p = viaProto ? proto : builder;
+ FragmentProtoOrBuilder p = viaProto ? proto : builder;
if (this.startOffset != null) {
return this.startOffset;
@@ -171,7 +171,7 @@ public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
}
public Long getLength() {
- TabletProtoOrBuilder p = viaProto ? proto : builder;
+ FragmentProtoOrBuilder p = viaProto ? proto : builder;
if (this.length != null) {
return this.length;
@@ -184,7 +184,7 @@ public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
}
public Boolean isDistCached() {
- TabletProtoOrBuilder p = viaProto ? proto : builder;
+ FragmentProtoOrBuilder p = viaProto ? proto : builder;
if (this.distCached != null) {
return distCached;
@@ -249,7 +249,7 @@ public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
initFromProto();
frag.proto = null;
frag.viaProto = false;
- frag.builder = TabletProto.newBuilder();
+ frag.builder = FragmentProto.newBuilder();
frag.fragmentId = fragmentId;
frag.path = path;
frag.meta = (TableMeta) (meta != null ? meta.clone() : null);
@@ -266,7 +266,7 @@ public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
}
@Override
- public TabletProto getProto() {
+ public FragmentProto getProto() {
if (!viaProto) {
mergeLocalToBuilder();
proto = builder.build();
@@ -278,14 +278,14 @@ public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
private void setModified() {
if (viaProto || builder == null) {
- builder = TabletProto.newBuilder(proto);
+ builder = FragmentProto.newBuilder(proto);
}
viaProto = false;
}
protected void mergeLocalToBuilder() {
if (builder == null) {
- this.builder = TabletProto.newBuilder(proto);
+ this.builder = FragmentProto.newBuilder(proto);
}
if (this.fragmentId != null) {
@@ -314,7 +314,7 @@ public class Fragment implements TableDesc, Comparable<Fragment>, SchemaObject {
}
private void mergeProtoToLocal() {
- TabletProtoOrBuilder p = viaProto ? proto : builder;
+ FragmentProtoOrBuilder p = viaProto ? proto : builder;
if (fragmentId == null && p.hasId()) {
fragmentId = p.getId();
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/400de6a7/tajo-core/tajo-core-storage/src/main/proto/CatalogProtos.proto
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-storage/src/main/proto/CatalogProtos.proto b/tajo-core/tajo-core-storage/src/main/proto/CatalogProtos.proto
index 598a7f6..96b35b3 100644
--- a/tajo-core/tajo-core-storage/src/main/proto/CatalogProtos.proto
+++ b/tajo-core/tajo-core-storage/src/main/proto/CatalogProtos.proto
@@ -80,7 +80,7 @@ message KeyValueSetProto {
repeated KeyValueProto keyval = 1;
}
-message TabletProto {
+message FragmentProto {
required string id = 1;
required string path = 2;
required int64 startOffset = 3;
@@ -208,4 +208,4 @@ message SortSpecProto {
required int32 sortColumnId = 1;
optional bool ascending = 2 [default = true];
optional bool nullFirst = 3 [default = false];
-}
\ No newline at end of file
+}