asterixdb-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	mb...@apache.org
Subject	[14/29] asterixdb git commit: [ASTERIXDB-2256] Reformat sources using code format template
Date	Sun, 28 Jan 2018 20:52:55 GMT
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/EventDataGen.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/EventDataGen.java b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/EventDataGen.java index b175b42..9737c93 100644 --- a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/EventDataGen.java +++ b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/EventDataGen.java @@ -49,12 +49,12 @@ public class EventDataGen { "Lake St.", "Hill St.", "Park St.", "View St." }; private static final int MIN_STREET_NUM = 1; private static final int MAX_STREET_NUM = 10000; - private static final String[] CITIES = { "Seattle", "Irvine", "Laguna Beach", "Los Angeles", "San Clemente", - "Huntington Beach", "Portland" }; + private static final String[] CITIES = + { "Seattle", "Irvine", "Laguna Beach", "Los Angeles", "San Clemente", "Huntington Beach", "Portland" }; private static final int MIN_ZIP = 100000; private static final int MAX_ZIP = 999999; - private static final String[] LAT_LONGS = { "47,-122", "33,-117", "33,-117", "34,-118", "33,-117", "33,-117", - "45,-122" }; + private static final String[] LAT_LONGS = + { "47,-122", "33,-117", "33,-117", "34,-118", "33,-117", "33,-117", "45,-122" }; private static final int MIN_MEMBERSHIPS = 1; private static final int MAX_MEMBERSHIPS = 10; @@ -87,8 +87,8 @@ public class EventDataGen { firstNameIdx = Math.abs(rndValue.nextInt()) % firstNames.length; lastNameIdx = Math.abs(rndValue.nextInt()) % lastNames.length; // name = firstNames[firstNameIx] + " " + lastNames[lastNameIx]; - numInterests = Math.abs((rndValue.nextInt()) % (MAX_USER_INTERESTS - MIN_USER_INTERESTS)) - + MIN_USER_INTERESTS; + numInterests = + Math.abs((rndValue.nextInt()) % (MAX_USER_INTERESTS - MIN_USER_INTERESTS)) + MIN_USER_INTERESTS; for (int i = 0; i < numInterests; i++) { interests[i] = Math.abs(rndValue.nextInt()) % INTERESTS.length; } @@ -107,8 +107,8 @@ public class EventDataGen { + MEMBER_SINCE_MIN_YEAR; int msMo = Math.abs(rndValue.nextInt()) % 12 + 1; int msDay = Math.abs(rndValue.nextInt()) % 28 + 1; - member_since_date[i] = msYear + "-" + (msMo < 10 ? "0" : "") + msMo + "-" + (msDay < 10 ? "0" : "") - + msDay; + member_since_date[i] = + msYear + "-" + (msMo < 10 ? "0" : "") + msMo + "-" + (msDay < 10 ? "0" : "") + msDay; } } @@ -218,14 +218,14 @@ public class EventDataGen { public static void main(String[] args) throws IOException { if (args.length != 2) { - System.err - .println("MUST PROVIDE 2 PARAMETERS, 1. output directory path and 2. number of records to generate."); + System.err.println( + "MUST PROVIDE 2 PARAMETERS, 1. output directory path and 2. number of records to generate."); System.exit(1); } String outputFile = args[0]; int numRecords = Integer.parseInt(args[1]); - Writer userFile = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile + File.separator - + "user.adm"))); + Writer userFile = new BufferedWriter( + new OutputStreamWriter(new FileOutputStream(outputFile + File.separator + "user.adm"))); EventDataGen dgen = new EventDataGen(); dgen.init(); for (int i = 0; i < numRecords; i++) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/external/data/DataGeneratorForSpatialIndexEvaluation.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/external/data/DataGeneratorForSpatialIndexEvaluation.java b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/external/data/DataGeneratorForSpatialIndexEvaluation.java index 60bca54..4f1f3d7 100644 --- a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/external/data/DataGeneratorForSpatialIndexEvaluation.java +++ b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/external/data/DataGeneratorForSpatialIndexEvaluation.java @@ -34,7 +34,8 @@ import org.apache.asterix.external.generator.DataGenerator; public class DataGeneratorForSpatialIndexEvaluation { - private static final String DUMMY_SIZE_ADJUSTER = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; + private static final String DUMMY_SIZE_ADJUSTER = + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; private RandomDateGenerator randDateGen; @@ -209,12 +210,11 @@ public class DataGeneratorForSpatialIndexEvaluation { : (date.getMonth() + random.nextInt(endDate.getMonth() - date.getMonth())) : random.nextInt(12) + 1; - int day = (year == endDate.getYear()) - ? month == endDate.getMonth() + int day = + (year == endDate.getYear()) ? month == endDate.getMonth() ? date.getDay() == endDate.getDay() ? endDate.getDay() : date.getDay() + random.nextInt(endDate.getDay() - date.getDay()) - : random.nextInt(28) + 1 - : random.nextInt(28) + 1; + : random.nextInt(28) + 1 : random.nextInt(28) + 1; recentDate.reset(month, day, year); return recentDate; } @@ -887,8 +887,8 @@ public class DataGeneratorForSpatialIndexEvaluation { } public static void main(String[] args) throws Exception { - DataGeneratorForSpatialIndexEvaluation dg = new DataGeneratorForSpatialIndexEvaluation( - new InitializationInfo()); + DataGeneratorForSpatialIndexEvaluation dg = + new DataGeneratorForSpatialIndexEvaluation(new InitializationInfo()); TweetMessageIterator tmi = dg.new TweetMessageIterator(1, new GULongIDGenerator(0, (byte) 0)); int len = 0; int count = 0; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/tbltoadm/TblToAdm.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/tbltoadm/TblToAdm.java b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/tbltoadm/TblToAdm.java index 26656f6..b1bf335 100644 --- a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/tbltoadm/TblToAdm.java +++ b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/tbltoadm/TblToAdm.java @@ -29,7 +29,8 @@ public class TblToAdm { private static final String SEPARATOR_STRING = "\\\|\\s"; private static final char SEPARATOR_CHAR = '\|'; - private static void convertFile(String inputFileName, String outputFileName, String scmFileName) throws IOException { + private static void convertFile(String inputFileName, String outputFileName, String scmFileName) + throws IOException { File scmFile = new File(scmFileName); File inFile = new File(inputFileName); File outFile = new File(outputFileName); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/test/AdmDataGenTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/test/AdmDataGenTest.java b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/test/AdmDataGenTest.java index b6d44e0..de77870 100644 --- a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/test/AdmDataGenTest.java +++ b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/test/AdmDataGenTest.java @@ -47,8 +47,8 @@ public class AdmDataGenTest { private static final String EXTENSION_QUERY = "adg"; private static final String FILENAME_IGNORE = "ignore.txt"; private static final String FILENAME_ONLY = "only.txt"; - private static final String PATH_BASE = "src" + SEPARATOR + "test" + SEPARATOR + "resources" + SEPARATOR + "adgts" - + SEPARATOR; + private static final String PATH_BASE = + "src" + SEPARATOR + "test" + SEPARATOR + "resources" + SEPARATOR + "adgts" + SEPARATOR; private static final String PATH_QUERIES = PATH_BASE + "dgscripts" + SEPARATOR; private static final String PATH_EXPECTED = PATH_BASE + "results" + SEPARATOR; private static final String PATH_ACTUAL = "adgtest" + SEPARATOR; @@ -109,12 +109,12 @@ public class AdmDataGenTest { @Test public void test() throws Exception { - String scriptFileShort = scriptFile.getPath().substring(PATH_QUERIES.length()) - .replace(SEPARATOR.charAt(0), '/'); + String scriptFileShort = + scriptFile.getPath().substring(PATH_QUERIES.length()).replace(SEPARATOR.charAt(0), '/'); if (!only.isEmpty()) { if (!only.contains(scriptFileShort)) { - LOGGER.info("SKIP TEST: \"" + scriptFile.getPath() - + "\" \"only.txt\" not empty and not in \"only.txt\"."); + LOGGER.info( + "SKIP TEST: \"" + scriptFile.getPath() + "\" \"only.txt\" not empty and not in \"only.txt\"."); } Assume.assumeTrue(only.contains(scriptFileShort)); } @@ -186,8 +186,8 @@ public class AdmDataGenTest { lineActual = readerActual.readLine(); // Assert.assertEquals(null, lineActual); if (lineActual != null) { - throw new Exception("Result for " + scriptFile + " changed at line " + num + ":\n< \n> " - + lineActual); + throw new Exception( + "Result for " + scriptFile + " changed at line " + num + ":\n< \n> " + lineActual); } } finally { readerExpected.close(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallbackFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallbackFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallbackFactory.java index 972668a..d9088e1 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallbackFactory.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallbackFactory.java @@ -30,8 +30,8 @@ public class SecondaryIndexSearchOperationCallbackFactory implements ISearchOper private static final long serialVersionUID = 1L; @Override - public ISearchOperationCallback createSearchOperationCallback(long resourceId, IHyracksTaskContext ctx, IOperatorNodePushable operatorNodePushable) - throws HyracksDataException { + public ISearchOperationCallback createSearchOperationCallback(long resourceId, IHyracksTaskContext ctx, + IOperatorNodePushable operatorNodePushable) throws HyracksDataException { return new SecondaryIndexSearchOperationCallback(resourceId); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java index a1d0dd5..ca22a84 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java @@ -131,8 +131,8 @@ public class PersistentLocalResourceRepository implements ILocalResourceReposito storageRoots = new Path[ioManager.getIODevices().size()]; final List<IODeviceHandle> ioDevices = ioManager.getIODevices(); for (int i = 0; i < ioDevices.size(); i++) { - storageRoots[i] = Paths.get(ioDevices.get(i).getMount().getAbsolutePath(), - StorageConstants.STORAGE_ROOT_DIR_NAME); + storageRoots[i] = + Paths.get(ioDevices.get(i).getMount().getAbsolutePath(), StorageConstants.STORAGE_ROOT_DIR_NAME); } createStorageRoots(); resourceCache = CacheBuilder.newBuilder().maximumSize(MAX_CACHED_RESOURCES).build(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/LockManagerStats.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/LockManagerStats.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/LockManagerStats.java index 4d9c94a..1acc0ac 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/LockManagerStats.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/LockManagerStats.java @@ -38,27 +38,39 @@ final class LockManagerStats { this.loggingPeriod = loggingPeriod; } - final void lock() { lCnt.incrementAndGet(); } - final void instantLock() { ilCnt.incrementAndGet(); } - final void tryLock() { tlCnt.incrementAndGet(); } - final void instantTryLock() { itlCnt.incrementAndGet(); } - final void unlock() { ulCnt.incrementAndGet(); } - final void releaseLocks() { rlCnt.incrementAndGet(); } + final void lock() { + lCnt.incrementAndGet(); + } + + final void instantLock() { + ilCnt.incrementAndGet(); + } + + final void tryLock() { + tlCnt.incrementAndGet(); + } + + final void instantTryLock() { + itlCnt.incrementAndGet(); + } + + final void unlock() { + ulCnt.incrementAndGet(); + } + + final void releaseLocks() { + rlCnt.incrementAndGet(); + } final int requestSum() { - return lCnt.intValue() + ilCnt.intValue() + tlCnt.intValue() - + itlCnt.intValue() + ulCnt.intValue() + rlCnt.intValue(); + return lCnt.intValue() + ilCnt.intValue() + tlCnt.intValue() + itlCnt.intValue() + ulCnt.intValue() + + rlCnt.intValue(); } final StringBuilder append(StringBuilder sb) { - sb.append("{") - .append(" lock : ").append(lCnt) - .append(", instantLock : ").append(ilCnt) - .append(", tryLock : ").append(tlCnt) - .append(", instantTryLock : ").append(itlCnt) - .append(", unlock : ").append(ulCnt) - .append(", releaseLocks : ").append(rlCnt) - .append(" }"); + sb.append("{").append(" lock : ").append(lCnt).append(", instantLock : ").append(ilCnt).append(", tryLock : ") + .append(tlCnt).append(", instantTryLock : ").append(itlCnt).append(", unlock : ").append(ulCnt) + .append(", releaseLocks : ").append(rlCnt).append(" }"); return sb; } @@ -68,8 +80,7 @@ final class LockManagerStats { } final void logCounters(final Logger logger, final Level lvl, boolean always) { - if (logger.isEnabled(lvl) - && (always \|\| requestSum() % loggingPeriod == 0)) { + if (logger.isEnabled(lvl) && (always \|\| requestSum() % loggingPeriod == 0)) { logger.log(lvl, toString()); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceGroup.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceGroup.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceGroup.java index 436745d..6e59217 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceGroup.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceGroup.java @@ -89,7 +89,7 @@ class ResourceGroup { } public String toString() { - return "{ id : " + hashCode() + ", first : " + TypeUtil.Global.toString(firstResourceIndex.get()) + ", " + - "waiters : " + (hasWaiters() ? "true" : "false") + " }"; + return "{ id : " + hashCode() + ", first : " + TypeUtil.Global.toString(firstResourceIndex.get()) + ", " + + "waiters : " + (hasWaiters() ? "true" : "false") + " }"; } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceGroupTable.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceGroupTable.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceGroupTable.java index 213ccd9..3759f96 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceGroupTable.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceGroupTable.java @@ -43,7 +43,8 @@ class ResourceGroupTable { ResourceGroup get(int dId, int entityHashValue) { // TODO ensure good properties of hash function int h = Math.abs(dId ^ entityHashValue); - if (h < 0) h = 0; + if (h < 0) + h = 0; return table[h % size]; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java index 614591b..bc487fe 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java @@ -220,8 +220,8 @@ public class LogBuffer implements ILogBuffer { reusableTxnId.setId(logRecord.getTxnId()); reusableDatasetId.setId(logRecord.getDatasetId()); txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(reusableTxnId); - txnSubsystem.getLockManager() - .unlock(reusableDatasetId, logRecord.getPKHashValue(), LockMode.ANY, txnCtx); + txnSubsystem.getLockManager().unlock(reusableDatasetId, logRecord.getPKHashValue(), + LockMode.ANY, txnCtx); txnCtx.notifyEntityCommitted(); if (txnSubsystem.getTransactionProperties().isCommitProfilerEnabled()) { txnSubsystem.incrementEntityCommitCount(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java index 840a19b..e08bebe 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java @@ -408,8 +408,8 @@ public class LogManager implements ILogManager, ILifeCycleComponent { The log file which contains the checkpointLSN has been reached. * The oldest log file being accessed by a LogReader has been reached. / - if (id >= checkpointLSNLogFileID \|\| (txnLogFileId2ReaderCount.containsKey(id) - && txnLogFileId2ReaderCount.get(id) > 0)) { + if (id >= checkpointLSNLogFileID + \|\| (txnLogFileId2ReaderCount.containsKey(id) && txnLogFileId2ReaderCount.get(id) > 0)) { break; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/AbstractCheckpointManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/AbstractCheckpointManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/AbstractCheckpointManager.java index 386c1c4..f8ab952 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/AbstractCheckpointManager.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/AbstractCheckpointManager.java @@ -112,8 +112,7 @@ public abstract class AbstractCheckpointManager implements ICheckpointManager { } catch (ClosedByInterruptException e) { Thread.currentThread().interrupt(); if (LOGGER.isWarnEnabled()) { - LOGGER.log(Level.WARN, "Interrupted while reading checkpoint file: " + file.getAbsolutePath(), - e); + LOGGER.log(Level.WARN, "Interrupted while reading checkpoint file: " + file.getAbsolutePath(), e); } throw new ACIDException(e); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/CheckpointManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/CheckpointManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/CheckpointManager.java index 487bc84..a541bd9 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/CheckpointManager.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/CheckpointManager.java @@ -45,8 +45,8 @@ public class CheckpointManager extends AbstractCheckpointManager { @Override public synchronized void doSharpCheckpoint() throws HyracksDataException { LOGGER.info("Starting sharp checkpoint..."); - final IDatasetLifecycleManager datasetLifecycleManager = txnSubsystem.getApplicationContext() - .getDatasetLifecycleManager(); + final IDatasetLifecycleManager datasetLifecycleManager = + txnSubsystem.getApplicationContext().getDatasetLifecycleManager(); datasetLifecycleManager.flushAllDatasets(); capture(SHARP_CHECKPOINT_LSN, true); txnSubsystem.getLogManager().renewLogFiles(); @@ -66,8 +66,8 @@ public class CheckpointManager extends AbstractCheckpointManager { boolean checkpointSucceeded = minFirstLSN >= checkpointTargetLSN; if (!checkpointSucceeded) { // Flush datasets with indexes behind target checkpoint LSN - IDatasetLifecycleManager datasetLifecycleManager = txnSubsystem.getApplicationContext() - .getDatasetLifecycleManager(); + IDatasetLifecycleManager datasetLifecycleManager = + txnSubsystem.getApplicationContext().getDatasetLifecycleManager(); datasetLifecycleManager.scheduleAsyncFlushForLaggingDatasets(checkpointTargetLSN); } capture(minFirstLSN, false); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 5098fff..ec72dec 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -282,6 +282,21 @@ </execution> </executions> </plugin> + <plugin> + <groupId>net.revelc.code.formatter</groupId> + <artifactId>formatter-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>${source-format.goal}</goal> + </goals> + </execution> + </executions> + <configuration> + <configFile>${root.dir}/AsterixCodeFormatProfile.xml</configFile> + <skipFormatting>${source-format.skip}</skipFormatting> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> @@ -709,31 +724,6 @@ </plugins> </build> </profile> - <profile> - <id>source-format</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>net.revelc.code.formatter</groupId> - <artifactId>formatter-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>${source-format.goal}</goal> - </goals> - </execution> - </executions> - <configuration> - <configFile>${root.dir}/AsterixCodeFormatProfile.xml</configFile> - <skipFormatting>${source-format.skip}</skipFormatting> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> <modules> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/src/main/assembly/source.xml ---------------------------------------------------------------------- diff --git a/asterixdb/src/main/assembly/source.xml b/asterixdb/src/main/assembly/source.xml index 6552829..78f4382 100644 --- a/asterixdb/src/main/assembly/source.xml +++ b/asterixdb/src/main/assembly/source.xml @@ -29,7 +29,7 @@ <outputDirectory>.</outputDirectory> <useDefaultExcludes>true</useDefaultExcludes> <excludes> - <exclude>/${project.build.directory}/</exclude> + <exclude>${project.build.directory}/</exclude> <exclude>release.properties</exclude> </excludes> </fileSet> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/exceptions/AlgebricksException.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/exceptions/AlgebricksException.java b/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/exceptions/AlgebricksException.java index 64e328a..d1feb08 100644 --- a/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/exceptions/AlgebricksException.java +++ b/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/exceptions/AlgebricksException.java @@ -108,8 +108,8 @@ public class AlgebricksException extends Exception { @Override public String getMessage() { if (msgCache == null) { - msgCache = new CachedMessage( - ErrorMessageUtil.formatMessage(component, errorCode, super.getMessage(), params)); + msgCache = + new CachedMessage(ErrorMessageUtil.formatMessage(component, errorCode, super.getMessage(), params)); } return msgCache.message; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-compiler/src/main/java/org/apache/hyracks/algebricks/compiler/rewriter/rulecontrollers/SequentialFirstRuleCheckFixpointRuleController.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-compiler/src/main/java/org/apache/hyracks/algebricks/compiler/rewriter/rulecontrollers/SequentialFirstRuleCheckFixpointRuleController.java b/hyracks-fullstack/algebricks/algebricks-compiler/src/main/java/org/apache/hyracks/algebricks/compiler/rewriter/rulecontrollers/SequentialFirstRuleCheckFixpointRuleController.java index 7328278..29c178a 100644 --- a/hyracks-fullstack/algebricks/algebricks-compiler/src/main/java/org/apache/hyracks/algebricks/compiler/rewriter/rulecontrollers/SequentialFirstRuleCheckFixpointRuleController.java +++ b/hyracks-fullstack/algebricks/algebricks-compiler/src/main/java/org/apache/hyracks/algebricks/compiler/rewriter/rulecontrollers/SequentialFirstRuleCheckFixpointRuleController.java @@ -59,8 +59,7 @@ public class SequentialFirstRuleCheckFixpointRuleController extends AbstractRule if (ruleCollection instanceof List) { rules = (List<IAlgebraicRewriteRule>) ruleCollection; } else { - throw AlgebricksException.create(ErrorCode.RULECOLLECTION_NOT_INSTANCE_OF_LIST, - this.getClass().getName()); + throw AlgebricksException.create(ErrorCode.RULECOLLECTION_NOT_INSTANCE_OF_LIST, this.getClass().getName()); } if (rules.isEmpty()) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/IHyracksJobBuilder.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/IHyracksJobBuilder.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/IHyracksJobBuilder.java index 1012fef..663661c 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/IHyracksJobBuilder.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/IHyracksJobBuilder.java @@ -46,7 +46,8 @@ public interface IHyracksJobBuilder { /* * inputs are numbered starting from 0 */ - public void contributeGraphEdge(ILogicalOperator src, int srcOutputIndex, ILogicalOperator dest, int destInputIndex); + public void contributeGraphEdge(ILogicalOperator src, int srcOutputIndex, ILogicalOperator dest, + int destInputIndex); public void contributeConnector(ILogicalOperator exchgOp, IConnectorDescriptor conn); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/ILogicalOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/ILogicalOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/ILogicalOperator.java index 707a7db..dd7e065 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/ILogicalOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/ILogicalOperator.java @@ -65,7 +65,7 @@ public interface ILogicalOperator { public void contributeRuntimeOperator(IHyracksJobBuilder builder, JobGenContext context, IOperatorSchema propagatedSchema, IOperatorSchema[] inputSchemas, IOperatorSchema outerPlanSchema) - throws AlgebricksException; + throws AlgebricksException; // variables http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/IPhysicalOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/IPhysicalOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/IPhysicalOperator.java index 8c0ab2f..2a92aba 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/IPhysicalOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/IPhysicalOperator.java @@ -53,7 +53,7 @@ public interface IPhysicalOperator { public void contributeRuntimeOperator(IHyracksJobBuilder builder, JobGenContext context, ILogicalOperator op, IOperatorSchema propagatedSchema, IOperatorSchema[] inputSchemas, IOperatorSchema outerPlanSchema) - throws AlgebricksException; + throws AlgebricksException; public void disableJobGenBelowMe(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/LogicalExpressionTag.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/LogicalExpressionTag.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/LogicalExpressionTag.java index 58f4c60..45b7edc 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/LogicalExpressionTag.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/LogicalExpressionTag.java @@ -19,5 +19,7 @@ package org.apache.hyracks.algebricks.core.algebra.base; public enum LogicalExpressionTag { - FUNCTION_CALL, VARIABLE, CONSTANT + FUNCTION_CALL, + VARIABLE, + CONSTANT } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/ExpressionRuntimeProvider.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/ExpressionRuntimeProvider.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/ExpressionRuntimeProvider.java index 31726d2..71f7b52 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/ExpressionRuntimeProvider.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/ExpressionRuntimeProvider.java @@ -44,7 +44,7 @@ public class ExpressionRuntimeProvider implements IExpressionRuntimeProvider { @Override public IAggregateEvaluatorFactory createAggregateFunctionFactory(AggregateFunctionCallExpression expr, IVariableTypeEnvironment env, IOperatorSchema[] inputSchemas, JobGenContext context) - throws AlgebricksException { + throws AlgebricksException { return lejg.createAggregateFunctionFactory(expr, env, inputSchemas, context); } @@ -58,14 +58,14 @@ public class ExpressionRuntimeProvider implements IExpressionRuntimeProvider { @Override public IRunningAggregateEvaluatorFactory createRunningAggregateFunctionFactory(StatefulFunctionCallExpression expr, IVariableTypeEnvironment env, IOperatorSchema[] inputSchemas, JobGenContext context) - throws AlgebricksException { + throws AlgebricksException { return lejg.createRunningAggregateFunctionFactory(expr, env, inputSchemas, context); } @Override public IUnnestingEvaluatorFactory createUnnestingFunctionFactory(UnnestingFunctionCallExpression expr, IVariableTypeEnvironment env, IOperatorSchema[] inputSchemas, JobGenContext context) - throws AlgebricksException { + throws AlgebricksException { return lejg.createUnnestingFunctionFactory(expr, env, inputSchemas, context); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/IMergeAggregationExpressionFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/IMergeAggregationExpressionFactory.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/IMergeAggregationExpressionFactory.java index 2816477..d022bff 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/IMergeAggregationExpressionFactory.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/IMergeAggregationExpressionFactory.java @@ -24,6 +24,6 @@ import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext; import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable; public interface IMergeAggregationExpressionFactory { - ILogicalExpression createMergeAggregation(LogicalVariable originalAggVariable, ILogicalExpression expr, IOptimizationContext env) - throws AlgebricksException; + ILogicalExpression createMergeAggregation(LogicalVariable originalAggVariable, ILogicalExpression expr, + IOptimizationContext env) throws AlgebricksException; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/functions/AlgebricksBuiltinFunctions.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/functions/AlgebricksBuiltinFunctions.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/functions/AlgebricksBuiltinFunctions.java index 07e4f98..2da7cf3 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/functions/AlgebricksBuiltinFunctions.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/functions/AlgebricksBuiltinFunctions.java @@ -43,8 +43,8 @@ public class AlgebricksBuiltinFunctions { // booleans public final static FunctionIdentifier NOT = new FunctionIdentifier(ALGEBRICKS_NS, "not", 1); - public final static FunctionIdentifier AND = new FunctionIdentifier(ALGEBRICKS_NS, "and", - FunctionIdentifier.VARARGS); + public final static FunctionIdentifier AND = + new FunctionIdentifier(ALGEBRICKS_NS, "and", FunctionIdentifier.VARARGS); public final static FunctionIdentifier OR = new FunctionIdentifier(ALGEBRICKS_NS, "or", FunctionIdentifier.VARARGS); // numerics @@ -56,7 +56,8 @@ public class AlgebricksBuiltinFunctions { // nulls public final static FunctionIdentifier IS_NULL = new FunctionIdentifier(ALGEBRICKS_NS, "is-null", 1); - private static final Map<FunctionIdentifier, ComparisonKind> comparisonFunctions = new HashMap<FunctionIdentifier, ComparisonKind>(); + private static final Map<FunctionIdentifier, ComparisonKind> comparisonFunctions = + new HashMap<FunctionIdentifier, ComparisonKind>(); static { comparisonFunctions.put(AlgebricksBuiltinFunctions.EQ, ComparisonKind.EQ); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AbstractScanOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AbstractScanOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AbstractScanOperator.java index 5d6f40c..c163c9f 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AbstractScanOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AbstractScanOperator.java @@ -40,7 +40,6 @@ public abstract class AbstractScanOperator extends AbstractLogicalOperator { return variables; } - public void setVariables(List<LogicalVariable> variables) { this.variables = variables; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AggregateOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AggregateOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AggregateOperator.java index c58dd67..b4a59a8 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AggregateOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AggregateOperator.java @@ -98,13 +98,13 @@ public class AggregateOperator extends AbstractAssignOperator { @Override public IVariableTypeEnvironment computeOutputTypeEnvironment(ITypingContext ctx) throws AlgebricksException { - IVariableTypeEnvironment env = new NonPropagatingTypeEnvironment(ctx.getExpressionTypeComputer(), - ctx.getMetadataProvider()); + IVariableTypeEnvironment env = + new NonPropagatingTypeEnvironment(ctx.getExpressionTypeComputer(), ctx.getMetadataProvider()); IVariableTypeEnvironment env2 = ctx.getOutputTypeEnvironment(inputs.get(0).getValue()); int n = variables.size(); for (int i = 0; i < n; i++) { - Object t = ctx.getExpressionTypeComputer().getType(expressions.get(i).getValue(), - ctx.getMetadataProvider(), env2); + Object t = ctx.getExpressionTypeComputer().getType(expressions.get(i).getValue(), ctx.getMetadataProvider(), + env2); env.setVarType(variables.get(i), t); } return env; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AssignOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AssignOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AssignOperator.java index ef1760b..861d74c 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AssignOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AssignOperator.java @@ -92,8 +92,8 @@ public class AssignOperator extends AbstractAssignOperator { env.setVarType(variables.get(i), ctx.getExpressionTypeComputer().getType(expressions.get(i).getValue(), ctx.getMetadataProvider(), env)); if (expressions.get(i).getValue().getExpressionTag() == LogicalExpressionTag.VARIABLE) { - LogicalVariable var = ((VariableReferenceExpression) expressions.get(i).getValue()) - .getVariableReference(); + LogicalVariable var = + ((VariableReferenceExpression) expressions.get(i).getValue()).getVariableReference(); for (List<LogicalVariable> list : env.getCorrelatedMissableVariableLists()) { if (list.contains(var)) { list.add(variables.get(i)); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/GroupByOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/GroupByOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/GroupByOperator.java index aa694b8..365d77e 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/GroupByOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/GroupByOperator.java @@ -296,9 +296,8 @@ public class GroupByOperator extends AbstractOperatorWithNestedPlans { // The groupAll flag can only be set if group by columns are empty. private void checkGroupAll(boolean groupAll) { if (groupAll && !gByList.isEmpty()) { - throw new IllegalStateException( - "Conflicting parameters for GROUP BY: there should be no GROUP BY keys " - + "when the GROUP ALL flag is set to true"); + throw new IllegalStateException("Conflicting parameters for GROUP BY: there should be no GROUP BY keys " + + "when the GROUP ALL flag is set to true"); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IndexInsertDeleteUpsertOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IndexInsertDeleteUpsertOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IndexInsertDeleteUpsertOperator.java index 02765f1..31a1294 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IndexInsertDeleteUpsertOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IndexInsertDeleteUpsertOperator.java @@ -181,8 +181,8 @@ public class IndexInsertDeleteUpsertOperator extends AbstractLogicalOperator { return prevAdditionalFilteringExpression; } - public void - setBeforeOpAdditionalFilteringExpression(Mutable<ILogicalExpression> prevAdditionalFilteringExpression) { + public void setBeforeOpAdditionalFilteringExpression( + Mutable<ILogicalExpression> prevAdditionalFilteringExpression) { this.prevAdditionalFilteringExpression = prevAdditionalFilteringExpression; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IntersectOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IntersectOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IntersectOperator.java index 0595ff8..8a06ec4 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IntersectOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IntersectOperator.java @@ -155,8 +155,8 @@ public class IntersectOperator extends AbstractLogicalOperator { Object expectedType = expected.getVarType(expectedVariables.get(i)); Object actualType = actual.getVarType(actualVariables.get(i)); if (!expectedType.equals(actualType)) { - AlgebricksConfig.ALGEBRICKS_LOGGER.warn( - "Type of two variables are not equal." + expectedVariables.get(i) + " is of type: " + AlgebricksConfig.ALGEBRICKS_LOGGER + .warn("Type of two variables are not equal." + expectedVariables.get(i) + " is of type: " + expectedType + actualVariables.get(i) + " is of type: " + actualType); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/LeftOuterJoinOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/LeftOuterJoinOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/LeftOuterJoinOperator.java index 2ae27f1..797c5eb 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/LeftOuterJoinOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/LeftOuterJoinOperator.java @@ -64,9 +64,9 @@ public class LeftOuterJoinOperator extends AbstractBinaryJoinOperator { for (int i = 0; i < n; i++) { envPointers[i] = new OpRefTypeEnvPointer(inputs.get(i), ctx); } - PropagatingTypeEnvironment env = new PropagatingTypeEnvironment(ctx.getExpressionTypeComputer(), - ctx.getMissableTypeComputer(), ctx.getMetadataProvider(), TypePropagationPolicy.LEFT_OUTER, - envPointers); + PropagatingTypeEnvironment env = + new PropagatingTypeEnvironment(ctx.getExpressionTypeComputer(), ctx.getMissableTypeComputer(), + ctx.getMetadataProvider(), TypePropagationPolicy.LEFT_OUTER, envPointers); List<LogicalVariable> liveVars = new ArrayList<LogicalVariable>(); VariableUtilities.getLiveVariables(inputs.get(1).getValue(), liveVars); // live variables from outer branch can be null together env.getCorrelatedMissableVariableLists().add(liveVars); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/MaterializeOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/MaterializeOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/MaterializeOperator.java index 6c10d60..9e35885 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/MaterializeOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/MaterializeOperator.java @@ -43,7 +43,8 @@ public class MaterializeOperator extends AbstractLogicalOperator { } @Override - public boolean acceptExpressionTransform(ILogicalExpressionReferenceTransform transform) throws AlgebricksException { + public boolean acceptExpressionTransform(ILogicalExpressionReferenceTransform transform) + throws AlgebricksException { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/RunningAggregateOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/RunningAggregateOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/RunningAggregateOperator.java index c2e244b..ef16613 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/RunningAggregateOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/RunningAggregateOperator.java @@ -72,10 +72,8 @@ public class RunningAggregateOperator extends AbstractAssignOperator { IVariableTypeEnvironment env = createPropagatingAllInputsTypeEnvironment(ctx); int n = variables.size(); for (int i = 0; i < n; i++) { - env.setVarType( - variables.get(i), - ctx.getExpressionTypeComputer().getType(expressions.get(i).getValue(), ctx.getMetadataProvider(), - env)); + env.setVarType(variables.get(i), ctx.getExpressionTypeComputer().getType(expressions.get(i).getValue(), + ctx.getMetadataProvider(), env)); } return env; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/ScriptOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/ScriptOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/ScriptOperator.java index b04b28c..6fb767c 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/ScriptOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/ScriptOperator.java @@ -99,8 +99,8 @@ public class ScriptOperator extends AbstractLogicalOperator { @Override public IVariableTypeEnvironment computeOutputTypeEnvironment(ITypingContext ctx) throws AlgebricksException { - IVariableTypeEnvironment env = new NonPropagatingTypeEnvironment(ctx.getExpressionTypeComputer(), - ctx.getMetadataProvider()); + IVariableTypeEnvironment env = + new NonPropagatingTypeEnvironment(ctx.getExpressionTypeComputer(), ctx.getMetadataProvider()); for (Pair<LogicalVariable, Object> p : scriptDesc.getVarTypePairs()) { env.setVarType(p.first, p.second); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/TokenizeOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/TokenizeOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/TokenizeOperator.java index c69ead7..d61ad07 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/TokenizeOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/TokenizeOperator.java @@ -50,12 +50,9 @@ public class TokenizeOperator extends AbstractLogicalOperator { private final List<Object> tokenizeVarTypes; private List<Mutable<ILogicalExpression>> additionalFilteringExpressions; - public TokenizeOperator(IDataSourceIndex<?, ?> dataSourceIndex, - List<Mutable<ILogicalExpression>> primaryKeyExprs, - List<Mutable<ILogicalExpression>> secondaryKeyExprs, - List<LogicalVariable> tokenizeVars, - Mutable<ILogicalExpression> filterExpr, Kind operation, - boolean bulkload, boolean isPartitioned, + public TokenizeOperator(IDataSourceIndex<?, ?> dataSourceIndex, List<Mutable<ILogicalExpression>> primaryKeyExprs, + List<Mutable<ILogicalExpression>> secondaryKeyExprs, List<LogicalVariable> tokenizeVars, + Mutable<ILogicalExpression> filterExpr, Kind operation, boolean bulkload, boolean isPartitioned, List<Object> tokenizeVarTypes) { this.dataSourceIndex = dataSourceIndex; this.primaryKeyExprs = primaryKeyExprs; @@ -76,9 +73,7 @@ public class TokenizeOperator extends AbstractLogicalOperator { } @Override - public boolean acceptExpressionTransform( - ILogicalExpressionReferenceTransform visitor) - throws AlgebricksException { + public boolean acceptExpressionTransform(ILogicalExpressionReferenceTransform visitor) throws AlgebricksException { boolean b = false; for (int i = 0; i < primaryKeyExprs.size(); i++) { if (visitor.transform(primaryKeyExprs.get(i))) { @@ -94,8 +89,7 @@ public class TokenizeOperator extends AbstractLogicalOperator { } @Override - public <R, T> R accept(ILogicalOperatorVisitor<R, T> visitor, T arg) - throws AlgebricksException { + public <R, T> R accept(ILogicalOperatorVisitor<R, T> visitor, T arg) throws AlgebricksException { return visitor.visitTokenizeOperator(this, arg); } @@ -109,8 +103,8 @@ public class TokenizeOperator extends AbstractLogicalOperator { return new VariablePropagationPolicy() { @Override - public void propagateVariables(IOperatorSchema target, - IOperatorSchema... sources) throws AlgebricksException { + public void propagateVariables(IOperatorSchema target, IOperatorSchema... sources) + throws AlgebricksException { target.addAllVariables(sources[0]); for (LogicalVariable v : tokenizeVars) { target.addVariable(v); @@ -126,8 +120,7 @@ public class TokenizeOperator extends AbstractLogicalOperator { } @Override - public IVariableTypeEnvironment computeOutputTypeEnvironment( - ITypingContext ctx) throws AlgebricksException { + public IVariableTypeEnvironment computeOutputTypeEnvironment(ITypingContext ctx) throws AlgebricksException { IVariableTypeEnvironment env = createPropagatingAllInputsTypeEnvironment(ctx); // If the secondary index is not length-partitioned, create one new http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/UpdateOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/UpdateOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/UpdateOperator.java index b1ca744..3a0068d 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/UpdateOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/UpdateOperator.java @@ -35,7 +35,8 @@ public class UpdateOperator extends AbstractLogicalOperator { } @Override - public boolean acceptExpressionTransform(ILogicalExpressionReferenceTransform transform) throws AlgebricksException { + public boolean acceptExpressionTransform(ILogicalExpressionReferenceTransform transform) + throws AlgebricksException { // TODO Auto-generated method stub return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java index 0c53685..fb1bcec 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java @@ -77,7 +77,8 @@ import org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalOperatorVisit public class IsomorphismOperatorVisitor implements ILogicalOperatorVisitor<Boolean, ILogicalOperator> { - private final Map<LogicalVariable, LogicalVariable> variableMapping = new HashMap<LogicalVariable, LogicalVariable>(); + private final Map<LogicalVariable, LogicalVariable> variableMapping = + new HashMap<LogicalVariable, LogicalVariable>(); public IsomorphismOperatorVisitor() { } @@ -89,9 +90,9 @@ public class IsomorphismOperatorVisitor implements ILogicalOperatorVisitor<Boole return Boolean.FALSE; } AggregateOperator aggOpArg = (AggregateOperator) copyAndSubstituteVar(op, arg); - boolean isomorphic = VariableUtilities.varListEqualUnordered( - getPairList(op.getVariables(), op.getExpressions()), - getPairList(aggOpArg.getVariables(), aggOpArg.getExpressions())); + boolean isomorphic = + VariableUtilities.varListEqualUnordered(getPairList(op.getVariables(), op.getExpressions()), + getPairList(aggOpArg.getVariables(), aggOpArg.getExpressions())); return isomorphic; } @@ -103,9 +104,9 @@ public class IsomorphismOperatorVisitor implements ILogicalOperatorVisitor<Boole return Boolean.FALSE; } RunningAggregateOperator aggOpArg = (RunningAggregateOperator) copyAndSubstituteVar(op, arg); - boolean isomorphic = VariableUtilities.varListEqualUnordered( - getPairList(op.getVariables(), op.getExpressions()), - getPairList(aggOpArg.getVariables(), aggOpArg.getExpressions())); + boolean isomorphic = + VariableUtilities.varListEqualUnordered(getPairList(op.getVariables(), op.getExpressions()), + getPairList(aggOpArg.getVariables(), aggOpArg.getExpressions())); return isomorphic; } @@ -142,8 +143,10 @@ public class IsomorphismOperatorVisitor implements ILogicalOperatorVisitor<Boole GroupByOperator gbyOpArg = (GroupByOperator) copyAndSubstituteVar(op, arg); List<Pair<LogicalVariable, Mutable<ILogicalExpression>>> keyListsArg = gbyOpArg.getGroupByList(); - List<Pair<LogicalVariable, ILogicalExpression>> listLeft = new ArrayList<Pair<LogicalVariable, ILogicalExpression>>(); - List<Pair<LogicalVariable, ILogicalExpression>> listRight = new ArrayList<Pair<LogicalVariable, ILogicalExpression>>(); + List<Pair<LogicalVariable, ILogicalExpression>> listLeft = + new ArrayList<Pair<LogicalVariable, ILogicalExpression>>(); + List<Pair<LogicalVariable, ILogicalExpression>> listRight = + new ArrayList<Pair<LogicalVariable, ILogicalExpression>>(); for (Pair<LogicalVariable, Mutable<ILogicalExpression>> pair : keyLists) { listLeft.add(new Pair<LogicalVariable, ILogicalExpression>(pair.first, pair.second.getValue())); @@ -249,9 +252,9 @@ public class IsomorphismOperatorVisitor implements ILogicalOperatorVisitor<Boole return Boolean.FALSE; } AssignOperator assignOpArg = (AssignOperator) copyAndSubstituteVar(op, arg); - boolean isomorphic = VariableUtilities.varListEqualUnordered( - getPairList(op.getVariables(), op.getExpressions()), - getPairList(assignOpArg.getVariables(), assignOpArg.getExpressions())); + boolean isomorphic = + VariableUtilities.varListEqualUnordered(getPairList(op.getVariables(), op.getExpressions()), + getPairList(assignOpArg.getVariables(), assignOpArg.getExpressions())); return isomorphic; } @@ -659,7 +662,8 @@ public class IsomorphismOperatorVisitor implements ILogicalOperatorVisitor<Boole public List<Pair<LogicalVariable, ILogicalExpression>> getPairList(List<LogicalVariable> vars, List<Mutable<ILogicalExpression>> exprs) throws AlgebricksException { - List<Pair<LogicalVariable, ILogicalExpression>> list = new ArrayList<Pair<LogicalVariable, ILogicalExpression>>(); + List<Pair<LogicalVariable, ILogicalExpression>> list = + new ArrayList<Pair<LogicalVariable, ILogicalExpression>>(); if (vars.size() != exprs.size()) { throw new AlgebricksException("variable list size does not equal to expression list size "); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalOperatorDeepCopyWithNewVariablesVisitor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalOperatorDeepCopyWithNewVariablesVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalOperatorDeepCopyWithNewVariablesVisitor.java index a75e7d6..74afdf5 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalOperatorDeepCopyWithNewVariablesVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalOperatorDeepCopyWithNewVariablesVisitor.java @@ -203,8 +203,8 @@ public class LogicalOperatorDeepCopyWithNewVariablesVisitor private List<Pair<IOrder, Mutable<ILogicalExpression>>> deepCopyOrderExpressionReferencePairList( List<Pair<IOrder, Mutable<ILogicalExpression>>> list) throws AlgebricksException { - ArrayList<Pair<IOrder, Mutable<ILogicalExpression>>> listCopy = new ArrayList<Pair<IOrder, Mutable<ILogicalExpression>>>( - list.size()); + ArrayList<Pair<IOrder, Mutable<ILogicalExpression>>> listCopy = + new ArrayList<Pair<IOrder, Mutable<ILogicalExpression>>>(list.size()); for (Pair<IOrder, Mutable<ILogicalExpression>> pair : list) { listCopy.add(new Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>(deepCopyOrder(pair.first), exprDeepCopyVisitor.deepCopyExpressionReference(pair.second))); @@ -248,8 +248,8 @@ public class LogicalOperatorDeepCopyWithNewVariablesVisitor private List<Pair<LogicalVariable, Mutable<ILogicalExpression>>> deepCopyVariableExpressionReferencePairList( List<Pair<LogicalVariable, Mutable<ILogicalExpression>>> list) throws AlgebricksException { - List<Pair<LogicalVariable, Mutable<ILogicalExpression>>> listCopy = new ArrayList<Pair<LogicalVariable, Mutable<ILogicalExpression>>>( - list.size()); + List<Pair<LogicalVariable, Mutable<ILogicalExpression>>> listCopy = + new ArrayList<Pair<LogicalVariable, Mutable<ILogicalExpression>>>(list.size()); for (Pair<LogicalVariable, Mutable<ILogicalExpression>> pair : list) { listCopy.add(new Pair<LogicalVariable, Mutable<ILogicalExpression>>(deepCopyVariable(pair.first), exprDeepCopyVisitor.deepCopyExpressionReference(pair.second))); @@ -317,8 +317,8 @@ public class LogicalOperatorDeepCopyWithNewVariablesVisitor @Override public ILogicalOperator visitDataScanOperator(DataSourceScanOperator op, ILogicalOperator arg) throws AlgebricksException { - DataSourceScanOperator opCopy = new DataSourceScanOperator(deepCopyVariableList(op.getVariables()), - op.getDataSource()); + DataSourceScanOperator opCopy = + new DataSourceScanOperator(deepCopyVariableList(op.getVariables()), op.getDataSource()); deepCopyInputsAnnotationsAndExecutionMode(op, arg, opCopy); return opCopy; } @@ -326,8 +326,8 @@ public class LogicalOperatorDeepCopyWithNewVariablesVisitor @Override public ILogicalOperator visitDistinctOperator(DistinctOperator op, ILogicalOperator arg) throws AlgebricksException { - DistinctOperator opCopy = new DistinctOperator( - exprDeepCopyVisitor.deepCopyExpressionReferenceList(op.getExpressions())); + DistinctOperator opCopy = + new DistinctOperator(exprDeepCopyVisitor.deepCopyExpressionReferenceList(op.getExpressions())); deepCopyInputsAnnotationsAndExecutionMode(op, arg, opCopy); return opCopy; } @@ -349,10 +349,10 @@ public class LogicalOperatorDeepCopyWithNewVariablesVisitor @Override public ILogicalOperator visitGroupByOperator(GroupByOperator op, ILogicalOperator arg) throws AlgebricksException { - List<Pair<LogicalVariable, Mutable<ILogicalExpression>>> groupByListCopy = deepCopyVariableExpressionReferencePairList( - op.getGroupByList()); - List<Pair<LogicalVariable, Mutable<ILogicalExpression>>> decorListCopy = deepCopyVariableExpressionReferencePairList( - op.getDecorList()); + List<Pair<LogicalVariable, Mutable<ILogicalExpression>>> groupByListCopy = + deepCopyVariableExpressionReferencePairList(op.getGroupByList()); + List<Pair<LogicalVariable, Mutable<ILogicalExpression>>> decorListCopy = + deepCopyVariableExpressionReferencePairList(op.getDecorList()); List<ILogicalPlan> nestedPlansCopy = new ArrayList<ILogicalPlan>(); GroupByOperator opCopy = new GroupByOperator(groupByListCopy, decorListCopy, nestedPlansCopy, op.isGroupAll()); @@ -364,10 +364,10 @@ public class LogicalOperatorDeepCopyWithNewVariablesVisitor @Override public ILogicalOperator visitInnerJoinOperator(InnerJoinOperator op, ILogicalOperator arg) throws AlgebricksException { - InnerJoinOperator opCopy = new InnerJoinOperator( - exprDeepCopyVisitor.deepCopyExpressionReference(op.getCondition()), - deepCopyOperatorReference(op.getInputs().get(0), arg), - deepCopyOperatorReference(op.getInputs().get(1), arg)); + InnerJoinOperator opCopy = + new InnerJoinOperator(exprDeepCopyVisitor.deepCopyExpressionReference(op.getCondition()), + deepCopyOperatorReference(op.getInputs().get(0), arg), + deepCopyOperatorReference(op.getInputs().get(1), arg)); copyAnnotations(op, opCopy); opCopy.setExecutionMode(op.getExecutionMode()); return opCopy; @@ -376,10 +376,10 @@ public class LogicalOperatorDeepCopyWithNewVariablesVisitor @Override public ILogicalOperator visitLeftOuterJoinOperator(LeftOuterJoinOperator op, ILogicalOperator arg) throws AlgebricksException { - LeftOuterJoinOperator opCopy = new LeftOuterJoinOperator( - exprDeepCopyVisitor.deepCopyExpressionReference(op.getCondition()), - deepCopyOperatorReference(op.getInputs().get(0), arg), - deepCopyOperatorReference(op.getInputs().get(1), arg)); + LeftOuterJoinOperator opCopy = + new LeftOuterJoinOperator(exprDeepCopyVisitor.deepCopyExpressionReference(op.getCondition()), + deepCopyOperatorReference(op.getInputs().get(0), arg), + deepCopyOperatorReference(op.getInputs().get(1), arg)); copyAnnotations(op, opCopy); opCopy.setExecutionMode(op.getExecutionMode()); return opCopy; @@ -396,8 +396,8 @@ public class LogicalOperatorDeepCopyWithNewVariablesVisitor @Override public ILogicalOperator visitNestedTupleSourceOperator(NestedTupleSourceOperator op, ILogicalOperator arg) throws AlgebricksException { - Mutable<ILogicalOperator> dataSourceReference = arg == null ? op.getDataSourceReference() - : new MutableObject<>(arg); + Mutable<ILogicalOperator> dataSourceReference = + arg == null ? op.getDataSourceReference() : new MutableObject<>(arg); NestedTupleSourceOperator opCopy = new NestedTupleSourceOperator(dataSourceReference); deepCopyInputsAnnotationsAndExecutionMode(op, arg, opCopy); return opCopy; @@ -495,8 +495,8 @@ public class LogicalOperatorDeepCopyWithNewVariablesVisitor int index = 0; for (Triple<LogicalVariable, LogicalVariable, LogicalVariable> triple : op.getVariableMappings()) { LogicalVariable producedVar = deepCopyVariable(triple.third); - Triple<LogicalVariable, LogicalVariable, LogicalVariable> copiedTriple = new Triple<>( - liveVarsInLeftInput.get(index), liveVarsInRightInput.get(index), producedVar); + Triple<LogicalVariable, LogicalVariable, LogicalVariable> copiedTriple = + new Triple<>(liveVarsInLeftInput.get(index), liveVarsInRightInput.get(index), producedVar); copiedTriples.add(copiedTriple); ++index; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/OperatorDeepCopyVisitor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/OperatorDeepCopyVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/OperatorDeepCopyVisitor.java index 7543e5f..600714b 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/OperatorDeepCopyVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/OperatorDeepCopyVisitor.java @@ -369,8 +369,8 @@ public class OperatorDeepCopyVisitor implements ILogicalOperatorVisitor<ILogical return newObjs; } - private List<Pair<IOrder, Mutable<ILogicalExpression>>> - deepCopyOrderAndExpression(List<Pair<IOrder, Mutable<ILogicalExpression>>> ordersAndExprs) { + private List<Pair<IOrder, Mutable<ILogicalExpression>>> deepCopyOrderAndExpression( + List<Pair<IOrder, Mutable<ILogicalExpression>>> ordersAndExprs) { List<Pair<IOrder, Mutable<ILogicalExpression>>> newOrdersAndExprs = new ArrayList<>(); for (Pair<IOrder, Mutable<ILogicalExpression>> pair : ordersAndExprs) { newOrdersAndExprs.add(new Pair<>(pair.first, deepCopyExpressionRef(pair.second))); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/VariableUtilities.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/VariableUtilities.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/VariableUtilities.java index 7221e81..69fe746 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/VariableUtilities.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/VariableUtilities.java @@ -139,7 +139,7 @@ public class VariableUtilities { public static void substituteVariables(ILogicalOperator op, List<Pair<LogicalVariable, LogicalVariable>> oldVarNewVarMapHistory, ITypingContext ctx) - throws AlgebricksException { + throws AlgebricksException { for (Pair<LogicalVariable, LogicalVariable> entry : oldVarNewVarMapHistory) { VariableUtilities.substituteVariables(op, entry.first, entry.second, ctx); } @@ -165,8 +165,8 @@ public class VariableUtilities { public static void substituteVariables(ILogicalOperator op, LogicalVariable v1, LogicalVariable v2, boolean goThroughNts, ITypingContext ctx) throws AlgebricksException { - ILogicalOperatorVisitor<Void, Pair<LogicalVariable, LogicalVariable>> visitor = new SubstituteVariableVisitor( - goThroughNts, ctx); + ILogicalOperatorVisitor<Void, Pair<LogicalVariable, LogicalVariable>> visitor = + new SubstituteVariableVisitor(goThroughNts, ctx); op.accept(visitor, new Pair<LogicalVariable, LogicalVariable>(v1, v2)); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractExchangePOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractExchangePOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractExchangePOperator.java index 799a6af..6f8d5e9 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractExchangePOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractExchangePOperator.java @@ -33,8 +33,8 @@ public abstract class AbstractExchangePOperator extends AbstractPhysicalOperator public void contributeRuntimeOperator(IHyracksJobBuilder builder, JobGenContext context, ILogicalOperator op, IOperatorSchema opSchema, IOperatorSchema[] inputSchemas, IOperatorSchema outerPlanSchema) throws AlgebricksException { - Pair<IConnectorDescriptor, TargetConstraint> connPair = createConnectorDescriptor(builder.getJobSpec(), op, - opSchema, context); + Pair<IConnectorDescriptor, TargetConstraint> connPair = + createConnectorDescriptor(builder.getJobSpec(), op, opSchema, context); builder.contributeConnectorWithTargetConstraint(op, connPair.first, connPair.second); ILogicalOperator src = op.getInputs().get(0).getValue(); builder.contributeGraphEdge(src, 0, op, 0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractHashJoinPOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractHashJoinPOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractHashJoinPOperator.java index f6a1bc4..6a81005 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractHashJoinPOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractHashJoinPOperator.java @@ -96,10 +96,10 @@ public abstract class AbstractHashJoinPOperator extends AbstractJoinPOperator { switch (partitioningType) { case PAIRWISE: pp1 = new UnorderedPartitionedProperty(new ListSet<>(keysLeftBranch), - context.getComputationNodeDomain()); + context.getComputationNodeDomain()); pp2 = new UnorderedPartitionedProperty(new ListSet<>(keysRightBranch), - context.getComputationNodeDomain()); - break; + context.getComputationNodeDomain()); + break; case BROADCAST: pp1 = new RandomPartitioningProperty(context.getComputationNodeDomain()); pp2 = new BroadcastPartitioningProperty(context.getComputationNodeDomain()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractJoinPOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractJoinPOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractJoinPOperator.java index 4afcbc8..aea9b3e 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractJoinPOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractJoinPOperator.java @@ -25,7 +25,8 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractBina public abstract class AbstractJoinPOperator extends AbstractPhysicalOperator { public enum JoinPartitioningType { - PAIRWISE, BROADCAST + PAIRWISE, + BROADCAST } protected final JoinKind kind;
Mime	Unnamed text/plain (inline, 7-Bit, 87579 bytes)
	View raw message