| commit | da4a349e46665aba7dc07296c5cb05687853208a | [log] [tgz] |
|---|---|---|
| author | madhusudancs@gmail.com <madhusudancs@gmail.com@eaa15691-b419-025a-1212-ee371bd00084> | Thu Feb 07 12:04:44 2013 +0000 |
| committer | madhusudancs@gmail.com <madhusudancs@gmail.com@eaa15691-b419-025a-1212-ee371bd00084> | Thu Feb 07 12:04:44 2013 +0000 |
| tree | 14b7c1424ed230d940de15f501a8561246778a0f | |
| parent | f9450d5abd1e6440d299671de0780ea53f9d5655 [diff] |
Style fixes. git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_result_distribution@1155 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/QueryResult.java b/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/QueryResult.java index ab29785..8d6b35e 100644 --- a/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/QueryResult.java +++ b/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/QueryResult.java
@@ -44,8 +44,7 @@ return query; } - public ResultSetId getResultId() { + public ResultSetId getResultSetId() { return resultSetId; } - }
diff --git a/asterix-common/src/main/java/edu/uci/ics/asterix/common/config/GlobalConfig.java b/asterix-common/src/main/java/edu/uci/ics/asterix/common/config/GlobalConfig.java index 137bfec..91ea627 100644 --- a/asterix-common/src/main/java/edu/uci/ics/asterix/common/config/GlobalConfig.java +++ b/asterix-common/src/main/java/edu/uci/ics/asterix/common/config/GlobalConfig.java
@@ -4,9 +4,9 @@ public class GlobalConfig { public static final boolean DEBUG = true; - + public static final String ASTERIX_LOGGER_NAME = "edu.uci.ics.asterix"; - + public static final Logger ASTERIX_LOGGER = Logger.getLogger(ASTERIX_LOGGER_NAME); public static final String ASTERIX_LOGFILE_PATTERN = "%t/asterix.log"; @@ -34,6 +34,6 @@ public static final String FRAME_SIZE_PROPERTY = "FrameSize"; public static final float DEFAULT_BTREE_FILL_FACTOR = 1.00f; - + public static int DEFAULT_INPUT_DATA_COLUMN = 0; }