You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ti...@apache.org on 2016/01/29 23:46:14 UTC
[3/4] incubator-asterixdb git commit: remove end-of-line whitespace
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-installer/src/test/java/org/apache/asterix/installer/test/AbstractExecutionIT.java
----------------------------------------------------------------------
diff --git a/asterix-installer/src/test/java/org/apache/asterix/installer/test/AbstractExecutionIT.java b/asterix-installer/src/test/java/org/apache/asterix/installer/test/AbstractExecutionIT.java
index 42827b4..5df074b 100644
--- a/asterix-installer/src/test/java/org/apache/asterix/installer/test/AbstractExecutionIT.java
+++ b/asterix-installer/src/test/java/org/apache/asterix/installer/test/AbstractExecutionIT.java
@@ -3,9 +3,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may obtain a copy of the License from
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-installer/src/test/java/org/apache/asterix/installer/test/ClusterExecutionIT.java
----------------------------------------------------------------------
diff --git a/asterix-installer/src/test/java/org/apache/asterix/installer/test/ClusterExecutionIT.java b/asterix-installer/src/test/java/org/apache/asterix/installer/test/ClusterExecutionIT.java
index cf69e1a..97709cb 100644
--- a/asterix-installer/src/test/java/org/apache/asterix/installer/test/ClusterExecutionIT.java
+++ b/asterix-installer/src/test/java/org/apache/asterix/installer/test/ClusterExecutionIT.java
@@ -3,9 +3,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may obtain a copy of the License from
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-installer/src/test/java/org/apache/asterix/installer/test/ManagixExecutionIT.java
----------------------------------------------------------------------
diff --git a/asterix-installer/src/test/java/org/apache/asterix/installer/test/ManagixExecutionIT.java b/asterix-installer/src/test/java/org/apache/asterix/installer/test/ManagixExecutionIT.java
index 492f173..14a1a58 100644
--- a/asterix-installer/src/test/java/org/apache/asterix/installer/test/ManagixExecutionIT.java
+++ b/asterix-installer/src/test/java/org/apache/asterix/installer/test/ManagixExecutionIT.java
@@ -3,9 +3,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may obtain a copy of the License from
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-installer/src/test/java/org/apache/asterix/installer/test/ManagixSqlppExecutionIT.java
----------------------------------------------------------------------
diff --git a/asterix-installer/src/test/java/org/apache/asterix/installer/test/ManagixSqlppExecutionIT.java b/asterix-installer/src/test/java/org/apache/asterix/installer/test/ManagixSqlppExecutionIT.java
index b9c2072..50d103a 100644
--- a/asterix-installer/src/test/java/org/apache/asterix/installer/test/ManagixSqlppExecutionIT.java
+++ b/asterix-installer/src/test/java/org/apache/asterix/installer/test/ManagixSqlppExecutionIT.java
@@ -3,9 +3,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may obtain a copy of the License from
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/context/FunctionExpressionMap.java
----------------------------------------------------------------------
diff --git a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/context/FunctionExpressionMap.java b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/context/FunctionExpressionMap.java
index 4d98cc1..1a3d151 100644
--- a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/context/FunctionExpressionMap.java
+++ b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/context/FunctionExpressionMap.java
@@ -24,7 +24,7 @@ import org.apache.asterix.common.functions.FunctionSignature;
public class FunctionExpressionMap extends HashMap<Integer, FunctionSignature> {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
private boolean varargs;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/DoubleLiteral.java
----------------------------------------------------------------------
diff --git a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/DoubleLiteral.java b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/DoubleLiteral.java
index 98f1a19..1a5066d 100644
--- a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/DoubleLiteral.java
+++ b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/DoubleLiteral.java
@@ -22,7 +22,7 @@ import org.apache.asterix.lang.common.base.Literal;
public class DoubleLiteral extends Literal {
/**
- *
+ *
*/
private static final long serialVersionUID = -5685491458356989250L;
private Double value;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/FloatLiteral.java
----------------------------------------------------------------------
diff --git a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/FloatLiteral.java b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/FloatLiteral.java
index 70bc8fe..d7c54fa 100644
--- a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/FloatLiteral.java
+++ b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/FloatLiteral.java
@@ -22,7 +22,7 @@ import org.apache.asterix.lang.common.base.Literal;
public class FloatLiteral extends Literal {
/**
- *
+ *
*/
private static final long serialVersionUID = 3273563021227964396L;
private Float value;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/IntegerLiteral.java
----------------------------------------------------------------------
diff --git a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/IntegerLiteral.java b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/IntegerLiteral.java
index 95173b5..e0c1de3 100644
--- a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/IntegerLiteral.java
+++ b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/IntegerLiteral.java
@@ -22,7 +22,7 @@ import org.apache.asterix.lang.common.base.Literal;
public class IntegerLiteral extends Literal {
/**
- *
+ *
*/
private static final long serialVersionUID = -8633520244871361967L;
private Integer value;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/LongIntegerLiteral.java
----------------------------------------------------------------------
diff --git a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/LongIntegerLiteral.java b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/LongIntegerLiteral.java
index 4afc3b6..3320dac 100644
--- a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/LongIntegerLiteral.java
+++ b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/LongIntegerLiteral.java
@@ -22,7 +22,7 @@ import org.apache.asterix.lang.common.base.Literal;
public class LongIntegerLiteral extends Literal {
/**
- *
+ *
*/
private static final long serialVersionUID = -8633520244871361967L;
private Long value;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/NullLiteral.java
----------------------------------------------------------------------
diff --git a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/NullLiteral.java b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/NullLiteral.java
index 242cbb6..e5fdb1d 100644
--- a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/NullLiteral.java
+++ b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/NullLiteral.java
@@ -23,7 +23,7 @@ import org.apache.asterix.lang.common.base.Literal;
public class NullLiteral extends Literal {
/**
- *
+ *
*/
private static final long serialVersionUID = -7782153599294838739L;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGeneratorMojo.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGeneratorMojo.java
index c72eb0a..7b914bc 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGeneratorMojo.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGeneratorMojo.java
@@ -37,7 +37,7 @@ import java.io.File;
public class LexerGeneratorMojo extends AbstractMojo {
/**
* parameter injected from pom.xml
- *
+ *
* @parameter
* @required
*/
@@ -45,7 +45,7 @@ public class LexerGeneratorMojo extends AbstractMojo {
/**
* parameter injected from pom.xml
- *
+ *
* @parameter
* @required
*/
@@ -93,4 +93,4 @@ public class LexerGeneratorMojo extends AbstractMojo {
return fileData.toString();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/Lexer.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/Lexer.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/Lexer.java
index a113864..60e6e89 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/Lexer.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/Lexer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package [PACKAGE];
+package [PACKAGE];
import java.io.IOException;
import [PACKAGE].[LEXER_NAME]Exception;
@@ -28,18 +28,18 @@ public class [LEXER_NAME] {
// Human representation of tokens. Useful for debug.
// Is possible to convert a TOKEN_CONSTANT in its image through
- // [LEXER_NAME].tokenKindToString(TOKEN_CONSTANT);
+ // [LEXER_NAME].tokenKindToString(TOKEN_CONSTANT);
private static final String[] tokenImage = {
"<EOF>", "<AUX_NOT_FOUND>" [TOKENS_IMAGES]
};
-
+
private static final char EOF_CHAR = 4;
protected java.io.Reader inputStream;
protected int column;
protected int line;
protected boolean prevCharIsCR;
protected boolean prevCharIsLF;
- protected boolean containsEscapes;
+ protected boolean containsEscapes;
protected char[] buffer;
protected int bufsize;
protected int bufpos;
@@ -56,12 +56,12 @@ public class [LEXER_NAME] {
// ================================================================================
// Main method. Return a TOKEN_CONSTANT
-// ================================================================================
-
+// ================================================================================
+
public int next() throws [LEXER_NAME]Exception, IOException {
char currentChar = buffer[bufpos];
while (currentChar == ' ' || currentChar=='\t' || currentChar == '\n' || currentChar=='\r')
- currentChar = readNextChar();
+ currentChar = readNextChar();
tokenBegin = bufpos;
containsEscapes = false;
if (currentChar==EOF_CHAR) return TOKEN_EOF;
@@ -124,21 +124,21 @@ public class [LEXER_NAME] {
return new String(buffer, tokenBegin, bufsize - tokenBegin) +
new String(buffer, 0, bufpos);
}
-
+
public int getColumn() {
return column;
}
-
+
public int getLine() {
return line;
}
-
+
public boolean containsEscapes() {
return containsEscapes;
}
public static String tokenKindToString(int token) {
- return tokenImage[token];
+ return tokenImage[token];
}
public void done(){
@@ -147,8 +147,8 @@ public class [LEXER_NAME] {
// ================================================================================
// Parse error management
-// ================================================================================
-
+// ================================================================================
+
protected int parseError(int ... tokens) throws [LEXER_NAME]Exception {
StringBuilder message = new StringBuilder();
message.append("Parse error at (").append(line).append(", ").append(column).append(")");
@@ -160,10 +160,10 @@ public class [LEXER_NAME] {
}
throw new [LEXER_NAME]Exception(message.toString());
}
-
+
protected void updateLineColumn(char c){
column++;
-
+
if (prevCharIsLF)
{
prevCharIsLF = false;
@@ -181,17 +181,17 @@ public class [LEXER_NAME] {
line += (column = 1);
}
}
-
+
if (c=='\r') {
prevCharIsCR = true;
} else if(c == '\n') {
prevCharIsLF = true;
}
}
-
+
// ================================================================================
// Read data, buffer management. It uses a circular (and expandable) buffer
-// ================================================================================
+// ================================================================================
protected char readNextChar() throws IOException {
if (++bufpos >= endOf_USED_Buffer)
@@ -202,13 +202,13 @@ public class [LEXER_NAME] {
}
protected boolean fillBuff() throws IOException {
- if (endOf_UNUSED_Buffer == endOf_USED_Buffer) // If no more unused buffer space
+ if (endOf_UNUSED_Buffer == endOf_USED_Buffer) // If no more unused buffer space
{
if (endOf_UNUSED_Buffer == bufsize) // -- If the previous unused space was
{ // -- at the end of the buffer
if (tokenBegin > maxUnusedBufferSize) // -- -- If the first N bytes before
{ // the current token are enough
- bufpos = endOf_USED_Buffer = 0; // -- -- -- setup buffer to use that fragment
+ bufpos = endOf_USED_Buffer = 0; // -- -- -- setup buffer to use that fragment
endOf_UNUSED_Buffer = tokenBegin;
}
else if (tokenBegin < 0) // -- -- If no token yet
@@ -220,9 +220,9 @@ public class [LEXER_NAME] {
endOf_UNUSED_Buffer = bufsize; // -- set endOf_UNUSED_Buffer to the end of the buffer
else if ((tokenBegin - endOf_UNUSED_Buffer) < maxUnusedBufferSize)
{ // If between endOf_UNUSED_Buffer and the token
- ExpandBuff(true); // there is NOT enough space expand the buffer
+ ExpandBuff(true); // there is NOT enough space expand the buffer
} // reorganizing it
- else
+ else
endOf_UNUSED_Buffer = tokenBegin; // Otherwise there is enough space at the start
} // so we set the buffer to use that fragment
int i;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/LexerException.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/LexerException.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/LexerException.java
index 8b37bae..9030eb2 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/LexerException.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/resources/LexerException.java
@@ -19,11 +19,11 @@
package [PACKAGE];
public class [LEXER_NAME]Exception extends Exception {
-
+
public [LEXER_NAME]Exception(String message) {
super(message);
}
-
+
private static final long serialVersionUID = 1L;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java
index be792e4..a6d0267 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java
@@ -34,18 +34,18 @@ public class Fixtures {
static String rule2_action = "myaction2";
static String rule2_name = "myrule2";
static String rule2_match = "matchCheck2("+rule_name+")";
-
+
static public Rule createRule(final String name){
return new Rule(){
String rule_name = name;
String rule_action = "myaction";
String rule_match = "matchCheck("+rule_name+")";
-
+
@Override
public Rule clone(){
return Fixtures.createRule(name+"_clone");
}
-
+
@Override
public String javaAction() {
return rule_action;
@@ -55,21 +55,21 @@ public class Fixtures {
public String javaMatch(String action) {
return rule_match+"{"+action+"}";
}
-
+
@Override
public String toString(){
return rule_name;
}
-
- };
+
+ };
}
-
+
static Rule rule = new Rule(){
-
+
public Rule clone(){
return null;
}
-
+
@Override
public String javaAction() {
return rule_action;
@@ -79,20 +79,20 @@ public class Fixtures {
public String javaMatch(String action) {
return rule_match+"{"+action+"}";
}
-
+
@Override
public String toString(){
return rule_name;
}
-
- };
+
+ };
static Rule rule2 = new Rule(){
public Rule clone(){
return null;
}
-
+
@Override
public String javaAction() {
return rule2_action;
@@ -102,17 +102,17 @@ public class Fixtures {
public String javaMatch(String act) {
return rule2_match+"{"+act+"}";
}
-
+
@Override
public String toString(){
return rule2_name;
}
-
+
};
-
+
static RuleChar ruleA = new RuleChar('a');
static RuleChar ruleB = new RuleChar('b');
static RuleChar ruleC = new RuleChar('c');
static String ruleABC_action = "currentChar = readNextChar();";
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java
index 28812e8..dee1255 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java
@@ -44,7 +44,7 @@ public class LexerNodeAddRuleTest {
+"}"
+token_parseerror , node.toJava());
}
-
+
@Test
public void NodeSwitchCase() {
LexerNode node = new LexerNode();
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java
index 9957776..206e69b 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java
@@ -49,7 +49,7 @@ public class LexerNodeAppendNodeTest {
node.append(node2);
assertEquals("Arule_clone! ", node.toString());
}
-
+
@Test
public void AppendedNodesAreCloned() throws Exception {
LexerNode node = new LexerNode();
@@ -61,7 +61,7 @@ public class LexerNodeAppendNodeTest {
node.append(node2);
// TODO
// assertEquals("A! B_clone! ", node.toString());
-
+
LexerNode node3 = new LexerNode();
node3.append(createRule("C"));
node3.append(createRule("D"));
@@ -95,5 +95,5 @@ public class LexerNodeAppendNodeTest {
// TODO
// assertEquals(" ( A_clone! A_clone! || A_clone! ) ", node.toString());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java
index fb2bdba..e532cf8 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import org.apache.asterix.lexergenerator.LexerNode;
import static org.apache.asterix.lexergenerator.Fixtures.*;
-public class LexerNodeAppendRuleTest {
+public class LexerNodeAppendRuleTest {
@Test
public void SingleNode() {
LexerNode node = new LexerNode();
@@ -62,4 +62,4 @@ public class LexerNodeAppendRuleTest {
+token_parseerror
+"}"+token_parseerror, node.toJava());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java
index 624af34..677d12e 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java
@@ -34,8 +34,8 @@ import org.apache.asterix.lexergenerator.rules.RuleEpsilon;
import org.apache.asterix.lexergenerator.rules.RulePartial;
public class LexerNodeAuxFunctionsTest {
- String expectedDifferentReturn = "return TOKEN_AUX_NOT_FOUND;\n";
-
+ String expectedDifferentReturn = "return TOKEN_AUX_NOT_FOUND;\n";
+
@Test
public void NodeRuleRuleNodeNode() {
LexerNode node = new LexerNode();
@@ -53,7 +53,7 @@ public class LexerNodeAuxFunctionsTest {
+"}"
+expectedDifferentReturn , node.toJavaAuxFunction());
}
-
+
@Test
public void NodeSwitchCase() {
LexerNode node = new LexerNode();
@@ -88,7 +88,7 @@ public class LexerNodeAuxFunctionsTest {
expectedNeededAuxFunctions.add("token1");
expectedNeededAuxFunctions.add("token2");
assertEquals(expectedNeededAuxFunctions, node.neededAuxFunctions());
- }
+ }
@Test(expected=Exception.class)
public void NodeExpandFirstActionError() throws Exception {
@@ -107,7 +107,7 @@ public class LexerNodeAuxFunctionsTest {
assertEquals("Cannot find a token used as part of another definition, missing token: token1", e.getMessage());
throw e;
}
- }
+ }
public void NodeExpandFirstAction() throws Exception {
LexerNode node = new LexerNode();
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/Generator.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/Generator.java b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/Generator.java
index 17a315e..ca53f66 100644
--- a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/Generator.java
+++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/Generator.java
@@ -27,19 +27,19 @@ import java.io.InputStreamReader;
import org.apache.asterix.recordmanagergenerator.RecordType.Field;
public class Generator {
-
+
public enum TemplateType {
RECORD_MANAGER,
ARENA_MANAGER,
SUPPORT
}
-
+
public static void generateSource(
- TemplateType tmplType,
+ TemplateType tmplType,
String packageName,
- RecordType rec,
- InputStream is,
- StringBuilder sb,
+ RecordType rec,
+ InputStream is,
+ StringBuilder sb,
boolean debug) {
try {
BufferedReader in = new BufferedReader(new InputStreamReader(is));
@@ -56,7 +56,7 @@ public class Generator {
break;
default:
throw new IllegalArgumentException();
- }
+ }
} catch (IOException ioe) {
ioe.printStackTrace();
}
@@ -65,9 +65,9 @@ public class Generator {
private static void generateMemoryManagerSource(
String packageName,
- RecordType resource,
- BufferedReader in,
- StringBuilder sb,
+ RecordType resource,
+ BufferedReader in,
+ StringBuilder sb,
boolean debug) throws IOException {
String line = null;
String indent = " ";
@@ -96,12 +96,12 @@ public class Generator {
}
}
} else if (line.contains("@INIT_SLOT@")) {
- for (int i = 0; i < resource.size(); ++i) {
+ for (int i = 0; i < resource.size(); ++i) {
final Field field = resource.fields.get(i);
field.appendInitializers(sb, indent, 3);
}
} else if (line.contains("@CHECK_SLOT@")) {
- for (int i = 0; i < resource.size(); ++i) {
+ for (int i = 0; i < resource.size(); ++i) {
final Field field = resource.fields.get(i);
field.appendChecks(sb, indent, 3);
}
@@ -116,9 +116,9 @@ public class Generator {
private static void generateArenaManagerSource(
String packageName,
- RecordType resource,
- BufferedReader in,
- StringBuilder sb,
+ RecordType resource,
+ BufferedReader in,
+ StringBuilder sb,
boolean debug) throws IOException {
String line = null;
String indent = " ";
@@ -154,7 +154,7 @@ public class Generator {
private static void generateSupportFileSource(
String packageName,
- BufferedReader in,
+ BufferedReader in,
StringBuilder sb,
boolean debug) throws IOException {
String line = null;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordManagerGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordManagerGeneratorMojo.java b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordManagerGeneratorMojo.java
index 38c0dd3..bf981aa 100644
--- a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordManagerGeneratorMojo.java
+++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordManagerGeneratorMojo.java
@@ -40,23 +40,23 @@ import org.json.JSONException;
* @requiresDependencyResolution compile
*/
public class RecordManagerGeneratorMojo extends AbstractMojo {
-
+
/**
* parameter injected from pom.xml
- *
+ *
* @parameter
*/
private boolean debug;
/**
* parameter injected from pom.xml
- *
+ *
* @parameter
* @required
*/
private String packageName;
/**
* parameter injected from pom.xml
- *
+ *
* @parameter
* @required
*/
@@ -67,15 +67,15 @@ public class RecordManagerGeneratorMojo extends AbstractMojo {
* @readonly
*/
MavenProject project;
-
-
- String recordManagerTemplate = "RecordManager.java";
+
+
+ String recordManagerTemplate = "RecordManager.java";
String arenaManagerTemplate = "ArenaManager.java";
String[] supportTemplates = { "RecordManagerStats.java", "AllocInfo.java", "TypeUtil.java" };
-
+
private Map<String, RecordType> typeMap;
- public RecordManagerGeneratorMojo() {
+ public RecordManagerGeneratorMojo() {
}
private void readRecordTypes() throws MojoExecutionException {
@@ -90,7 +90,7 @@ public class RecordManagerGeneratorMojo extends AbstractMojo {
getLog().info("reading " + inputFiles[i].toString());
Reader read = new FileReader(inputFiles[i]);
RecordType type = RecordType.read(read);
- // always add allocId to enable tracking of allocations
+ // always add allocId to enable tracking of allocations
type.addField("alloc id", RecordType.Type.SHORT, null);
type.addToMap(typeMap);
} catch (FileNotFoundException fnfe) {
@@ -102,7 +102,7 @@ public class RecordManagerGeneratorMojo extends AbstractMojo {
}
public void execute() throws MojoExecutionException, MojoFailureException {
- String outputPath = project.getBuild().getDirectory() + File.separator
+ String outputPath = project.getBuild().getDirectory() + File.separator
+ "generated-sources" + File.separator
+ "java" + File.separator
+ packageName.replace('.', File.separatorChar);
@@ -112,12 +112,12 @@ public class RecordManagerGeneratorMojo extends AbstractMojo {
}
readRecordTypes();
-
+
for (String recordType : typeMap.keySet()) {
generateSource(Generator.TemplateType.RECORD_MANAGER, recordManagerTemplate, recordType, outputPath);
generateSource(Generator.TemplateType.ARENA_MANAGER, arenaManagerTemplate, recordType, outputPath);
}
-
+
for (int i = 0; i < supportTemplates.length; ++i) {
generateSource(Generator.TemplateType.SUPPORT, supportTemplates[i], "", outputPath);
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordType.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordType.java b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordType.java
index c3a6e1f..6702a8f 100644
--- a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordType.java
+++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordType.java
@@ -31,13 +31,13 @@ import org.json.JSONObject;
import org.json.JSONTokener;
public class RecordType {
-
+
enum Type {
BYTE (1, "byte", "get", "put", "(byte)0xde", "TypeUtil.Byte.append", "TypeUtil.Byte.appendFixed"),
SHORT (2, "short", "getShort", "putShort", "(short)0xdead", "TypeUtil.Short.append", "TypeUtil.Short.appendFixed"),
INT (4, "int", "getInt", "putInt", "0xdeadbeef", "TypeUtil.Int.append", "TypeUtil.Int.appendFixed"),
GLOBAL(8, "long", "getLong", "putLong", "0xdeadbeefdeadbeefl", "TypeUtil.Global.append", "TypeUtil.Global.appendFixed");
-
+
Type(int size, String javaType, String bbGetter, String bbSetter, String deadMemInitializer, String appender, String tabAppender) {
this.size = size;
this.javaType = javaType;
@@ -47,7 +47,7 @@ public class RecordType {
this.appender = appender;
this.tabAppender = tabAppender;
}
-
+
int size;
String javaType;
String bbGetter;
@@ -56,9 +56,9 @@ public class RecordType {
String appender;
String tabAppender;
}
-
+
static class Field {
-
+
String name;
Type type;
String initial;
@@ -72,14 +72,14 @@ public class RecordType {
this.offset = offset;
this.accessible = accessible;
}
-
+
public static Field fromJSON(JSONObject obj) throws JSONException {
String name = obj.getString("name");
Type type = parseType(obj.getString("type"));
String initial = obj.optString("initial", null);
return new Field(name, type, initial, -1, true);
}
-
+
private static Type parseType(String string) {
string = string.toUpperCase();
if (string.equals("GLOBAL")) {
@@ -103,7 +103,7 @@ public class RecordType {
sb.append(word.substring(0, 1).toUpperCase());
sb.append(word.substring(1));
}
- return sb.toString();
+ return sb.toString();
}
StringBuilder appendMemoryManagerGetMethod(StringBuilder sb, String indent, int level) {
@@ -129,7 +129,7 @@ public class RecordType {
sb.append("}\n");
return sb;
}
-
+
StringBuilder appendMemoryManagerSetMethod(StringBuilder sb, String indent, int level) {
sb = indent(sb, indent, level);
sb.append("public void ")
@@ -173,7 +173,7 @@ public class RecordType {
sb.append("}\n");
return sb;
}
-
+
StringBuilder appendArenaManagerSetMethod(StringBuilder sb, String indent, int level) {
sb = indent(sb, indent, level);
sb.append("public void ")
@@ -197,7 +197,7 @@ public class RecordType {
sb.append("}\n");
return sb;
}
-
+
StringBuilder appendInitializers(StringBuilder sb, String indent, int level) {
sb = indent(sb, indent, level);
sb.append("bb.")
@@ -213,7 +213,7 @@ public class RecordType {
sb.append(");\n");
return sb;
}
-
+
StringBuilder appendChecks(StringBuilder sb, String indent, int level) {
if (initial == null) {
return sb;
@@ -236,7 +236,7 @@ public class RecordType {
sb.append("}\n");
return sb;
}
-
+
String offsetName() {
String words[] = name.split(" ");
assert(words.length > 0);
@@ -247,7 +247,7 @@ public class RecordType {
sb.append("_OFF");
return sb.toString();
}
-
+
int offset() {
return offset;
}
@@ -257,26 +257,26 @@ public class RecordType {
ArrayList<Field> fields;
int totalSize;
boolean modifiable = true;
-
+
static StringBuilder indent(StringBuilder sb, String indent, int level) {
for (int i = 0; i < level; ++i) {
sb.append(indent);
}
return sb;
}
-
+
public RecordType(String name) {
this.name = name;
fields = new ArrayList<Field>();
addField("next free slot", Type.INT, "-1", false);
}
-
+
public static RecordType read(Reader reader) throws JSONException {
JSONTokener tok = new JSONTokener(reader);
JSONObject obj = new JSONObject(tok);
return fromJSON(obj);
}
-
+
public static RecordType fromJSON(JSONObject obj) throws JSONException {
RecordType result = new RecordType(obj.getString("name"));
JSONArray fields = obj.getJSONArray("fields");
@@ -284,9 +284,9 @@ public class RecordType {
JSONObject field = fields.getJSONObject(i);
result.fields.add(Field.fromJSON(field));
}
- return result;
+ return result;
}
-
+
public void addToMap(Map<String, RecordType> map) {
modifiable = false;
calcOffsetsAndSize();
@@ -295,15 +295,15 @@ public class RecordType {
public void addField(String name, Type type, String initial) {
addField(name, type, initial, true);
- }
-
+ }
+
private void addField(String name, Type type, String initial, boolean accessible) {
if (! modifiable) {
throw new IllegalStateException("cannot modify type anmore");
}
fields.add(new Field(name, type, initial, -1, accessible));
}
-
+
private void calcOffsetsAndSize() {
Collections.sort(fields, new Comparator<Field>() {
public int compare(Field left, Field right) {
@@ -313,7 +313,7 @@ public class RecordType {
// sort fields by size and align the items
totalSize = 0;
int alignment = 0;
- for (int i = 0; i < fields.size(); ++i) {
+ for (int i = 0; i < fields.size(); ++i) {
final Field field = fields.get(i);
assert field.offset == -1;
field.offset = totalSize;
@@ -322,22 +322,22 @@ public class RecordType {
if (size > alignment) alignment = size;
}
if (totalSize % alignment != 0) {
- totalSize = ((totalSize / alignment) + 1) * alignment;
+ totalSize = ((totalSize / alignment) + 1) * alignment;
}
}
-
+
int size() {
return fields.size();
}
-
+
static String padRight(String s, int n) {
- return String.format("%1$-" + n + "s", s);
+ return String.format("%1$-" + n + "s", s);
}
static String padLeft(String s, int n) {
- return String.format("%1$" + n + "s", s);
+ return String.format("%1$" + n + "s", s);
}
-
+
StringBuilder appendConstants(StringBuilder sb, String indent, int level) {
sb = indent(sb, indent, level);
sb.append("public static int ITEM_SIZE = ")
@@ -354,7 +354,7 @@ public class RecordType {
}
return sb;
}
-
+
StringBuilder appendBufferPrinter(StringBuilder sb, String indent, int level) {
int maxNameWidth = 0;
for (int i = 0; i < fields.size(); ++i) {
@@ -391,20 +391,20 @@ public class RecordType {
}
return sb;
}
-
+
StringBuilder appendRecordPrinter(StringBuilder sb, String indent, int level) {
sb = indent(sb, indent, level);
sb.append("public StringBuilder appendRecord(StringBuilder sb, long slotNum) {\n");
-
+
sb = indent(sb, indent, level + 1);
sb.append("sb.append(\"{ \");\n\n");
-
+
for (int i = 0; i < fields.size(); ++i) {
Field field = fields.get(i);
if (field.accessible) {
if (i > 0) {
sb = indent(sb, indent, level + 1);
- sb.append("sb.append(\", \");\n\n");
+ sb.append("sb.append(\", \");\n\n");
}
sb = indent(sb, indent, level + 1);
sb.append("sb.append(\"\\\"").append(field.name).append("\\\" : \\\"\");\n");
@@ -421,7 +421,7 @@ public class RecordType {
sb = indent(sb, indent, level);
sb.append("}");
-
+
return sb;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/AllocInfo.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/AllocInfo.java b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/AllocInfo.java
index 0bea5da..f415562 100644
--- a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/AllocInfo.java
+++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/AllocInfo.java
@@ -24,11 +24,11 @@ import java.io.StringWriter;
public class AllocInfo {
String alloc;
String free;
-
+
void alloc() {
alloc = getStackTrace();
}
-
+
void free() {
free = getStackTrace();
}
@@ -42,11 +42,11 @@ public class AllocInfo {
// remove first 3 lines
int nlPos = 0;
for (int i = 0; i < 3; ++i) {
- nlPos = res.indexOf('\n', nlPos) + 1;
+ nlPos = res.indexOf('\n', nlPos) + 1;
}
return res.substring(nlPos);
}
-
+
public String toString() {
return "allocation stack:\n" + alloc + "\nfree stack\n" + free;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/ArenaManager.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/ArenaManager.java b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/ArenaManager.java
index adb73af..be295d6 100644
--- a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/ArenaManager.java
+++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/ArenaManager.java
@@ -20,18 +20,18 @@
package @PACKAGE@;
public class @E@ArenaManager {
-
+
public static final boolean TRACK_ALLOC_ID = @DEBUG@;
private final int noArenas;
private final @E@RecordManager[] arenas;
private ThreadLocal<LocalManager> local;
-
+
static class LocalManager {
int arenaId;
@E@RecordManager mgr;
}
-
+
public @E@ArenaManager(final int noArenas, final long txnShrinkTimer) {
this.noArenas = noArenas;
arenas = new @E@RecordManager[noArenas];
@@ -39,7 +39,7 @@ public class @E@ArenaManager {
arenas[i] = new @E@RecordManager(txnShrinkTimer);
}
local = new ThreadLocal<LocalManager>() {
- private int nextArena = 0;
+ private int nextArena = 0;
@Override
protected synchronized LocalManager initialValue() {
@@ -58,7 +58,7 @@ public class @E@ArenaManager {
final @E@RecordManager recMgr = localManager.mgr;
final int allocId = TRACK_ALLOC_ID ? (++recMgr.allocCounter % 0x7fff) : 0;
final int localId = recMgr.allocate();
-
+
long result = TypeUtil.Global.build(localManager.arenaId, allocId, localId);
if (TRACK_ALLOC_ID) setAllocId(result, (short) allocId);
@@ -68,23 +68,23 @@ public class @E@ArenaManager {
assert TypeUtil.Global.localId(result) == localId;
return result;
}
-
+
public void deallocate(long slotNum) {
if (TRACK_ALLOC_ID) checkAllocId(slotNum);
final int arenaId = TypeUtil.Global.arenaId(slotNum);
get(arenaId).deallocate(TypeUtil.Global.localId(slotNum));
}
-
+
public @E@RecordManager get(int i) {
return arenas[i];
}
-
+
public @E@RecordManager local() {
return local.get().mgr;
}
-
+
@METHODS@
-
+
private void checkAllocId(long slotNum) {
final int refAllocId = TypeUtil.Global.allocId(slotNum);
final short curAllocId = getAllocId(slotNum);
@@ -100,14 +100,14 @@ public class @E@ArenaManager {
throw new IllegalStateException(msg);
}
}
-
+
public AllocInfo getAllocInfo(long slotNum) {
final int arenaId = TypeUtil.Global.arenaId(slotNum);
return get(arenaId).getAllocInfo(TypeUtil.Global.localId(slotNum));
}
-
+
@PRINT_RECORD@
-
+
public StringBuilder append(StringBuilder sb) {
for (int i = 0; i < noArenas; ++i) {
sb.append("++++ arena ").append(i).append(" ++++\n");
@@ -115,7 +115,7 @@ public class @E@ArenaManager {
}
return sb;
}
-
+
public String toString() {
return append(new StringBuilder()).toString();
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/RecordManager.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/RecordManager.java b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/RecordManager.java
index b3c06f1..6e5041f 100644
--- a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/RecordManager.java
+++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/RecordManager.java
@@ -26,7 +26,7 @@ public class @E@RecordManager {
public static final boolean CHECK_SLOTS = @DEBUG@;
public static final boolean TRACK_ALLOC_LOC = @DEBUG@;
-
+
static final int NO_SLOTS = 1000;
@CONSTS@
@@ -39,22 +39,22 @@ public class @E@RecordManager {
private boolean isShrinkTimerOn;
int allocCounter;
-
+
public @E@RecordManager(long txnShrinkTimer) {
this.txnShrinkTimer = txnShrinkTimer;
buffers = new ArrayList<Buffer>();
buffers.add(new Buffer());
current = 0;
-
+
allocCounter = 0;
}
-
+
enum SlotSource {
NON_FULL,
UNINITIALIZED,
NEW
}
-
+
synchronized int allocate() {
if (buffers.get(current).isFull()) {
final int size = buffers.size();
@@ -74,7 +74,7 @@ public class @E@RecordManager {
current = i;
}
}
-
+
switch (source) {
case NEW:
buffers.add(new Buffer());
@@ -114,7 +114,7 @@ public class @E@RecordManager {
* buffers status : O O x x x x x
* However, in the above case, if we subtract the deinitialized children's slots,
* needShrink() will return false even if we shrink the buffers at this case.
- *
+ *
* @return
*/
private boolean needShrink() {
@@ -175,7 +175,7 @@ public class @E@RecordManager {
break;
}
}
-
+
//reset allocChild to the first buffer
current = 0;
@@ -183,7 +183,7 @@ public class @E@RecordManager {
}
@METHODS@
-
+
public AllocInfo getAllocInfo(int slotNum) {
final Buffer buf = buffers.get(slotNum / NO_SLOTS);
if (buf.allocList == null) {
@@ -192,7 +192,7 @@ public class @E@RecordManager {
return buf.allocList.get(slotNum % NO_SLOTS);
}
}
-
+
StringBuilder append(StringBuilder sb) {
sb.append("+++ current: ")
.append(current)
@@ -205,7 +205,7 @@ public class @E@RecordManager {
}
return sb;
}
-
+
public String toString() {
return append(new StringBuilder()).toString();
}
@@ -220,14 +220,14 @@ public class @E@RecordManager {
}
return s;
}
-
+
static class Buffer {
private ByteBuffer bb = null; // null represents 'deinitialized' state.
private int freeSlotNum;
private int occupiedSlots;
-
+
ArrayList<AllocInfo> allocList;
-
+
Buffer() {
initialize();
}
@@ -241,7 +241,7 @@ public class @E@RecordManager {
setNextFreeSlot(i, i + 1);
}
setNextFreeSlot(NO_SLOTS - 1, -1); //-1 represents EOL(end of link)
-
+
if (TRACK_ALLOC_LOC) {
allocList = new ArrayList<AllocInfo>(NO_SLOTS);
for (int i = 0; i < NO_SLOTS; ++i) {
@@ -249,12 +249,12 @@ public class @E@RecordManager {
}
}
}
-
+
public void deinitialize() {
if (TRACK_ALLOC_LOC) allocList = null;
bb = null;
}
-
+
public boolean isInitialized() {
return bb != null;
}
@@ -266,7 +266,7 @@ public class @E@RecordManager {
public boolean isEmpty() {
return occupiedSlots == 0;
}
-
+
public int allocate() {
int slotNum = freeSlotNum;
freeSlotNum = getNextFreeSlot(slotNum);
@@ -275,7 +275,7 @@ public class @E@RecordManager {
if (TRACK_ALLOC_LOC) allocList.get(slotNum).alloc();
return slotNum;
}
-
+
public void deallocate(int slotNum) {
@INIT_SLOT@
setNextFreeSlot(slotNum, freeSlotNum);
@@ -286,8 +286,8 @@ public class @E@RecordManager {
public int getNextFreeSlot(int slotNum) {
return bb.getInt(slotNum * ITEM_SIZE + NEXT_FREE_SLOT_OFF);
- }
-
+ }
+
public void setNextFreeSlot(int slotNum, int nextFreeSlot) {
bb.putInt(slotNum * ITEM_SIZE + NEXT_FREE_SLOT_OFF, nextFreeSlot);
}
@@ -301,17 +301,17 @@ public class @E@RecordManager {
@PRINT_BUFFER@
return sb;
}
-
+
public String toString() {
return append(new StringBuilder()).toString();
}
-
+
public void addTo(RecordManagerStats s) {
if (isInitialized()) {
s.items += occupiedSlots;
}
}
-
+
private void checkSlot(int slotNum) {
if (! CHECK_SLOTS) {
return;
@@ -320,5 +320,5 @@ public class @E@RecordManager {
// @CHECK_SLOT@
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/RecordManagerStats.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/RecordManagerStats.java b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/RecordManagerStats.java
index b5a3bbf..800b388 100644
--- a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/RecordManagerStats.java
+++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/RecordManagerStats.java
@@ -24,7 +24,7 @@ public class RecordManagerStats {
int slots = 0;
int items = 0;
int size = 0;
-
+
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{ arenas : ").append(arenas);
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/TypeUtil.java
----------------------------------------------------------------------
diff --git a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/TypeUtil.java b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/TypeUtil.java
index 8108094..81d6958 100644
--- a/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/TypeUtil.java
+++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/resources/TypeUtil.java
@@ -19,7 +19,7 @@
package @PACKAGE@;
public class TypeUtil {
-
+
public static class Byte {
public static StringBuilder append(StringBuilder sb, byte b) {
return sb.append(String.format("%1$x", b));
@@ -71,7 +71,7 @@ public class TypeUtil {
public static int localId(long l) {
return (int) (l & 0xffffffffL);
}
-
+
public static StringBuilder append(StringBuilder sb, long l) {
sb.append(String.format("%1$x", TypeUtil.Global.arenaId(l)));
sb.append(':');
@@ -80,7 +80,7 @@ public class TypeUtil {
sb.append(String.format("%1$x", TypeUtil.Global.localId(l)));
return sb;
}
-
+
public static StringBuilder appendFixed(StringBuilder sb, long l) {
sb.append(String.format("%1$4x", TypeUtil.Global.arenaId(l)));
sb.append(':');
@@ -89,10 +89,10 @@ public class TypeUtil {
sb.append(String.format("%1$8x", TypeUtil.Global.localId(l)));
return sb;
}
-
+
public static String toString(long l) {
return append(new StringBuilder(), l).toString();
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java
----------------------------------------------------------------------
diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java
index a3a81de..b1eaf0f 100644
--- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java
+++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java
@@ -64,16 +64,16 @@ public class MetadataCache {
protected final Map<String, NodeGroup> nodeGroups = new HashMap<String, NodeGroup>();
// Key is function Identifier . Key of value map is function name.
protected final Map<FunctionSignature, Function> functions = new HashMap<FunctionSignature, Function>();
- // Key is adapter dataverse. Key of value map is the adapter name
+ // Key is adapter dataverse. Key of value map is the adapter name
protected final Map<String, Map<String, DatasourceAdapter>> adapters = new HashMap<String, Map<String, DatasourceAdapter>>();
- // Key is DataverseName, Key of the value map is the Policy name
+ // Key is DataverseName, Key of the value map is the Policy name
protected final Map<String, Map<String, FeedPolicyEntity>> feedPolicies = new HashMap<String, Map<String, FeedPolicyEntity>>();
// Key is library dataverse. Key of value map is the library name
protected final Map<String, Map<String, Library>> libraries = new HashMap<String, Map<String, Library>>();
- // Key is library dataverse. Key of value map is the feed name
+ // Key is library dataverse. Key of value map is the feed name
protected final Map<String, Map<String, Feed>> feeds = new HashMap<String, Map<String, Feed>>();
- // Key is DataverseName, Key of the value map is the Policy name
+ // Key is DataverseName, Key of the value map is the Policy name
protected final Map<String, Map<String, CompactionPolicy>> compactionPolicies = new HashMap<String, Map<String, CompactionPolicy>>();
// Atomically executes all metadata operations in ctx's log.
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataEntityTupleTranslator.java
----------------------------------------------------------------------
diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataEntityTupleTranslator.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataEntityTupleTranslator.java
index 0c08b55..7c115b8 100644
--- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataEntityTupleTranslator.java
+++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataEntityTupleTranslator.java
@@ -36,7 +36,7 @@ public interface IMetadataEntityTupleTranslator<T> {
* Transforms a metadata entity of type T from a given tuple to a Java
* object (deserializing the appropriate field(s) in the tuple as
* necessary).
- *
+ *
* @param tuple
* Tuple containing a serialized representation of a metadata
* entity of type T.
@@ -49,10 +49,10 @@ public interface IMetadataEntityTupleTranslator<T> {
/**
* Serializes the given metadata entity of type T into an appropriate tuple
* representation (i.e., some number of fields containing bytes).
- *
+ *
* @param metadataEntity
* Metadata entity to be written into a tuple.
* @throws IOException
*/
public ITupleReference getTupleFromMetadataEntity(T metadataEntity) throws MetadataException, IOException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java
----------------------------------------------------------------------
diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java
index 0d8818d..7070a88 100644
--- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java
+++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java
@@ -55,7 +55,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Begins a local transaction against the metadata.
- *
+ *
* @throws ACIDException
* @throws RemoteException
*/
@@ -63,7 +63,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Commits a local transaction against the metadata.
- *
+ *
* @throws ACIDException
* @throws RemoteException
*/
@@ -71,7 +71,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Aborts a local transaction against the metadata.
- *
+ *
* @throws ACIDException
* @throws RemoteException
*/
@@ -80,7 +80,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Locally locks the entire metadata in given mode on behalf of given
* transaction id.
- *
+ *
* @throws ACIDException
* @throws RemoteException
*/
@@ -88,7 +88,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Releases all local locks of given transaction id.
- *
+ *
* @throws ACIDException
* @throws RemoteException
*/
@@ -97,7 +97,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Inserts a new dataverse into the metadata, acquiring local locks on
* behalf of the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverse
@@ -111,7 +111,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Retrieves all dataverses, acquiring local locks on behalf of
* the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @return A list of dataverse instances.
@@ -124,7 +124,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Retrieves a dataverse with given name, acquiring local locks on behalf of
* the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -139,7 +139,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Retrieves all datasets belonging to the given dataverse, acquiring local
* locks on behalf of the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -155,7 +155,7 @@ public interface IMetadataNode extends Remote, Serializable {
* Deletes the dataverse with given name, and all it's associated datasets,
* indexes, and types, acquiring local locks on behalf of the given
* transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @return A list of dataset instances.
@@ -168,7 +168,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Inserts a new dataset into the metadata, acquiring local locks on behalf
* of the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataset
@@ -182,7 +182,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Retrieves a dataset within a given dataverse, acquiring local locks on
* behalf of the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -200,7 +200,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Retrieves all indexes of a dataset, acquiring local locks on behalf of
* the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -218,7 +218,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Deletes the dataset with given name, and all it's associated indexes,
* acquiring local locks on behalf of the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -236,7 +236,7 @@ public interface IMetadataNode extends Remote, Serializable {
* Inserts an index into the metadata, acquiring local locks on behalf of
* the given transaction id. The index itself knows its name, and which
* dataset it belongs to.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param index
@@ -250,7 +250,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Retrieves the index with given name, in given dataverse and dataset,
* acquiring local locks on behalf of the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -269,7 +269,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Deletes the index with given name, in given dataverse and dataset,
* acquiring local locks on behalf of the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -287,7 +287,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Inserts a datatype, acquiring local locks on behalf of the given
* transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param datatype
@@ -301,7 +301,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Retrieves the datatype with given name in given dataverse, acquiring
* local locks on behalf of the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -319,7 +319,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Deletes the given datatype in given dataverse, acquiring local locks on
* behalf of the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -337,7 +337,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Inserts a node group, acquiring local locks on behalf of the given
* transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param nodeGroup
@@ -351,7 +351,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Retrieves a node group, acquiring local locks on behalf of the given
* transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param nodeGroupName
@@ -365,7 +365,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Deletes a node group, acquiring local locks on behalf of the given
* transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param nodeGroupName
@@ -380,7 +380,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Inserts a node (compute node), acquiring local locks on behalf of the
* given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param node
@@ -406,7 +406,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Deletes a function, acquiring local locks on behalf of the given
* transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param functionSignature
@@ -465,7 +465,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Deletes a adapter , acquiring local locks on behalf of the given
* transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -550,7 +550,7 @@ public interface IMetadataNode extends Remote, Serializable {
*/
public void dropFeed(JobId jobId, String dataverse, String feedName) throws MetadataException, RemoteException;
-
+
/**
* @param jobId
* @param feedPolicy
@@ -570,11 +570,11 @@ public interface IMetadataNode extends Remote, Serializable {
public FeedPolicyEntity getFeedPolicy(JobId jobId, String dataverse, String policy) throws MetadataException,
RemoteException;
-
+
/**
* Removes a library , acquiring local locks on behalf of the given
* transaction id.
- *
+ *
* @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -590,7 +590,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Adds a library, acquiring local locks on behalf of the given
* transaction id.
- *
+ *
* @param txnId
* A globally unique id for an active metadata transaction.
* @param library
@@ -617,7 +617,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Retireve libraries installed in a given dataverse.
- *
+ *
* @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -640,7 +640,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* delete a give feed (ingestion) policy
- *
+ *
* @param jobId
* @param dataverseName
* @param policyName
@@ -685,7 +685,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Deletes an externalFile , acquiring local locks on behalf of the given
* transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -702,7 +702,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Deletes all external files belonging to a dataset, acquiring local locks on behalf of the given
* transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataset
@@ -714,7 +714,7 @@ public interface IMetadataNode extends Remote, Serializable {
/**
* Retrieves the file with given number, in given dataverse and dataset,
* acquiring local locks on behalf of the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataverseName
@@ -730,12 +730,12 @@ public interface IMetadataNode extends Remote, Serializable {
*/
public ExternalFile getExternalFile(JobId jobId, String dataverseName, String datasetName, Integer fileNumber)
throws MetadataException, RemoteException;
-
-
+
+
/**
* update an existing dataset in the metadata, acquiring local locks on behalf
* of the given transaction id.
- *
+ *
* @param jobId
* A globally unique id for an active metadata transaction.
* @param dataset
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IValueExtractor.java
----------------------------------------------------------------------
diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IValueExtractor.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IValueExtractor.java
index 1722117..5effd7d 100644
--- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IValueExtractor.java
+++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IValueExtractor.java
@@ -36,7 +36,7 @@ import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
public interface IValueExtractor<T> {
/**
* Extracts an object of type T from a given tuple.
- *
+ *
* @param jobId
* A globally unique transaction id.
* @param tuple
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/AbstractClusterManagementWork.java
----------------------------------------------------------------------
diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/AbstractClusterManagementWork.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/AbstractClusterManagementWork.java
index 2e47d1f..3c9e2d2 100644
--- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/AbstractClusterManagementWork.java
+++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/AbstractClusterManagementWork.java
@@ -39,7 +39,7 @@ public abstract class AbstractClusterManagementWork implements IClusterManagemen
this.workId = WorkIdGenerator.getNextWorkId();
}
-
+
private static class WorkIdGenerator {
private static AtomicInteger workId = new AtomicInteger(0);
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagementWorkResponse.java
----------------------------------------------------------------------
diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagementWorkResponse.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagementWorkResponse.java
index 60fd796..61a35e3 100644
--- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagementWorkResponse.java
+++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagementWorkResponse.java
@@ -32,7 +32,7 @@ public class ClusterManagementWorkResponse implements IClusterManagementWorkResp
this.status = Status.IN_PROGRESS;
}
-
+
@Override
public IClusterManagementWork getWork() {
return work;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-metadata/src/main/java/org/apache/asterix/metadata/dataset/hints/DatasetHints.java
----------------------------------------------------------------------
diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/dataset/hints/DatasetHints.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/dataset/hints/DatasetHints.java
index a305155..9e65d62 100644
--- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/dataset/hints/DatasetHints.java
+++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/dataset/hints/DatasetHints.java
@@ -33,7 +33,7 @@ public class DatasetHints {
/**
* validate the use of a hint
- *
+ *
* @param hintName
* name of the hint
* @param value
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-metadata/src/main/java/org/apache/asterix/metadata/dataset/hints/IHint.java
----------------------------------------------------------------------
diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/dataset/hints/IHint.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/dataset/hints/IHint.java
index 502e0ab..fefc066 100644
--- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/dataset/hints/IHint.java
+++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/dataset/hints/IHint.java
@@ -27,14 +27,14 @@ public interface IHint {
/**
* retrieve the name of the hint.
- *
+ *
* @return
*/
public String getName();
/**
* validate the value associated with the hint.
- *
+ *
* @param value
* the value associated with the hint.
* @return a Pair with
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalDatasetsRegistry.java
----------------------------------------------------------------------
diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalDatasetsRegistry.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalDatasetsRegistry.java
index 5235484..5f4b11e 100644
--- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalDatasetsRegistry.java
+++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalDatasetsRegistry.java
@@ -43,7 +43,7 @@ public class ExternalDatasetsRegistry {
/**
* Get the current version of the dataset
- *
+ *
* @param dataset
* @return
*/
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/keynormalizers/AWrappedAscNormalizedKeyComputerFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/keynormalizers/AWrappedAscNormalizedKeyComputerFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/keynormalizers/AWrappedAscNormalizedKeyComputerFactory.java
index f1f4f0f..de214fc 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/keynormalizers/AWrappedAscNormalizedKeyComputerFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/keynormalizers/AWrappedAscNormalizedKeyComputerFactory.java
@@ -42,7 +42,7 @@ public class AWrappedAscNormalizedKeyComputerFactory implements INormalizedKeyCo
@Override
public int normalize(byte[] bytes, int start, int length) {
- // start +1, length -1 is because in ASTERIX data format, there is always a type tag before the value
+ // start +1, length -1 is because in ASTERIX data format, there is always a type tag before the value
return nkc.normalize(bytes, start + 1, length - 1);
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADateParserFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADateParserFactory.java b/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADateParserFactory.java
index 9f7ee00..6897cb6 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADateParserFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADateParserFactory.java
@@ -55,7 +55,7 @@ public class ADateParserFactory implements IValueParserFactory {
/**
* Parse the given char sequence as a date string, and return the milliseconds represented by the date.
- *
+ *
* @param charAccessor
* accessor for the char sequence
* @param isDateOnly
@@ -153,7 +153,7 @@ public class ADateParserFactory implements IValueParserFactory {
/**
* A copy-and-paste of {@link #parseDatePart(String, int, int)} but for a char array, in order
* to avoid object creation.
- *
+ *
* @param dateString
* @param start
* @param length
@@ -249,7 +249,7 @@ public class ADateParserFactory implements IValueParserFactory {
/**
* A copy-and-paste of {@link #parseDatePart(String, int, int)} but for a byte array, in order
* to avoid object creation.
- *
+ *
* @param dateString
* @param start
* @param length
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ATimeParserFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ATimeParserFactory.java b/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ATimeParserFactory.java
index f4431a9..2b97005 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ATimeParserFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ATimeParserFactory.java
@@ -55,7 +55,7 @@ public class ATimeParserFactory implements IValueParserFactory {
/**
* Parse the given string as a time string, and return the milliseconds represented by the time.
- *
+ *
* @param timeString
* @param start
* @param length
@@ -160,7 +160,7 @@ public class ATimeParserFactory implements IValueParserFactory {
/**
* Parse the given string as a time string, and parse the timezone field.
- *
+ *
* @param timeString
* @param start
* @return
@@ -209,7 +209,7 @@ public class ATimeParserFactory implements IValueParserFactory {
/**
* Similar to {@link #parseTimePart(String, int, int)} but use a char array as input; although this is almost
* a copy-and-past code but it avoids object creation.
- *
+ *
* @param timeString
* @param start
* @param length
@@ -314,7 +314,7 @@ public class ATimeParserFactory implements IValueParserFactory {
/**
* Similar to {@link #parseTimezonePart(String, int)} but use a char array as input; although this is almost
* a copy-and-past code but it avoids object creation.
- *
+ *
* @param timeString
* @param start
* @param length
@@ -363,7 +363,7 @@ public class ATimeParserFactory implements IValueParserFactory {
/**
* Similar to {@link #parseTimePart(String, int, int)} but use a byte array as input; although this is almost
* a copy-and-past code but it avoids object creation.
- *
+ *
* @param timeString
* @param start
* @param length
@@ -468,7 +468,7 @@ public class ATimeParserFactory implements IValueParserFactory {
/**
* Similar to {@link #parseTimezonePart(String, int)} but use a byte array as input; although this is almost
* a copy-and-past code but it avoids object creation.
- *
+ *
* @param timeString
* @param start
* @param length
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e2439b44/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DurationArithmeticOperations.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DurationArithmeticOperations.java b/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DurationArithmeticOperations.java
index cf91db5..404bf42 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DurationArithmeticOperations.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DurationArithmeticOperations.java
@@ -32,7 +32,7 @@ public class DurationArithmeticOperations {
* <p/>
* The basic algorithm is like this: duration is applied to the time point as two separated fields: year-month field and day-time field. Year-month field is applied firstly by reserving the correct day within the month's range (for example add 1M to 03-31 will return 04-30). Then day-time field is applied.
* <p/>
- *
+ *
* @param pointChronon
* The time instance where the duration will be added, represented as the milliseconds since the anchored time (00:00:00 for time type, 1970-01-01T00:00:00Z for datetime and date types).
* @param yearMonthDuration