You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2015/01/06 18:26:15 UTC
tajo git commit: TAJO-1270: Fix typos. (DaeMyung Kang via hyunsik)
Repository: tajo
Updated Branches:
refs/heads/master bc8e7243e -> 4c7d82970
TAJO-1270: Fix typos. (DaeMyung Kang via hyunsik)
Closes #321
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/4c7d8297
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/4c7d8297
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/4c7d8297
Branch: refs/heads/master
Commit: 4c7d8297076c54898ce45ecbbcfbc78a592911ab
Parents: bc8e724
Author: Hyunsik Choi <hy...@apache.org>
Authored: Wed Jan 7 02:23:44 2015 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Wed Jan 7 02:23:44 2015 +0900
----------------------------------------------------------------------
CHANGES | 8 +++++---
dev-support/test-patch.sh | 2 +-
.../org/apache/tajo/catalog/CatalogService.java | 4 ++--
.../apache/tajo/catalog/store/HCatalogStore.java | 2 +-
.../apache/tajo/catalog/store/HCatalogUtil.java | 2 +-
.../tajo/catalog/store/AbstractDBStore.java | 10 +++++-----
.../catalog/store/XMLCatalogSchemaManager.java | 18 +++++++++---------
.../store/TestXMLCatalogSchemaManager.java | 14 +++++++-------
.../cli/tsql/DefaultTajoCliOutputFormatter.java | 2 +-
.../java/org/apache/tajo/cli/tsql/TajoCli.java | 4 ++--
.../tajo/cli/tsql/TajoCliOutputFormatter.java | 2 +-
.../apache/tajo/util/datetime/DateTimeFormat.java | 2 +-
.../tajo/master/querymaster/Repartitioner.java | 16 ++++++++--------
tajo-dist/src/main/bin/tajo | 2 +-
.../main/sphinx/backup_and_restore/catalog.rst | 2 +-
.../apache/tajo/plan/LogicalPlanPreprocessor.java | 2 +-
.../plan/rewrite/rules/FilterPushDownRule.java | 6 +++---
.../apache/tajo/plan/verifier/ExprsVerifier.java | 2 +-
tajo-project/src/site/markdown/tajo-0.2.0-doc.md | 2 +-
tajo-project/src/site/markdown/tajo-0.8.0-doc.md | 2 +-
.../site/resources/releases/0.8.0/relnotes.html | 4 ++--
.../site/resources/releases/0.9.0/relnotes.html | 2 +-
.../java/org/apache/tajo/storage/DiskUtil.java | 2 +-
.../tajo/storage/HashShuffleAppenderManager.java | 8 ++++----
.../apache/tajo/storage/avro/AvroAppender.java | 2 +-
.../tajo/storage/parquet/ParquetAppender.java | 2 +-
.../org/apache/tajo/storage/rcfile/RCFile.java | 2 +-
.../objectweb/asm/commons/GeneratorAdapter.java | 2 +-
.../tajo/org/objectweb/asm/tree/InsnList.java | 4 ++--
.../org/objectweb/asm/tree/analysis/Analyzer.java | 2 +-
.../objectweb/asm/tree/analysis/Interpreter.java | 14 +++++++-------
31 files changed, 75 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 472f69a..86dab41 100644
--- a/CHANGES
+++ b/CHANGES
@@ -137,6 +137,8 @@ Release 0.9.1 - unreleased
BUG FIXES
+ TAJO-1270: Fix typos. (DaeMyung Kang via hyunsik)
+
TAJO-1180: digitValue should throw Exception when char is not in
valid range. (DaeMyung Kang via hyunsik)
@@ -1048,7 +1050,7 @@ Release 0.8.0
TAJO-589: Add fine grained progress indicator for each task.
(hyoungjunkim via hyunsik)
- TAJO-614: Explaning a logical node should use ExplainLogicalPlanVisitor.
+ TAJO-614: Explaining a logical node should use ExplainLogicalPlanVisitor.
(hyunsik)
TAJO-610: Refactor Column class. (hyunsik)
@@ -1464,7 +1466,7 @@ Release 0.8.0
TAJO-411: Fix Bug: createFromInt8's DATE type should be TIMESTAMP.
(DaeMyung Kang via jihoon)
- TAJO-390: Queries on history are expired ealier than a given expiry time.
+ TAJO-390: Queries on history are expired earlier than a given expiry time.
(hyoungjunkim via hyunsik)
TAJO-410: A query with a combination of general and distinct aggregation
@@ -1839,7 +1841,7 @@ Release 0.2.0
TAJO-262: Integration test hang on jenkins. (jinho)
- TAJO-257: Unit tests occassionally fail. (hyunsik)
+ TAJO-257: Unit tests occasionally fail. (hyunsik)
TAJO-169: the default TAJO_WORKER_STANDBY_MODE in tajo-env.sh is wrong.
(hyunsik)
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/dev-support/test-patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index 1978e36..c7fa34f 100644
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -918,7 +918,7 @@ checkFindbugsWarnings
checkReleaseAuditWarnings
(( RESULT = RESULT + $? ))
buildAndInstall
-### Run tests for Jenkins or if explictly asked for by a developer
+### Run tests for Jenkins or if explicitly asked for by a developer
if [[ $JENKINS == "true" || $RUN_TESTS == "true" ]] ; then
runTests
(( RESULT = RESULT + $? ))
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogService.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogService.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogService.java
index eb11272..2a5d890 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogService.java
+++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogService.java
@@ -95,7 +95,7 @@ public interface CatalogService {
/**
*
* @param databaseName Database name to be dropped
- * @return True if database is dropped sucessfully. Otherwise, it will return FALSE.
+ * @return True if database is dropped successfully. Otherwise, it will return FALSE.
*/
Boolean dropDatabase(String databaseName);
@@ -221,4 +221,4 @@ public interface CatalogService {
boolean updateTableStats(UpdateTableStatsProto stats);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java
index 89c0fdd..2c3fc6a 100644
--- a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java
+++ b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java
@@ -287,7 +287,7 @@ public class HCatalogStore extends CatalogConstants implements CatalogStore {
try {
return Enum.valueOf(TajoDataTypes.Type.class, typeStr);
} catch (IllegalArgumentException iae) {
- LOG.error("Cannot find a matched type aginst from '" + typeStr + "'");
+ LOG.error("Cannot find a matched type against from '" + typeStr + "'");
return null;
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogUtil.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogUtil.java b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogUtil.java
index ff2a2c4..8e8e58c 100644
--- a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogUtil.java
+++ b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogUtil.java
@@ -89,7 +89,7 @@ public class HCatalogUtil {
try {
return Enum.valueOf(TajoDataTypes.Type.class, typeStr);
} catch (IllegalArgumentException iae) {
- throw new CatalogException("Cannot find a matched type aginst from '" + typeStr + "'");
+ throw new CatalogException("Cannot find a matched type against from '" + typeStr + "'");
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
index a239a92..bcd846e 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
@@ -1058,13 +1058,13 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
resultSet = pstmt.executeQuery();
CatalogProtos.ColumnProto columnProto = null;
- int ordinalPostion = -1;
+ int ordinalPosition = -1;
if (resultSet.next()) {
columnProto = resultToColumnProto(resultSet);
//NOTE ==> Setting new column Name
columnProto = columnProto.toBuilder().setName(alterColumnProto.getNewColumnName()).build();
- ordinalPostion = resultSet.getInt("ORDINAL_POSITION");
+ ordinalPosition = resultSet.getInt("ORDINAL_POSITION");
} else {
throw new NoSuchColumnException(alterColumnProto.getOldColumnName());
}
@@ -1084,7 +1084,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
pstmt = conn.prepareStatement(insertNewColumnSql);
pstmt.setInt(1, tableId);
pstmt.setString(2, CatalogUtil.extractSimpleName(columnProto.getName()));
- pstmt.setInt(3, ordinalPostion);
+ pstmt.setInt(3, ordinalPosition);
pstmt.setString(4, columnProto.getDataType().getType().name());
pstmt.setInt(5, (columnProto.getDataType().hasLength() ? columnProto.getDataType().getLength() : 0));
pstmt.executeUpdate();
@@ -1478,7 +1478,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
try {
return Enum.valueOf(Type.class, typeStr);
} catch (IllegalArgumentException iae) {
- LOG.error("Cannot find a matched type aginst from '" + typeStr + "'");
+ LOG.error("Cannot find a matched type against from '" + typeStr + "'");
return null;
}
}
@@ -2333,7 +2333,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
if (typeStr.equals(IndexMethod.TWO_LEVEL_BIN_TREE.toString())) {
return IndexMethod.TWO_LEVEL_BIN_TREE;
} else {
- LOG.error("Cannot find a matched type aginst from '"
+ LOG.error("Cannot find a matched type against from '"
+ typeStr + "'");
// TODO - needs exception handling
return null;
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java
index b09bfa8..94e6e20 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java
@@ -155,7 +155,7 @@ public class XMLCatalogSchemaManager {
return pstmt;
}
- protected boolean checkExistance(Connection conn, DatabaseObjectType type, String... params)
+ protected boolean checkExistence(Connection conn, DatabaseObjectType type, String... params)
throws SQLException {
boolean result = false;
DatabaseMetaData metadata = null;
@@ -163,7 +163,7 @@ public class XMLCatalogSchemaManager {
BaseSchema baseSchema = catalogStore.getSchema();
if (params == null || params.length < 1) {
- throw new IllegalArgumentException("checkExistance function needs at least one argument.");
+ throw new IllegalArgumentException("checkExistence function needs at least one argument.");
}
switch(type) {
@@ -190,7 +190,7 @@ public class XMLCatalogSchemaManager {
pstmt = getExistQuery(conn, type);
if (pstmt != null) {
- result = checkExistanceByQuery(pstmt, baseSchema, params);
+ result = checkExistenceByQuery(pstmt, baseSchema, params);
} else {
metadata = conn.getMetaData();
ResultSet indexes = metadata.getIndexInfo(null, baseSchema.getSchemaName() != null
@@ -208,7 +208,7 @@ public class XMLCatalogSchemaManager {
case TABLE:
pstmt = getExistQuery(conn, type);
if (pstmt != null) {
- result = checkExistanceByQuery(pstmt, baseSchema, params);
+ result = checkExistenceByQuery(pstmt, baseSchema, params);
} else {
metadata = conn.getMetaData();
ResultSet tables = metadata.getTables(null, baseSchema.getSchemaName() != null
@@ -231,14 +231,14 @@ public class XMLCatalogSchemaManager {
+ " type of database object is not supported on this database system.");
}
- result = checkExistanceByQuery(pstmt, baseSchema, params);
+ result = checkExistenceByQuery(pstmt, baseSchema, params);
break;
}
return result;
}
- private boolean checkExistanceByQuery(PreparedStatement pstmt, BaseSchema baseSchema,
+ private boolean checkExistenceByQuery(PreparedStatement pstmt, BaseSchema baseSchema,
String... params) throws SQLException {
int paramIdx = 1;
boolean result = false;
@@ -288,7 +288,7 @@ public class XMLCatalogSchemaManager {
params[0] = object.getName();
}
- if (checkExistance(conn, object.getType(), params)) {
+ if (checkExistence(conn, object.getType(), params)) {
LOG.info("Skip to create " + object.getName() + " databse object. Already exists.");
}
else {
@@ -344,10 +344,10 @@ public class XMLCatalogSchemaManager {
for (DatabaseObject object: catalogStore.getSchema().getObjects()) {
try {
if (DatabaseObjectType.INDEX == object.getType()) {
- result &= checkExistance(conn, object.getType(), object.getDependsOn(), object.getName());
+ result &= checkExistence(conn, object.getType(), object.getDependsOn(), object.getName());
}
else {
- result &= checkExistance(conn, object.getType(), object.getName());
+ result &= checkExistence(conn, object.getType(), object.getName());
}
} catch (SQLException e) {
throw new CatalogException(e.getMessage(), e);
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java
index fdb8556..d5b0403 100644
--- a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java
+++ b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java
@@ -407,12 +407,12 @@ public class TestXMLCatalogSchemaManager {
stmt.executeBatch();
manager.createBaseSchema(conn);
- assertThat(manager.checkExistance(conn, DatabaseObjectType.TABLE, "TESTTABLE1"), is(true));
- assertThat(manager.checkExistance(conn, DatabaseObjectType.TABLE, "TESTTABLE3"), is(false));
- assertThat(manager.checkExistance(conn, DatabaseObjectType.INDEX, "testtable1", "TESTINDEX1"), is(true));
- assertThat(manager.checkExistance(conn, DatabaseObjectType.TRIGGER, "TESTTRIGGER1"), is(true));
- assertThat(manager.checkExistance(conn, DatabaseObjectType.SEQUENCE, "TESTSEQ"), is(true));
- assertThat(manager.checkExistance(conn, DatabaseObjectType.VIEW, "TESTVIEW"), is(true));
+ assertThat(manager.checkExistence(conn, DatabaseObjectType.TABLE, "TESTTABLE1"), is(true));
+ assertThat(manager.checkExistence(conn, DatabaseObjectType.TABLE, "TESTTABLE3"), is(false));
+ assertThat(manager.checkExistence(conn, DatabaseObjectType.INDEX, "testtable1", "TESTINDEX1"), is(true));
+ assertThat(manager.checkExistence(conn, DatabaseObjectType.TRIGGER, "TESTTRIGGER1"), is(true));
+ assertThat(manager.checkExistence(conn, DatabaseObjectType.SEQUENCE, "TESTSEQ"), is(true));
+ assertThat(manager.checkExistence(conn, DatabaseObjectType.VIEW, "TESTVIEW"), is(true));
}
@Test
@@ -431,7 +431,7 @@ public class TestXMLCatalogSchemaManager {
stmt.executeBatch();
manager.createBaseSchema(conn);
- assertTrue(manager.checkExistance(conn, DatabaseObjectType.TABLE, "TESTTABLE2"));
+ assertTrue(manager.checkExistence(conn, DatabaseObjectType.TABLE, "TESTTABLE2"));
}
@Test
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-client/src/main/java/org/apache/tajo/cli/tsql/DefaultTajoCliOutputFormatter.java
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/java/org/apache/tajo/cli/tsql/DefaultTajoCliOutputFormatter.java b/tajo-client/src/main/java/org/apache/tajo/cli/tsql/DefaultTajoCliOutputFormatter.java
index 8d8c023..17c94b9 100644
--- a/tajo-client/src/main/java/org/apache/tajo/cli/tsql/DefaultTajoCliOutputFormatter.java
+++ b/tajo-client/src/main/java/org/apache/tajo/cli/tsql/DefaultTajoCliOutputFormatter.java
@@ -47,7 +47,7 @@ public class DefaultTajoCliOutputFormatter implements TajoCliOutputFormatter {
}
@Override
- public void setScirptMode() {
+ public void setScriptMode() {
this.printPause = false;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoCli.java
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoCli.java b/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoCli.java
index fe9a005..db7f981 100644
--- a/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoCli.java
+++ b/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoCli.java
@@ -246,13 +246,13 @@ public class TajoCli {
}
if (cmd.hasOption("c")) {
- displayFormatter.setScirptMode();
+ displayFormatter.setScriptMode();
int exitCode = executeScript(cmd.getOptionValue("c"));
sout.flush();
System.exit(exitCode);
}
if (cmd.hasOption("f")) {
- displayFormatter.setScirptMode();
+ displayFormatter.setScriptMode();
cmd.getOptionValues("");
File sqlFile = new File(cmd.getOptionValue("f"));
if (sqlFile.exists()) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoCliOutputFormatter.java
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoCliOutputFormatter.java b/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoCliOutputFormatter.java
index b3632f0..a90baf3 100644
--- a/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoCliOutputFormatter.java
+++ b/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoCliOutputFormatter.java
@@ -94,5 +94,5 @@ public interface TajoCliOutputFormatter {
*/
void printErrorMessage(PrintWriter sout, QueryStatus status);
- void setScirptMode();
+ void setScriptMode();
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-common/src/main/java/org/apache/tajo/util/datetime/DateTimeFormat.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/util/datetime/DateTimeFormat.java b/tajo-common/src/main/java/org/apache/tajo/util/datetime/DateTimeFormat.java
index c47c359..8ce08b2 100644
--- a/tajo-common/src/main/java/org/apache/tajo/util/datetime/DateTimeFormat.java
+++ b/tajo-common/src/main/java/org/apache/tajo/util/datetime/DateTimeFormat.java
@@ -735,7 +735,7 @@ public class DateTimeFormat {
tmfc.cc = -tmfc.cc;
}
if (tmfc.cc >= 0) {
- /* +1 becuase 21st century started in 2001 */
+ /* +1 because 21st century started in 2001 */
tm.years = (tmfc.cc - 1) * 100 + 1;
} else {
/* +1 because year == 599 is 600 BC */
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java
index 4cf6ce2..367897d 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java
@@ -340,22 +340,22 @@ public class Repartitioner {
if (childExecSM.getHashShuffleIntermediateEntries() != null &&
!childExecSM.getHashShuffleIntermediateEntries().isEmpty()) {
- for (IntermediateEntry intermEntry: childExecSM.getHashShuffleIntermediateEntries()) {
- intermEntry.setEbId(childBlock.getId());
- if (hashEntries.containsKey(intermEntry.getPartId())) {
+ for (IntermediateEntry intermediateEntry: childExecSM.getHashShuffleIntermediateEntries()) {
+ intermediateEntry.setEbId(childBlock.getId());
+ if (hashEntries.containsKey(intermediateEntry.getPartId())) {
Map<ExecutionBlockId, List<IntermediateEntry>> tbNameToInterm =
- hashEntries.get(intermEntry.getPartId());
+ hashEntries.get(intermediateEntry.getPartId());
if (tbNameToInterm.containsKey(scanEbId)) {
- tbNameToInterm.get(scanEbId).add(intermEntry);
+ tbNameToInterm.get(scanEbId).add(intermediateEntry);
} else {
- tbNameToInterm.put(scanEbId, TUtil.newList(intermEntry));
+ tbNameToInterm.put(scanEbId, TUtil.newList(intermediateEntry));
}
} else {
Map<ExecutionBlockId, List<IntermediateEntry>> tbNameToInterm =
new HashMap<ExecutionBlockId, List<IntermediateEntry>>();
- tbNameToInterm.put(scanEbId, TUtil.newList(intermEntry));
- hashEntries.put(intermEntry.getPartId(), tbNameToInterm);
+ tbNameToInterm.put(scanEbId, TUtil.newList(intermediateEntry));
+ hashEntries.put(intermediateEntry.getPartId(), tbNameToInterm);
}
}
} else {
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-dist/src/main/bin/tajo
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/bin/tajo b/tajo-dist/src/main/bin/tajo
index 3df5397..e73c6b2 100755
--- a/tajo-dist/src/main/bin/tajo
+++ b/tajo-dist/src/main/bin/tajo
@@ -172,7 +172,7 @@ if [ "x$HADOOP_VERSION" == "x" ]; then
HADOOP_VERSION=$($HADOOP version | awk '{if (NR == 1) {print $2;}}');
fi
-# Save the regex to a var to workaround quoting incompatabilities
+# Save the regex to a var to workaround quoting incompatibilities
# between Bash 3.1 and 3.2
hadoop_version_re="^([[:digit:]]+)\.([[:digit:]]+)(\.([[:digit:]]+))?.*$"
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-docs/src/main/sphinx/backup_and_restore/catalog.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/backup_and_restore/catalog.rst b/tajo-docs/src/main/sphinx/backup_and_restore/catalog.rst
index 1b1bf15..200aa85 100644
--- a/tajo-docs/src/main/sphinx/backup_and_restore/catalog.rst
+++ b/tajo-docs/src/main/sphinx/backup_and_restore/catalog.rst
@@ -11,7 +11,7 @@ Now, Tajo supports a two backup methods for
SQL dump
==========
-SQL dump is an easy and strong way. If you use this approach, you don't need to concern database-level compatiblities. If you want to backup your catalog, just use bin/tajo-dump command. The basic usage of this command is: ::
+SQL dump is an easy and strong way. If you use this approach, you don't need to concern database-level compatibilities. If you want to backup your catalog, just use bin/tajo-dump command. The basic usage of this command is: ::
$ tajo-dump table_name > outfile
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanPreprocessor.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanPreprocessor.java b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanPreprocessor.java
index 544f83a..6262995 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanPreprocessor.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanPreprocessor.java
@@ -205,7 +205,7 @@ public class LogicalPlanPreprocessor extends BaseAlgebraVisitor<LogicalPlanner.P
for (int i = 0; i < expr.getNamedExprs().length; i++) {
NamedExpr namedExpr = projectTargetExprs[i];
- // 1) Normalize all field names occured in each expr into full qualified names
+ // 1) Normalize all field names occurred in each expr into full qualified names
NameRefInSelectListNormalizer.normalize(ctx, namedExpr.getExpr());
// 2) Register explicit column aliases to block
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/FilterPushDownRule.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/FilterPushDownRule.java b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/FilterPushDownRule.java
index ef5e7b6..d7cd82e 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/FilterPushDownRule.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/FilterPushDownRule.java
@@ -820,13 +820,13 @@ public class FilterPushDownRule extends BasicLogicalPlanVisitor<FilterPushDownCo
List<EvalNode> notMatched = new ArrayList<EvalNode>();
// transform
- Map<EvalNode, EvalNode> tranformed =
+ Map<EvalNode, EvalNode> transformed =
findCanPushdownAndTransform(context, block, groupbyNode,groupbyNode.getChild(), notMatched, null, false, 0);
- context.setFiltersTobePushed(tranformed.keySet());
+ context.setFiltersTobePushed(transformed.keySet());
LogicalNode current = super.visitGroupBy(context, plan, block, groupbyNode, stack);
- context.setToOrigin(tranformed);
+ context.setToOrigin(transformed);
context.addFiltersTobePushed(notMatched);
return current;
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/ExprsVerifier.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/ExprsVerifier.java b/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/ExprsVerifier.java
index ed8a702..bc6e696 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/ExprsVerifier.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/ExprsVerifier.java
@@ -33,7 +33,7 @@ import static org.apache.tajo.common.TajoDataTypes.Type;
* It verifies one predicate or expression with the semantic and data type checks as follows:
* <ul>
* <ul>Both expressions in a binary expression are compatible to each other</ul>
- * <ul>All column references of one expression are avilable at this node</ul>
+ * <ul>All column references of one expression are available at this node</ul>
* </ul>
*/
public class ExprsVerifier extends BasicEvalNodeVisitor<VerificationState, EvalNode> {
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-project/src/site/markdown/tajo-0.2.0-doc.md
----------------------------------------------------------------------
diff --git a/tajo-project/src/site/markdown/tajo-0.2.0-doc.md b/tajo-project/src/site/markdown/tajo-0.2.0-doc.md
index 1f8c1ff..b30865d 100644
--- a/tajo-project/src/site/markdown/tajo-0.2.0-doc.md
+++ b/tajo-project/src/site/markdown/tajo-0.2.0-doc.md
@@ -807,7 +807,7 @@ Now, Tajo supports a two backup methods for
### <a name="SQLDump"></a>SQL dump
-SQL dump is an easy and strong way. If you use this approach, you don't need to concern database-level compatiblities. If you want to backup your catalog, just use bin/tajo_dump command. The basic usage of this command is:
+SQL dump is an easy and strong way. If you use this approach, you don't need to concern database-level compatibilities. If you want to backup your catalog, just use bin/tajo_dump command. The basic usage of this command is:
```
$ tajo_dump table_name > outfile
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-project/src/site/markdown/tajo-0.8.0-doc.md
----------------------------------------------------------------------
diff --git a/tajo-project/src/site/markdown/tajo-0.8.0-doc.md b/tajo-project/src/site/markdown/tajo-0.8.0-doc.md
index 76c80a1..5483c97 100644
--- a/tajo-project/src/site/markdown/tajo-0.8.0-doc.md
+++ b/tajo-project/src/site/markdown/tajo-0.8.0-doc.md
@@ -933,7 +933,7 @@ Now, Tajo supports a two backup methods for
### <a name="SQLDump"></a>SQL dump
-SQL dump is an easy and strong way. If you use this approach, you don't need to concern database-level compatiblities. If you want to backup your catalog, just use bin/tajo_dump command. The basic usage of this command is:
+SQL dump is an easy and strong way. If you use this approach, you don't need to concern database-level compatibilities. If you want to backup your catalog, just use bin/tajo_dump command. The basic usage of this command is:
```
$ tajo_dump table_name > outfile
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-project/src/site/resources/releases/0.8.0/relnotes.html
----------------------------------------------------------------------
diff --git a/tajo-project/src/site/resources/releases/0.8.0/relnotes.html b/tajo-project/src/site/resources/releases/0.8.0/relnotes.html
index 892db47..d3654bc 100644
--- a/tajo-project/src/site/resources/releases/0.8.0/relnotes.html
+++ b/tajo-project/src/site/resources/releases/0.8.0/relnotes.html
@@ -226,7 +226,7 @@
</li>
<li>[<a href="https://issues.apache.org/jira/browse/TAJO-389">TAJO-389</a>] - The LazyTuple does not work when number format exception occurs in text deserializer
</li>
-<li>[<a href="https://issues.apache.org/jira/browse/TAJO-390">TAJO-390</a>] - Queries on history are expired ealier than a given expiry time.
+<li>[<a href="https://issues.apache.org/jira/browse/TAJO-390">TAJO-390</a>] - Queries on history are expired earlier than a given expiry time.
</li>
<li>[<a href="https://issues.apache.org/jira/browse/TAJO-393">TAJO-393</a>] - Unit tests must use test-data directory.
</li>
@@ -619,7 +619,7 @@
</li>
<li>[<a href="https://issues.apache.org/jira/browse/TAJO-601">TAJO-601</a>] - Improve distinct aggregation query processing
</li>
-<li>[<a href="https://issues.apache.org/jira/browse/TAJO-614">TAJO-614</a>] - Explaning a logical node should use ExplainLogicalPlanVisitor.
+<li>[<a href="https://issues.apache.org/jira/browse/TAJO-614">TAJO-614</a>] - Explaining a logical node should use ExplainLogicalPlanVisitor.
</li>
<li>[<a href="https://issues.apache.org/jira/browse/TAJO-616">TAJO-616</a>] - SequenceFile support
</li>
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-project/src/site/resources/releases/0.9.0/relnotes.html
----------------------------------------------------------------------
diff --git a/tajo-project/src/site/resources/releases/0.9.0/relnotes.html b/tajo-project/src/site/resources/releases/0.9.0/relnotes.html
index 01a8570..3a2d3ca 100644
--- a/tajo-project/src/site/resources/releases/0.9.0/relnotes.html
+++ b/tajo-project/src/site/resources/releases/0.9.0/relnotes.html
@@ -473,7 +473,7 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/TAJO-589'>TAJO-589</a>] - Add fine grained progress indicator for each task
</li>
-<li>[<a href='https://issues.apache.org/jira/browse/TAJO-614'>TAJO-614</a>] - Explaning a logical node should use ExplainLogicalPlanVisitor.
+<li>[<a href='https://issues.apache.org/jira/browse/TAJO-614'>TAJO-614</a>] - Explaining a logical node should use ExplainLogicalPlanVisitor.
</li>
<li>[<a href='https://issues.apache.org/jira/browse/TAJO-616'>TAJO-616</a>] - SequenceFile support
</li>
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/DiskUtil.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/DiskUtil.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/DiskUtil.java
index 2d68870..0bcd5ec 100644
--- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/DiskUtil.java
+++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/DiskUtil.java
@@ -99,7 +99,7 @@ public class DiskUtil {
DiskDeviceInfo diskDeviceInfo = new DiskDeviceInfo(id++);
diskDeviceInfo.setName(eachDeviceName);
- //TODO set addtional info
+ //TODO set additional info
// /sys/block/sda/queue
infos.add(diskDeviceInfo);
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/HashShuffleAppenderManager.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/HashShuffleAppenderManager.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/HashShuffleAppenderManager.java
index 74190bc..dededc6 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/HashShuffleAppenderManager.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/HashShuffleAppenderManager.java
@@ -134,7 +134,7 @@ public class HashShuffleAppenderManager {
}
// Send Intermediate data to QueryMaster.
- List<HashShuffleIntermediate> intermEntries = new ArrayList<HashShuffleIntermediate>();
+ List<HashShuffleIntermediate> intermediateEntries = new ArrayList<HashShuffleIntermediate>();
for (PartitionAppenderMeta eachMeta : partitionAppenderMap.values()) {
try {
eachMeta.appender.close();
@@ -142,16 +142,16 @@ public class HashShuffleAppenderManager {
new HashShuffleIntermediate(eachMeta.partId, eachMeta.appender.getOffset(),
eachMeta.appender.getPages(),
eachMeta.appender.getMergedTupleIndexes());
- intermEntries.add(intermediate);
+ intermediateEntries.add(intermediate);
} catch (IOException e) {
LOG.error(e.getMessage(), e);
throw e;
}
}
- LOG.info("Close HashShuffleAppender:" + ebId + ", intermediates=" + intermEntries.size());
+ LOG.info("Close HashShuffleAppender:" + ebId + ", intermediates=" + intermediateEntries.size());
- return intermEntries;
+ return intermediateEntries;
}
public void finalizeTask(TaskAttemptId taskId) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/avro/AvroAppender.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/avro/AvroAppender.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/avro/AvroAppender.java
index 69399dc..f617099 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/avro/AvroAppender.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/avro/AvroAppender.java
@@ -92,7 +92,7 @@ public class AvroAppender extends FileAppender {
}
/**
- * Gets the current offset. Tracking offsets is currenly not implemented, so
+ * Gets the current offset. Tracking offsets is currently not implemented, so
* this method always returns 0.
*
* @return 0
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/ParquetAppender.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/ParquetAppender.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/ParquetAppender.java
index ef5203c..4557287 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/ParquetAppender.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/ParquetAppender.java
@@ -88,7 +88,7 @@ public class ParquetAppender extends FileAppender {
}
/**
- * Gets the current offset. Tracking offsets is currenly not implemented, so
+ * Gets the current offset. Tracking offsets is currently not implemented, so
* this method always returns 0.
*
* @return 0
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java
index 2c09100..44aabd4 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java
@@ -179,7 +179,7 @@ import java.util.Arrays;
* -- A boolean field indicating whether or not the file is block compressed.
* -- This field is *always* false. According to comments in the original
* -- RCFile implementation this field was retained for backwards
- * -- compatability with the SequenceFile format.
+ * -- compatibility with the SequenceFile format.
*
* file-is-block-compressed ::= Byte[1] {false}
*
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/GeneratorAdapter.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/GeneratorAdapter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/GeneratorAdapter.java
index 4d7a07f..f8c8ae0 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/GeneratorAdapter.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/GeneratorAdapter.java
@@ -1532,7 +1532,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
}
// ------------------------------------------------------------------------
- // Miscelaneous instructions
+ // Miscellaneous instructions
// ------------------------------------------------------------------------
/**
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/InsnList.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/InsnList.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/InsnList.java
index 0876b7b..a027020 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/InsnList.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/InsnList.java
@@ -283,7 +283,7 @@ public class InsnList {
}
/**
- * Inserts the given instruction at the begining of this list.
+ * Inserts the given instruction at the beginning of this list.
*
* @param insn
* an instruction, <i>which must not belong to any
@@ -304,7 +304,7 @@ public class InsnList {
}
/**
- * Inserts the given instructions at the begining of this list.
+ * Inserts the given instructions at the beginning of this list.
*
* @param insns
* an instruction list, which is cleared during the process. This
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Analyzer.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Analyzer.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Analyzer.java
index 1095dd0..0288e73 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Analyzer.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Analyzer.java
@@ -375,7 +375,7 @@ public class Analyzer<V extends Value> implements Opcodes {
* instruction of the method. The size of the returned array is
* equal to the number of instructions (and labels) of the method. A
* given frame is <tt>null</tt> if the corresponding instruction
- * cannot be reached, or if an error occured during the analysis of
+ * cannot be reached, or if an error occurred during the analysis of
* the method.
*/
public Frame<V>[] getFrames() {
http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7d8297/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Interpreter.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Interpreter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Interpreter.java
index 5e90560..99ba5d7 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Interpreter.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Interpreter.java
@@ -82,7 +82,7 @@ public abstract class Interpreter<V extends Value> {
* the bytecode instruction to be interpreted.
* @return the result of the interpretation of the given instruction.
* @throws AnalyzerException
- * if an error occured during the interpretation.
+ * if an error occurred during the interpretation.
*/
public abstract V newOperation(AbstractInsnNode insn)
throws AnalyzerException;
@@ -101,7 +101,7 @@ public abstract class Interpreter<V extends Value> {
* @return the result of the interpretation of the given instruction. The
* returned value must be <tt>equal</tt> to the given value.
* @throws AnalyzerException
- * if an error occured during the interpretation.
+ * if an error occurred during the interpretation.
*/
public abstract V copyOperation(AbstractInsnNode insn, V value)
throws AnalyzerException;
@@ -122,7 +122,7 @@ public abstract class Interpreter<V extends Value> {
* the argument of the instruction to be interpreted.
* @return the result of the interpretation of the given instruction.
* @throws AnalyzerException
- * if an error occured during the interpretation.
+ * if an error occurred during the interpretation.
*/
public abstract V unaryOperation(AbstractInsnNode insn, V value)
throws AnalyzerException;
@@ -146,7 +146,7 @@ public abstract class Interpreter<V extends Value> {
* the second argument of the instruction to be interpreted.
* @return the result of the interpretation of the given instruction.
* @throws AnalyzerException
- * if an error occured during the interpretation.
+ * if an error occurred during the interpretation.
*/
public abstract V binaryOperation(AbstractInsnNode insn, V value1, V value2)
throws AnalyzerException;
@@ -167,7 +167,7 @@ public abstract class Interpreter<V extends Value> {
* the third argument of the instruction to be interpreted.
* @return the result of the interpretation of the given instruction.
* @throws AnalyzerException
- * if an error occured during the interpretation.
+ * if an error occurred during the interpretation.
*/
public abstract V ternaryOperation(AbstractInsnNode insn, V value1,
V value2, V value3) throws AnalyzerException;
@@ -185,7 +185,7 @@ public abstract class Interpreter<V extends Value> {
* the arguments of the instruction to be interpreted.
* @return the result of the interpretation of the given instruction.
* @throws AnalyzerException
- * if an error occured during the interpretation.
+ * if an error occurred during the interpretation.
*/
public abstract V naryOperation(AbstractInsnNode insn,
List<? extends V> values) throws AnalyzerException;
@@ -203,7 +203,7 @@ public abstract class Interpreter<V extends Value> {
* @param expected
* the expected return type of the analyzed method.
* @throws AnalyzerException
- * if an error occured during the interpretation.
+ * if an error occurred during the interpretation.
*/
public abstract void returnOperation(AbstractInsnNode insn, V value,
V expected) throws AnalyzerException;