February 2013 - teiid-commits - Jboss List Archives

Teiid - Continuous Build - Build # 1961 - Failure!

by ci-builds＠redhat.com

Teiid - Continuous Build - Build # 1961 - Failure: Check console output at http://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/Teiid%20-%20Continuou... to view the results.

11 years, 2 months

1
3
0 / 0

[teiid/teiid] 58a1ce: TEIID-2379 fixing the npe with uninitialized close

by shawkins

Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 58a1ce58bd2a9a1049165f163e579fa49eaec808 https://github.com/teiid/teiid/commit/58a1ce58bd2a9a1049165f163e579fa49ea... Author: shawkins <shawkins(a)redhat.com> Date: 2013-02-06 (Wed, 06 Feb 2013) Changed paths: M engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java M engine/src/main/java/org/teiid/query/processor/relational/InsertPlanExecutionNode.java M engine/src/main/java/org/teiid/query/processor/relational/UnionAllNode.java M engine/src/test/java/org/teiid/query/processor/relational/TestAccessNode.java Log Message: ----------- TEIID-2379 fixing the npe with uninitialized close

11 years, 2 months

1
0
0 / 0

[teiid/teiid] 847d38: TEIID-1854 making the inline count optional

by shawkins

Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 847d38276d4a8326b90fa36f093158bd685824c9 https://github.com/teiid/teiid/commit/847d38276d4a8326b90fa36f093158bd685... Author: shawkins <shawkins(a)redhat.com> Date: 2013-02-06 (Wed, 06 Feb 2013) Changed paths: M odata/src/main/java/org/teiid/odata/Client.java M odata/src/main/java/org/teiid/odata/EntityList.java M odata/src/main/java/org/teiid/odata/LocalClient.java M odata/src/main/java/org/teiid/odata/TeiidProducer.java M odata/src/test/java/org/teiid/odata/TestODataIntegration.java Log Message: ----------- TEIID-1854 making the inline count optional

11 years, 2 months

1
0
0 / 0

teiid SVN: r4552 - branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle.

by teiid-commits＠lists.jboss.org

