http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java index f2933f4..c9f777d 100755 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java @@ -171,8 +171,7 @@ public class ExternalLibraryUtils { // belong to the library? if (adapter.getAdapterIdentifier().getName().startsWith(libraryName + "#")) { // remove adapter <! we didn't check if there are feeds which use this adapter> - MetadataManager.INSTANCE.dropAdapter(mdTxnCtx, dataverse, - adapter.getAdapterIdentifier().getName()); + MetadataManager.INSTANCE.dropAdapter(mdTxnCtx, dataverse, adapter.getAdapterIdentifier().getName()); } } // drop the library itself @@ -394,8 +393,8 @@ public class ExternalLibraryUtils { // Check managix directory first. If not exists, check app home. File installDir = new File(System.getProperty("user.dir"), "library"); if (!installDir.exists()) { - installDir = new File(System.getProperty("app.home", System.getProperty("user.home")) - + File.separator + "lib" + File.separator + "udfs"); + installDir = new File(System.getProperty("app.home", System.getProperty("user.home")) + File.separator + + "lib" + File.separator + "udfs"); } return installDir; } @@ -407,8 +406,8 @@ public class ExternalLibraryUtils { // Check managix directory first. If not exists, check app home. File uninstallDir = new File(System.getProperty("user.dir"), "uninstall"); if (!uninstallDir.exists()) { - uninstallDir = new File(System.getProperty("app.home", System.getProperty("user.home")) - + File.separator + "lib" + File.separator + "udfs" + File.separator + "uninstall"); + uninstallDir = new File(System.getProperty("app.home", System.getProperty("user.home")) + File.separator + + "lib" + File.separator + "udfs" + File.separator + "uninstall"); } return uninstallDir; }
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalUDFLibrarian.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalUDFLibrarian.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalUDFLibrarian.java index 75207e8..29a4b36 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalUDFLibrarian.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalUDFLibrarian.java @@ -89,8 +89,8 @@ public class ExternalUDFLibrarian implements IExternalUDFLibrarian { installLibDir.mkdir(); } // copy the library file into the directory - File destinationDir = new File( - installLibDir.getAbsolutePath() + File.separator + dvName + File.separator + libName); + File destinationDir = + new File(installLibDir.getAbsolutePath() + File.separator + dvName + File.separator + libName); FileUtils.deleteQuietly(destinationDir); destinationDir.mkdirs(); try { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java index 5b0eb97..31b213e 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java @@ -122,9 +122,8 @@ public final class ExecuteStatementRequestMessage implements ICcAddressedMessage IStatementExecutor translator = statementExecutorFactory.create(ccAppCtx, statements, sessionOutput, compilationProvider, storageComponentProvider); final IStatementExecutor.Stats stats = new IStatementExecutor.Stats(); - final IRequestParameters requestParameters = - new RequestParameters(null, resultProperties, stats, outMetadata, clientContextID, - optionalParameters); + final IRequestParameters requestParameters = new RequestParameters(null, resultProperties, stats, + outMetadata, clientContextID, optionalParameters); translator.compileAndExecute(ccApp.getHcc(), statementExecutorContext, requestParameters); outPrinter.close(); responseMsg.setResult(outWriter.toString()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java index cb8c161..c554cbd 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java @@ -203,8 +203,8 @@ public class NCAppRuntimeContext implements INcApplicationContext { datasetMemoryManager, indexCheckpointManagerProvider, ioManager.getIODevices().size()); final String nodeId = getServiceContext().getNodeId(); final ClusterPartition[] nodePartitions = metadataProperties.getNodePartitions().get(nodeId); - final Set<Integer> nodePartitionsIds = Arrays.stream(nodePartitions).map(ClusterPartition::getPartitionId) - .collect(Collectors.toSet()); + final Set<Integer> nodePartitionsIds = + Arrays.stream(nodePartitions).map(ClusterPartition::getPartitionId).collect(Collectors.toSet()); replicaManager = new ReplicaManager(this, nodePartitionsIds); isShuttingdown = false; activeManager = new ActiveManager(threadExecutor, getServiceContext().getNodeId(), http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java index c189983..3717673 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java @@ -97,7 +97,6 @@ public class RecoveryManager implements IRecoveryManager, ILifeCycleComponent { private final INCServiceContext serviceCtx; private final INcApplicationContext appCtx; - public RecoveryManager(ITransactionSubsystem txnSubsystem, INCServiceContext serviceCtx) { this.serviceCtx = serviceCtx; this.txnSubsystem = txnSubsystem; @@ -414,8 +413,8 @@ public class RecoveryManager implements IRecoveryManager, ILifeCycleComponent { long minFirstLSN = logMgr.getAppendLSN(); if (!openIndexList.isEmpty()) { for (IIndex index : openIndexList) { - AbstractLSMIOOperationCallback ioCallback = (AbstractLSMIOOperationCallback) ((ILSMIndex) index) - .getIOOperationCallback(); + AbstractLSMIOOperationCallback ioCallback = + (AbstractLSMIOOperationCallback) ((ILSMIndex) index).getIOOperationCallback(); if (!((AbstractLSMIndex) index).isCurrentMutableComponentEmpty() || ioCallback.hasPendingFlush()) { firstLSN = ioCallback.getFirstLSN(); minFirstLSN = Math.min(minFirstLSN, firstLSN); @@ -583,9 +582,9 @@ public class RecoveryManager implements IRecoveryManager, ILifeCycleComponent { if (activePartitions.contains(logRecord.getResourcePartition())) { undoLSNSet = jobLoserEntity2LSNsMap.get(tempKeyTxnEntityId); if (undoLSNSet == null) { - loserEntity = new TxnEntityId(logTxnId, logRecord.getDatasetId(), - logRecord.getPKHashValue(), logRecord.getPKValue(), logRecord.getPKValueSize(), - true); + loserEntity = + new TxnEntityId(logTxnId, logRecord.getDatasetId(), logRecord.getPKHashValue(), + logRecord.getPKValue(), logRecord.getPKValueSize(), true); undoLSNSet = new LinkedList<>(); jobLoserEntity2LSNsMap.put(loserEntity, undoLSNSet); } @@ -680,8 +679,8 @@ public class RecoveryManager implements IRecoveryManager, ILifeCycleComponent { private static void undo(ILogRecord logRecord, IDatasetLifecycleManager datasetLifecycleManager) { try { - ILSMIndex index = (ILSMIndex) datasetLifecycleManager.getIndex(logRecord.getDatasetId(), - logRecord.getResourceId()); + ILSMIndex index = + (ILSMIndex) datasetLifecycleManager.getIndex(logRecord.getDatasetId(), logRecord.getResourceId()); ILSMIndexAccessor indexAccessor = index.createAccessor(NoOpIndexAccessParameters.INSTANCE); if (logRecord.getNewOp() == AbstractIndexModificationOperationCallback.INSERT_BYTE) { indexAccessor.forceDelete(logRecord.getNewValue()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NcLifecycleCoordinator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NcLifecycleCoordinator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NcLifecycleCoordinator.java index 54b1a01..980375d 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NcLifecycleCoordinator.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NcLifecycleCoordinator.java @@ -146,9 +146,8 @@ public class NcLifecycleCoordinator implements INcLifecycleCoordinator { final List<INCLifecycleTask> tasks = new ArrayList<>(); if (state == SystemState.CORRUPTED) { //need to perform local recovery for node partitions - LocalRecoveryTask rt = new LocalRecoveryTask( - Arrays.asList(clusterManager.getNodePartitions(nodeId)).stream() - .map(ClusterPartition::getPartitionId).collect(Collectors.toSet())); + LocalRecoveryTask rt = new LocalRecoveryTask(Arrays.asList(clusterManager.getNodePartitions(nodeId)) + .stream().map(ClusterPartition::getPartitionId).collect(Collectors.toSet())); tasks.add(rt); } if (replicationEnabled) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java index 62e7a69..3c7182d 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java @@ -48,8 +48,8 @@ public class RegistrationTasksRequestMessage implements INCLifecycleMessage, ICc public static void send(CcId ccId, NodeControllerService cs, NodeStatus nodeStatus, SystemState systemState) throws HyracksDataException { try { - RegistrationTasksRequestMessage msg = new RegistrationTasksRequestMessage(cs.getId(), nodeStatus, - systemState); + RegistrationTasksRequestMessage msg = + new RegistrationTasksRequestMessage(cs.getId(), nodeStatus, systemState); ((INCMessageBroker) cs.getContext().getMessageBroker()).sendMessageToCC(ccId, msg); } catch (Exception e) { LOGGER.log(Level.ERROR, "Unable to send RegistrationTasksRequestMessage to CC", e); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/resource/RequiredCapacityVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/resource/RequiredCapacityVisitor.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/resource/RequiredCapacityVisitor.java index 3a6bfee..89fbcb2 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/resource/RequiredCapacityVisitor.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/resource/RequiredCapacityVisitor.java @@ -314,8 +314,8 @@ public class RequiredCapacityVisitor implements ILogicalOperatorVisitor<Void, Vo addOutputBuffer(op); return; } - stageMemorySoFar += 2L * MAX_BUFFER_PER_CONNECTION * numComputationPartitions * numComputationPartitions - * frameSize; + stageMemorySoFar += + 2L * MAX_BUFFER_PER_CONNECTION * numComputationPartitions * numComputationPartitions * frameSize; clusterCapacity.setAggregatedMemoryByteSize(stageMemorySoFar); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/drivers/AsterixClientDriver.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/drivers/AsterixClientDriver.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/drivers/AsterixClientDriver.java index 14a5fe0..aa6bbdd 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/drivers/AsterixClientDriver.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/drivers/AsterixClientDriver.java @@ -64,9 +64,8 @@ public class AsterixClientDriver { boolean onlyPhysical, boolean createBinaryRuntime) throws Exception { ILangCompilationProvider compilationProvider = new AqlCompilationProvider(); FileReader reader = new FileReader(filename); - AsterixJavaClient q = - new AsterixJavaClient(null, hcc, reader, compilationProvider, new DefaultStatementExecutorFactory(), - new StorageComponentProvider()); + AsterixJavaClient q = new AsterixJavaClient(null, hcc, reader, compilationProvider, + new DefaultStatementExecutorFactory(), new StorageComponentProvider()); q.compile(optimize, true, true, true, onlyPhysical, createBinaryRuntime, createBinaryRuntime); return q; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java index 1c7bfb7..6baf488 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java @@ -124,8 +124,8 @@ public class CCApplication extends BaseCCApplication { if (args.length > 0) { throw new IllegalArgumentException("Unrecognized argument(s): " + Arrays.toString(args)); } - final ClusterControllerService controllerService = (ClusterControllerService) ccServiceCtx - .getControllerService(); + final ClusterControllerService controllerService = + (ClusterControllerService) ccServiceCtx.getControllerService(); ccServiceCtx.setMessageBroker(new CCMessageBroker(controllerService)); configureLoggingLevel(ccServiceCtx.getAppConfig().getLoggingLevel(ExternalProperties.Option.LOG_LEVEL)); @@ -137,8 +137,8 @@ public class CCApplication extends BaseCCApplication { hcc = new HyracksConnection(strIP, port); MetadataBuiltinFunctions.init(); ILibraryManager libraryManager = new ExternalLibraryManager(); - ReplicationProperties repProp = new ReplicationProperties( - PropertiesAccessor.getInstance(ccServiceCtx.getAppConfig())); + ReplicationProperties repProp = + new ReplicationProperties(PropertiesAccessor.getInstance(ccServiceCtx.getAppConfig())); INcLifecycleCoordinator lifecycleCoordinator = createNcLifeCycleCoordinator(repProp.isReplicationEnabled()); ExternalLibraryUtils.setUpExternaLibraries(libraryManager, false); componentProvider = new StorageComponentProvider(); @@ -225,8 +225,8 @@ public class CCApplication extends BaseCCApplication { } protected HttpServer setupJSONAPIServer(ExternalProperties externalProperties) throws Exception { - HttpServer jsonAPIServer = new HttpServer(webManager.getBosses(), webManager.getWorkers(), - externalProperties.getAPIServerPort()); + HttpServer jsonAPIServer = + new HttpServer(webManager.getBosses(), webManager.getWorkers(), externalProperties.getAPIServerPort()); jsonAPIServer.setAttribute(HYRACKS_CONNECTION_ATTR, hcc); jsonAPIServer.setAttribute(ASTERIX_APP_CONTEXT_INFO_ATTR, appCtx); jsonAPIServer.setAttribute(ServletConstants.EXECUTOR_SERVICE_ATTR, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java index 932f47c..22c89c5 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java @@ -136,8 +136,8 @@ public class ClusterLifecycleListener implements IClusterLifecycleListener { case REMOVE_NODE: nodesToRemove.addAll(((RemoveNodeWork) w).getNodesToBeRemoved()); nodeRemovalRequests.add(w); - RemoveNodeWorkResponse response = new RemoveNodeWorkResponse((RemoveNodeWork) w, - Status.IN_PROGRESS); + RemoveNodeWorkResponse response = + new RemoveNodeWorkResponse((RemoveNodeWork) w, Status.IN_PROGRESS); pendingWorkResponses.add(response); break; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/GlobalRecoveryManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/GlobalRecoveryManager.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/GlobalRecoveryManager.java index 8e753c8..e2f1eaf 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/GlobalRecoveryManager.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/GlobalRecoveryManager.java @@ -144,8 +144,8 @@ public class GlobalRecoveryManager implements IGlobalRecoveryManager { if (!dataverse.getDataverseName().equals(MetadataConstants.METADATA_DATAVERSE_NAME)) { MetadataProvider metadataProvider = new MetadataProvider(appCtx, dataverse); try { - List<Dataset> datasets = MetadataManager.INSTANCE.getDataverseDatasets(mdTxnCtx, - dataverse.getDataverseName()); + List<Dataset> datasets = + MetadataManager.INSTANCE.getDataverseDatasets(mdTxnCtx, dataverse.getDataverseName()); for (Dataset dataset : datasets) { if (dataset.getDatasetType() == DatasetType.EXTERNAL) { // External dataset @@ -157,8 +157,8 @@ public class GlobalRecoveryManager implements IGlobalRecoveryManager { TransactionState datasetState = dsd.getState(); if (!indexes.isEmpty()) { if (datasetState == TransactionState.BEGIN) { - List<ExternalFile> files = MetadataManager.INSTANCE.getDatasetExternalFiles(mdTxnCtx, - dataset); + List<ExternalFile> files = + MetadataManager.INSTANCE.getDatasetExternalFiles(mdTxnCtx, dataset); // if persumed abort, roll backward // 1. delete all pending files for (ExternalFile file : files) { @@ -169,8 +169,8 @@ public class GlobalRecoveryManager implements IGlobalRecoveryManager { } // 2. clean artifacts in NCs metadataProvider.setMetadataTxnContext(mdTxnCtx); - JobSpecification jobSpec = ExternalIndexingOperations.buildAbortOp(dataset, indexes, - metadataProvider); + JobSpecification jobSpec = + ExternalIndexingOperations.buildAbortOp(dataset, indexes, metadataProvider); executeHyracksJob(jobSpec); // 3. correct the dataset state ((ExternalDatasetDetails) dataset.getDatasetDetails()).setState(TransactionState.COMMIT); @@ -178,13 +178,13 @@ public class GlobalRecoveryManager implements IGlobalRecoveryManager { MetadataManager.INSTANCE.commitTransaction(mdTxnCtx); mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); } else if (datasetState == TransactionState.READY_TO_COMMIT) { - List<ExternalFile> files = MetadataManager.INSTANCE.getDatasetExternalFiles(mdTxnCtx, - dataset); + List<ExternalFile> files = + MetadataManager.INSTANCE.getDatasetExternalFiles(mdTxnCtx, dataset); // if ready to commit, roll forward // 1. commit indexes in NCs metadataProvider.setMetadataTxnContext(mdTxnCtx); - JobSpecification jobSpec = ExternalIndexingOperations.buildRecoverOp(dataset, indexes, - metadataProvider); + JobSpecification jobSpec = + ExternalIndexingOperations.buildRecoverOp(dataset, indexes, metadataProvider); executeHyracksJob(jobSpec); // 2. add pending files in metadata for (ExternalFile file : files) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/messaging/NCMessageBroker.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/messaging/NCMessageBroker.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/messaging/NCMessageBroker.java index 988c7bb..22458d3 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/messaging/NCMessageBroker.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/messaging/NCMessageBroker.java @@ -59,8 +59,8 @@ public class NCMessageBroker implements INCMessageBroker { appContext = (INcApplicationContext) ncs.getApplicationContext(); maxMsgSize = messagingProperties.getFrameSize(); int messagingMemoryBudget = messagingProperties.getFrameSize() * messagingProperties.getFrameCount(); - messagingFramePool = new ConcurrentFramePool(ncs.getId(), messagingMemoryBudget, - messagingProperties.getFrameSize()); + messagingFramePool = + new ConcurrentFramePool(ncs.getId(), messagingMemoryBudget, messagingProperties.getFrameSize()); receivedMsgsQ = new LinkedBlockingQueue<>(); futureIdGenerator = new AtomicLong(); futureMap = new LongObjectHashMap<>(); @@ -79,8 +79,7 @@ public class NCMessageBroker implements INCMessageBroker { } @Override - public void sendMessageToNC(String nodeId, INcAddressedMessage message) - throws Exception { + public void sendMessageToNC(String nodeId, INcAddressedMessage message) throws Exception { IChannelControlBlock messagingChannel = ncs.getMessagingNetworkManager().getMessagingChannel(nodeId); sendMessageToChannel(messagingChannel, message); } @@ -161,8 +160,7 @@ public class NCMessageBroker implements INCMessageBroker { Thread.currentThread().interrupt(); } catch (Exception e) { if (LOGGER.isWarnEnabled() && msg != null) { - LOGGER.log(Level.WARN, "Could not process message : " - + msg, e); + LOGGER.log(Level.WARN, "Could not process message : " + msg, e); } else { if (LOGGER.isWarnEnabled()) { LOGGER.log(Level.WARN, "Could not process message", e); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/DataverseUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/DataverseUtil.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/DataverseUtil.java index 73c841e..f470949 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/DataverseUtil.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/DataverseUtil.java @@ -35,8 +35,8 @@ public class DataverseUtil { public static JobSpecification dropDataverseJobSpec(Dataverse dataverse, MetadataProvider metadata) { JobSpecification jobSpec = RuntimeUtils.createJobSpecification(metadata.getApplicationContext()); - Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint = metadata - .splitAndConstraints(dataverse.getDataverseName()); + Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint = + metadata.splitAndConstraints(dataverse.getDataverseName()); FileRemoveOperatorDescriptor frod = new FileRemoveOperatorDescriptor(jobSpec, splitsAndConstraint.first, false); AlgebricksPartitionConstraintHelper.setPartitionConstraintInJobSpec(jobSpec, frod, splitsAndConstraint.second); jobSpec.addRoot(frod); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FeedOperations.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FeedOperations.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FeedOperations.java index 186cc94..b6371dc 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FeedOperations.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FeedOperations.java @@ -198,10 +198,9 @@ public class FeedOperations { VariableExpr fromTermLeftExpr = new VariableExpr(fromVarId); // TODO: remove target feedid from args list (xikui) // TODO: Get rid of this INTAKE - List<Expression> exprList = - addArgs(feedConnection.getDataverseName(), feedConnection.getFeedId().getEntityName(), - feedConnection.getFeedId().getEntityName(), FeedRuntimeType.INTAKE.toString(), - feedConnection.getDatasetName(), feedConnection.getOutputType()); + List<Expression> exprList = addArgs(feedConnection.getDataverseName(), + feedConnection.getFeedId().getEntityName(), feedConnection.getFeedId().getEntityName(), + FeedRuntimeType.INTAKE.toString(), feedConnection.getDatasetName(), feedConnection.getOutputType()); CallExpr datasrouceCallFunction = new CallExpr(new FunctionSignature(BuiltinFunctions.FEED_COLLECT), exprList); FromTerm fromterm = new FromTerm(datasrouceCallFunction, fromTermLeftExpr, null, null); FromClause fromClause = new FromClause(Arrays.asList(fromterm)); @@ -290,9 +289,9 @@ public class FeedOperations { String datasetName = feedConnections.get(iter1).getDatasetName(); FeedConnectionId feedConnectionId = new FeedConnectionId(ingestionOp.getEntityId(), datasetName); - FeedPolicyEntity feedPolicyEntity = FeedMetadataUtil - .validateIfPolicyExists(curFeedConnection.getDataverseName(), curFeedConnection.getPolicyName(), - metadataProvider.getMetadataTxnContext()); + FeedPolicyEntity feedPolicyEntity = + FeedMetadataUtil.validateIfPolicyExists(curFeedConnection.getDataverseName(), + curFeedConnection.getPolicyName(), metadataProvider.getMetadataTxnContext()); for (Map.Entry<OperatorDescriptorId, IOperatorDescriptor> entry : operatorsMap.entrySet()) { IOperatorDescriptor opDesc = entry.getValue(); @@ -344,8 +343,8 @@ public class FeedOperations { }); // make connections between operators - for (Entry<ConnectorDescriptorId, Pair<Pair<IOperatorDescriptor, Integer>, - Pair<IOperatorDescriptor, Integer>>> entry : subJob.getConnectorOperatorMap().entrySet()) { + for (Entry<ConnectorDescriptorId, Pair<Pair<IOperatorDescriptor, Integer>, Pair<IOperatorDescriptor, Integer>>> entry : subJob + .getConnectorOperatorMap().entrySet()) { ConnectorDescriptorId newId = connectorIdMapping.get(entry.getKey()); IConnectorDescriptor connDesc = jobSpec.getConnectorMap().get(newId); Pair<IOperatorDescriptor, Integer> leftOp = entry.getValue().getLeft(); @@ -423,8 +422,7 @@ public class FeedOperations { } // jobEventListenerFactory - jobSpec.setJobletEventListenerFactory( - new MultiTransactionJobletEventListenerFactory(txnIdMap, true)); + jobSpec.setJobletEventListenerFactory(new MultiTransactionJobletEventListenerFactory(txnIdMap, true)); // useConnectorSchedulingPolicy jobSpec.setUseConnectorPolicyForScheduling(jobsList.get(0).isUseConnectorPolicyForScheduling()); // connectorAssignmentPolicy @@ -436,9 +434,8 @@ public class FeedOperations { SessionOutput sessionOutput) { List<Statement> stmts = new ArrayList<>(); DefaultStatementExecutorFactory qtFactory = new DefaultStatementExecutorFactory(); - IStatementExecutor translator = qtFactory - .create(metadataProvider.getApplicationContext(), stmts, sessionOutput, new SqlppCompilationProvider(), - new StorageComponentProvider()); + IStatementExecutor translator = qtFactory.create(metadataProvider.getApplicationContext(), stmts, sessionOutput, + new SqlppCompilationProvider(), new StorageComponentProvider()); return translator; } @@ -456,15 +453,15 @@ public class FeedOperations { String[] ingestionLocations = ingestionAdaptorFactory.getPartitionConstraint().getLocations(); // Add metadata configs metadataProvider.getConfig().put(FunctionUtil.IMPORT_PRIVATE_FUNCTIONS, Boolean.TRUE.toString()); - metadataProvider.getConfig() - .put(FeedActivityDetails.COLLECT_LOCATIONS, StringUtils.join(ingestionLocations, ',')); + metadataProvider.getConfig().put(FeedActivityDetails.COLLECT_LOCATIONS, + StringUtils.join(ingestionLocations, ',')); // TODO: Once we deprecated AQL, this extra queryTranslator can be removed. IStatementExecutor translator = getSQLPPTranslator(metadataProvider, ((QueryTranslator) statementExecutor).getSessionOutput()); // Add connection job for (FeedConnection feedConnection : feedConnections) { - JobSpecification connectionJob = getConnectionJob(metadataProvider, feedConnection, translator, hcc, - insertFeed); + JobSpecification connectionJob = + getConnectionJob(metadataProvider, feedConnection, translator, hcc, insertFeed); jobsList.add(connectionJob); } return Pair.of(combineIntakeCollectJobs(metadataProvider, feed, intakeJob, jobsList, feedConnections, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FlushDatasetUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FlushDatasetUtil.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FlushDatasetUtil.java index 4137fbd..f446c4b 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FlushDatasetUtil.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FlushDatasetUtil.java @@ -61,13 +61,13 @@ public class FlushDatasetUtil { new IPushRuntimeFactory[] { new EmptyTupleSourceRuntimeFactory() }, rDescs); TxnId txnId = TxnIdFactory.create(); - FlushDatasetOperatorDescriptor flushOperator = new FlushDatasetOperatorDescriptor(spec, txnId, - dataset.getDatasetId()); + FlushDatasetOperatorDescriptor flushOperator = + new FlushDatasetOperatorDescriptor(spec, txnId, dataset.getDatasetId()); spec.connect(new OneToOneConnectorDescriptor(spec), emptySource, 0, flushOperator, 0); - Pair<IFileSplitProvider, AlgebricksPartitionConstraint> primarySplitsAndConstraint = metadataProvider - .getSplitProviderAndConstraints(dataset, dataset.getDatasetName()); + Pair<IFileSplitProvider, AlgebricksPartitionConstraint> primarySplitsAndConstraint = + metadataProvider.getSplitProviderAndConstraints(dataset, dataset.getDatasetName()); AlgebricksPartitionConstraint primaryPartitionConstraint = primarySplitsAndConstraint.second; AlgebricksPartitionConstraintHelper.setPartitionConstraintInJobSpec(spec, emptySource, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java index 16ffd40..80275a5 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java @@ -119,9 +119,9 @@ public class RebalanceUtil { if (!targetNcNames.isEmpty()) { // Creates a node group for rebalance. - String nodeGroupName = DatasetUtil - .createNodeGroupForNewDataset(sourceDataset.getDataverseName(), sourceDataset.getDatasetName(), - sourceDataset.getRebalanceCount() + 1, targetNcNames, metadataProvider); + String nodeGroupName = DatasetUtil.createNodeGroupForNewDataset(sourceDataset.getDataverseName(), + sourceDataset.getDatasetName(), sourceDataset.getRebalanceCount() + 1, targetNcNames, + metadataProvider); // The target dataset for rebalance. targetDataset = sourceDataset.getTargetDatasetForRebalance(nodeGroupName); @@ -338,8 +338,7 @@ public class RebalanceUtil { Dataset target) throws AlgebricksException { int[] primaryKeyFields = getPrimaryKeyPermutationForUpsert(target); return new AlgebricksMetaOperatorDescriptor(spec, 1, 0, - new IPushRuntimeFactory[] { - target.getCommitRuntimeFactory(metadataProvider, primaryKeyFields, true) }, + new IPushRuntimeFactory[] { target.getCommitRuntimeFactory(metadataProvider, primaryKeyFields, true) }, new RecordDescriptor[] { target.getPrimaryRecordDescriptor(metadataProvider) }); } @@ -405,9 +404,9 @@ public class RebalanceUtil { dropDatasetFiles(dataset, metadataProvider, hcc); // drop dataset entry from metadata - runMetadataTransaction(metadataProvider, () -> MetadataManager.INSTANCE - .dropDataset(metadataProvider.getMetadataTxnContext(), dataset.getDataverseName(), - dataset.getDatasetName())); + runMetadataTransaction(metadataProvider, + () -> MetadataManager.INSTANCE.dropDataset(metadataProvider.getMetadataTxnContext(), + dataset.getDataverseName(), dataset.getDatasetName())); MetadataManager.INSTANCE.commitTransaction(metadataProvider.getMetadataTxnContext()); // try to drop the dataset's node group runMetadataTransaction(metadataProvider, () -> tryDropDatasetNodegroup(dataset, metadataProvider)); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/ResourceUtils.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/ResourceUtils.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/ResourceUtils.java index 1763a98..89c4c76 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/ResourceUtils.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/ResourceUtils.java @@ -54,8 +54,7 @@ public class ResourceUtils { */ public static IClusterCapacity getRequiredCapacity(ILogicalPlan plan, AlgebricksAbsolutePartitionConstraint computationLocations, int sortFrameLimit, int groupFrameLimit, - int joinFrameLimit, int frameSize) - throws AlgebricksException { + int joinFrameLimit, int frameSize) throws AlgebricksException { // Creates a cluster capacity visitor. IClusterCapacity clusterCapacity = new ClusterCapacity(); RequiredCapacityVisitor visitor = new RequiredCapacityVisitor(computationLocations.getLocations().length, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/APIFrameworkTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/APIFrameworkTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/APIFrameworkTest.java index 90fc646..2d3de1c 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/APIFrameworkTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/APIFrameworkTest.java @@ -67,10 +67,10 @@ public class APIFrameworkTest { APIFramework apiFramework = new APIFramework(mock(ILangCompilationProvider.class)); // Tests large storage locations. - AlgebricksAbsolutePartitionConstraint storageLocations = new AlgebricksAbsolutePartitionConstraint( - new String[] { "node1", "node1", "node2" }); - AlgebricksAbsolutePartitionConstraint computationLocations = (AlgebricksAbsolutePartitionConstraint) PA - .invokeMethod(apiFramework, + AlgebricksAbsolutePartitionConstraint storageLocations = + new AlgebricksAbsolutePartitionConstraint(new String[] { "node1", "node1", "node2" }); + AlgebricksAbsolutePartitionConstraint computationLocations = + (AlgebricksAbsolutePartitionConstraint) PA.invokeMethod(apiFramework, "chooseLocations(" + IClusterInfoCollector.class.getName() + ",int," + AlgebricksAbsolutePartitionConstraint.class.getName() + ")", clusterInfoCollector, CompilerProperties.COMPILER_PARALLELISM_AS_STORAGE, storageLocations); @@ -114,8 +114,8 @@ public class APIFrameworkTest { APIFramework apiFramework = new APIFramework(mock(ILangCompilationProvider.class)); // Tests odd number parallelism. - AlgebricksAbsolutePartitionConstraint loc = (AlgebricksAbsolutePartitionConstraint) PA.invokeMethod( - apiFramework, "getComputationLocations(java.util.Map,int)", map, 5); + AlgebricksAbsolutePartitionConstraint loc = (AlgebricksAbsolutePartitionConstraint) PA + .invokeMethod(apiFramework, "getComputationLocations(java.util.Map,int)", map, 5); int nc1Count = 0, nc2Count = 0; String[] partitions = loc.getLocations(); for (String partition : partitions) { @@ -194,8 +194,8 @@ public class APIFrameworkTest { jobSpec.getUserConstraints().add(new Constraint(lValueMock, nc1Location)); final String[] clusterLocation = new String[] { nc1, nc2 }; - final AlgebricksAbsolutePartitionConstraint jobLocations = APIFramework - .getJobLocations(jobSpec, nodeJobTracker, new AlgebricksAbsolutePartitionConstraint(clusterLocation)); + final AlgebricksAbsolutePartitionConstraint jobLocations = APIFramework.getJobLocations(jobSpec, nodeJobTracker, + new AlgebricksAbsolutePartitionConstraint(clusterLocation)); // ensure nc2 wasn't included Assert.assertEquals(1, jobLocations.getLocations().length); Assert.assertEquals(nc1, jobLocations.getLocations()[0]); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java index 97079eb..ae82ea7 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java @@ -65,8 +65,8 @@ public class AsterixHyracksIntegrationUtil { public static final int DEFAULT_HYRACKS_CC_CLIENT_PORT = 1098; public static final int DEFAULT_HYRACKS_CC_CLUSTER_PORT = 1099; - public static final String DEFAULT_CONF_FILE = joinPath(getProjectPath().toString(), "src", "test", "resources", - "cc.conf"); + public static final String DEFAULT_CONF_FILE = + joinPath(getProjectPath().toString(), "src", "test", "resources", "cc.conf"); private static final String DEFAULT_STORAGE_PATH = joinPath("target", "io", "dir"); private static String storagePath = DEFAULT_STORAGE_PATH; @@ -135,8 +135,8 @@ public class AsterixHyracksIntegrationUtil { ncConfigManager = new ConfigManager(new String[] { "-config-file", confFile }); } ncApplication.registerConfig(ncConfigManager); - nodeControllers.add(new NodeControllerService(fixupIODevices(createNCConfig(nodeId, ncConfigManager)), - ncApplication)); + nodeControllers.add( + new NodeControllerService(fixupIODevices(createNCConfig(nodeId, ncConfigManager)), ncApplication)); } opts.stream().forEach(opt -> configManager.set(opt.getLeft(), opt.getRight())); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java index 87ee2ef..06d92b7 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java @@ -152,7 +152,8 @@ public class ConnectorApiServletTest { nodeMap.put("asterix_nc2", mockInfo2); PA.invokeMethod(let, "formResponseObject(" + ObjectNode.class.getName() + ", " + FileSplit.class.getName() + "[], " - + ARecordType.class.getName() + ", " + String.class.getName() + ", " + Map.class.getName() + ")", + + ARecordType.class.getName() + ", " + String.class.getName() + ", " + Map.class.getName() + + ")", actualResponse, splits, recordType, primaryKey, nodeMap); // Constructs expected response. ObjectNode expectedResponse = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/QueryCancellationServletTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/QueryCancellationServletTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/QueryCancellationServletTest.java index 3cb46fe..d5262cf 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/QueryCancellationServletTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/QueryCancellationServletTest.java @@ -47,8 +47,8 @@ public class QueryCancellationServletTest { @Test public void testDelete() throws Exception { // Creates a query cancellation servlet. - QueryCancellationServlet cancellationServlet = new QueryCancellationServlet(new ConcurrentHashMap<>(), - new String[] { "/" }); + QueryCancellationServlet cancellationServlet = + new QueryCancellationServlet(new ConcurrentHashMap<>(), new String[] { "/" }); // Adds mocked Hyracks client connection into the servlet context. IHyracksClientConnection mockHcc = mock(IHyracksClientConnection.class); cancellationServlet.ctx().put(ServletConstants.HYRACKS_CONNECTION_ATTR, mockHcc); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java index e583c75..976dbc3 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java @@ -62,7 +62,6 @@ public class VersionApiServletTest { SqlppExecutionTest.tearDown(); } - @Test public void testGet() throws Exception { // Configures a test version api servlet. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java index 23a3eda..69ce2ea 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java @@ -178,29 +178,30 @@ public class TestNodeController { int[] primaryKeyIndexes, List<Integer> primaryKeyIndicators, StorageComponentProvider storageComponentProvider, Index secondaryIndex) throws AlgebricksException, HyracksDataException, RemoteException, ACIDException { - CcApplicationContext appCtx = (CcApplicationContext) ExecutionTestUtil.integrationUtil.cc - .getApplicationContext(); + CcApplicationContext appCtx = + (CcApplicationContext) ExecutionTestUtil.integrationUtil.cc.getApplicationContext(); MetadataProvider mdProvider = new MetadataProvider(appCtx, null); try { MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); - org.apache.hyracks.algebricks.common.utils.Pair<ILSMMergePolicyFactory, Map<String, String>> mergePolicy = DatasetUtil - .getMergePolicyFactory(dataset, mdTxnCtx); + org.apache.hyracks.algebricks.common.utils.Pair<ILSMMergePolicyFactory, Map<String, String>> mergePolicy = + DatasetUtil.getMergePolicyFactory(dataset, mdTxnCtx); MetadataManager.INSTANCE.commitTransaction(mdTxnCtx); PrimaryIndexInfo primaryIndexInfo = new PrimaryIndexInfo(dataset, primaryKeyTypes, recordType, metaType, mergePolicy.first, mergePolicy.second, filterFields, primaryKeyIndexes, primaryKeyIndicators); IndexOperation op = IndexOperation.INSERT; - IModificationOperationCallbackFactory modOpCallbackFactory = new PrimaryIndexModificationOperationCallbackFactory( - dataset.getDatasetId(), primaryIndexInfo.primaryKeyIndexes, TXN_SUBSYSTEM_PROVIDER, - Operation.get(op), ResourceType.LSM_BTREE); + IModificationOperationCallbackFactory modOpCallbackFactory = + new PrimaryIndexModificationOperationCallbackFactory(dataset.getDatasetId(), + primaryIndexInfo.primaryKeyIndexes, TXN_SUBSYSTEM_PROVIDER, Operation.get(op), + ResourceType.LSM_BTREE); IRecordDescriptorProvider recordDescProvider = primaryIndexInfo.getInsertRecordDescriptorProvider(); - RecordDescriptor recordDesc = recordDescProvider - .getInputRecordDescriptor(new ActivityId(new OperatorDescriptorId(0), 0), 0); + RecordDescriptor recordDesc = + recordDescProvider.getInputRecordDescriptor(new ActivityId(new OperatorDescriptorId(0), 0), 0); IIndexDataflowHelperFactory indexHelperFactory = new IndexDataflowHelperFactory( storageComponentProvider.getStorageManager(), primaryIndexInfo.getFileSplitProvider()); - LSMInsertDeleteOperatorNodePushable insertOp = new LSMInsertDeleteOperatorNodePushable(ctx, - ctx.getTaskAttemptId().getTaskId().getPartition(), - primaryIndexInfo.primaryIndexInsertFieldsPermutations, recordDesc, op, true, indexHelperFactory, - modOpCallbackFactory, null); + LSMInsertDeleteOperatorNodePushable insertOp = + new LSMInsertDeleteOperatorNodePushable(ctx, ctx.getTaskAttemptId().getTaskId().getPartition(), + primaryIndexInfo.primaryIndexInsertFieldsPermutations, recordDesc, op, true, + indexHelperFactory, modOpCallbackFactory, null); // For now, this assumes a single secondary index. recordDesc is always <pk-record-meta> // for the index, we will have to create an assign operator that extract the sk @@ -208,8 +209,8 @@ public class TestNodeController { if (secondaryIndex != null) { List<List<String>> skNames = secondaryIndex.getKeyFieldNames(); List<Integer> indicators = secondaryIndex.getKeyFieldSourceIndicators(); - IScalarEvaluatorFactory[] secondaryFieldAccessEvalFactories = new IScalarEvaluatorFactory[skNames - .size()]; + IScalarEvaluatorFactory[] secondaryFieldAccessEvalFactories = + new IScalarEvaluatorFactory[skNames.size()]; for (int i = 0; i < skNames.size(); i++) { ARecordType sourceType = dataset.hasMetaPart() ? indicators.get(i).intValue() == Index.RECORD_INDICATOR ? recordType : metaType @@ -232,17 +233,18 @@ public class TestNodeController { for (int i = 0; i < primaryIndexInfo.index.getKeyFieldNames().size(); i++) { projectionList[projCount++] = i; } - IPushRuntime assignOp = new AssignRuntimeFactory(outColumns, secondaryFieldAccessEvalFactories, - projectionList, true).createPushRuntime(ctx); + IPushRuntime assignOp = + new AssignRuntimeFactory(outColumns, secondaryFieldAccessEvalFactories, projectionList, true) + .createPushRuntime(ctx); insertOp.setOutputFrameWriter(0, assignOp, primaryIndexInfo.rDesc); assignOp.setInputRecordDescriptor(0, primaryIndexInfo.rDesc); SecondaryIndexInfo secondaryIndexInfo = new SecondaryIndexInfo(primaryIndexInfo, secondaryIndex); IIndexDataflowHelperFactory secondaryIndexHelperFactory = new IndexDataflowHelperFactory( storageComponentProvider.getStorageManager(), secondaryIndexInfo.fileSplitProvider); - LSMInsertDeleteOperatorNodePushable secondaryInsertOp = new LSMInsertDeleteOperatorNodePushable(ctx, - ctx.getTaskAttemptId().getTaskId().getPartition(), secondaryIndexInfo.insertFieldsPermutations, - secondaryIndexInfo.rDesc, op, false, secondaryIndexHelperFactory, - NoOpOperationCallbackFactory.INSTANCE, null); + LSMInsertDeleteOperatorNodePushable secondaryInsertOp = + new LSMInsertDeleteOperatorNodePushable(ctx, ctx.getTaskAttemptId().getTaskId().getPartition(), + secondaryIndexInfo.insertFieldsPermutations, secondaryIndexInfo.rDesc, op, false, + secondaryIndexHelperFactory, NoOpOperationCallbackFactory.INSTANCE, null); assignOp.setOutputFrameWriter(0, secondaryInsertOp, secondaryIndexInfo.rDesc); CommitRuntime commitOp = new CommitRuntime(ctx, getTxnJobId(ctx), dataset.getDatasetId(), secondaryIndexInfo.primaryKeyIndexes, true, ctx.getTaskAttemptId().getTaskId().getPartition(), @@ -277,9 +279,9 @@ public class TestNodeController { BTreeSearchOperatorDescriptor searchOpDesc = new BTreeSearchOperatorDescriptor(spec, primaryIndexInfo.rDesc, null, null, true, true, indexDataflowHelperFactory, false, false, null, NoOpOperationCallbackFactory.INSTANCE, filterFields, filterFields, false); - BTreeSearchOperatorNodePushable searchOp = searchOpDesc.createPushRuntime(ctx, - primaryIndexInfo.getSearchRecordDescriptorProvider(), ctx.getTaskAttemptId().getTaskId().getPartition(), - 1); + BTreeSearchOperatorNodePushable searchOp = + searchOpDesc.createPushRuntime(ctx, primaryIndexInfo.getSearchRecordDescriptorProvider(), + ctx.getTaskAttemptId().getTaskId().getPartition(), 1); emptyTupleOp.setOutputFrameWriter(0, searchOp, primaryIndexInfo.getSearchRecordDescriptorProvider().getInputRecordDescriptor(null, 0)); searchOp.setOutputFrameWriter(0, countOp, primaryIndexInfo.rDesc); @@ -299,8 +301,8 @@ public class TestNodeController { Dataverse dataverse = new Dataverse(dataset.getDataverseName(), NonTaggedDataFormat.class.getName(), MetadataUtil.PENDING_NO_OP); Index index = primaryIndexInfo.getIndex(); - CcApplicationContext appCtx = (CcApplicationContext) ExecutionTestUtil.integrationUtil.cc - .getApplicationContext(); + CcApplicationContext appCtx = + (CcApplicationContext) ExecutionTestUtil.integrationUtil.cc.getApplicationContext(); MetadataProvider mdProvider = new MetadataProvider(appCtx, dataverse); try { return dataset.getResourceFactory(mdProvider, index, primaryIndexInfo.recordType, primaryIndexInfo.metaType, @@ -315,8 +317,8 @@ public class TestNodeController { int[] primaryKeyIndexes, List<Integer> primaryKeyIndicators, int partition) throws AlgebricksException, HyracksDataException, RemoteException, ACIDException { MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); - org.apache.hyracks.algebricks.common.utils.Pair<ILSMMergePolicyFactory, Map<String, String>> mergePolicy = DatasetUtil - .getMergePolicyFactory(dataset, mdTxnCtx); + org.apache.hyracks.algebricks.common.utils.Pair<ILSMMergePolicyFactory, Map<String, String>> mergePolicy = + DatasetUtil.getMergePolicyFactory(dataset, mdTxnCtx); MetadataManager.INSTANCE.commitTransaction(mdTxnCtx); PrimaryIndexInfo primaryIndexInfo = new PrimaryIndexInfo(dataset, primaryKeyTypes, recordType, metaType, mergePolicy.first, mergePolicy.second, filterFields, primaryKeyIndexes, primaryKeyIndicators); @@ -327,9 +329,9 @@ public class TestNodeController { try { IResourceFactory resourceFactory = dataset.getResourceFactory(mdProvider, primaryIndexInfo.index, recordType, metaType, mergePolicy.first, mergePolicy.second); - IndexBuilderFactory indexBuilderFactory = new IndexBuilderFactory( - storageComponentProvider.getStorageManager(), primaryIndexInfo.getFileSplitProvider(), - resourceFactory, true); + IndexBuilderFactory indexBuilderFactory = + new IndexBuilderFactory(storageComponentProvider.getStorageManager(), + primaryIndexInfo.getFileSplitProvider(), resourceFactory, true); IHyracksTaskContext ctx = createTestContext(newJobId(), partition, false); IIndexBuilder indexBuilder = indexBuilderFactory.create(ctx, partition); indexBuilder.build(); @@ -343,8 +345,8 @@ public class TestNodeController { IStorageComponentProvider storageComponentProvider, int partition) throws AlgebricksException, HyracksDataException, RemoteException, ACIDException { MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); - org.apache.hyracks.algebricks.common.utils.Pair<ILSMMergePolicyFactory, Map<String, String>> mergePolicy = DatasetUtil - .getMergePolicyFactory(primaryIndexInfo.dataset, mdTxnCtx); + org.apache.hyracks.algebricks.common.utils.Pair<ILSMMergePolicyFactory, Map<String, String>> mergePolicy = + DatasetUtil.getMergePolicyFactory(primaryIndexInfo.dataset, mdTxnCtx); MetadataManager.INSTANCE.commitTransaction(mdTxnCtx); Dataverse dataverse = new Dataverse(primaryIndexInfo.dataset.getDataverseName(), NonTaggedDataFormat.class.getName(), MetadataUtil.PENDING_NO_OP); @@ -355,9 +357,9 @@ public class TestNodeController { IResourceFactory resourceFactory = primaryIndexInfo.dataset.getResourceFactory(mdProvider, secondaryIndex, primaryIndexInfo.recordType, primaryIndexInfo.metaType, mergePolicy.first, mergePolicy.second); - IndexBuilderFactory indexBuilderFactory = new IndexBuilderFactory( - storageComponentProvider.getStorageManager(), secondaryIndexInfo.fileSplitProvider, resourceFactory, - true); + IndexBuilderFactory indexBuilderFactory = + new IndexBuilderFactory(storageComponentProvider.getStorageManager(), + secondaryIndexInfo.fileSplitProvider, resourceFactory, true); IHyracksTaskContext ctx = createTestContext(newJobId(), partition, false); IIndexBuilder indexBuilder = indexBuilderFactory.create(ctx, partition); indexBuilder.build(); @@ -372,8 +374,8 @@ public class TestNodeController { int i = 0; ISerializerDeserializer<?>[] primaryIndexSerdes = new ISerializerDeserializer<?>[primaryIndexNumOfTupleFields]; for (; i < primaryKeyTypes.length; i++) { - primaryIndexSerdes[i] = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(primaryKeyTypes[i]); + primaryIndexSerdes[i] = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(primaryKeyTypes[i]); } primaryIndexSerdes[i++] = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(recordType); if (metaType != null) { @@ -384,16 +386,16 @@ public class TestNodeController { public static ISerializerDeserializer<?>[] createSecondaryIndexSerdes(ARecordType recordType, ARecordType metaType, IAType[] primaryKeyTypes, IAType[] secondaryKeyTypes) { - ISerializerDeserializer<?>[] secondaryIndexSerdes = new ISerializerDeserializer<?>[secondaryKeyTypes.length - + primaryKeyTypes.length]; + ISerializerDeserializer<?>[] secondaryIndexSerdes = + new ISerializerDeserializer<?>[secondaryKeyTypes.length + primaryKeyTypes.length]; int i = 0; for (; i < secondaryKeyTypes.length; i++) { - secondaryIndexSerdes[i] = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(secondaryKeyTypes[i]); + secondaryIndexSerdes[i] = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(secondaryKeyTypes[i]); } for (; i < primaryKeyTypes.length; i++) { - secondaryIndexSerdes[i] = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(primaryKeyTypes[i]); + secondaryIndexSerdes[i] = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(primaryKeyTypes[i]); } return secondaryIndexSerdes; } @@ -439,8 +441,8 @@ public class TestNodeController { ctx = Mockito.spy(ctx); Mockito.when(ctx.getJobletContext()).thenReturn(jobletCtx); Mockito.when(ctx.getIoManager()).thenReturn(ExecutionTestUtil.integrationUtil.ncs[0].getIoManager()); - TaskAttemptId taskId = new TaskAttemptId(new TaskId(new ActivityId(new OperatorDescriptorId(0), 0), partition), - 0); + TaskAttemptId taskId = + new TaskAttemptId(new TaskId(new ActivityId(new OperatorDescriptorId(0), 0), partition), 0); Mockito.when(ctx.getTaskAttemptId()).thenReturn(taskId); return ctx; } @@ -474,8 +476,8 @@ public class TestNodeController { this.primaryIndexInfo = primaryIndexInfo; this.secondaryIndex = secondaryIndex; List<String> nodes = Collections.singletonList(ExecutionTestUtil.integrationUtil.ncs[0].getId()); - CcApplicationContext appCtx = (CcApplicationContext) ExecutionTestUtil.integrationUtil.cc - .getApplicationContext(); + CcApplicationContext appCtx = + (CcApplicationContext) ExecutionTestUtil.integrationUtil.cc.getApplicationContext(); FileSplit[] splits = SplitsAndConstraintsUtil.getIndexSplits(appCtx.getClusterStateManager(), primaryIndexInfo.dataset, secondaryIndex.getIndexName(), nodes); fileSplitProvider = new ConstantFileSplitProvider(splits); @@ -529,10 +531,10 @@ public class TestNodeController { this.mergePolicyProperties = mergePolicyProperties; this.primaryKeyIndexes = primaryKeyIndexes; primaryIndexNumOfTupleFields = primaryKeyTypes.length + (1 + ((metaType == null) ? 0 : 1)); - primaryIndexTypeTraits = createPrimaryIndexTypeTraits(primaryIndexNumOfTupleFields, primaryKeyTypes, - recordType, metaType); - primaryIndexSerdes = createPrimaryIndexSerdes(primaryIndexNumOfTupleFields, primaryKeyTypes, recordType, - metaType); + primaryIndexTypeTraits = + createPrimaryIndexTypeTraits(primaryIndexNumOfTupleFields, primaryKeyTypes, recordType, metaType); + primaryIndexSerdes = + createPrimaryIndexSerdes(primaryIndexNumOfTupleFields, primaryKeyTypes, recordType, metaType); rDesc = new RecordDescriptor(primaryIndexSerdes, primaryIndexTypeTraits); primaryIndexInsertFieldsPermutations = new int[primaryIndexNumOfTupleFields]; for (int i = 0; i < primaryIndexNumOfTupleFields; i++) { @@ -542,16 +544,16 @@ public class TestNodeController { List<IAType> keyFieldTypes = Arrays.asList(primaryKeyTypes); for (int i = 0; i < primaryKeyIndicators.size(); i++) { Integer indicator = primaryKeyIndicators.get(i); - String[] fieldNames = indicator == Index.RECORD_INDICATOR ? recordType.getFieldNames() - : metaType.getFieldNames(); + String[] fieldNames = + indicator == Index.RECORD_INDICATOR ? recordType.getFieldNames() : metaType.getFieldNames(); keyFieldNames.add(Arrays.asList(fieldNames[primaryKeyIndexes[i]])); } index = new Index(dataset.getDataverseName(), dataset.getDatasetName(), dataset.getDatasetName(), IndexType.BTREE, keyFieldNames, primaryKeyIndicators, keyFieldTypes, false, false, true, MetadataUtil.PENDING_NO_OP); List<String> nodes = Collections.singletonList(ExecutionTestUtil.integrationUtil.ncs[0].getId()); - CcApplicationContext appCtx = (CcApplicationContext) ExecutionTestUtil.integrationUtil.cc - .getApplicationContext(); + CcApplicationContext appCtx = + (CcApplicationContext) ExecutionTestUtil.integrationUtil.cc.getApplicationContext(); FileSplit[] splits = SplitsAndConstraintsUtil.getIndexSplits(appCtx.getClusterStateManager(), dataset, index.getIndexName(), nodes); fileSplitProvider = new ConstantFileSplitProvider(splits); @@ -572,8 +574,8 @@ public class TestNodeController { ISerializerDeserializer<?>[] primaryKeySerdes = new ISerializerDeserializer<?>[primaryKeyTypes.length]; for (int i = 0; i < primaryKeyTypes.length; i++) { primaryKeyTypeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(primaryKeyTypes[i]); - primaryKeySerdes[i] = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(primaryKeyTypes[i]); + primaryKeySerdes[i] = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(primaryKeyTypes[i]); } RecordDescriptor searcgRecDesc = new RecordDescriptor(primaryKeySerdes, primaryKeyTypeTraits); IRecordDescriptorProvider rDescProvider = Mockito.mock(IRecordDescriptorProvider.class); @@ -589,10 +591,10 @@ public class TestNodeController { public RecordDescriptor getSearchOutputDesc(IAType[] keyTypes, ARecordType recordType, ARecordType metaType) { int primaryIndexNumOfTupleFields = keyTypes.length + (1 + ((metaType == null) ? 0 : 1)); - ITypeTraits[] primaryIndexTypeTraits = createPrimaryIndexTypeTraits(primaryIndexNumOfTupleFields, keyTypes, - recordType, metaType); - ISerializerDeserializer<?>[] primaryIndexSerdes = createPrimaryIndexSerdes(primaryIndexNumOfTupleFields, - keyTypes, recordType, metaType); + ITypeTraits[] primaryIndexTypeTraits = + createPrimaryIndexTypeTraits(primaryIndexNumOfTupleFields, keyTypes, recordType, metaType); + ISerializerDeserializer<?>[] primaryIndexSerdes = + createPrimaryIndexSerdes(primaryIndexNumOfTupleFields, keyTypes, recordType, metaType); return new RecordDescriptor(primaryIndexSerdes, primaryIndexTypeTraits); } @@ -603,8 +605,8 @@ public class TestNodeController { } public IStorageManager getStorageManager() { - CcApplicationContext appCtx = (CcApplicationContext) ExecutionTestUtil.integrationUtil.cc - .getApplicationContext(); + CcApplicationContext appCtx = + (CcApplicationContext) ExecutionTestUtil.integrationUtil.cc.getApplicationContext(); return appCtx.getStorageManager(); } @@ -613,8 +615,8 @@ public class TestNodeController { int[] keyIndexes, List<Integer> keyIndicators, StorageComponentProvider storageComponentProvider, IFrameOperationCallbackFactory frameOpCallbackFactory, boolean hasSecondaries) throws Exception { MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); - org.apache.hyracks.algebricks.common.utils.Pair<ILSMMergePolicyFactory, Map<String, String>> mergePolicy = DatasetUtil - .getMergePolicyFactory(dataset, mdTxnCtx); + org.apache.hyracks.algebricks.common.utils.Pair<ILSMMergePolicyFactory, Map<String, String>> mergePolicy = + DatasetUtil.getMergePolicyFactory(dataset, mdTxnCtx); MetadataManager.INSTANCE.commitTransaction(mdTxnCtx); PrimaryIndexInfo primaryIndexInfo = new PrimaryIndexInfo(dataset, keyTypes, recordType, metaType, mergePolicy.first, mergePolicy.second, filterFields, keyIndexes, keyIndicators); @@ -625,13 +627,13 @@ public class TestNodeController { IRecordDescriptorProvider recordDescProvider = primaryIndexInfo.getInsertRecordDescriptorProvider(); IIndexDataflowHelperFactory indexHelperFactory = new IndexDataflowHelperFactory( storageComponentProvider.getStorageManager(), primaryIndexInfo.getFileSplitProvider()); - LSMPrimaryUpsertOperatorNodePushable insertOp = new LSMPrimaryUpsertOperatorNodePushable(ctx, - ctx.getTaskAttemptId().getTaskId().getPartition(), indexHelperFactory, - primaryIndexInfo.primaryIndexInsertFieldsPermutations, - recordDescProvider.getInputRecordDescriptor(new ActivityId(new OperatorDescriptorId(0), 0), 0), - modificationCallbackFactory, searchCallbackFactory, keyIndexes.length, recordType, -1, - frameOpCallbackFactory == null ? dataset.getFrameOpCallbackFactory() : frameOpCallbackFactory, - MissingWriterFactory.INSTANCE, hasSecondaries); + LSMPrimaryUpsertOperatorNodePushable insertOp = + new LSMPrimaryUpsertOperatorNodePushable(ctx, ctx.getTaskAttemptId().getTaskId().getPartition(), + indexHelperFactory, primaryIndexInfo.primaryIndexInsertFieldsPermutations, + recordDescProvider.getInputRecordDescriptor(new ActivityId(new OperatorDescriptorId(0), 0), 0), + modificationCallbackFactory, searchCallbackFactory, keyIndexes.length, recordType, -1, + frameOpCallbackFactory == null ? dataset.getFrameOpCallbackFactory() : frameOpCallbackFactory, + MissingWriterFactory.INSTANCE, hasSecondaries); RecordDescriptor upsertOutRecDesc = getUpsertOutRecDesc(primaryIndexInfo.rDesc, dataset, filterFields == null ? 0 : filterFields.length, recordType, metaType); // fix pk fields @@ -649,8 +651,8 @@ public class TestNodeController { private RecordDescriptor getUpsertOutRecDesc(RecordDescriptor inputRecordDesc, Dataset dataset, int numFilterFields, ARecordType itemType, ARecordType metaItemType) throws Exception { - ITypeTraits[] outputTypeTraits = new ITypeTraits[inputRecordDesc.getFieldCount() - + (dataset.hasMetaPart() ? 2 : 1) + numFilterFields]; + ITypeTraits[] outputTypeTraits = + new ITypeTraits[inputRecordDesc.getFieldCount() + (dataset.hasMetaPart() ? 2 : 1) + numFilterFields]; ISerializerDeserializer<?>[] outputSerDes = new ISerializerDeserializer[inputRecordDesc.getFieldCount() + (dataset.hasMetaPart() ? 2 : 1) + numFilterFields]; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/test/java/org/apache/asterix/common/TestDataUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/common/TestDataUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/common/TestDataUtil.java index 6d114c6..ab8969e 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/common/TestDataUtil.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/common/TestDataUtil.java @@ -80,7 +80,8 @@ public class TestDataUtil { fields.forEach((fName, fType) -> stringBuilder.append(fName).append(":").append(fType).append(",")); stringBuilder.deleteCharAt(stringBuilder.length() - 1); TEST_EXECUTOR.executeSqlppUpdateOrDdl("CREATE TYPE dsType AS {" + stringBuilder + "};", OUTPUT_FORMAT); - TEST_EXECUTOR.executeSqlppUpdateOrDdl("CREATE DATASET " + dataset + "(dsType) PRIMARY KEY " + PKName + ";", OUTPUT_FORMAT); + TEST_EXECUTOR.executeSqlppUpdateOrDdl("CREATE DATASET " + dataset + "(dsType) PRIMARY KEY " + PKName + ";", + OUTPUT_FORMAT); } /** @@ -90,7 +91,8 @@ public class TestDataUtil { * @throws Exception */ public static void createPrimaryIndex(String dataset, String indexName) throws Exception { - TEST_EXECUTOR.executeSqlppUpdateOrDdl("CREATE PRIMARY INDEX " + indexName + " ON " + dataset + ";", OUTPUT_FORMAT); + TEST_EXECUTOR.executeSqlppUpdateOrDdl("CREATE PRIMARY INDEX " + indexName + " ON " + dataset + ";", + OUTPUT_FORMAT); } /** @@ -101,7 +103,8 @@ public class TestDataUtil { * @throws Exception */ public static void createSecondaryBTreeIndex(String dataset, String indexName, String SKName) throws Exception { - TEST_EXECUTOR.executeSqlppUpdateOrDdl("CREATE INDEX " + indexName + " ON " + dataset + "(" + SKName + ");", OUTPUT_FORMAT); + TEST_EXECUTOR.executeSqlppUpdateOrDdl("CREATE INDEX " + indexName + " ON " + dataset + "(" + SKName + ");", + OUTPUT_FORMAT); } /** @@ -127,8 +130,8 @@ public class TestDataUtil { */ public static long getDatasetCount(String datasetName) throws Exception { final String query = "SELECT VALUE COUNT(*) FROM `" + datasetName + "`;"; - final InputStream responseStream = TEST_EXECUTOR - .executeQueryService(query, TEST_EXECUTOR.getEndpoint(Servlets.QUERY_SERVICE), OUTPUT_FORMAT); + final InputStream responseStream = TEST_EXECUTOR.executeQueryService(query, + TEST_EXECUTOR.getEndpoint(Servlets.QUERY_SERVICE), OUTPUT_FORMAT); final ObjectNode response = OBJECT_MAPPER.readValue(responseStream, ObjectNode.class); final JsonNode result = response.get("results"); // make sure there is a single value in result @@ -209,8 +212,8 @@ public class TestDataUtil { (ICcApplicationContext) integrationUtil.getClusterControllerService().getApplicationContext(); final MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); try { - return SplitsAndConstraintsUtil - .getIndexSplits(dataset, dataset.getDatasetName(), mdTxnCtx, ccAppCtx.getClusterStateManager()); + return SplitsAndConstraintsUtil.getIndexSplits(dataset, dataset.getDatasetName(), mdTxnCtx, + ccAppCtx.getClusterStateManager()); } finally { MetadataManager.INSTANCE.commitTransaction(mdTxnCtx); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ClusterStateManagerTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ClusterStateManagerTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ClusterStateManagerTest.java index ca314aa..4dd7463 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ClusterStateManagerTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ClusterStateManagerTest.java @@ -207,7 +207,8 @@ public class ClusterStateManagerTest { Mockito.when(iccServiceContext.getAppConfig()).thenReturn(applicationConfig); Mockito.when(ccApplicationContext.getServiceContext()).thenReturn(iccServiceContext); - NcLifecycleCoordinator coordinator = new NcLifecycleCoordinator(ccApplicationContext.getServiceContext(), false); + NcLifecycleCoordinator coordinator = + new NcLifecycleCoordinator(ccApplicationContext.getServiceContext(), false); coordinator.bindTo(csm); Mockito.when(ccApplicationContext.getNcLifecycleCoordinator()).thenReturn(coordinator); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ExceptionIT.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ExceptionIT.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ExceptionIT.java index 4bcee04..baaf546 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ExceptionIT.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ExceptionIT.java @@ -60,8 +60,8 @@ public class ExceptionIT { } private void testFunction(IFunctionDescriptorFactory funcFactory) throws Exception { - AbstractScalarFunctionDynamicDescriptor funcDesc = (AbstractScalarFunctionDynamicDescriptor) funcFactory - .createFunctionDescriptor(); + AbstractScalarFunctionDynamicDescriptor funcDesc = + (AbstractScalarFunctionDynamicDescriptor) funcFactory.createFunctionDescriptor(); int inputArity = funcDesc.getIdentifier().getArity(); Iterator<IScalarEvaluatorFactory[]> argEvalFactoryIterator = getArgCombinations(inputArity); while (argEvalFactoryIterator.hasNext()) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/ActiveStatsTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/ActiveStatsTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/ActiveStatsTest.java index df7756b..dfb92b7 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/ActiveStatsTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/ActiveStatsTest.java @@ -71,16 +71,16 @@ public class ActiveStatsTest { public void refreshStatsTest() throws Exception { // Entities to be used EntityId entityId = new EntityId("MockExtension", "MockDataverse", "MockEntity"); - ActiveRuntimeId activeRuntimeId = new ActiveRuntimeId(entityId, - FeedIntakeOperatorNodePushable.class.getSimpleName(), 0); + ActiveRuntimeId activeRuntimeId = + new ActiveRuntimeId(entityId, FeedIntakeOperatorNodePushable.class.getSimpleName(), 0); List<Dataset> datasetList = new ArrayList<>(); - AlgebricksAbsolutePartitionConstraint partitionConstraint = new AlgebricksAbsolutePartitionConstraint( - new String[] { "asterix_nc1" }); + AlgebricksAbsolutePartitionConstraint partitionConstraint = + new AlgebricksAbsolutePartitionConstraint(new String[] { "asterix_nc1" }); String requestedStats; - CcApplicationContext appCtx = (CcApplicationContext) ExecutionTestUtil.integrationUtil.cc - .getApplicationContext(); - ActiveNotificationHandler activeJobNotificationHandler = (ActiveNotificationHandler) appCtx - .getActiveNotificationHandler(); + CcApplicationContext appCtx = + (CcApplicationContext) ExecutionTestUtil.integrationUtil.cc.getApplicationContext(); + ActiveNotificationHandler activeJobNotificationHandler = + (ActiveNotificationHandler) appCtx.getActiveNotificationHandler(); JobId jobId = new JobId(1); // Mock ActiveRuntime @@ -104,8 +104,8 @@ public class ActiveStatsTest { entityId, datasetList, partitionConstraint, FeedIntakeOperatorNodePushable.class.getSimpleName(), NoRetryPolicyFactory.INSTANCE, null, Collections.emptyList()); // Register mock runtime - NCAppRuntimeContext nc1AppCtx = (NCAppRuntimeContext) ExecutionTestUtil.integrationUtil.ncs[0] - .getApplicationContext(); + NCAppRuntimeContext nc1AppCtx = + (NCAppRuntimeContext) ExecutionTestUtil.integrationUtil.ncs[0].getApplicationContext(); nc1AppCtx.getActiveManager().registerRuntime(mockRuntime); // Check init stats @@ -116,8 +116,8 @@ public class ActiveStatsTest { eventsListener.refreshStats(1000); requestedStats = eventsListener.getStats(); Assert.assertTrue(requestedStats.contains("N/A")); - WaitForStateSubscriber startingSubscriber = new WaitForStateSubscriber(eventsListener, - Collections.singleton(ActivityState.STARTING)); + WaitForStateSubscriber startingSubscriber = + new WaitForStateSubscriber(eventsListener, Collections.singleton(ActivityState.STARTING)); // Update stats of created/started job without joined partition TestUserActor user = new TestUserActor("Xikui", mdProvider, null); Action start = user.startActivity(eventsListener); @@ -128,8 +128,8 @@ public class ActiveStatsTest { requestedStats = eventsListener.getStats(); Assert.assertTrue(requestedStats.contains("N/A")); // Fake partition message and notify eventListener - ActivePartitionMessage partitionMessage = new ActivePartitionMessage(activeRuntimeId, jobId, - Event.RUNTIME_REGISTERED, null); + ActivePartitionMessage partitionMessage = + new ActivePartitionMessage(activeRuntimeId, jobId, Event.RUNTIME_REGISTERED, null); partitionMessage.handle(appCtx); start.sync(); if (start.hasFailed()) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/aql/AQLTestSuite.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/aql/AQLTestSuite.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/aql/AQLTestSuite.java index 57a446a..a7c9c40 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/aql/AQLTestSuite.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/aql/AQLTestSuite.java @@ -29,10 +29,11 @@ import org.apache.asterix.lang.aql.parser.ParseException; import org.apache.commons.lang3.StringUtils; public class AQLTestSuite extends TestSuite { - private static String AQLTS_PATH = StringUtils.join(new String[] { "src", "test", "resources", "parserts", - "queries" + File.separator }, File.separator); - private static String AQLTS_SQL_LIKE_PATH = StringUtils.join(new String[] { "src", "test", "resources", "parserts", - "queries-sql-like" + File.separator }, File.separator); + private static String AQLTS_PATH = StringUtils + .join(new String[] { "src", "test", "resources", "parserts", "queries" + File.separator }, File.separator); + private static String AQLTS_SQL_LIKE_PATH = StringUtils.join( + new String[] { "src", "test", "resources", "parserts", "queries-sql-like" + File.separator }, + File.separator); public static Test suite() throws ParseException, UnsupportedEncodingException, FileNotFoundException { File testData = new File(AQLTS_PATH); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/CancellationTestExecutor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/CancellationTestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/CancellationTestExecutor.java index b4f9ded..41aa23f 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/CancellationTestExecutor.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/CancellationTestExecutor.java @@ -112,7 +112,8 @@ public class CancellationTestExecutor extends TestExecutor { queryCount.increment(); return false; } else { - System.err.println("Expected to find one of the following in error text:\n+++++\n" + expectedErrors + "\n+++++"); + System.err.println( + "Expected to find one of the following in error text:\n+++++\n" + expectedErrors + "\n+++++"); return true; } }