Author: jolee Date: 2013-02-05 15:34:44 -0500 (Tue, 05 Feb 2013) New Revision: 4552 Modified: branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java Log: TEIID-2374: OracleExecutionFactory should indicate support of common table expressions for 9.2 or later Modified: branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java =================================================================== --- branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java 2013-02-05 20:21:35 UTC (rev 4551) +++ branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java 2013-02-05 20:34:44 UTC (rev 4552) @@ -65,6 +65,9 @@ @Translator(name="oracle", description="A translator for Oracle 9i Database or later") public class OracleExecutionFactory extends JDBCExecutionFactory { + public static final String NINE_0 = "9.0"; //$NON-NLS-1$ + public static final String NINE_2 = "9.2"; //$NON-NLS-1$ + private static final String TIME_FORMAT = "HH24:MI:SS"; //$NON-NLS-1$ private static final String DATE_FORMAT = "YYYY-MM-DD"; //$NON-NLS-1$ private static final String DATETIME_FORMAT = DATE_FORMAT + " " + TIME_FORMAT; //$NON-NLS-1$ @@ -98,6 +101,10 @@ static int FIXED_CHAR_TYPE = 999; private boolean oracleSuppliedDriver = true; + + public OracleExecutionFactory() { + setDatabaseVersion(NINE_0); + } public void start() throws TranslatorException { super.start(); @@ -738,4 +745,9 @@ return OracleFormatFunctionModifier.supportsLiteral(literal); } + @Override + public boolean supportsCommonTableExpressions() { + return getDatabaseVersion().compareTo(NINE_2) >= 0; + } + }

11 years, 2 months

1
0
0 / 0

teiid SVN: r4551 - in branches/7.7.x/engine/src: test/java/org/teiid/query/rewriter and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: jolee Date: 2013-02-05 15:21:35 -0500 (Tue, 05 Feb 2013) New Revision: 4551 Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java branches/7.7.x/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java Log: TEIID-2366: If where clause contains both equal and greater then conditions then query may return no results Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java =================================================================== --- branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2013-02-05 20:09:09 UTC (rev 4550) +++ branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2013-02-05 20:21:35 UTC (rev 4551) @@ -1231,8 +1231,14 @@ if (cc.getOperator() == CompareCriteria.EQ) { exprMap.put(cc.getLeftExpression(), cc); } else if (modified) { - newCrits.add(sc); - exprMap.put(sc.getExpression(), sc); + if (sc.getNumberOfValues() == 1) { + CompareCriteria comp = new CompareCriteria(sc.getExpression(), CompareCriteria.EQ, (Expression)sc.getValues().iterator().next()); + newCrits.add(comp); + exprMap.put(sc.getExpression(), comp); + } else { + newCrits.add(sc); + exprMap.put(sc.getExpression(), sc); + } return null; } } else { @@ -1240,7 +1246,7 @@ if (cc1.getOperator() == CompareCriteria.NE) { exprMap.put(cc.getLeftExpression(), cc); } else if (cc1.getOperator() == CompareCriteria.EQ) { - if (!Evaluator.compare(cc1, ((Constant)cc1.getRightExpression()).getValue(), ((Constant)cc.getRightExpression()).getValue())) { + if (!Evaluator.compare(cc, ((Constant)cc1.getRightExpression()).getValue(), ((Constant)cc.getRightExpression()).getValue())) { return FALSE_CRITERIA; } return null; Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java =================================================================== --- branches/7.7.x/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java 2013-02-05 20:09:09 UTC (rev 4550) +++ branches/7.7.x/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java 2013-02-05 20:21:35 UTC (rev 4551) @@ -2410,6 +2410,18 @@ helpTestRewriteCriteria("pm1.g1.e2 > 5 and pm1.g1.e2 < 2", "1 = 0"); } + @Test public void testRewritePredicateOptimization8() throws Exception { + helpTestRewriteCriteria("pm1.g1.e2 = 2 and pm1.g1.e2 > 1", "pm1.g1.e2 = 2"); + } + + @Test public void testRewritePredicateOptimization8a() throws Exception { + helpTestRewriteCriteria("pm1.g1.e2 in (0, 2) and pm1.g1.e2 > 1", "pm1.g1.e2 = 2"); + } + + @Test public void testRewritePredicateOptimization9() throws Exception { + helpTestRewriteCriteria("not(pm1.g1.e2 = 2 and pm1.g1.e2 = 3)", "(pm1.g1.e2 <> 2) OR (pm1.g1.e2 <> 3)"); + } + @Test public void testRewritePredicateOptimizationOr() throws Exception { helpTestRewriteCriteria("pm1.g1.e2 in (5, 6) or pm1.g1.e2 = 2", "pm1.g1.e2 IN (2, 5, 6)"); }

11 years, 2 months

1
0
0 / 0

teiid SVN: r4550 - in branches/7.7.x/engine/src: test/java/org/teiid/common/buffer/impl and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: jolee Date: 2013-02-05 15:09:09 -0500 (Tue, 05 Feb 2013) New Revision: 4550 Added: branches/7.7.x/engine/src/test/java/org/teiid/common/buffer/impl/TestBlockByteBuffer.java Modified: branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl/BlockByteBuffer.java Log: TEIID-2360: Memory buffer sizes over 1GB are not correctly handled Modified: branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl/BlockByteBuffer.java =================================================================== --- branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl/BlockByteBuffer.java 2013-02-05 19:59:24 UTC (rev 4549) +++ branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl/BlockByteBuffer.java 2013-02-05 20:09:09 UTC (rev 4550) @@ -73,7 +73,7 @@ } buffers = new ThreadLocal[segments]; for (int i = 0; i < fullSegments; i++) { - buffers[i] = new ThreadLocalByteBuffer(allocate(lastSegmentSize, direct)); + buffers[i] = new ThreadLocalByteBuffer(allocate(segmentSize, direct)); } if (lastSegmentSize > 0) { buffers[fullSegments] = new ThreadLocalByteBuffer(allocate(lastSegmentSize, direct)); Added: branches/7.7.x/engine/src/test/java/org/teiid/common/buffer/impl/TestBlockByteBuffer.java =================================================================== --- branches/7.7.x/engine/src/test/java/org/teiid/common/buffer/impl/TestBlockByteBuffer.java (rev 0) +++ branches/7.7.x/engine/src/test/java/org/teiid/common/buffer/impl/TestBlockByteBuffer.java 2013-02-05 20:09:09 UTC (rev 4550) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.common.buffer.impl; + +import org.junit.Test; + +public class TestBlockByteBuffer { + + @Test public void testBufferSizing() { + BlockByteBuffer bbb = new BlockByteBuffer(4, 100, 4, false); + bbb.getByteBuffer(1); + } + +}

11 years, 2 months

1
0
0 / 0

teiid SVN: r4549 - in branches/7.7.x/engine/src: test/java/org/teiid/common/buffer/impl and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: jolee Date: 2013-02-05 14:59:24 -0500 (Tue, 05 Feb 2013) New Revision: 4549 Modified: branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java branches/7.7.x/engine/src/test/java/org/teiid/common/buffer/impl/TestFileStorageManager.java Log: TEIID-2357: max buffer space is not honored Modified: branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java =================================================================== --- branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java 2013-02-05 19:36:43 UTC (rev 4548) +++ branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java 2013-02-05 19:59:24 UTC (rev 4549) @@ -45,8 +45,9 @@ */ public class FileStorageManager implements StorageManager { + private static final long MB = 1024L * 1024L; public static final int DEFAULT_MAX_OPEN_FILES = 64; - public static final long DEFAULT_MAX_BUFFERSPACE = 50L * 1024L * 1024L * 1024L; + public static final long DEFAULT_MAX_BUFFERSPACE = 50L * 1024L * MB; private static final String FILE_PREFIX = "b_"; //$NON-NLS-1$ private long maxBufferSpace = DEFAULT_MAX_BUFFERSPACE; @@ -128,30 +129,46 @@ if (fileInfo == null) { fileInfo = new FileInfo(createFile(name)); } - long bytesUsed = 0; try { RandomAccessFile fileAccess = fileInfo.open(); long newLength = fileOffset + length; - bytesUsed = newLength - fileAccess.length(); - if (bytesUsed > 0) { - long used = usedBufferSpace.addAndGet(bytesUsed); - if (used > maxBufferSpace) { - //TODO: trigger a compaction before this is thrown - throw new IOException(QueryPlugin.Util.getString("FileStoreageManager.space_exhausted", maxBufferSpace)); //$NON-NLS-1$ - } - fileAccess.setLength(newLength); - bytesUsed = 0; - } + setLength(fileAccess, newLength, false); fileAccess.seek(fileOffset); fileAccess.write(b, offSet, length); } finally { - if (bytesUsed > 0) { - usedBufferSpace.addAndGet(-bytesUsed); - } fileInfo.close(); } return length; } + + private void setLength(RandomAccessFile fileAccess, long newLength, boolean truncate) + throws IOException { + long currentLength = fileAccess.length(); + long bytesUsed = newLength - currentLength; + if (bytesUsed == 0) { + return; + } + if (bytesUsed < 0) { + if (!truncate) { + return; + } + } else if (bytesUsed > MB) { + //this is a weak check, concurrent access may push us over the max. we are just trying to prevent large overage allocations + long used = usedBufferSpace.get() + bytesUsed; + if (used > maxBufferSpace) { + //TODO: trigger a compaction before this is thrown + throw new IOException(QueryPlugin.Util.getString("FileStoreageManager.space_exhausted", maxBufferSpace)); //$NON-NLS-1$ + } + } + fileAccess.setLength(newLength); + long used = usedBufferSpace.addAndGet(bytesUsed); + if (bytesUsed > 0 && used > maxBufferSpace) { + fileAccess.setLength(currentLength); + usedBufferSpace.addAndGet(-bytesUsed); + //TODO: trigger a compaction before this is thrown + throw new IOException(QueryPlugin.Util.getString("FileStoreageManager.space_exhausted", maxBufferSpace)); //$NON-NLS-1$ + } + } @Override public synchronized void setLength(long length) throws IOException { @@ -159,7 +176,7 @@ fileInfo = new FileInfo(createFile(name)); } try { - fileInfo.open().setLength(length); + setLength(fileInfo.open(), length, true); } finally { fileInfo.close(); } Modified: branches/7.7.x/engine/src/test/java/org/teiid/common/buffer/impl/TestFileStorageManager.java =================================================================== --- branches/7.7.x/engine/src/test/java/org/teiid/common/buffer/impl/TestFileStorageManager.java 2013-02-05 19:36:43 UTC (rev 4548) +++ branches/7.7.x/engine/src/test/java/org/teiid/common/buffer/impl/TestFileStorageManager.java 2013-02-05 19:59:24 UTC (rev 4549) @@ -95,6 +95,35 @@ writeBytes(store); } + @Test(expected=IOException.class) public void testMaxSpaceSplit() throws Exception { + FileStorageManager sm = getStorageManager(null, null); + sm.setMaxBufferSpace(1); + String tsID = "0"; //$NON-NLS-1$ + + SplittableStorageManager ssm = new SplittableStorageManager(sm); + FileStore store = ssm.createFileStore(tsID); + try { + writeBytes(store); + } finally { + assertEquals(0, sm.getUsedBufferSpace()); + } + } + + @Test public void testSetLength() throws Exception { + FileStorageManager sm = getStorageManager(null, null); + + String tsID = "0"; //$NON-NLS-1$ + FileStore store = sm.createFileStore(tsID); + store.setLength(1000); + assertEquals(1000, sm.getUsedBufferSpace()); + + store.setLength(200); + assertEquals(200, sm.getUsedBufferSpace()); + + store.setLength(1000); + assertEquals(1000, sm.getUsedBufferSpace()); + } + @Test public void testFlush() throws Exception { FileStorageManager sm = getStorageManager(null, null); FileStore store = sm.createFileStore("0");

11 years, 2 months

1
0
0 / 0

teiid SVN: r4548 - branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process.

by teiid-commits＠lists.jboss.org

Author: jolee Date: 2013-02-05 14:36:43 -0500 (Tue, 05 Feb 2013) New Revision: 4548 Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java Log: TEIID-2352: START USER COMMAND and END USER COMMAND are not shown with loglevel=DEBUG Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java =================================================================== --- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2013-01-31 19:54:35 UTC (rev 4547) +++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2013-02-05 19:36:43 UTC (rev 4548) @@ -691,7 +691,7 @@ void logMMCommand(RequestWorkItem workItem, Event status, Integer rowCount) { if ((status != Event.PLAN && !LogManager.isMessageToBeRecorded(LogConstants.CTX_COMMANDLOGGING, MessageLevel.DETAIL)) - || !LogManager.isMessageToBeRecorded(LogConstants.CTX_COMMANDLOGGING, MessageLevel.TRACE)) { + || (status == Event.PLAN && !LogManager.isMessageToBeRecorded(LogConstants.CTX_COMMANDLOGGING, MessageLevel.TRACE))) { return; }

11 years, 2 months

1
0
0 / 0

[teiid/teiid] d1a8d3: Edits from SteveH

by Ramesh Reddy

Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: d1a8d36696a3ada03cac7009cdd24bb2257cbff9 https://github.com/teiid/teiid/commit/d1a8d36696a3ada03cac7009cdd24bb2257... Author: rareddy <rareddy(a)jboss.org> Date: 2013-02-05 (Tue, 05 Feb 2013) Changed paths: M odata/src/main/java/org/teiid/odata/EntityList.java M odata/src/main/java/org/teiid/odata/LocalClient.java M odata/src/main/java/org/teiid/odata/TeiidProducer.java M odata/src/test/java/org/teiid/odata/TestDataEntitySchemaBuilder.java M odata/src/test/java/org/teiid/odata/TestODataIntegration.java M odata/src/test/java/org/teiid/odata/TestODataSQLStringVisitor.java Log Message: ----------- Edits from SteveH Commit: 6b6d6559f09080d00f69fce424819762d2e1f69c https://github.com/teiid/teiid/commit/6b6d6559f09080d00f69fce424819762d2e... Author: Ramesh Reddy <rareddy(a)jboss.org> Date: 2013-02-05 (Tue, 05 Feb 2013) Changed paths: M odata/src/main/java/org/teiid/odata/EntityList.java M odata/src/main/java/org/teiid/odata/LocalClient.java M odata/src/main/java/org/teiid/odata/TeiidProducer.java M odata/src/test/java/org/teiid/odata/TestDataEntitySchemaBuilder.java M odata/src/test/java/org/teiid/odata/TestODataIntegration.java M odata/src/test/java/org/teiid/odata/TestODataSQLStringVisitor.java Log Message: ----------- Merge pull request #48 from rareddy/TEIID-1854 Edits from SteveH Compare: https://github.com/teiid/teiid/compare/fe9ec5545272...6b6d6559f090

11 years, 2 months

1
0
0 / 0

[teiid/teiid] abaff4: Correcting the domain mode startup failures caused...

by Ramesh Reddy

Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: abaff4c8890539eada5aaa14bfc9cd5f6ec5a766 https://github.com/teiid/teiid/commit/abaff4c8890539eada5aaa14bfc9cd5f6ec... Author: rareddy <rareddy(a)jboss.org> Date: 2013-02-05 (Tue, 05 Feb 2013) Changed paths: M build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli M build/pom.xml M jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java Log Message: ----------- Correcting the domain mode startup failures caused by odata war file Commit: fe9ec5545272add7a2434bba747ccb4410312954 https://github.com/teiid/teiid/commit/fe9ec5545272add7a2434bba747ccb44103... Author: Ramesh Reddy <rareddy(a)jboss.org> Date: 2013-02-05 (Tue, 05 Feb 2013) Changed paths: M build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli M build/pom.xml M jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java Log Message: ----------- Merge pull request #47 from rareddy/TEIID-2364 Correcting the domain mode startup failures caused by odata war file Compare: https://github.com/teiid/teiid/compare/a9a5659b9b1c...fe9ec5545272

11 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits February 2013